summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-02-11 14:50:18 -0600
committerGitHub <noreply@github.com>2018-02-11 14:50:18 -0600
commit14a76793e596d612efd273169c4172922c270f13 (patch)
tree9517f097031e48ed4dd590ee772875a0da48c652 /data
parent387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff)
parentd704a2b5df0a7957f6df06669cf4423e5026d87b (diff)
Merge pull request #206 from DizzyEggg/battle_labels
More battle code clean up
Diffstat (limited to 'data')
-rw-r--r--data/battle_ai_scripts.s260
-rw-r--r--data/battle_anim_scripts.s2
-rw-r--r--data/battle_moves.inc2
-rw-r--r--data/battle_scripts_1.s1468
-rw-r--r--data/battle_scripts_2.s37
-rw-r--r--data/battle_tower.s1
-rw-r--r--data/data2b.s1
-rw-r--r--data/data2c.s1
8 files changed, 889 insertions, 883 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index afe365231..430f9f403 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -1,11 +1,11 @@
- .include "include/constants/battle_ai.h"
- .include "include/constants/abilities.h"
- .include "include/constants/items.h"
- .include "include/constants/moves.h"
- .include "include/constants/battle_move_effects.h"
- .include "include/constants/hold_effects.h"
- .include "constants/battle_constants.inc"
- .include "constants/type_constants.inc"
+#include "constants/battle.h"
+#include "constants/battle_ai.h"
+#include "constants/abilities.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/battle_move_effects.h"
+#include "constants/hold_effects.h"
+#include "constants/pokemon.h"
.include "asm/macros/battle_ai_script.inc"
.section script_data, "aw", %progbits
@@ -249,64 +249,64 @@ BattleAIScript_82DC341:
if_hp_less_than AI_USER, 51, Score_Minus10
BattleAIScript_82DC348:
- if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
end
BattleAIScript_82DC351:
- if_stat_level_equal AI_USER, DEF, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
end
BattleAIScript_82DC35A:
- if_stat_level_equal AI_USER, SPEED, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10
end
BattleAIScript_82DC363:
- if_stat_level_equal AI_USER, SPATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
end
BattleAIScript_82DC36C:
- if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10
end
BattleAIScript_82DC375:
- if_stat_level_equal AI_USER, ACC, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10
end
BattleAIScript_82DC37E:
- if_stat_level_equal AI_USER, EVASION, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10
end
BattleAIScript_82DC387:
- if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_HYPER_CUTTER, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC39C:
- if_stat_level_equal AI_TARGET, DEF, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3A9:
- if_stat_level_equal AI_TARGET, SPEED, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10
if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3BF:
- if_stat_level_equal AI_TARGET, SPATK, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3CC:
- if_stat_level_equal AI_TARGET, SPDEF, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3D9:
- if_stat_level_equal AI_TARGET, ACC, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_KEEN_EYE, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3EE:
- if_stat_level_equal AI_TARGET, EVASION, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10
BattleAIScript_82DC3F6:
get_ability AI_TARGET
@@ -315,20 +315,20 @@ BattleAIScript_82DC3F6:
end
BattleAIScript_82DC405:
- if_stat_level_less_than AI_USER, ATK, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, DEF, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, SPEED, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, SPATK, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, SPDEF, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, ACC, 6, BattleAIScript_82DC47A
- if_stat_level_less_than AI_USER, EVASION, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, ATK, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, DEF, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, SPEED, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, SPATK, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, SPDEF, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, ACC, 6, BattleAIScript_82DC47A
- if_stat_level_more_than AI_TARGET, EVASION, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_ATK, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_DEF, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_SPEED, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_SPATK, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_SPDEF, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_ACC, 6, BattleAIScript_82DC47A
+ if_stat_level_less_than AI_USER, STAT_EVASION, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_DEF, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_SPEED, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_SPATK, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_SPDEF, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_ACC, 6, BattleAIScript_82DC47A
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, BattleAIScript_82DC47A
goto Score_Minus10
BattleAIScript_82DC47A:
@@ -436,8 +436,8 @@ BattleAIScript_82DC5B0:
end
BattleAIScript_82DC5BB:
- if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
- if_stat_level_equal AI_USER, DEF, 12, Score_Minus8
+ if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
end
BattleAIScript_82DC5CC:
@@ -484,8 +484,8 @@ BattleAIScript_82DC635:
end
BattleAIScript_82DC640:
- if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
- if_stat_level_equal AI_TARGET, SPATK, 0, Score_Minus8
+ if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8
BattleAIScript_82DC650:
count_usable_party_mons AI_USER
@@ -574,18 +574,18 @@ BattleAIScript_82DC71E:
end
BattleAIScript_82DC729:
- if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
- if_stat_level_equal AI_TARGET, DEF, 0, Score_Minus8
+ if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
+ if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8
end
BattleAIScript_82DC73A:
- if_stat_level_equal AI_USER, DEF, 12, Score_Minus10
- if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus8
+ if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
end
BattleAIScript_82DC74B:
- if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
- if_stat_level_equal AI_USER, DEF, 12, Score_Minus8
+ if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
end
BattleAIScript_82DC75C:
@@ -593,13 +593,13 @@ BattleAIScript_82DC75C:
end
BattleAIScript_82DC767:
- if_stat_level_equal AI_USER, SPATK, 12, Score_Minus10
- if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus8
+ if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
end
BattleAIScript_82DC778:
- if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
- if_stat_level_equal AI_USER, SPEED, 12, Score_Minus8
+ if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
+ if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8
end
Score_Minus1:
@@ -805,9 +805,9 @@ BattleAIScript_82DCAC7:
end
BattleAIScript_82DCAC8:
- if_stat_level_less_than AI_TARGET, EVASION, 7, BattleAIScript_82DCAE2
+ if_stat_level_less_than AI_TARGET, STAT_EVASION, 7, BattleAIScript_82DCAE2
score -1
- if_stat_level_less_than AI_TARGET, EVASION, 10, BattleAIScript_82DCAE2
+ if_stat_level_less_than AI_TARGET, STAT_EVASION, 10, BattleAIScript_82DCAE2
if_random_less_than 128, BattleAIScript_82DCAE2
score -1
@@ -906,7 +906,7 @@ sMovesTable_82DCB6C:
.2byte -1
BattleAIScript_82DCBBC:
- if_stat_level_less_than AI_USER, ATK, 9, BattleAIScript_82DCBD1
+ if_stat_level_less_than AI_USER, STAT_ATK, 9, BattleAIScript_82DCBD1
if_random_less_than 100, BattleAIScript_82DCBE0
score -1
goto BattleAIScript_82DCBE0
@@ -928,7 +928,7 @@ BattleAIScript_82DCBF6:
end
BattleAIScript_82DCBF7:
- if_stat_level_less_than AI_USER, DEF, 9, BattleAIScript_82DCC0C
+ if_stat_level_less_than AI_USER, STAT_DEF, 9, BattleAIScript_82DCC0C
if_random_less_than 100, BattleAIScript_82DCC1B
score -1
goto BattleAIScript_82DCC1B
@@ -986,7 +986,7 @@ BattleAIScript_82DCC72:
end
BattleAIScript_82DCC73:
- if_stat_level_less_than AI_USER, SPATK, 9, BattleAIScript_82DCC88
+ if_stat_level_less_than AI_USER, STAT_SPATK, 9, BattleAIScript_82DCC88
if_random_less_than 100, BattleAIScript_82DCC97
score -1
goto BattleAIScript_82DCC97
@@ -1008,7 +1008,7 @@ BattleAIScript_82DCCAD:
end
BattleAIScript_82DCCAE:
- if_stat_level_less_than AI_USER, SPDEF, 9, BattleAIScript_82DCCC3
+ if_stat_level_less_than AI_USER, STAT_SPDEF, 9, BattleAIScript_82DCCC3
if_random_less_than 100, BattleAIScript_82DCCD2
score -1
goto BattleAIScript_82DCCD2
@@ -1054,7 +1054,7 @@ sTypesTable_82DCD0A:
.byte -1
BattleAIScript_82DCD14:
- if_stat_level_less_than AI_USER, ACC, 9, BattleAIScript_82DCD24
+ if_stat_level_less_than AI_USER, STAT_ACC, 9, BattleAIScript_82DCD24
if_random_less_than 50, BattleAIScript_82DCD24
score -2
@@ -1071,7 +1071,7 @@ BattleAIScript_82DCD2E:
score +3
BattleAIScript_82DCD3D:
- if_stat_level_less_than AI_USER, EVASION, 9, BattleAIScript_82DCD4D
+ if_stat_level_less_than AI_USER, STAT_EVASION, 9, BattleAIScript_82DCD4D
if_random_less_than 128, BattleAIScript_82DCD4D
score -1
@@ -1101,7 +1101,7 @@ BattleAIScript_82DCD90:
BattleAIScript_82DCDA2:
if_hp_more_than AI_USER, 70, BattleAIScript_82DCDC7
- if_stat_level_equal AI_USER, EVASION, 6, BattleAIScript_82DCDC7
+ if_stat_level_equal AI_USER, STAT_EVASION, 6, BattleAIScript_82DCDC7
if_hp_less_than AI_USER, 40, BattleAIScript_82DCDC5
if_hp_less_than AI_TARGET, 40, BattleAIScript_82DCDC5
if_random_less_than 70, BattleAIScript_82DCDC7
@@ -1113,10 +1113,10 @@ BattleAIScript_82DCDC7:
end
BattleAIScript_82DCDC8:
- if_stat_level_more_than AI_TARGET, EVASION, 10, BattleAIScript_82DCDED
- if_stat_level_less_than AI_USER, ACC, 2, BattleAIScript_82DCDED
- if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DCDEF
- if_stat_level_less_than AI_USER, ACC, 4, BattleAIScript_82DCDEF
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 10, BattleAIScript_82DCDED
+ if_stat_level_less_than AI_USER, STAT_ACC, 2, BattleAIScript_82DCDED
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DCDEF
+ if_stat_level_less_than AI_USER, STAT_ACC, 4, BattleAIScript_82DCDEF
goto BattleAIScript_82DCDF7
BattleAIScript_82DCDED:
@@ -1130,13 +1130,13 @@ BattleAIScript_82DCDF7:
end
BattleAIScript_82DCDF8:
- if_stat_level_equal AI_TARGET, ATK, 6, BattleAIScript_82DCE1B
+ if_stat_level_equal AI_TARGET, STAT_ATK, 6, BattleAIScript_82DCE1B
score -1
if_hp_more_than AI_USER, 90, BattleAIScript_82DCE0B
score -1
BattleAIScript_82DCE0B:
- if_stat_level_more_than AI_TARGET, ATK, 3, BattleAIScript_82DCE1B
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DCE1B
if_random_less_than 50, BattleAIScript_82DCE1B
score -2
@@ -1166,7 +1166,7 @@ sTypesTable_82DCE43:
BattleAIScript_82DCE4A:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCE59
- if_stat_level_more_than AI_TARGET, DEF, 3, BattleAIScript_82DCE61
+ if_stat_level_more_than AI_TARGET, STAT_DEF, 3, BattleAIScript_82DCE61
BattleAIScript_82DCE59:
if_random_less_than 50, BattleAIScript_82DCE61
@@ -1198,13 +1198,13 @@ BattleAIScript_82DCE96:
end
BattleAIScript_82DCE97:
- if_stat_level_equal AI_TARGET, ATK, 6, BattleAIScript_82DCEBA
+ if_stat_level_equal AI_TARGET, STAT_ATK, 6, BattleAIScript_82DCEBA
score -1
if_hp_more_than AI_USER, 90, BattleAIScript_82DCEAA
score -1
BattleAIScript_82DCEAA:
- if_stat_level_more_than AI_TARGET, SPATK, 3, BattleAIScript_82DCEBA
+ if_stat_level_more_than AI_TARGET, STAT_SPATK, 3, BattleAIScript_82DCEBA
if_random_less_than 50, BattleAIScript_82DCEBA
score -2
@@ -1236,7 +1236,7 @@ sTypesTable_82DCEE2:
BattleAIScript_82DCEEB:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCEFA
- if_stat_level_more_than AI_TARGET, SPDEF, 3, BattleAIScript_82DCF02
+ if_stat_level_more_than AI_TARGET, STAT_SPDEF, 3, BattleAIScript_82DCF02
BattleAIScript_82DCEFA:
if_random_less_than 50, BattleAIScript_82DCF02
@@ -1258,7 +1258,7 @@ BattleAIScript_82DCF1A:
score -1
BattleAIScript_82DCF22:
- if_stat_level_more_than AI_USER, ACC, 4, BattleAIScript_82DCF32
+ if_stat_level_more_than AI_USER, STAT_ACC, 4, BattleAIScript_82DCF32
if_random_less_than 80, BattleAIScript_82DCF32
score -2
@@ -1284,7 +1284,7 @@ BattleAIScript_82DCF68:
BattleAIScript_82DCF7A:
if_hp_more_than AI_USER, 70, BattleAIScript_82DCF9F
- if_stat_level_equal AI_TARGET, ACC, 6, BattleAIScript_82DCF9F
+ if_stat_level_equal AI_TARGET, STAT_ACC, 6, BattleAIScript_82DCF9F
if_hp_less_than AI_USER, 40, BattleAIScript_82DCF9D
if_hp_less_than AI_TARGET, 40, BattleAIScript_82DCF9D
if_random_less_than 70, BattleAIScript_82DCF9F
@@ -1297,7 +1297,7 @@ BattleAIScript_82DCF9F:
BattleAIScript_82DCFA0:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCFAF
- if_stat_level_more_than AI_TARGET, EVASION, 3, BattleAIScript_82DCFB7
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 3, BattleAIScript_82DCFB7
BattleAIScript_82DCFAF:
if_random_less_than 50, BattleAIScript_82DCFB7
@@ -1311,16 +1311,16 @@ BattleAIScript_82DCFC0:
end
BattleAIScript_82DCFC1:
- if_stat_level_more_than AI_USER, ATK, 8, BattleAIScript_82DD016
- if_stat_level_more_than AI_USER, DEF, 8, BattleAIScript_82DD016
- if_stat_level_more_than AI_USER, SPATK, 8, BattleAIScript_82DD016
- if_stat_level_more_than AI_USER, SPDEF, 8, BattleAIScript_82DD016
- if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD016
- if_stat_level_less_than AI_TARGET, ATK, 4, BattleAIScript_82DD016
- if_stat_level_less_than AI_TARGET, DEF, 4, BattleAIScript_82DD016
- if_stat_level_less_than AI_TARGET, SPATK, 4, BattleAIScript_82DD016
- if_stat_level_less_than AI_TARGET, SPDEF, 4, BattleAIScript_82DD016
- if_stat_level_less_than AI_TARGET, ACC, 4, BattleAIScript_82DD016
+ if_stat_level_more_than AI_USER, STAT_ATK, 8, BattleAIScript_82DD016
+ if_stat_level_more_than AI_USER, STAT_DEF, 8, BattleAIScript_82DD016
+ if_stat_level_more_than AI_USER, STAT_SPATK, 8, BattleAIScript_82DD016
+ if_stat_level_more_than AI_USER, STAT_SPDEF, 8, BattleAIScript_82DD016
+ if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD016
+ if_stat_level_less_than AI_TARGET, STAT_ATK, 4, BattleAIScript_82DD016
+ if_stat_level_less_than AI_TARGET, STAT_DEF, 4, BattleAIScript_82DD016
+ if_stat_level_less_than AI_TARGET, STAT_SPATK, 4, BattleAIScript_82DD016
+ if_stat_level_less_than AI_TARGET, STAT_SPDEF, 4, BattleAIScript_82DD016
+ if_stat_level_less_than AI_TARGET, STAT_ACC, 4, BattleAIScript_82DD016
goto BattleAIScript_82DD01E
BattleAIScript_82DD016:
@@ -1328,16 +1328,16 @@ BattleAIScript_82DD016:
score -3
BattleAIScript_82DD01E:
- if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD07B
- if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD07B
- if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD07B
- if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD07B
- if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD07B
- if_stat_level_less_than AI_USER, ATK, 4, BattleAIScript_82DD07B
- if_stat_level_less_than AI_USER, DEF, 4, BattleAIScript_82DD07B
- if_stat_level_less_than AI_USER, SPATK, 4, BattleAIScript_82DD07B
- if_stat_level_less_than AI_USER, SPDEF, 4, BattleAIScript_82DD07B
- if_stat_level_less_than AI_USER, ACC, 4, BattleAIScript_82DD07B
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD07B
+ if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD07B
+ if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD07B
+ if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD07B
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD07B
+ if_stat_level_less_than AI_USER, STAT_ATK, 4, BattleAIScript_82DD07B
+ if_stat_level_less_than AI_USER, STAT_DEF, 4, BattleAIScript_82DD07B
+ if_stat_level_less_than AI_USER, STAT_SPATK, 4, BattleAIScript_82DD07B
+ if_stat_level_less_than AI_USER, STAT_SPDEF, 4, BattleAIScript_82DD07B
+ if_stat_level_less_than AI_USER, STAT_ACC, 4, BattleAIScript_82DD07B
if_random_less_than 50, BattleAIScript_82DD083
score -1
goto BattleAIScript_82DD083
@@ -1357,11 +1357,11 @@ BattleAIScript_82DD08D:
end
BattleAIScript_82DD08E:
- if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD0BD
- if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD0BD
- if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD0BD
- if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD0BD
- if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD0BD
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD0BD
+ if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD0BD
+ if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD0BD
+ if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD0BD
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD0BD
score -3
goto BattleAIScript_82DD0C5
@@ -1569,7 +1569,7 @@ BattleAIScript_82DD2B7:
end
BattleAIScript_82DD2B8:
- if_stat_level_more_than AI_TARGET, ATK, 3, BattleAIScript_82DD2D0
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DD2D0
score +3
get_turn_count
if_not_equal 0, BattleAIScript_82DD2D2
@@ -1987,17 +1987,17 @@ BattleAIScript_82DD645:
if_equal TYPE_GHOST, BattleAIScript_82DD68A
get_user_type2
if_equal TYPE_GHOST, BattleAIScript_82DD68A
- if_stat_level_more_than AI_USER, DEF, 9, BattleAIScript_82DD693
+ if_stat_level_more_than AI_USER, STAT_DEF, 9, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD665
score +1
BattleAIScript_82DD665:
- if_stat_level_more_than AI_USER, DEF, 7, BattleAIScript_82DD693
+ if_stat_level_more_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD675
score +1
BattleAIScript_82DD675:
- if_stat_level_more_than AI_USER, DEF, 6, BattleAIScript_82DD693
+ if_stat_level_more_than AI_USER, STAT_DEF, 6, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD693
score +1
goto BattleAIScript_82DD693
@@ -2062,7 +2062,7 @@ BattleAIScript_82DD75D:
if_equal TYPE_GHOST, BattleAIScript_82DD77C
get_user_type2
if_equal TYPE_GHOST, BattleAIScript_82DD77C
- if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD782
+ if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD782
score -2
goto BattleAIScript_82DD78A
@@ -2092,11 +2092,11 @@ BattleAIScript_82DD7A8:
end
BattleAIScript_82DD7A9:
- if_stat_level_more_than AI_USER, ATK, 8, BattleAIScript_82DD7D6
- if_stat_level_more_than AI_USER, DEF, 8, BattleAIScript_82DD7D6
- if_stat_level_more_than AI_USER, SPATK, 8, BattleAIScript_82DD7D6
- if_stat_level_more_than AI_USER, SPDEF, 8, BattleAIScript_82DD7D6
- if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD7D6
+ if_stat_level_more_than AI_USER, STAT_ATK, 8, BattleAIScript_82DD7D6
+ if_stat_level_more_than AI_USER, STAT_DEF, 8, BattleAIScript_82DD7D6
+ if_stat_level_more_than AI_USER, STAT_SPATK, 8, BattleAIScript_82DD7D6
+ if_stat_level_more_than AI_USER, STAT_SPDEF, 8, BattleAIScript_82DD7D6
+ if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD7D6
goto BattleAIScript_82DD7FC
BattleAIScript_82DD7D6:
@@ -2113,11 +2113,11 @@ BattleAIScript_82DD7EF:
goto BattleAIScript_82DD844
BattleAIScript_82DD7FC:
- if_stat_level_more_than AI_USER, ATK, 7, BattleAIScript_82DD829
- if_stat_level_more_than AI_USER, DEF, 7, BattleAIScript_82DD829
- if_stat_level_more_than AI_USER, SPATK, 7, BattleAIScript_82DD829
- if_stat_level_more_than AI_USER, SPDEF, 7, BattleAIScript_82DD829
- if_stat_level_more_than AI_USER, EVASION, 7, BattleAIScript_82DD829
+ if_stat_level_more_than AI_USER, STAT_ATK, 7, BattleAIScript_82DD829
+ if_stat_level_more_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD829
+ if_stat_level_more_than AI_USER, STAT_SPATK, 7, BattleAIScript_82DD829
+ if_stat_level_more_than AI_USER, STAT_SPDEF, 7, BattleAIScript_82DD829
+ if_stat_level_more_than AI_USER, STAT_EVASION, 7, BattleAIScript_82DD829
goto BattleAIScript_82DD842
BattleAIScript_82DD829:
@@ -2208,19 +2208,19 @@ BattleAIScript_82DD8F1:
end
BattleAIScript_82DD8F2:
- if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD91F
- if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD91F
- if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD91F
- if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD91F
- if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD91F
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD91F
+ if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD91F
+ if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD91F
+ if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD91F
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD91F
goto BattleAIScript_82DD957
BattleAIScript_82DD91F:
- if_stat_level_less_than AI_USER, ATK, 7, BattleAIScript_82DD954
- if_stat_level_less_than AI_USER, DEF, 7, BattleAIScript_82DD954
- if_stat_level_less_than AI_USER, SPATK, 7, BattleAIScript_82DD954
- if_stat_level_less_than AI_USER, SPDEF, 7, BattleAIScript_82DD954
- if_stat_level_less_than AI_USER, EVASION, 7, BattleAIScript_82DD952
+ if_stat_level_less_than AI_USER, STAT_ATK, 7, BattleAIScript_82DD954
+ if_stat_level_less_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD954
+ if_stat_level_less_than AI_USER, STAT_SPATK, 7, BattleAIScript_82DD954
+ if_stat_level_less_than AI_USER, STAT_SPDEF, 7, BattleAIScript_82DD954
+ if_stat_level_less_than AI_USER, STAT_EVASION, 7, BattleAIScript_82DD952
if_random_less_than 50, BattleAIScript_82DD959
goto BattleAIScript_82DD957
@@ -2515,7 +2515,7 @@ sAbilitiesTable_82DDBDF:
BattleAIScript_82DDBF0:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, BattleAIScript_82DDC1D
if_type_effectiveness AI_EFFECTIVENESS_x0_5, BattleAIScript_82DDC1D
- if_stat_level_less_than AI_USER, ATK, 6, BattleAIScript_82DDC1D
+ if_stat_level_less_than AI_USER, STAT_ATK, 6, BattleAIScript_82DDC1D
if_target_faster BattleAIScript_82DDC16
if_hp_more_than AI_USER, 40, BattleAIScript_82DDC1D
goto BattleAIScript_82DDC1F
@@ -2930,12 +2930,12 @@ sMovesTable_82DDF75:
BattleAIScript_82DDF7B:
get_turn_count
if_equal 0, Score_Minus2
- if_stat_level_more_than AI_USER, ATK, 8, Score_Plus3
- if_stat_level_more_than AI_USER, ATK, 7, Score_Plus2
- if_stat_level_more_than AI_USER, ATK, 6, Score_Plus1
- if_stat_level_more_than AI_USER, SPATK, 8, Score_Plus3
- if_stat_level_more_than AI_USER, SPATK, 7, Score_Plus2
- if_stat_level_more_than AI_USER, SPATK, 6, Score_Plus1
+ if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
+ if_stat_level_more_than AI_USER, STAT_ATK, 7, Score_Plus2
+ if_stat_level_more_than AI_USER, STAT_ATK, 6, Score_Plus1
+ if_stat_level_more_than AI_USER, STAT_SPATK, 8, Score_Plus3
+ if_stat_level_more_than AI_USER, STAT_SPATK, 7, Score_Plus2
+ if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
end
BattleAIScript_82DDFB3:
@@ -3073,7 +3073,7 @@ BattleAIScript_82DE178:
goto Score_Minus30_
BattleAIScript_82DE185:
- if_stat_level_more_than AI_TARGET, ATK, 7, BattleAIScript_82DE18F
+ if_stat_level_more_than AI_TARGET, STAT_ATK, 7, BattleAIScript_82DE18F
score +3
BattleAIScript_82DE18F:
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 878b48ccb..727a62f3d 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,7 +1,7 @@
+#include "constants/battle_anim.h"
#include "constants/rgb.h"
#include "constants/songs.h"
.include "asm/macros/battle_anim_script.inc"
- .include "include/constants/battle_anim.h"
.section script_data, "aw", %progbits
diff --git a/data/battle_moves.inc b/data/battle_moves.inc
index 586248bf0..c5c090546 100644
--- a/data/battle_moves.inc
+++ b/data/battle_moves.inc
@@ -1917,7 +1917,7 @@ gBattleMoves:: @ 831C898
@ Curse
.byte 0x6d @ effect
.byte 0 @ power
- .byte TYPE_UNKNOWN
+ .byte TYPE_MYSTERY
.byte 0 @ accuracy
.byte 10 @ PP
.byte 0 @ side effect chance
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 4d8b22186..058833fa9 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1,15 +1,17 @@
+#include "constants/battle.h"
+#include "constants/pokemon.h"
+#include "constants/battle_script_commands.h"
+#include "constants/battle_anim.h"
+#include "constants/battle_string_ids.h"
#include "constants/abilities.h"
#include "constants/moves.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
- .include "constants/battle_constants.inc"
- .include "constants/battle_script_constants.inc"
- .include "constants/battle_text.inc"
.section script_data, "aw", %progbits
-
+
.align 2
gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectHit
@@ -251,7 +253,7 @@ BattleScript_EffectUnused8d::
BattleScript_EffectUnusedA3::
BattleScript_EffectHit::
jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler
- jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler
+ jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler
orword gHitMarker, HITMARKER_IGNORE_UNDERWATER
setbyte sDMG_MULTIPLIER, 0x2
BattleScript_HitFromAtkCanceler::
@@ -270,16 +272,16 @@ BattleScript_HitFromAtkAnimation::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
seteffectwithchance
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
BattleScript_MoveEnd::
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
@@ -302,20 +304,20 @@ BattleScript_EffectSleep::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
jumpifcantmakeasleep BattleScript_CantMakeAsleep
- jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_SLEEP
+ setmoveeffect MOVE_EFFECT_SLEEP
seteffectprimary
goto BattleScript_MoveEnd
BattleScript_AlreadyAsleep::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNALREADYASLEEP
waitmessage 0x40
@@ -335,7 +337,7 @@ BattleScript_CantMakeAsleep::
BattleScript_EffectPoisonHit::
BattleScript_EffectPoisonTail::
- setmoveeffect EFFECT_POISON
+ setmoveeffect MOVE_EFFECT_POISON
goto BattleScript_EffectHit
BattleScript_EffectAbsorb::
@@ -350,44 +352,44 @@ BattleScript_EffectAbsorb::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
negativedamage
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze
+ jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze
setbyte cMULTISTRING_CHOOSER, 0x0
goto BattleScript_AbsorbUpdateHp
BattleScript_AbsorbLiquidOoze::
manipulatedamage ATK80_DMG_CHANGE_SIGN
setbyte cMULTISTRING_CHOOSER, 0x1
BattleScript_AbsorbUpdateHp::
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
jumpifmovehadnoeffect BattleScript_AbsorbTryFainting
printfromtable gLeechSeedDrainStringIds
waitmessage 0x40
BattleScript_AbsorbTryFainting::
- tryfaintmon ATTACKER, FALSE, NULL
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectBurnHit::
BattleScript_EffectBlazeKick::
- setmoveeffect EFFECT_BURN
+ setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
BattleScript_EffectFreezeHit::
- setmoveeffect EFFECT_FREEZE
+ setmoveeffect MOVE_EFFECT_FREEZE
goto BattleScript_EffectHit
BattleScript_EffectParalyzeHit::
- setmoveeffect EFFECT_PARALYSIS
+ setmoveeffect MOVE_EFFECT_PARALYSIS
goto BattleScript_EffectHit
BattleScript_EffectExplosion::
@@ -397,7 +399,7 @@ BattleScript_EffectExplosion::
faintifabilitynotdamp
setatkhptozero
waitstate
- jumpifbyte NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
+ jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
call BattleScript_82D8BEA
goto BattleScript_82D8B96
BattleScript_82D8B94::
@@ -411,19 +413,19 @@ BattleScript_82D8B96::
adjustnormaldamage
accuracycheck BattleScript_82D8BCF, ACC_CURR_MOVE
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BCF::
effectivenesssound
@@ -432,7 +434,7 @@ BattleScript_82D8BCF::
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BEA::
@@ -444,8 +446,8 @@ BattleScript_82D8BEA::
BattleScript_EffectDreamEater::
attackcanceler
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
- jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_82D8C18
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_82D8C18
BattleScript_82D8C0E::
attackstring
ppreduce
@@ -462,23 +464,23 @@ BattleScript_82D8C18::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
negativedamage
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
printstring STRINGID_PKMNDREAMEATEN
waitmessage 0x40
BattleScript_DreamEaterTryFaintEnd::
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectMirrorMove::
@@ -493,26 +495,26 @@ BattleScript_EffectMirrorMove::
goto BattleScript_MoveEnd
BattleScript_EffectAttackUp::
- setstatchanger ATK, 1, FALSE
+ setstatchanger STAT_ATK, 1, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectDefenseUp::
- setstatchanger DEF, 1, FALSE
+ setstatchanger STAT_DEF, 1, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialAttackUp::
- setstatchanger SPATK, 1, FALSE
+ setstatchanger STAT_SPATK, 1, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectEvasionUp::
- setstatchanger EVASION, 1, FALSE
+ setstatchanger STAT_EVASION, 1, FALSE
BattleScript_EffectStatUp::
attackcanceler
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
- statbuffchange AFFECTS_USER | 0x1, BattleScript_StatUpEnd
- jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_StatUpEnd
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
pause 0x20
goto BattleScript_StatUpPrintString
BattleScript_StatUpAttackAnim::
@@ -520,7 +522,7 @@ BattleScript_StatUpAttackAnim::
waitanimation
BattleScript_StatUpDoAnim::
setgraphicalstatchangevalues
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_StatUpPrintString::
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -528,45 +530,45 @@ BattleScript_StatUpEnd::
goto BattleScript_MoveEnd
BattleScript_StatUp::
- playanimation EFFECT_BANK, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
return
BattleScript_EffectAttackDown::
- setstatchanger ATK, 1, TRUE
+ setstatchanger STAT_ATK, 1, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectDefenseDown::
- setstatchanger DEF, 1, TRUE
+ setstatchanger STAT_DEF, 1, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectSpeedDown::
- setstatchanger SPEED, 1, TRUE
+ setstatchanger STAT_SPEED, 1, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectAccuracyDown::
- setstatchanger ACC, 1, TRUE
+ setstatchanger STAT_ACC, 1, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectEvasionDown::
- setstatchanger EVASION, 1, TRUE
+ setstatchanger STAT_EVASION, 1, TRUE
BattleScript_EffectStatDown::
attackcanceler
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
statbuffchange 0x1, BattleScript_StatDownEnd
- jumpifbyte LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd
pause 0x20
goto BattleScript_StatDownPrintString
BattleScript_StatDownDoAnim::
attackanimation
waitanimation
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_StatDownPrintString::
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -574,7 +576,7 @@ BattleScript_StatDownEnd::
goto BattleScript_MoveEnd
BattleScript_StatDown::
- playanimation EFFECT_BANK, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
waitmessage 0x40
return
@@ -604,7 +606,7 @@ BattleScript_EffectRampage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D8DAE
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D8DAE
ppreduce
BattleScript_82D8DAE::
confuseifrepeatingattackends
@@ -614,8 +616,8 @@ BattleScript_EffectRoar::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
- jumpifstatus3 TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
+ jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
+ jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
@@ -630,10 +632,10 @@ BattleScript_EffectMultiHit::
initmultihitstring
setbyte sMULTIHIT_EFFECT, 0x0
BattleScript_MultiHitLoop::
- jumpifhasnohp ATTACKER, BattleScript_MultiHitEnd
- jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings
- jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
- jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
+ jumpifhasnohp BS_ATTACKER, BattleScript_MultiHitEnd
+ jumpifhasnohp BS_TARGET, BattleScript_MultiHitPrintStrings
+ jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
BattleScript_DoMultiHit::
movevaluescleanup
copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT
@@ -645,10 +647,10 @@ BattleScript_DoMultiHit::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
@@ -656,7 +658,7 @@ BattleScript_DoMultiHit::
addbyte sMULTIHIT_STRING + 4, 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
- jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
+ jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
@@ -670,7 +672,7 @@ BattleScript_MultiHitPrintStrings::
waitmessage 0x40
BattleScript_MultiHitEnd::
seteffectwithchance
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x2
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0x4
@@ -689,19 +691,19 @@ BattleScript_EffectConversion::
goto BattleScript_MoveEnd
BattleScript_EffectFlinchHit::
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
BattleScript_EffectRestoreHp::
attackcanceler
attackstring
ppreduce
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, ATTACKER
+ tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_ATTACKER
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -710,38 +712,38 @@ BattleScript_EffectToxic::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
- jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
- jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
+ jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpiftype BS_TARGET, TYPE_POISON, BattleScript_NotAffected
+ jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_NotAffected
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_TOXIC
+ setmoveeffect MOVE_EFFECT_TOXIC
seteffectprimary
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_AlreadyPoisoned::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x40
printstring STRINGID_PKMNALREADYPOISONED
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_ImmunityProtected::
- copybyte gEffectBank, gBattlerTarget
+ copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PSNPrevention
goto BattleScript_MoveEnd
BattleScript_EffectPayDay::
- setmoveeffect EFFECT_PAYDAY
+ setmoveeffect MOVE_EFFECT_PAYDAY
goto BattleScript_EffectHit
BattleScript_EffectLightScreen::
@@ -752,20 +754,20 @@ BattleScript_EffectLightScreen::
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectTriAttack::
- setmoveeffect EFFECT_TRI_ATTACK
+ setmoveeffect MOVE_EFFECT_TRI_ATTACK
goto BattleScript_EffectHit
BattleScript_EffectRest::
attackcanceler
attackstring
ppreduce
- jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
jumpifcantmakeasleep BattleScript_RestCantSleep
trysetrest BattleScript_AlreadyAtFullHp
pause 0x20
printfromtable gRestUsedStringIds
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
waitstate
goto BattleScript_PresentHealTarget
@@ -776,7 +778,7 @@ BattleScript_RestCantSleep::
goto BattleScript_MoveEnd
BattleScript_RestIsAlreadyAsleep::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNALREADYASLEEP2
waitmessage 0x40
@@ -799,20 +801,20 @@ BattleScript_KOFail::
goto BattleScript_MoveEnd
BattleScript_EffectRazorWind::
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x0
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_TwoTurnMovesSecondTurn::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- setbyte sANIM_TURN, 0x1
- clearstatusfromeffect ATTACKER
+ setmoveeffect MOVE_EFFECT_CHARGING
+ setbyte sB_ANIM_TURN, 0x1
+ clearstatusfromeffect BS_ATTACKER
orword gHitMarker, HITMARKER_NO_PPDEDUCT
jumpifnotmove MOVE_SKY_ATTACK, BattleScript_HitFromAccCheck
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_HitFromAccCheck
BattleScriptFirstChargingTurn::
@@ -822,7 +824,7 @@ BattleScriptFirstChargingTurn::
attackanimation
waitanimation
orword gHitMarker, HITMARKER_x8000000
- setmoveeffect EFFECT_CHARGING | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
@@ -852,11 +854,11 @@ BattleScript_EffectDragonRage::
BattleScript_EffectTrap::
jumpifnotmove MOVE_WHIRLPOOL, BattleScript_DoWrapEffect
- jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_DoWrapEffect
+ jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_DoWrapEffect
orword gHitMarker, HITMARKER_IGNORE_UNDERWATER
setbyte sDMG_MULTIPLIER, 0x2
BattleScript_DoWrapEffect::
- setmoveeffect EFFECT_WRAP
+ setmoveeffect MOVE_EFFECT_WRAP
goto BattleScript_EffectHit
BattleScript_EffectDoubleHit::
@@ -879,7 +881,7 @@ BattleScript_MoveMissedDoDamage::
pause 0x40
resultmessage
waitmessage 0x40
- jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
+ jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
printstring STRINGID_PKMNCRASHED
waitmessage 0x40
damagecalc
@@ -888,9 +890,9 @@ BattleScript_MoveMissedDoDamage::
manipulatedamage ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- tryfaintmon ATTACKER, FALSE, NULL
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ tryfaintmon BS_ATTACKER, FALSE, NULL
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
goto BattleScript_MoveEnd
@@ -909,7 +911,7 @@ BattleScript_EffectFocusEnergy::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 ATTACKER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed
+ jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed
setfocusenergy
attackanimation
waitanimation
@@ -918,7 +920,7 @@ BattleScript_EffectFocusEnergy::
goto BattleScript_MoveEnd
BattleScript_EffectRecoil::
- setmoveeffect EFFECT_RECOIL_25 | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
incrementgamestat 0x1B
goto BattleScript_EffectHit
@@ -927,44 +929,44 @@ BattleScript_EffectConfuse::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_CONFUSION
+ setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_AlreadyConfused::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNALREADYCONFUSED
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_EffectAttackUp2::
- setstatchanger ATK, 2, FALSE
+ setstatchanger STAT_ATK, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectDefenseUp2::
- setstatchanger DEF, 2, FALSE
+ setstatchanger STAT_DEF, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectSpeedUp2::
- setstatchanger SPEED, 2, FALSE
+ setstatchanger STAT_SPEED, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialAttackUp2::
- setstatchanger SPATK, 2, FALSE
+ setstatchanger STAT_SPATK, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectSpecialDefenseUp2::
- setstatchanger SPDEF, 2, FALSE
+ setstatchanger STAT_SPDEF, 2, FALSE
goto BattleScript_EffectStatUp
BattleScript_EffectTransform::
@@ -979,19 +981,19 @@ BattleScript_EffectTransform::
goto BattleScript_MoveEnd
BattleScript_EffectAttackDown2::
- setstatchanger ATK, 2, TRUE
+ setstatchanger STAT_ATK, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectDefenseDown2::
- setstatchanger DEF, 2, TRUE
+ setstatchanger STAT_DEF, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectSpeedDown2::
- setstatchanger SPEED, 2, TRUE
+ setstatchanger STAT_SPEED, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectSpecialDefenseDown2::
- setstatchanger SPDEF, 2, TRUE
+ setstatchanger STAT_SPDEF, 2, TRUE
goto BattleScript_EffectStatDown
BattleScript_EffectReflect::
@@ -1010,18 +1012,18 @@ BattleScript_EffectPoison::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
- jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
- jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
- jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpiftype BS_TARGET, TYPE_POISON, BattleScript_NotAffected
+ jumpiftype BS_TARGET, TYPE_STEEL, BattleScript_NotAffected
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_POISON
+ setmoveeffect MOVE_EFFECT_POISON
seteffectprimary
resultmessage
waitmessage 0x40
@@ -1031,74 +1033,74 @@ BattleScript_EffectParalyze::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
typecalc
jumpifmovehadnoeffect BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
- jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_PARALYSIS
+ setmoveeffect MOVE_EFFECT_PARALYSIS
seteffectprimary
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_AlreadyParalyzed::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNISALREADYPARALYZED
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_LimberProtected::
- copybyte gEffectBank, gBattlerTarget
+ copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PRLZPrevention
goto BattleScript_MoveEnd
BattleScript_EffectAttackDownHit::
- setmoveeffect EFFECT_ATK_MINUS_1
+ setmoveeffect MOVE_EFFECT_ATK_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectDefenseDownHit::
- setmoveeffect EFFECT_DEF_MINUS_1
+ setmoveeffect MOVE_EFFECT_DEF_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectSpeedDownHit::
- setmoveeffect EFFECT_SPD_MINUS_1
+ setmoveeffect MOVE_EFFECT_SPD_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectSpecialAttackDownHit::
- setmoveeffect EFFECT_SP_ATK_MINUS_1
+ setmoveeffect MOVE_EFFECT_SP_ATK_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectSpecialDefenseDownHit::
- setmoveeffect EFFECT_SP_DEF_MINUS_1
+ setmoveeffect MOVE_EFFECT_SP_DEF_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectAccuracyDownHit::
- setmoveeffect EFFECT_ACC_MINUS_1
+ setmoveeffect MOVE_EFFECT_ACC_MINUS_1
goto BattleScript_EffectHit
BattleScript_EffectSkyAttack::
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x3
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_EffectConfuseHit::
- setmoveeffect EFFECT_CONFUSION
+ setmoveeffect MOVE_EFFECT_CONFUSION
goto BattleScript_EffectHit
BattleScript_EffectTwineedle::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- setbyte sMULTIHIT_EFFECT, EFFECT_POISON
+ setbyte sMULTIHIT_EFFECT, MOVE_EFFECT_POISON
attackstring
ppreduce
setmultihitcounter 0x2
@@ -1110,22 +1112,22 @@ BattleScript_EffectSubstitute::
ppreduce
attackstring
waitstate
- jumpifstatus2 ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
+ jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
setsubstitute
- jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x1, BattleScript_SubstituteAnim
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x1, BattleScript_SubstituteAnim
pause 0x20
goto BattleScript_SubstituteString
BattleScript_SubstituteAnim::
attackanimation
waitanimation
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
BattleScript_SubstituteString::
printfromtable gSubsituteUsedStringIds
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_AlreadyHasSubstitute::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNHASSUBSTITUTE
waitmessage 0x40
@@ -1134,7 +1136,7 @@ BattleScript_AlreadyHasSubstitute::
BattleScript_EffectRecharge::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- setmoveeffect EFFECT_RECHARGE | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_RECHARGE | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_HitFromAtkString
BattleScript_MoveUsedMustRecharge::
@@ -1145,20 +1147,20 @@ BattleScript_MoveUsedMustRecharge::
BattleScript_EffectRage::
attackcanceler
accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE
- setmoveeffect EFFECT_RAGE
+ setmoveeffect MOVE_EFFECT_RAGE
seteffectprimary
setmoveeffect 0
goto BattleScript_HitFromAtkString
BattleScript_RageMiss::
- setmoveeffect EFFECT_RAGE
- clearstatusfromeffect ATTACKER
+ setmoveeffect MOVE_EFFECT_RAGE
+ clearstatusfromeffect BS_ATTACKER
goto BattleScript_PrintMoveMissed
BattleScript_EffectMimic::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
mimicattackcopy BattleScript_ButItFailed
attackanimation
@@ -1173,8 +1175,8 @@ BattleScript_EffectMetronome::
pause 0x20
attackanimation
waitanimation
- setbyte sANIM_TURN, 0x0
- setbyte sANIM_TARGETS_HIT, 0x0
+ setbyte sB_ANIM_TURN, 0x0
+ setbyte sB_ANIM_TARGETS_HIT, 0x0
metronome
BattleScript_EffectLeechSeed::
@@ -1182,7 +1184,7 @@ BattleScript_EffectLeechSeed::
attackstring
pause 0x20
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE
BattleScript_DoLeechSeed::
setseeded
@@ -1268,31 +1270,31 @@ BattleScript_EffectPainSplit::
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
copyword gBattleMoveDamage, sPAINSPLIT_HP
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
printstring STRINGID_SHAREDPAIN
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_EffectSnore::
attackcanceler
- jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
BattleScript_SnoreIsAsleep::
- jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore
+ jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore
printstring STRINGID_PKMNFASTASLEEP
waitmessage 0x40
- statusanimation ATTACKER
+ statusanimation BS_ATTACKER
BattleScript_DoSnore::
attackstring
ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_HitFromCritCalc
BattleScript_EffectConversion2::
@@ -1310,7 +1312,7 @@ BattleScript_EffectLockOn::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
setalwayshitflag
attackanimation
@@ -1323,7 +1325,7 @@ BattleScript_EffectSketch::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
copymovepermanently BattleScript_ButItFailed
attackanimation
waitanimation
@@ -1333,14 +1335,14 @@ BattleScript_EffectSketch::
BattleScript_EffectSleepTalk::
attackcanceler
- jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
BattleScript_SleepTalkIsAsleep::
printstring STRINGID_PKMNFASTASLEEP
waitmessage 0x40
- statusanimation ATTACKER
+ statusanimation BS_ATTACKER
attackstring
ppreduce
orword gHitMarker, HITMARKER_NO_PPDEDUCT
@@ -1350,8 +1352,8 @@ BattleScript_SleepTalkIsAsleep::
BattleScript_SleepTalkUsingMove::
attackanimation
waitanimation
- setbyte sANIM_TURN, 0x0
- setbyte sANIM_TARGETS_HIT, 0x0
+ setbyte sB_ANIM_TURN, 0x0
+ setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptorandomattack TRUE
BattleScript_EffectDestinyBond::
@@ -1392,15 +1394,15 @@ BattleScript_EffectHealBell::
printfromtable gPartyStatusHealStringIds
waitmessage 0x40
jumpifnotmove MOVE_HEAL_BELL, BattleScript_PartyHealEnd
- jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 0x1, BattleScript_CheckHealBellMon2Unaffected
+ jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 0x1, BattleScript_CheckHealBellMon2Unaffected
printstring STRINGID_PKMNSXBLOCKSY
waitmessage 0x40
BattleScript_CheckHealBellMon2Unaffected::
- jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 0x2, BattleScript_PartyHealEnd
+ jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 0x2, BattleScript_PartyHealEnd
printstring STRINGID_PKMNSXBLOCKSY2
waitmessage 0x40
BattleScript_PartyHealEnd::
- updatestatusicon ATTACKER_WITH_PARTNER
+ updatestatusicon BS_ATTACKER_WITH_PARTNER
waitstate
goto BattleScript_MoveEnd
@@ -1412,10 +1414,10 @@ BattleScript_EffectTripleKick::
initmultihitstring
setmultihit 0x3
BattleScript_TripleKickLoop::
- jumpifhasnohp ATTACKER, BattleScript_TripleKickEnd
- jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits
- jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
- jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
+ jumpifhasnohp BS_ATTACKER, BattleScript_TripleKickEnd
+ jumpifhasnohp BS_TARGET, BattleScript_TripleKickNoMoreHits
+ jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
+ jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
BattleScript_DoTripleKickAttack::
accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE
movevaluescleanup
@@ -1430,40 +1432,40 @@ BattleScript_DoTripleKickAttack::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
- jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
+ jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
BattleScript_TripleKickNoMoreHits::
pause 0x20
- jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickPrintStrings
+ jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickPrintStrings
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_TripleKickPrintStrings::
resultmessage
waitmessage 0x40
- jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickEnd
- jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
+ jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickEnd
+ jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES
waitmessage 0x40
BattleScript_TripleKickEnd::
seteffectwithchance
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0xE
moveend 0x0, 0x0
end
BattleScript_EffectThief::
- setmoveeffect EFFECT_STEAL_ITEM
+ setmoveeffect MOVE_EFFECT_STEAL_ITEM
goto BattleScript_EffectHit
BattleScript_EffectMeanLook::
@@ -1471,11 +1473,11 @@ BattleScript_EffectMeanLook::
attackstring
ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC
- jumpifstatus2 TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
attackanimation
waitanimation
- setmoveeffect EFFECT_PREVENT_ESCAPE
+ setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE
seteffectprimary
printstring STRINGID_TARGETCANTESCAPENOW
waitmessage 0x40
@@ -1485,14 +1487,14 @@ BattleScript_EffectNightmare::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
goto BattleScript_ButItFailed
BattleScript_NightmareWorked::
attackanimation
waitanimation
- setmoveeffect EFFECT_NIGHTMARE
+ setmoveeffect MOVE_EFFECT_NIGHTMARE
seteffectprimary
printstring STRINGID_PKMNFELLINTONIGHTMARE
waitmessage 0x40
@@ -1501,57 +1503,57 @@ BattleScript_NightmareWorked::
BattleScript_EffectMinimize::
attackcanceler
setminimize
- setstatchanger EVASION, 1, FALSE
+ setstatchanger STAT_EVASION, 1, FALSE
goto BattleScript_EffectStatUpAfterAtkCanceler
BattleScript_EffectCurse::
- jumpiftype2 ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
+ jumpiftype2 BS_ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
attackcanceler
attackstring
ppreduce
- jumpifstat ATTACKER, GREATER_THAN, SPEED, 0x0, BattleScript_CurseTrySpeed
- jumpifstat ATTACKER, NOT_EQUAL, ATK, 0xC, BattleScript_CurseTrySpeed
- jumpifstat ATTACKER, EQUAL, DEF, 0xC, BattleScript_ButItFailed
+ jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0x0, BattleScript_CurseTrySpeed
+ jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 0xC, BattleScript_CurseTrySpeed
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_ButItFailed
BattleScript_CurseTrySpeed::
copybyte gBattlerTarget, gBattlerAttacker
- setbyte sANIM_TURN, 0x1
+ setbyte sB_ANIM_TURN, 0x1
attackanimation
waitanimation
- setstatchanger SPEED, 1, TRUE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryAttack
+ setstatchanger STAT_SPEED, 1, TRUE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_CurseTryAttack::
- setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryDefence
+ setstatchanger STAT_ATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryDefence
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseTryDefence::
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseEnd
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseEnd::
goto BattleScript_MoveEnd
BattleScript_GhostCurse::
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
- getmovetarget ATTACKER
+ getmovetarget BS_ATTACKER
BattleScript_DoGhostCurse::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
cursetarget BattleScript_ButItFailed
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- setbyte sANIM_TURN, 0x0
+ setbyte sB_ANIM_TURN, 0x0
attackanimation
waitanimation
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNLAIDCURSE
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectProtect::
@@ -1600,7 +1602,7 @@ BattleScript_EffectPerishSong::
waitmessage 0x40
setbyte sBANK, 0x0
BattleScript_PerishSongLoop::
- jumpifability SCRIPTING_BANK, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
+ jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte sBANK, 0x1
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
@@ -1621,7 +1623,7 @@ BattleScript_EffectSandstorm::
BattleScript_EffectRollout::
attackcanceler
attackstring
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy
ppreduce
BattleScript_RolloutCheckAccuracy::
accuracycheck BattleScript_RolloutHit, ACC_CURR_MOVE
@@ -1632,24 +1634,24 @@ BattleScript_RolloutHit::
BattleScript_EffectSwagger::
attackcanceler
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
- jumpifconfusedandstatmaxed ATK, BattleScript_ButItFailed
+ jumpifconfusedandstatmaxed STAT_ATK, BattleScript_ButItFailed
attackanimation
waitanimation
- setstatchanger ATK, 2, FALSE
+ setstatchanger STAT_ATK, 2, FALSE
statbuffchange 0x1, BattleScript_SwaggerTryConfuse
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_SwaggerTryConfuse::
- jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
- setmoveeffect EFFECT_CONFUSION
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
goto BattleScript_MoveEnd
@@ -1702,7 +1704,7 @@ BattleScript_EffectSafeguard::
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectThawHit::
- setmoveeffect EFFECT_BURN
+ setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
BattleScript_EffectMagnitude::
@@ -1721,25 +1723,25 @@ BattleScript_EffectBatonPass::
attackstring
ppreduce
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
- jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | ATTACKER, BattleScript_ButItFailed
+ jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
openpartyscreen 0x1, BattleScript_ButItFailed
- switchoutabilities ATTACKER
+ switchoutabilities BS_ATTACKER
waitstate
- switchhandleorder ATTACKER, 0x2
- returntoball ATTACKER
- getswitchedmondata ATTACKER
- switchindataupdate ATTACKER
- hpthresholds ATTACKER
+ switchhandleorder BS_ATTACKER, 0x2
+ returntoball BS_ATTACKER
+ getswitchedmondata BS_ATTACKER
+ switchindataupdate BS_ATTACKER
+ hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
- switchinanim ATTACKER, TRUE
+ switchinanim BS_ATTACKER, TRUE
waitstate
- switchineffects ATTACKER
+ switchineffects BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectRapidSpin::
- setmoveeffect EFFECT_RAPIDSPIN | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectSonicboom::
@@ -1787,15 +1789,15 @@ BattleScript_EffectSunnyDay::
goto BattleScript_MoveWeatherChange
BattleScript_EffectDefenseUpHit::
- setmoveeffect EFFECT_DEF_PLUS_1 | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_DEF_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
BattleScript_EffectAttackUpHit::
- setmoveeffect EFFECT_ATK_PLUS_1 | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
BattleScript_EffectAllStatsUpHit::
- setmoveeffect EFFECT_ALL_STATS_UP | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_ALL_STATS_UP | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
BattleScript_EffectBellyDrum::
@@ -1806,8 +1808,8 @@ BattleScript_EffectBellyDrum::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
attackanimation
waitanimation
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNCUTHPMAXEDATTACK
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -1834,26 +1836,26 @@ BattleScript_EffectMirrorCoat::
goto BattleScript_HitFromAtkAnimation
BattleScript_EffectSkullBash::
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x2
call BattleScriptFirstChargingTurn
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_SkullBashEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_SkullBashEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
setgraphicalstatchangevalues
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_SkullBashEnd::
goto BattleScript_MoveEnd
BattleScript_EffectTwister::
- jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_FlinchEffect
+ jumpifnostatus3 BS_TARGET, STATUS3_ON_AIR, BattleScript_FlinchEffect
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
setbyte sDMG_MULTIPLIER, 0x2
BattleScript_FlinchEffect::
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
BattleScript_EffectEarthquake::
@@ -1863,7 +1865,7 @@ BattleScript_EffectEarthquake::
selectfirstvalidtarget
BattleScript_HitsAllWithUndergroundBonusLoop::
movevaluescleanup
- jumpifnostatus3 TARGET, STATUS3_UNDERGROUND, BattleScript_HitsAllNoUndergroundBonus
+ jumpifnostatus3 BS_TARGET, STATUS3_UNDERGROUND, BattleScript_HitsAllNoUndergroundBonus
orword gHitMarker, HITMARKER_IGNORE_UNDERGROUND
setbyte sDMG_MULTIPLIER, 0x2
goto BattleScript_DoHitAllWithUndergroundBonus
@@ -1879,17 +1881,17 @@ BattleScript_DoHitAllWithUndergroundBonus::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
@@ -1917,35 +1919,35 @@ BattleScript_EffectFutureSight::
goto BattleScript_MoveEnd
BattleScript_EffectGust::
- jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_EffectHit
+ jumpifnostatus3 BS_TARGET, STATUS3_ON_AIR, BattleScript_EffectHit
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
setbyte sDMG_MULTIPLIER, 0x2
goto BattleScript_EffectHit
BattleScript_EffectStomp::
- jumpifnostatus3 TARGET, STATUS3_MINIMIZED, BattleScript_FlinchEffect
+ jumpifnostatus3 BS_TARGET, STATUS3_MINIMIZED, BattleScript_FlinchEffect
setbyte sDMG_MULTIPLIER, 0x2
goto BattleScript_FlinchEffect
BattleScript_EffectSolarbeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn
- jumpifhalfword COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn
+ jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn
BattleScript_SolarbeamDecideTurn::
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x1
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn::
orword gHitMarker, HITMARKER_x8000000
- setmoveeffect EFFECT_CHARGING | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
ppreduce
goto BattleScript_TwoTurnMovesSecondTurn
BattleScript_EffectThunder::
- setmoveeffect EFFECT_PARALYSIS
+ setmoveeffect MOVE_EFFECT_PARALYSIS
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
goto BattleScript_EffectHit
@@ -1954,14 +1956,14 @@ BattleScript_EffectTeleport::
attackstring
ppreduce
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
- getifcantrunfrombattle ATTACKER
- jumpifbyte EQUAL, gBattleCommunication, 0x1, BattleScript_ButItFailed
- jumpifbyte EQUAL, gBattleCommunication, 0x2, BattleScript_PrintAbilityMadeIneffective
+ getifcantrunfrombattle BS_ATTACKER
+ jumpifbyte CMP_EQUAL, gBattleCommunication, 0x1, BattleScript_ButItFailed
+ jumpifbyte CMP_EQUAL, gBattleCommunication, 0x2, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
waitmessage 0x40
- setoutcomeonteleport ATTACKER
+ setoutcomeonteleport BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectBeatUp::
@@ -1976,22 +1978,22 @@ BattleScript_BeatUpLoop::
trydobeatup BattleScript_BeatUpEnd, BattleScript_ButItFailed
printstring STRINGID_PKMNATTACK
critcalc
- jumpifbyte NOT_EQUAL, gCritMultiplier, 0x2, BattleScript_BeatUpAttack
+ jumpifbyte CMP_NOT_EQUAL, gCritMultiplier, 0x2, BattleScript_BeatUpAttack
manipulatedamage ATK80_DMG_DOUBLED
BattleScript_BeatUpAttack::
adjustnormaldamage
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
goto BattleScript_BeatUpLoop
@@ -1999,8 +2001,8 @@ BattleScript_BeatUpEnd::
end
BattleScript_EffectSemiInvulnerable::
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable
jumpifmove MOVE_FLY, BattleScript_FirstTurnFly
jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive
jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce
@@ -2024,12 +2026,12 @@ BattleScript_FirstTurnSemiInvulnerable::
BattleScript_SecondTurnSemiInvulnerable::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- setbyte sANIM_TURN, 0x1
- clearstatusfromeffect ATTACKER
+ setmoveeffect MOVE_EFFECT_CHARGING
+ setbyte sB_ANIM_TURN, 0x1
+ clearstatusfromeffect BS_ATTACKER
orword gHitMarker, HITMARKER_NO_PPDEDUCT
jumpifnotmove MOVE_BOUNCE, BattleScript_SemiInvulnerableTryHit
- setmoveeffect EFFECT_PARALYSIS
+ setmoveeffect MOVE_EFFECT_PARALYSIS
BattleScript_SemiInvulnerableTryHit::
accuracycheck BattleScript_SemiInvulnerableMiss, ACC_CURR_MOVE
clearsemiinvulnerablebit
@@ -2044,9 +2046,9 @@ BattleScript_EffectDefenseCurl::
attackstring
ppreduce
setdefensecurlbit
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
attackanimation
waitanimation
BattleScript_DefenseCurlDoStatUpAnim::
@@ -2056,13 +2058,13 @@ BattleScript_EffectSoftboiled::
attackcanceler
attackstring
ppreduce
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, TARGET
+ tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
BattleScript_PresentHealTarget::
attackanimation
waitanimation
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2076,7 +2078,7 @@ BattleScript_AlreadyAtFullHp::
BattleScript_EffectFakeOut::
attackcanceler
jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce
- setmoveeffect EFFECT_FLINCH | CERTAIN
+ setmoveeffect MOVE_EFFECT_FLINCH | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_ButItFailedAtkStringPpReduce::
@@ -2100,9 +2102,9 @@ BattleScript_NotAffected::
BattleScript_EffectUproar::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- setmoveeffect EFFECT_UPROAR | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_UPROAR | MOVE_EFFECT_AFFECTS_USER
attackstring
- jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit
+ jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit
ppreduce
BattleScript_UproarHit::
nop
@@ -2121,7 +2123,7 @@ BattleScript_EffectStockpile::
BattleScript_EffectSpitUp::
attackcanceler
- jumpifbyte EQUAL, gBattleCommunication + 6, 0x1, BattleScript_82D9FA2
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 0x1, BattleScript_82D9FA2
attackstring
ppreduce
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
@@ -2178,24 +2180,24 @@ BattleScript_EffectTorment::
BattleScript_EffectFlatter::
attackcanceler
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
- jumpifconfusedandstatmaxed SPATK, BattleScript_ButItFailed
+ jumpifconfusedandstatmaxed STAT_SPATK, BattleScript_ButItFailed
attackanimation
waitanimation
- setstatchanger SPATK, 1, FALSE
+ setstatchanger STAT_SPATK, 1, FALSE
statbuffchange 0x1, BattleScript_FlatterTryConfuse
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_FlatterTryConfuse::
- jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
- setmoveeffect EFFECT_CONFUSION
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
goto BattleScript_MoveEnd
@@ -2203,27 +2205,27 @@ BattleScript_EffectWillOWisp::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS1_BURN, BattleScript_AlreadyBurned
- jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected
- jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
- jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus BS_TARGET, STATUS1_BURN, BattleScript_AlreadyBurned
+ jumpiftype BS_TARGET, TYPE_FIRE, BattleScript_NotAffected
+ jumpifability BS_TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
+ jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_BURN
+ setmoveeffect MOVE_EFFECT_BURN
seteffectprimary
goto BattleScript_MoveEnd
BattleScript_WaterVeilPrevents::
- copybyte gEffectBank, gBattlerTarget
+ copybyte gEffectBattler, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_BRNPrevention
goto BattleScript_MoveEnd
BattleScript_AlreadyBurned::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNALREADYHASBURN
waitmessage 0x40
@@ -2231,31 +2233,31 @@ BattleScript_AlreadyBurned::
BattleScript_EffectMemento::
attackcanceler
- jumpifbyte EQUAL, gBattleCommunication + 6, 0x1, BattleScript_82DA153
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 0x1, BattleScript_82DA153
attackstring
ppreduce
jumpifattackandspecialattackcannotfall BattleScript_ButItFailed
setatkhptozero
attackanimation
waitanimation
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82DA148
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DA148
setbyte sFIELD_1B, 0x0
- playstatchangeanimation TARGET, 0x12, 0x7
- playstatchangeanimation TARGET, 0x2, 0x3
- setstatchanger ATK, 2, TRUE
+ playstatchangeanimation BS_TARGET, 0x12, 0x7
+ playstatchangeanimation BS_TARGET, 0x2, 0x3
+ setstatchanger STAT_ATK, 2, TRUE
statbuffchange 0x1, BattleScript_82DA119
- jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA119
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA119
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DA119::
- playstatchangeanimation TARGET, 0x10, 0x3
- setstatchanger SPATK, 2, TRUE
+ playstatchangeanimation BS_TARGET, 0x10, 0x3
+ setstatchanger STAT_SPATK, 2, TRUE
statbuffchange 0x1, BattleScript_82DA13C
- jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA13C
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA13C
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DA13C::
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_82DA148::
printstring STRINGID_BUTNOEFFECT
@@ -2271,11 +2273,11 @@ BattleScript_82DA15A::
effectivenesssound
resultmessage
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectFacade::
- jumpifstatus ATTACKER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg
+ jumpifstatus BS_ATTACKER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg
goto BattleScript_EffectHit
BattleScript_FacadeDoubleDmg::
@@ -2291,9 +2293,9 @@ BattleScript_EffectFocusPunch::
goto BattleScript_MoveEnd
BattleScript_EffectSmellingsalt::
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
- setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN
- jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
+ setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN
+ jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
BattleScript_SmellingsaltDoubleDmg::
@@ -2358,7 +2360,7 @@ BattleScript_EffectTrick::
attackcanceler
attackstring
ppreduce
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
tryswapitems BattleScript_ButItFailed
attackanimation
@@ -2396,8 +2398,8 @@ BattleScript_EffectAssist::
asistattackselect BattleScript_ButItFailedPpReduce
attackanimation
waitanimation
- setbyte sANIM_TURN, 0x0
- setbyte sANIM_TARGETS_HIT, 0x0
+ setbyte sB_ANIM_TURN, 0x0
+ setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptorandomattack TRUE
BattleScript_EffectIngrain::
@@ -2412,7 +2414,7 @@ BattleScript_EffectIngrain::
goto BattleScript_MoveEnd
BattleScript_EffectSuperpower::
- setmoveeffect EFFECT_ATK_DEF_DOWN | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_ATK_DEF_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectMagicCoat::
@@ -2451,37 +2453,37 @@ BattleScript_EffectBrickBreak::
damagecalc
typecalc
adjustnormaldamage
- jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_BrickBreakAnim
+ jumpifbyte CMP_EQUAL, sB_ANIM_TURN, 0x0, BattleScript_BrickBreakAnim
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
BattleScript_BrickBreakAnim::
attackanimation
waitanimation
- jumpifbyte LESS_THAN, sANIM_TURN, 0x2, BattleScript_BrickBreakDoHit
+ jumpifbyte CMP_LESS_THAN, sB_ANIM_TURN, 0x2, BattleScript_BrickBreakDoHit
printstring STRINGID_THEWALLSHATTERED
waitmessage 0x40
BattleScript_BrickBreakDoHit::
typecalc2
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
seteffectwithchance
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_EffectYawn::
attackcanceler
attackstring
ppreduce
- jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
- jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+ jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
+ jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifcantmakeasleep BattleScript_ButItFailed
setyawn BattleScript_ButItFailed
@@ -2499,7 +2501,7 @@ BattleScript_PrintAbilityMadeIneffective::
goto BattleScript_MoveEnd
BattleScript_EffectKnockOff::
- setmoveeffect EFFECT_KNOCK_OFF
+ setmoveeffect MOVE_EFFECT_KNOCK_OFF
goto BattleScript_EffectHit
BattleScript_EffectEndeavor::
@@ -2552,7 +2554,7 @@ BattleScript_EffectRefresh::
waitanimation
printstring STRINGID_PKMNSTATUSNORMAL
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectGrudge::
@@ -2591,7 +2593,7 @@ BattleScript_EffectSecretPower::
goto BattleScript_EffectHit
BattleScript_EffectDoubleEdge::
- setmoveeffect EFFECT_RECOIL_33_PARALYSIS | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_RECOIL_33_PARALYSIS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectTeeterDance::
@@ -2601,14 +2603,14 @@ BattleScript_EffectTeeterDance::
setbyte gBattlerTarget, 0x0
BattleScript_TeeterDanceLoop::
movevaluescleanup
- setmoveeffect EFFECT_CONFUSION
+ setmoveeffect MOVE_EFFECT_CONFUSION
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_TeeterDanceLoopIncrement
- jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents
- jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
- jumpifhasnohp TARGET, BattleScript_TeeterDanceLoopIncrement
+ jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents
+ jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
+ jumpifhasnohp BS_TARGET, BattleScript_TeeterDanceLoopIncrement
accuracycheck BattleScript_TeeterDanceMissed, ACC_CURR_MOVE
- jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_TeeterDanceSafeguardProtected
+ jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_TeeterDanceSafeguardProtected
attackanimation
waitanimation
seteffectprimary
@@ -2641,7 +2643,7 @@ BattleScript_TeeterDanceSubstitutePrevents::
goto BattleScript_TeeterDanceDoMoveEndIncrement
BattleScript_TeeterDanceAlreadyConfused::
- various23 ATTACKER
+ various23 BS_ATTACKER
pause 0x20
printstring STRINGID_PKMNALREADYCONFUSED
waitmessage 0x40
@@ -2665,7 +2667,7 @@ BattleScript_EffectWaterSport::
goto BattleScript_MoveEnd
BattleScript_EffectPoisonFang::
- setmoveeffect EFFECT_TOXIC
+ setmoveeffect MOVE_EFFECT_TOXIC
goto BattleScript_EffectHit
BattleScript_EffectWeatherBall::
@@ -2673,32 +2675,32 @@ BattleScript_EffectWeatherBall::
goto BattleScript_EffectHit
BattleScript_EffectOverheat::
- setmoveeffect EFFECT_SP_ATK_TWO_DOWN | AFFECTS_USER | CERTAIN
+ setmoveeffect MOVE_EFFECT_SP_ATK_TWO_DOWN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectTickle::
attackcanceler
attackstring
ppreduce
- jumpifstat TARGET, GREATER_THAN, ATK, 0x0, BattleScript_TickleDoMoveAnim
- jumpifstat TARGET, EQUAL, DEF, 0x0, BattleScript_CantLowerMultipleStats
+ jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0x0, BattleScript_TickleDoMoveAnim
+ jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0x0, BattleScript_CantLowerMultipleStats
BattleScript_TickleDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
setbyte sFIELD_1B, 0x0
- playstatchangeanimation TARGET, 0x6, 0x5
- playstatchangeanimation TARGET, 0x2, 0x1
- setstatchanger ATK, 1, TRUE
+ playstatchangeanimation BS_TARGET, 0x6, 0x5
+ playstatchangeanimation BS_TARGET, 0x2, 0x1
+ setstatchanger STAT_ATK, 1, TRUE
statbuffchange 0x1, BattleScript_TickleTryLowerDef
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_TickleTryLowerDef::
- playstatchangeanimation TARGET, 0x4, 0x1
- setstatchanger DEF, 1, TRUE
+ playstatchangeanimation BS_TARGET, 0x4, 0x1
+ setstatchanger STAT_DEF, 1, TRUE
statbuffchange 0x1, BattleScript_TickleEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_TickleEnd::
@@ -2715,22 +2717,22 @@ BattleScript_EffectCosmicPower::
attackcanceler
attackstring
ppreduce
- jumpifstat ATTACKER, LESS_THAN, DEF, 0xC, BattleScript_CosmicPowerDoMoveAnim
- jumpifstat ATTACKER, EQUAL, SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_CosmicPowerDoMoveAnim
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
BattleScript_CosmicPowerDoMoveAnim::
attackanimation
waitanimation
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x24, 0x0
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
+ playstatchangeanimation BS_ATTACKER, 0x24, 0x0
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CosmicPowerTrySpDef::
- setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
+ setstatchanger STAT_SPDEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CosmicPowerEnd::
@@ -2744,22 +2746,22 @@ BattleScript_EffectBulkUp::
attackcanceler
attackstring
ppreduce
- jumpifstat ATTACKER, LESS_THAN, ATK, 0xC, BattleScript_BulkUpDoMoveAnim
- jumpifstat ATTACKER, EQUAL, DEF, 0xC, BattleScript_CantRaiseMultipleStats
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_BulkUpDoMoveAnim
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_CantRaiseMultipleStats
BattleScript_BulkUpDoMoveAnim::
attackanimation
waitanimation
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x6, 0x0
- setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
+ playstatchangeanimation BS_ATTACKER, 0x6, 0x0
+ setstatchanger STAT_ATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_BulkUpTryDef::
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_BulkUpEnd::
@@ -2769,22 +2771,22 @@ BattleScript_EffectCalmMind::
attackcanceler
attackstring
ppreduce
- jumpifstat ATTACKER, LESS_THAN, SPATK, 0xC, BattleScript_CalmMindDoMoveAnim
- jumpifstat ATTACKER, EQUAL, SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_CalmMindDoMoveAnim
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
BattleScript_CalmMindDoMoveAnim::
attackanimation
waitanimation
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x30, 0x0
- setstatchanger SPATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
+ playstatchangeanimation BS_ATTACKER, 0x30, 0x0
+ setstatchanger STAT_SPATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CalmMindTrySpDef::
- setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
+ setstatchanger STAT_SPDEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CalmMindEnd::
@@ -2801,22 +2803,22 @@ BattleScript_EffectDragonDance::
attackcanceler
attackstring
ppreduce
- jumpifstat ATTACKER, LESS_THAN, ATK, 0xC, BattleScript_DragonDanceDoMoveAnim
- jumpifstat ATTACKER, EQUAL, SPEED, 0xC, BattleScript_CantRaiseMultipleStats
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_DragonDanceDoMoveAnim
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 0xC, BattleScript_CantRaiseMultipleStats
BattleScript_DragonDanceDoMoveAnim::
attackanimation
waitanimation
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0xA, 0x0
- setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
+ playstatchangeanimation BS_ATTACKER, 0xA, 0x0
+ setstatchanger STAT_ATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_DragonDanceTrySpeed::
- setstatchanger SPEED, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
+ setstatchanger STAT_SPEED, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_DragonDanceEnd::
@@ -2834,85 +2836,85 @@ BattleScript_EffectCamouflage::
goto BattleScript_MoveEnd
BattleScript_FaintAttacker::
- playfaintcry ATTACKER
+ playfaintcry BS_ATTACKER
pause 0x40
- dofaintanimation ATTACKER
- cleareffectsonfaint ATTACKER
+ dofaintanimation BS_ATTACKER
+ cleareffectsonfaint BS_ATTACKER
printstring STRINGID_ATTACKERFAINTED
return
BattleScript_FaintTarget::
- playfaintcry TARGET
+ playfaintcry BS_TARGET
pause 0x40
- dofaintanimation TARGET
- cleareffectsonfaint TARGET
+ dofaintanimation BS_TARGET
+ cleareffectsonfaint BS_TARGET
printstring STRINGID_TARGETFAINTED
return
BattleScript_GiveExp::
setbyte sGIVEEXP_STATE, 0x0
- getexp TARGET
+ getexp BS_TARGET
end2
BattleScript_HandleFaintedMon::
atk24 BattleScript_82DA8F6
- jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
+ jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother
- jumpifword NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother
+ jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother
printstring STRINGID_USENEXTPKMN
setbyte gBattleCommunication, 0x0
yesnobox
- jumpifbyte EQUAL, gBattleCommunication + 1, 0x0, BattleScript_FaintedMonTryChooseAnother
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x0, BattleScript_FaintedMonTryChooseAnother
jumpifplayerran BattleScript_FaintedMonEnd
printstring STRINGID_CANTESCAPE2
BattleScript_FaintedMonTryChooseAnother::
openpartyscreen 0x3, BattleScript_FaintedMonEnd
- switchhandleorder GBANK_1, 0x2
+ switchhandleorder BS_FAINTED, 0x2
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
- jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
- jumpifbyte EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
+ jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
+ jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
jumpifcantswitch 11, BattleScript_FaintedMonChooseAnother
printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
setbyte gBattleCommunication, 0x0
yesnobox
- jumpifbyte EQUAL, gBattleCommunication + 1, 0x1, BattleScript_FaintedMonChooseAnother
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x1, BattleScript_FaintedMonChooseAnother
setatktoplayer0
openpartyscreen 0x81, BattleScript_FaintedMonChooseAnother
- switchhandleorder ATTACKER, 0x2
- jumpifbyte EQUAL, gBattleCommunication, 0x6, BattleScript_FaintedMonChooseAnother
+ switchhandleorder BS_ATTACKER, 0x2
+ jumpifbyte CMP_EQUAL, gBattleCommunication, 0x6, BattleScript_FaintedMonChooseAnother
atknameinbuff1
- resetintrimidatetracebits ATTACKER
- hpthresholds2 ATTACKER
+ resetintrimidatetracebits BS_ATTACKER
+ hpthresholds2 BS_ATTACKER
printstring STRINGID_RETURNMON
- switchoutabilities ATTACKER
+ switchoutabilities BS_ATTACKER
waitstate
returnatktoball
waitstate
- drawpartystatussummary ATTACKER
- getswitchedmondata ATTACKER
- switchindataupdate ATTACKER
- hpthresholds ATTACKER
+ drawpartystatussummary BS_ATTACKER
+ getswitchedmondata BS_ATTACKER
+ switchindataupdate BS_ATTACKER
+ hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
- atk62 ATTACKER
- switchinanim ATTACKER, 0x0
+ atk62 BS_ATTACKER
+ switchinanim BS_ATTACKER, 0x0
waitstate
- switchineffects ATTACKER
+ switchineffects BS_ATTACKER
resetsentmonsvalue
BattleScript_FaintedMonChooseAnother::
- drawpartystatussummary GBANK_1
- getswitchedmondata GBANK_1
- switchindataupdate GBANK_1
- hpthresholds GBANK_1
+ drawpartystatussummary BS_FAINTED
+ getswitchedmondata BS_FAINTED
+ switchindataupdate BS_FAINTED
+ hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
- atk62 GBANK_1
- switchinanim GBANK_1, FALSE
+ atk62 BS_FAINTED
+ switchinanim BS_FAINTED, FALSE
waitstate
- various7 ATTACKER
- switchineffects GBANK_1
+ various7 BS_ATTACKER
+ switchineffects BS_FAINTED
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd
cancelallactions
BattleScript_FaintedMonEnd::
@@ -2921,21 +2923,21 @@ BattleScript_FaintedMonEnd::
BattleScript_82DA8F6::
openpartyscreen 0x5, BattleScript_82DA8FC
BattleScript_82DA8FC::
- switchhandleorder GBANK_1, 0x0
+ switchhandleorder BS_FAINTED, 0x0
openpartyscreen 0x6, BattleScript_82DA92C
- switchhandleorder GBANK_1, 0x0
+ switchhandleorder BS_FAINTED, 0x0
BattleScript_82DA908::
- switchhandleorder GBANK_1, 0x3
- drawpartystatussummary GBANK_1
- getswitchedmondata GBANK_1
- switchindataupdate GBANK_1
- hpthresholds GBANK_1
+ switchhandleorder BS_FAINTED, 0x3
+ drawpartystatussummary BS_FAINTED
+ getswitchedmondata BS_FAINTED
+ switchindataupdate BS_FAINTED
+ hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
- atk62 GBANK_1
- switchinanim GBANK_1, FALSE
+ atk62 BS_FAINTED
+ switchinanim BS_FAINTED, FALSE
waitstate
switchineffects 5
- jumpifbytenotequal gBank1, gBattlersCount, BattleScript_82DA908
+ jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_82DA908
BattleScript_82DA92C::
end2
@@ -2946,13 +2948,13 @@ BattleScript_LocalTrainerBattleWon::
BattleScript_LocalTwoTrainersDefeated::
printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_LocalBattleWonLoseTexts::
- trainerslidein ATTACKER
+ trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
- trainerslidein GBANK_1
+ trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_LocalBattleWonReward::
@@ -2969,7 +2971,7 @@ BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
- jumpifhalfword EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
+ jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
BattleScript_LocalBattleLostPrintWhiteOut::
printstring STRINGID_PLAYERWHITEOUT
waitmessage 0x40
@@ -2978,14 +2980,14 @@ BattleScript_LocalBattleLostPrintWhiteOut::
BattleScript_LocalBattleLostEnd::
end2
BattleScript_CheckDomeDrew::
- jumpifbyte EQUAL, gBattleOutcome, DREW, BattleScript_LocalBattleLostEnd_
+ jumpifbyte CMP_EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostPrintWhiteOut
- returnopponentmon1toball ATTACKER
+ returnopponentmon1toball BS_ATTACKER
waitstate
- returnopponentmon2toball ATTACKER
+ returnopponentmon2toball BS_ATTACKER
waitstate
- trainerslidein ATTACKER
+ trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText
@@ -2993,23 +2995,23 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
BattleScript_LocalBattleLostDoTrainer2WinText::
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
- trainerslidein GBANK_1
+ trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2WINTEXT
BattleScript_LocalBattleLostEnd_::
end2
BattleScript_82DAA0B::
- returnopponentmon1toball ATTACKER
+ returnopponentmon1toball BS_ATTACKER
waitstate
- returnopponentmon2toball ATTACKER
+ returnopponentmon2toball BS_ATTACKER
waitstate
- trainerslidein ATTACKER
+ trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
- trainerslidein GBANK_1
+ trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2WINTEXT
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA31
@@ -3029,15 +3031,15 @@ BattleScript_LinkBattleWonOrLostWaitEnd::
end2
BattleScript_82DAA5C::
- playtrainerdefeatbgm ATTACKER
+ playtrainerdefeatbgm BS_ATTACKER
printstring STRINGID_BATTLEEND
waitmessage 0x40
- trainerslidein ATTACKER
+ trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
- trainerslidein GBANK_1
+ trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA83
@@ -3054,13 +3056,13 @@ BattleScript_FrontierTrainerBattleWon::
BattleScript_82DAAAB::
printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_82DAAAE::
- trainerslidein ATTACKER
+ trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
- trainerslidein GBANK_1
+ trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_82DAACB::
@@ -3070,7 +3072,7 @@ BattleScript_82DAADA::
end2
BattleScript_SmokeBallEscape::
- playanimation ATTACKER, ANIM_SMOKEBALL_ESCAPE, NULL
+ playanimation BS_ATTACKER, B_ANIM_SMOKEBALL_ESCAPE, NULL
printstring STRINGID_PKMNFLEDUSINGITS
waitmessage 0x40
end2
@@ -3108,7 +3110,7 @@ BattleScript_PrintFullBox::
endselectionscript
BattleScript_ActionSwitch::
- hpthresholds2 ATTACKER
+ hpthresholds2 BS_ATTACKER
printstring STRINGID_RETURNMON
setbyte sDMG_MULTIPLIER, 0x2
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit
@@ -3124,20 +3126,20 @@ BattleScript_PursuitSwitchDmgLoop::
atk5F
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
- switchoutabilities ATTACKER
+ switchoutabilities BS_ATTACKER
waitstate
returnatktoball
waitstate
- drawpartystatussummary ATTACKER
- switchhandleorder ATTACKER, 0x1
- getswitchedmondata ATTACKER
- switchindataupdate ATTACKER
- hpthresholds ATTACKER
+ drawpartystatussummary BS_ATTACKER
+ switchhandleorder BS_ATTACKER, 0x1
+ getswitchedmondata BS_ATTACKER
+ switchindataupdate BS_ATTACKER
+ hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
- atk62 ATTACKER
- switchinanim ATTACKER, FALSE
+ atk62 BS_ATTACKER
+ switchinanim BS_ATTACKER, FALSE
waitstate
- switchineffects ATTACKER
+ switchineffects BS_ATTACKER
setbyte sMOVEEND_STATE, 0x4
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0xF
@@ -3155,21 +3157,21 @@ BattleScript_PursuitDmgOnSwitchOut::
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x3
moveend 0x2, 0x6
- various4 TARGET
- jumpifbyte EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
+ various4 BS_TARGET
+ jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0
- getexp TARGET
+ getexp BS_TARGET
BattleScript_PursuitDmgOnSwitchOutRet::
return
@@ -3209,7 +3211,7 @@ BattleScript_LearnedNewMove::
fanfare MUS_FANFA1
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
- updatechoicemoveonlvlup ATTACKER
+ updatechoicemoveonlvlup BS_ATTACKER
goto BattleScript_TryLearnMoveLoop
BattleScript_LearnMoveReturn::
return
@@ -3217,31 +3219,31 @@ BattleScript_LearnMoveReturn::
BattleScript_RainContinuesOrEnds::
printfromtable gRainContinuesStringIds
waitmessage 0x40
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_RainContinuesOrEndsEnd
- playanimation ATTACKER, ANIM_RAIN_CONTINUES, NULL
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_RainContinuesOrEndsEnd
+ playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES, NULL
BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
waitmessage 0x40
- playanimation2 ATTACKER, sANIM_ARG1, NULL
+ playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
weatherdamage
- jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
+ jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
- hitanimation ATTACKER
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- tryfaintmon ATTACKER, FALSE, NULL
+ hitanimation BS_ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ tryfaintmon BS_ATTACKER, FALSE, NULL
atk24 BattleScript_DamagingWeatherLoopIncrement
BattleScript_DamagingWeatherLoopIncrement::
- jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
+ jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
addbyte gBattleCommunication, 0x1
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
BattleScript_DamagingWeatherContinuesEnd::
@@ -3256,7 +3258,7 @@ BattleScript_SandStormHailEnds::
BattleScript_SunlightContinues::
printstring STRINGID_SUNLIGHTSTRONG
waitmessage 0x40
- playanimation ATTACKER, ANIM_SUN_CONTINUES, NULL
+ playanimation BS_ATTACKER, B_ANIM_SUN_CONTINUES, NULL
end2
BattleScript_SunlightFaded::
@@ -3267,7 +3269,7 @@ BattleScript_SunlightFaded::
BattleScript_OverworldWeatherStarts::
printfromtable gWeatherContinuesStringIds
waitmessage 0x40
- playanimation2 ATTACKER, sANIM_ARG1, NULL
+ playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
end3
BattleScript_SideStatusWoreOff::
@@ -3288,12 +3290,12 @@ BattleScript_SafeguardEnds::
end2
BattleScript_LeechSeedTurnDrain::
- playanimation ATTACKER, ANIM_LEECH_SEED_DRAIN, sANIM_ARG1
+ playanimation BS_ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
copyword gBattleMoveDamage, gHpDealt
- jumpifability ATTACKER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze
+ jumpifability BS_ATTACKER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze
manipulatedamage ATK80_DMG_CHANGE_SIGN
setbyte cMULTISTRING_CHOOSER, 0x3
goto BattleScript_LeechSeedTurnPrintAndUpdateHp
@@ -3301,12 +3303,12 @@ BattleScript_LeechSeedTurnPrintLiquidOoze::
setbyte cMULTISTRING_CHOOSER, 0x4
BattleScript_LeechSeedTurnPrintAndUpdateHp::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
printfromtable gLeechSeedStringIds
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
end2
BattleScript_BideStoringEnergy::
@@ -3316,8 +3318,8 @@ BattleScript_BideStoringEnergy::
BattleScript_BideAttack::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- clearstatusfromeffect ATTACKER
+ setmoveeffect MOVE_EFFECT_CHARGING
+ clearstatusfromeffect BS_ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage 0x40
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
@@ -3325,23 +3327,23 @@ BattleScript_BideAttack::
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, sBIDE_DMG
adjustsetdamage
- setbyte sANIM_TURN, 0x1
+ setbyte sB_ANIM_TURN, 0x1
attackanimation
waitanimation
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
resultmessage
waitmessage 0x40
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_BideNoEnergyToAttack::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- clearstatusfromeffect ATTACKER
+ setmoveeffect MOVE_EFFECT_CHARGING
+ clearstatusfromeffect BS_ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage 0x40
goto BattleScript_ButItFailed
@@ -3349,20 +3351,20 @@ BattleScript_BideNoEnergyToAttack::
BattleScript_SuccessForceOut::
attackanimation
waitanimation
- switchoutabilities TARGET
- returntoball TARGET
+ switchoutabilities BS_TARGET
+ returntoball BS_TARGET
waitstate
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_TrainerBattleForceOut
- setoutcomeonteleport ATTACKER
+ setoutcomeonteleport BS_ATTACKER
finishaction
BattleScript_TrainerBattleForceOut::
- getswitchedmondata TARGET
- switchindataupdate TARGET
- switchinanim TARGET, FALSE
+ getswitchedmondata BS_TARGET
+ switchindataupdate BS_TARGET
+ switchinanim BS_TARGET, FALSE
waitstate
printstring STRINGID_PKMNWASDRAGGEDOUT
- switchineffects TARGET
+ switchineffects BS_TARGET
goto BattleScript_MoveEnd
BattleScript_MistProtected::
@@ -3406,55 +3408,55 @@ BattleScript_DestinyBondTakesLife::
printstring STRINGID_PKMNTOOKFOE
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- tryfaintmon ATTACKER, FALSE, NULL
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ tryfaintmon BS_ATTACKER, FALSE, NULL
return
BattleScript_SpikesOnAttacker::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
call BattleScript_PrintHurtBySpikes
- tryfaintmon ATTACKER, FALSE, NULL
- tryfaintmon ATTACKER, TRUE, BattleScript_SpikesOnAttackerFainted
+ tryfaintmon BS_ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, TRUE, BattleScript_SpikesOnAttackerFainted
return
BattleScript_SpikesOnAttackerFainted::
setbyte sGIVEEXP_STATE, 0x0
- getexp ATTACKER
+ getexp BS_ATTACKER
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
goto BattleScript_HandleFaintedMon
BattleScript_SpikesOnTarget::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
call BattleScript_PrintHurtBySpikes
- tryfaintmon TARGET, FALSE, NULL
- tryfaintmon TARGET, TRUE, BattleScript_SpikesOnTargetFainted
+ tryfaintmon BS_TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, TRUE, BattleScript_SpikesOnTargetFainted
return
BattleScript_SpikesOnTargetFainted::
setbyte sGIVEEXP_STATE, 0x0
- getexp TARGET
+ getexp BS_TARGET
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
goto BattleScript_HandleFaintedMon
-BattleScript_SpikesOngBank1::
+BattleScript_SpikesOnFaintedBattler::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate GBANK_1
- datahpupdate GBANK_1
+ healthbarupdate BS_FAINTED
+ datahpupdate BS_FAINTED
call BattleScript_PrintHurtBySpikes
- tryfaintmon GBANK_1, FALSE, NULL
- tryfaintmon GBANK_1, TRUE, BattleScript_SpikesOngBank1Fainted
+ tryfaintmon BS_FAINTED, FALSE, NULL
+ tryfaintmon BS_FAINTED, TRUE, BattleScript_SpikesOnFaintedBattlerFainted
return
-BattleScript_SpikesOngBank1Fainted::
+BattleScript_SpikesOnFaintedBattlerFainted::
setbyte sGIVEEXP_STATE, 0x0
- getexp GBANK_1
+ getexp BS_FAINTED
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
goto BattleScript_HandleFaintedMon
@@ -3468,9 +3470,9 @@ BattleScript_PerishSongTakesLife::
printstring STRINGID_PKMNPERISHCOUNTFELL
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- tryfaintmon ATTACKER, FALSE, NULL
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ tryfaintmon BS_ATTACKER, FALSE, NULL
end2
BattleScript_PerishSongCountGoesDown::
@@ -3479,36 +3481,36 @@ BattleScript_PerishSongCountGoesDown::
end2
BattleScript_AllStatsUp::
- jumpifstat ATTACKER, LESS_THAN, ATK, 0xC, BattleScript_AllStatsUpAtk
- jumpifstat ATTACKER, LESS_THAN, DEF, 0xC, BattleScript_AllStatsUpAtk
- jumpifstat ATTACKER, LESS_THAN, SPEED, 0xC, BattleScript_AllStatsUpAtk
- jumpifstat ATTACKER, LESS_THAN, SPATK, 0xC, BattleScript_AllStatsUpAtk
- jumpifstat ATTACKER, EQUAL, SPDEF, 0xC, BattleScript_AllStatsUpRet
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_AllStatsUpAtk
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_AllStatsUpAtk
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 0xC, BattleScript_AllStatsUpAtk
+ jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_AllStatsUpAtk
+ jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_AllStatsUpRet
BattleScript_AllStatsUpAtk::
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x3E, 0x0
- setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
+ playstatchangeanimation BS_ATTACKER, 0x3E, 0x0
+ setstatchanger STAT_ATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpDef::
- setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
+ setstatchanger STAT_DEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpeed::
- setstatchanger SPEED, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
+ setstatchanger STAT_SPEED, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpAtk::
- setstatchanger SPATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
+ setstatchanger STAT_SPATK, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpDef::
- setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
+ setstatchanger STAT_SPDEF, 1, FALSE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpRet::
@@ -3537,27 +3539,27 @@ BattleScript_SpikesFree::
BattleScript_MonTookFutureAttack::
printstring STRINGID_PKMNTOOKATTACK
waitmessage 0x40
- jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_CheckDoomDesireMiss
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_CheckDoomDesireMiss
accuracycheck BattleScript_FutureAttackMiss, MOVE_FUTURE_SIGHT
goto BattleScript_FutureAttackAnimate
BattleScript_CheckDoomDesireMiss::
accuracycheck BattleScript_FutureAttackMiss, MOVE_DOOM_DESIRE
BattleScript_FutureAttackAnimate::
adjustnormaldamage2
- jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_FutureHitAnimDoomDesire
- playanimation ATTACKER, ANIM_FUTURE_SIGHT_HIT, NULL
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_FutureHitAnimDoomDesire
+ playanimation BS_ATTACKER, B_ANIM_FUTURE_SIGHT_HIT, NULL
goto BattleScript_DoFutureAttackHit
BattleScript_FutureHitAnimDoomDesire::
- playanimation ATTACKER, ANIM_DOOM_DESIRE_HIT, NULL
+ playanimation BS_ATTACKER, B_ANIM_DOOM_DESIRE_HIT, NULL
BattleScript_DoFutureAttackHit::
effectivenesssound
- hitanimation TARGET
+ hitanimation BS_TARGET
waitstate
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
resultmessage
waitmessage 0x40
- tryfaintmon TARGET, FALSE, NULL
+ tryfaintmon BS_TARGET, FALSE, NULL
atk24 BattleScript_FutureAttackEnd
BattleScript_FutureAttackEnd::
setbyte sMOVEEND_STATE, 0x0
@@ -3619,12 +3621,12 @@ BattleScript_SelectingNotAllowedMoveTauntInPalace::
BattleScript_WishComesTrue::
trywish 0x1, BattleScript_WishButFullHp
- playanimation TARGET, ANIM_WISH_HEAL, NULL
+ playanimation BS_TARGET, B_ANIM_WISH_HEAL, NULL
printstring STRINGID_PKMNWISHCAMETRUE
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage 0x40
end2
@@ -3638,12 +3640,12 @@ BattleScript_WishButFullHp::
end2
BattleScript_IngrainTurnHeal::
- playanimation ATTACKER, ANIM_INGRAIN_HEAL, NULL
+ playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
printstring STRINGID_PKMNABSORBEDNUTRIENTS
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
end2
BattleScript_PrintMonIsRooted::
@@ -3654,25 +3656,25 @@ BattleScript_PrintMonIsRooted::
BattleScript_AtkDefDown::
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x6, 0xD
- playstatchangeanimation ATTACKER, 0x2, 0x9
- setstatchanger ATK, 1, TRUE
- statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_82DB144
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
+ playstatchangeanimation BS_ATTACKER, 0x6, 0xD
+ playstatchangeanimation BS_ATTACKER, 0x2, 0x9
+ setstatchanger STAT_ATK, 1, TRUE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB144
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB144::
- playstatchangeanimation ATTACKER, 0x4, 0x9
- setstatchanger DEF, 1, TRUE
- statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_82DB167
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
+ playstatchangeanimation BS_ATTACKER, 0x4, 0x9
+ setstatchanger STAT_DEF, 1, TRUE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB167
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB167::
return
BattleScript_KnockedOff::
- playanimation TARGET, ANIM_ITEM_KNOCKOFF, NULL
+ playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF, NULL
printstring STRINGID_PKMNKNOCKEDOFF
waitmessage 0x40
return
@@ -3702,14 +3704,14 @@ BattleScript_MagicCoatBounce::
printstring STRINGID_PKMNMOVEBOUNCED
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
- setmagiccoattarget ATTACKER
+ setmagiccoattarget BS_ATTACKER
return
BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbanks
- playanimation TARGET, ANIM_SNATCH_MOVE, NULL
+ playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
@@ -3728,10 +3730,10 @@ BattleScript_OneHitKOMsg::
BattleScript_SAtkDown2::
setbyte sFIELD_1B, 0x0
- playstatchangeanimation ATTACKER, 0x10, 0xB
- setstatchanger SPATK, 2, TRUE
- statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_82DB1FE
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB1FE
+ playstatchangeanimation BS_ATTACKER, 0x10, 0xB
+ setstatchanger STAT_SPATK, 2, TRUE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB1FE
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB1FE
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB1FE::
@@ -3740,7 +3742,7 @@ BattleScript_82DB1FE::
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
- playanimation ATTACKER, ANIM_x14, NULL
+ playanimation BS_ATTACKER, B_ANIM_x14, NULL
printstring STRINGID_PKMNTIGHTENINGFOCUS
waitmessage 0x40
end2
@@ -3748,32 +3750,32 @@ BattleScript_FocusPunchSetUp::
BattleScript_MoveUsedIsAsleep::
printstring STRINGID_PKMNFASTASLEEP
waitmessage 0x40
- statusanimation ATTACKER
+ statusanimation BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_MoveUsedWokeUp::
bicword gHitMarker, HITMARKER_x10
printfromtable gWokeUpStringIds
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
return
BattleScript_MonWokeUpInUproar::
printstring STRINGID_PKMNWOKEUPINUPROAR
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
end2
BattleScript_PoisonTurnDmg::
printstring STRINGID_PKMNHURTBYPOISON
waitmessage 0x40
BattleScript_DoStatusTurnDmg::
- statusanimation ATTACKER
+ statusanimation BS_ATTACKER
BattleScript_DoTurnDmg::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- tryfaintmon ATTACKER, FALSE, NULL
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ tryfaintmon BS_ATTACKER, FALSE, NULL
atk24 BattleScript_DoTurnDmgEnd
BattleScript_DoTurnDmgEnd::
end2
@@ -3786,26 +3788,26 @@ BattleScript_BurnTurnDmg::
BattleScript_MoveUsedIsFrozen::
printstring STRINGID_PKMNISFROZEN
waitmessage 0x40
- statusanimation ATTACKER
+ statusanimation BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_MoveUsedUnfroze::
printfromtable gGotDefrostedStringIds
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
return
BattleScript_DefrostedViaFireMove::
printstring STRINGID_PKMNWASDEFROSTED
waitmessage 0x40
- updatestatusicon TARGET
+ updatestatusicon BS_TARGET
return
BattleScript_MoveUsedIsParalyzed::
printstring STRINGID_PKMNISPARALYZED
waitmessage 0x40
- statusanimation ATTACKER
- cancelmultiturnmoves ATTACKER
+ statusanimation BS_ATTACKER
+ cancelmultiturnmoves BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_MoveUsedFlinched::
@@ -3819,7 +3821,7 @@ BattleScript_PrintUproarOverTurns::
end2
BattleScript_ThrashConfuses::
- chosenstatus2animation ATTACKER, STATUS2_CONFUSION
+ chosenstatus2animation BS_ATTACKER, STATUS2_CONFUSION
printstring STRINGID_PKMNFATIGUECONFUSION
waitmessage 0x40
end2
@@ -3827,22 +3829,22 @@ BattleScript_ThrashConfuses::
BattleScript_MoveUsedIsConfused::
printstring STRINGID_PKMNISCONFUSED
waitmessage 0x40
- status2animation ATTACKER, STATUS2_CONFUSION
- jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_MoveUsedIsConfusedRet
+ status2animation BS_ATTACKER, STATUS2_CONFUSION
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_MoveUsedIsConfusedRet
BattleScript_DoSelfConfusionDmg::
- cancelmultiturnmoves ATTACKER
+ cancelmultiturnmoves BS_ATTACKER
adjustnormaldamage2
printstring STRINGID_ITHURTCONFUSION
waitmessage 0x40
effectivenesssound
- hitanimation ATTACKER
+ hitanimation BS_ATTACKER
waitstate
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
resultmessage
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
goto BattleScript_MoveEnd
BattleScript_MoveUsedIsConfusedRet::
return
@@ -3858,7 +3860,7 @@ BattleScript_PrintPayDayMoneyString::
return
BattleScript_WrapTurnDmg::
- playanimation ATTACKER, ANIM_TURN_TRAP, sANIM_ARG1
+ playanimation BS_ATTACKER, B_ANIM_TURN_TRAP, sB_ANIM_ARG1
printstring STRINGID_PKMNHURTBY
waitmessage 0x40
goto BattleScript_DoTurnDmg
@@ -3871,7 +3873,7 @@ BattleScript_WrapEnds::
BattleScript_MoveUsedIsInLove::
printstring STRINGID_PKMNINLOVE
waitmessage 0x40
- status2animation ATTACKER, STATUS2_INFATUATION
+ status2animation BS_ATTACKER, STATUS2_INFATUATION
return
BattleScript_MoveUsedIsParalyzedCantAttack::
@@ -3882,59 +3884,59 @@ BattleScript_MoveUsedIsParalyzedCantAttack::
BattleScript_NightmareTurnDmg::
printstring STRINGID_PKMNLOCKEDINNIGHTMARE
waitmessage 0x40
- status2animation ATTACKER, STATUS2_NIGHTMARE
+ status2animation BS_ATTACKER, STATUS2_NIGHTMARE
goto BattleScript_DoTurnDmg
BattleScript_CurseTurnDmg::
printstring STRINGID_PKMNAFFLICTEDBYCURSE
waitmessage 0x40
- status2animation ATTACKER, STATUS2_CURSED
+ status2animation BS_ATTACKER, STATUS2_CURSED
goto BattleScript_DoTurnDmg
BattleScript_TargetPRLZHeal::
printstring STRINGID_PKMNHEALEDPARALYSIS
waitmessage 0x40
- updatestatusicon TARGET
+ updatestatusicon BS_TARGET
return
BattleScript_MoveEffectSleep::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printfromtable gFellAsleepStringIds
waitmessage 0x40
BattleScript_UpdateEffectStatusIconRet::
- updatestatusicon EFFECT_BANK
+ updatestatusicon BS_EFFECT_BATTLER
waitstate
return
BattleScript_YawnMakesAsleep::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printstring STRINGID_PKMNFELLASLEEP
waitmessage 0x40
- updatestatusicon EFFECT_BANK
+ updatestatusicon BS_EFFECT_BATTLER
waitstate
- makevisible EFFECT_BANK
+ makevisible BS_EFFECT_BATTLER
end2
BattleScript_MoveEffectPoison::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printfromtable gGotPoisonedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectBurn::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printfromtable gGotBurnedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectFreeze::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printfromtable gGotFrozenStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectParalysis::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printfromtable gGotParalyzedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
@@ -3945,7 +3947,7 @@ BattleScript_MoveEffectUproar::
return
BattleScript_MoveEffectToxic::
- statusanimation EFFECT_BANK
+ statusanimation BS_EFFECT_BATTLER
printstring STRINGID_PKMNBADLYPOISONED
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
@@ -3961,26 +3963,26 @@ BattleScript_MoveEffectWrap::
return
BattleScript_MoveEffectConfusion::
- chosenstatus2animation EFFECT_BANK, STATUS2_CONFUSION
+ chosenstatus2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
printstring STRINGID_PKMNWASCONFUSED
waitmessage 0x40
return
BattleScript_MoveEffectRecoil33::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33
- jumpifability ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End
+ jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End
BattleScript_DoRecoil33::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHITWITHRECOIL
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
BattleScript_Recoil33End::
return
BattleScript_ItemSteal::
- playanimation TARGET, ANIM_ITEM_STEAL, NULL
+ playanimation BS_TARGET, B_ANIM_ITEM_STEAL, NULL
printstring STRINGID_PKMNSTOLEITEM
waitmessage 0x40
return
@@ -3989,12 +3991,12 @@ BattleScript_DrizzleActivates::
pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
- playanimation BANK0, ANIM_RAIN_CONTINUES, NULL
+ playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
BattleScript_SpeedBoostActivates::
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNRAISEDSPEED
waitmessage 0x40
end3
@@ -4009,22 +4011,22 @@ BattleScript_RainDishActivates::
printstring STRINGID_PKMNSXRESTOREDHPALITTLE2
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
end3
BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
- playanimation BANK0, ANIM_SANDSTORM_CONTINUES, NULL
+ playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
BattleScript_ShedSkinActivates::
printstring STRINGID_PKMNSXCUREDYPROBLEM
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
end3
BattleScript_WeatherFormChanges::
@@ -4054,17 +4056,17 @@ BattleScript_82DB4BE::
pause 0x20
BattleScript_82DB4C1::
setbyte gBattlerTarget, 0x0
- setstatchanger ATK, 1, TRUE
+ setstatchanger STAT_ATK, 1, TRUE
BattleScript_82DB4CD::
trygetintimidatetarget BattleScript_82DB51B
- jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82DB510
- jumpifability TARGET, ABILITY_CLEAR_BODY, BattleScript_82DB51C
- jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_82DB51C
- jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_82DB51C
+ jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DB510
+ jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_82DB51C
+ jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_82DB51C
+ jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_82DB51C
statbuffchange 0x21, BattleScript_82DB510
- jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNCUTSATTACKWITH
waitmessage 0x40
BattleScript_82DB510::
@@ -4083,7 +4085,7 @@ BattleScript_DroughtActivates::
pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
- playanimation BANK0, ANIM_SUN_CONTINUES, NULL
+ playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4113,8 +4115,8 @@ BattleScript_MoveHPDrain::
attackstring
pause 0x20
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate TARGET
- datahpupdate TARGET
+ healthbarupdate BS_TARGET
+ datahpupdate BS_TARGET
printstring STRINGID_PKMNRESTOREDHPUSING
waitmessage 0x40
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
@@ -4215,15 +4217,15 @@ BattleScript_ColorChangeActivates::
BattleScript_RoughSkinActivates::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHURTSWITH
waitmessage 0x40
- tryfaintmon ATTACKER, FALSE, NULL
+ tryfaintmon BS_ATTACKER, FALSE, NULL
return
BattleScript_CuteCharmActivates::
- status2animation ATTACKER, STATUS2_INFATUATION
+ status2animation BS_ATTACKER, STATUS2_INFATUATION
printstring STRINGID_PKMNSXINFATUATEDY
waitmessage 0x40
return
@@ -4247,7 +4249,7 @@ BattleScript_NoItemSteal::
BattleScript_AbilityCuredStatus::
printstring STRINGID_PKMNSXCUREDITSYPROBLEM
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
return
BattleScript_82DB695::
@@ -4263,9 +4265,9 @@ BattleScript_IgnoresAndUsesRandomMove::
jumptorandomattack FALSE
BattleScript_MoveUsedLoafingAround::
- jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7
setbyte gBattleCommunication, 0x0
- various24 ATTACKER
+ various24 BS_ATTACKER
setbyte cMULTISTRING_CHOOSER, 0x4
BattleScript_82DB6C7::
printfromtable gInobedientStringIds
@@ -4277,7 +4279,7 @@ BattleScript_82DB6C7::
BattleScript_IgnoresAndFallsAsleep::
printstring STRINGID_PKMNBEGANTONAP
waitmessage 0x40
- setmoveeffect EFFECT_SLEEP | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
@@ -4289,7 +4291,7 @@ BattleScript_82DB6F0::
goto BattleScript_DoSelfConfusionDmg
BattleScript_SubstituteFade::
- playanimation TARGET, ANIM_SUBSTITUTE_FADE, NULL
+ playanimation BS_TARGET, B_ANIM_SUBSTITUTE_FADE, NULL
printstring STRINGID_PKMNSUBSTITUTEFADED
return
@@ -4298,11 +4300,11 @@ BattleScript_BerryCurePrlzEnd2::
end2
BattleScript_BerryCureParRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCurePsnEnd2::
@@ -4310,11 +4312,11 @@ BattleScript_BerryCurePsnEnd2::
end2
BattleScript_BerryCurePsnRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPOISON
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCureBrnEnd2::
@@ -4322,11 +4324,11 @@ BattleScript_BerryCureBrnEnd2::
end2
BattleScript_BerryCureBrnRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMHEALEDBURN
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCureFrzEnd2::
@@ -4334,11 +4336,11 @@ BattleScript_BerryCureFrzEnd2::
end2
BattleScript_BerryCureFrzRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMDEFROSTEDIT
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCureSlpEnd2::
@@ -4346,11 +4348,11 @@ BattleScript_BerryCureSlpEnd2::
end2
BattleScript_BerryCureSlpRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMWOKEIT
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCureConfusionEnd2::
@@ -4358,10 +4360,10 @@ BattleScript_BerryCureConfusionEnd2::
end2
BattleScript_BerryCureConfusionRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMSNAPPEDOUT
waitmessage 0x40
- removeitem SCRIPTING_BANK
+ removeitem BS_SCRIPTING
return
BattleScript_BerryCureChosenStatusEnd2::
@@ -4369,11 +4371,11 @@ BattleScript_BerryCureChosenStatusEnd2::
end2
BattleScript_BerryCureChosenStatusRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printfromtable gBerryEffectStringIds
waitmessage 0x40
- updatestatusicon SCRIPTING_BANK
- removeitem SCRIPTING_BANK
+ updatestatusicon BS_SCRIPTING
+ removeitem BS_SCRIPTING
return
BattleScript_WhiteHerbEnd2::
@@ -4381,27 +4383,27 @@ BattleScript_WhiteHerbEnd2::
end2
BattleScript_WhiteHerbRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
waitmessage 0x40
- removeitem SCRIPTING_BANK
+ removeitem BS_SCRIPTING
return
BattleScript_ItemHealHP_RemoveItem::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
- removeitem ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
+ removeitem BS_ATTACKER
end2
BattleScript_BerryPPHealEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDPP
waitmessage 0x40
- removeitem ATTACKER
+ removeitem BS_ATTACKER
end2
BattleScript_ItemHealHP_End2::
@@ -4409,12 +4411,12 @@ BattleScript_ItemHealHP_End2::
end2
BattleScript_ItemHealHP_Ret::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
return
BattleScript_SelectingNotAllowedMoveChoiceItem::
@@ -4422,39 +4424,39 @@ BattleScript_SelectingNotAllowedMoveChoiceItem::
endselectionscript
BattleScript_HangedOnMsg::
- playanimation TARGET, ANIM_HANGED_ON, NULL
+ playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL
printstring STRINGID_PKMNHUNGONWITHX
waitmessage 0x40
return
BattleScript_BerryConfuseHealEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_FORXCOMMAYZ
waitmessage 0x40
- setmoveeffect EFFECT_CONFUSION | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
- removeitem ATTACKER
+ removeitem BS_ATTACKER
end2
BattleScript_BerryStatRaiseEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
- statbuffchange AFFECTS_USER | 0x1, BattleScript_82DB85B
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_82DB85B
BattleScript_82DB85B::
setbyte cMULTISTRING_CHOOSER, 0x4
call BattleScript_StatUp
- removeitem ATTACKER
+ removeitem BS_ATTACKER
end2
BattleScript_BerryFocusEnergyEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNUSEDXTOGETPUMPED
waitmessage 0x40
- removeitem ATTACKER
+ removeitem BS_ATTACKER
end2
BattleScript_ActionSelectionItemsCantBeUsed::
@@ -4468,8 +4470,8 @@ BattleScript_82DB87D::
BattleScript_82DB881::
setbyte gBattleCommunication + 1, 0x0
BattleScript_82DB887::
- various8 ATTACKER
- jumpifbyte NOT_EQUAL, gBattleCommunication, 0x1, BattleScript_82DB89D
+ various8 BS_ATTACKER
+ jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0x1, BattleScript_82DB89D
printfromtable gStringIds_85CCF0A
waitmessage 0x40
BattleScript_82DB89D::
@@ -4480,105 +4482,105 @@ BattleScript_82DB89D::
end2
BattleScript_82DB8BE::
- waitcry ATTACKER
- various21 ATTACKER
+ waitcry BS_ATTACKER
+ various21 BS_ATTACKER
playse 0x109
pause 0x8
playse 0x109
- various14 ATTACKER
+ various14 BS_ATTACKER
various16 8
various17 8
pause 0x40
- various15 ATTACKER
- various22 ATTACKER
+ various15 BS_ATTACKER
+ various22 BS_ATTACKER
end2
BattleScript_82DB8E0::
playse SE_PINPON
- various14 ATTACKER
- various16 TARGET
- various17 TARGET
+ various14 BS_ATTACKER
+ various16 BS_TARGET
+ various17 BS_TARGET
pause 0x40
- various15 ATTACKER
+ various15 BS_ATTACKER
end2
BattleScript_82DB8F3::
makevisible 11
waitstate
- makevisible OPPONENT1
+ makevisible BS_OPPONENT1
waitstate
- various21 ATTACKER
+ various21 BS_ATTACKER
playse 0x109
pause 0x8
playse 0x109
pause 0x40
- various14 ATTACKER
- various16 ATTACKER
- various17 ATTACKER
+ various14 BS_ATTACKER
+ various16 BS_ATTACKER
+ various17 BS_ATTACKER
pause 0x40
setbyte gBattleCommunication, 0x0
- various9 ATTACKER
+ various9 BS_ATTACKER
pause 0x40
- various9 ATTACKER
- various16 EFFECT_BANK
- various17 EFFECT_BANK
- various9 ATTACKER
- various16 GBANK_1
- various17 GBANK_1
- various9 ATTACKER
+ various9 BS_ATTACKER
+ various16 BS_EFFECT_BATTLER
+ various17 BS_EFFECT_BATTLER
+ various9 BS_ATTACKER
+ various16 BS_FAINTED
+ various17 BS_FAINTED
+ various9 BS_ATTACKER
various16 0x4
various17 0x4
- various9 ATTACKER
- jumpifbyte EQUAL, gBattleCommunication + 1, 0x3, BattleScript_82DB973
- jumpifbyte EQUAL, gBattleCommunication + 1, 0x4, BattleScript_82DB992
+ various9 BS_ATTACKER
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_82DB973
+ jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_82DB992
various16 0x5
various17 0x5
- various9 ATTACKER
- various15 ATTACKER
+ various9 BS_ATTACKER
+ various15 BS_ATTACKER
printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
waitmessage 0x40
- playfaintcry OPPONENT1
- waitcry ATTACKER
- dofaintanimation OPPONENT1
- cleareffectsonfaint OPPONENT1
- various10 ATTACKER
+ playfaintcry BS_OPPONENT1
+ waitcry BS_ATTACKER
+ dofaintanimation BS_OPPONENT1
+ cleareffectsonfaint BS_OPPONENT1
+ various10 BS_ATTACKER
end2
BattleScript_82DB973::
various16 0x6
various17 0x6
- various9 ATTACKER
- various15 ATTACKER
+ various9 BS_ATTACKER
+ various15 BS_ATTACKER
printstring STRINGID_LOSTTOOPPONENTBYREFEREE
waitmessage 0x40
playfaintcry 11
- waitcry ATTACKER
+ waitcry BS_ATTACKER
dofaintanimation 11
cleareffectsonfaint 11
- various11 ATTACKER
+ various11 BS_ATTACKER
end2
BattleScript_82DB992::
- various16 BANK0
- various17 BANK0
- various9 ATTACKER
- various15 ATTACKER
+ various16 BS_BANK_0
+ various17 BS_BANK_0
+ various9 BS_ATTACKER
+ various15 BS_ATTACKER
printstring STRINGID_TIEDOPPONENTBYREFEREE
waitmessage 0x40
playfaintcry 11
- waitcry ATTACKER
+ waitcry BS_ATTACKER
dofaintanimation 11
cleareffectsonfaint 11
- playfaintcry OPPONENT1
- waitcry ATTACKER
- dofaintanimation OPPONENT1
- cleareffectsonfaint OPPONENT1
- various12 ATTACKER
+ playfaintcry BS_OPPONENT1
+ waitcry BS_ATTACKER
+ dofaintanimation BS_OPPONENT1
+ cleareffectsonfaint BS_OPPONENT1
+ various12 BS_ATTACKER
end2
BattleScript_AskIfWantsToForfeitMatch::
printselectionstring STRINGID_QUESTIONFORFEITMATCH
- forfeityesnobox ATTACKER
+ forfeityesnobox BS_ATTACKER
endselectionscript
BattleScript_PrintPlayerForfeited::
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 9cd6a4d7d..8020d7c5c 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -1,11 +1,12 @@
+#include "constants/battle.h"
+#include "constants/battle_script_commands.h"
+#include "constants/battle_anim.h"
+#include "constants/battle_string_ids.h"
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
- .include "constants/battle_constants.inc"
- .include "constants/battle_script_constants.inc"
- .include "constants/battle_text.inc"
.section script_data, "aw", %progbits
@@ -46,7 +47,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
.4byte BattleScript_82DBEE3
BattleScript_BallThrow::
- jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
+ jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
printstring STRINGID_PLAYERUSEDITEM
handleballthrow
@@ -56,11 +57,11 @@ BattleScript_BallThrowByWally::
BattleScript_SafariBallThrow::
printstring STRINGID_PLAYERUSEDITEM
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
handleballthrow
BattleScript_SuccessBallThrow::
- jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
+ jumpifhalfword CMP_EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat 0xB
BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT
@@ -81,22 +82,22 @@ BattleScript_TryNicknameCaughtMon::
BattleScript_GiveCaughtMonEnd::
givecaughtmon
BattleScript_SuccessBallThrowEnd::
- setbyte gBattleOutcome, CAUGHT
+ setbyte gBattleOutcome, B_OUTCOME_CAUGHT
finishturn
BattleScript_WallyBallThrow::
printstring STRINGID_GOTCHAPKMNCAUGHT2
- setbyte gBattleOutcome, CAUGHT
+ setbyte gBattleOutcome, B_OUTCOME_CAUGHT
finishturn
BattleScript_ShakeBallThrow::
printfromtable gBallEscapeStringIds
waitmessage 0x40
- jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
- jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
+ jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
+ jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
printstring STRINGID_OUTOFSAFARIBALLS
waitmessage 0x40
- setbyte gBattleOutcome, OUT_OF_BALLS
+ setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
BattleScript_ShakeBallThrowEnd::
finishaction
@@ -121,11 +122,11 @@ BattleScript_OpponentUsesHealItem::
waitmessage 0x40
useitemonopponent
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate ATTACKER
- datahpupdate ATTACKER
+ healthbarupdate BS_ATTACKER
+ datahpupdate BS_ATTACKER
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
finishaction
@@ -139,7 +140,7 @@ BattleScript_OpponentUsesStatusCureItem::
useitemonopponent
printfromtable gTrainerItemCuredStatusStringIds
waitmessage 0x40
- updatestatusicon ATTACKER
+ updatestatusicon BS_ATTACKER
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
finishaction
@@ -172,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs::
BattleScript_RunByUsingItem::
playse SE_NIGERU
- setbyte gBattleOutcome, RAN
+ setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
@@ -188,7 +189,7 @@ BattleScript_ActionGetNear::
BattleScript_ActionThrowPokeblock::
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
- playanimation ATTACKER, ANIM_x4, NULL
+ playanimation BS_ATTACKER, B_ANIM_x4, NULL
printfromtable gSafariPokeblockResultStringIds
waitmessage 0x40
end2
@@ -198,7 +199,7 @@ BattleScript_82DBEE3::
waitmessage 0x40
returnatktoball
waitstate
- trainerslidein TARGET
+ trainerslidein BS_TARGET
waitstate
printstring STRINGID_YOUTHROWABALLNOWRIGHT
waitmessage 0x40
diff --git a/data/battle_tower.s b/data/battle_tower.s
index 9ef2c2d44..2cc0aa639 100644
--- a/data/battle_tower.s
+++ b/data/battle_tower.s
@@ -3,6 +3,7 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
+#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
diff --git a/data/data2b.s b/data/data2b.s
index 4d3126215..b34995bee 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -2,6 +2,7 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
+#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
diff --git a/data/data2c.s b/data/data2c.s
index 69254d366..8d134ccb2 100644
--- a/data/data2c.s
+++ b/data/data2c.s
@@ -2,6 +2,7 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
+#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 19:45:10 +0000