diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:12:02 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:12:02 -0500 |
| commit | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (patch) | |
| tree | 5492d50f51f51acca9cf1861c7b5936182649364 /data | |
| parent | 42cfbcb197bb271e675a4b2b9e70a2647bd65532 (diff) | |
| parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) | |
move data to c
Diffstat (limited to 'data')
24 files changed, 1020 insertions, 2556 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_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc index 1fe938099..034c1b62c 100644 --- a/data/battle_frontier/battle_frontier_trainers.inc +++ b/data/battle_frontier/battle_frontier_trainers.inc @@ -157,7 +157,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Peggy @ 6 - .4byte FACILITY_CLASS_SCHOOL_KID_1 + .4byte FACILITY_CLASS_SCHOOL_KID_M .string "KEITH$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -183,7 +183,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Keith @ 7 - .4byte FACILITY_CLASS_SCHOOL_KID_1 + .4byte FACILITY_CLASS_SCHOOL_KID_M .string "GRAYSON$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -209,7 +209,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Grayson @ 8 - .4byte FACILITY_CLASS_SCHOOL_KID_1 + .4byte FACILITY_CLASS_SCHOOL_KID_M .string "GLENN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -235,7 +235,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Glenn @ 9 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "LILIANA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -261,7 +261,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Liliana @ 10 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "ELISE$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -287,7 +287,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Elise @ 11 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "ZOEY$", 8 @ pre-battle speech .2byte EC_WORD_PLEASE @@ -2965,7 +2965,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Rayna @ 114 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "EVAN$", 8 @ pre-battle speech .2byte EC_WORD_EVERY @@ -2991,7 +2991,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Evan @ 115 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "JORDAN$", 8 @ pre-battle speech .2byte EC_WORD_GOOD @@ -3017,7 +3017,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jordan @ 116 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "JOEL$", 8 @ pre-battle speech .2byte EC_WORD_FUFUFU @@ -3121,7 +3121,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Chloe @ 120 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "NORTON$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -3147,7 +3147,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Norton @ 121 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "LUKAS$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -3173,7 +3173,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Lukas @ 122 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "ZACH$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -3199,7 +3199,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Zach @ 123 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "KAITLYN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -3225,7 +3225,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kaitlyn @ 124 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "BREANNA$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -3251,7 +3251,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Breanna @ 125 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "KENDRA$", 8 @ pre-battle speech .2byte EC_WORD_IF @@ -3641,7 +3641,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Sofia @ 140 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "BRADEN$", 8 @ pre-battle speech .2byte EC_WORD_I_CHOOSE_YOU @@ -3667,7 +3667,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Braden @ 141 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "KAYDEN$", 8 @ pre-battle speech .2byte EC_WORD_THEY @@ -3693,7 +3693,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kayden @ 142 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "COOPER$", 8 @ pre-battle speech .2byte EC_WORD_THIS @@ -3719,7 +3719,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Cooper @ 143 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "JULIA$", 8 @ pre-battle speech .2byte EC_WORD_SPIRIT @@ -3745,7 +3745,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Julia @ 144 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "AMARA$", 8 @ pre-battle speech .2byte EC_WORD_WROOOAAR_EXCL @@ -3771,7 +3771,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Amara @ 145 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "LYNN$", 8 @ pre-battle speech .2byte EC_WORD_YOUR @@ -3797,7 +3797,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Lynn @ 146 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "JOVAN$", 8 @ pre-battle speech .2byte EC_WORD_YOUR @@ -3823,7 +3823,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jovan @ 147 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "DOMINIC$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -3849,7 +3849,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dominic @ 148 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "NIKOLAS$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -3875,7 +3875,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nikolas @ 149 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "VALERIA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -3901,7 +3901,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Valeria @ 150 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "DELANEY$", 8 @ pre-battle speech .2byte EC_WORD_SCHOOL @@ -3927,7 +3927,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Delaney @ 151 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "MEGHAN$", 8 @ pre-battle speech .2byte EC_WORD_SCHOOL @@ -4265,7 +4265,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kaila @ 164 - .4byte FACILITY_CLASS_SCHOOL_KID_1 + .4byte FACILITY_CLASS_SCHOOL_KID_M .string "ISIAH$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4291,7 +4291,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Isiah @ 165 - .4byte FACILITY_CLASS_SCHOOL_KID_1 + .4byte FACILITY_CLASS_SCHOOL_KID_M .string "GARRETT$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4317,7 +4317,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Garrett @ 166 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "HAYLIE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4343,7 +4343,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Haylie @ 167 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "MEGAN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5721,7 +5721,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Tess @ 220 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "LEON$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -5747,7 +5747,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Leon @ 221 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "ALONZO$", 8 @ pre-battle speech .2byte EC_WORD_I_VE @@ -5773,7 +5773,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Alonzo @ 222 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "VINCE$", 8 @ pre-battle speech .2byte EC_WORD_THE @@ -5799,7 +5799,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Vince @ 223 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "BRYON$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -5825,7 +5825,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Bryon @ 224 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "AVA$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -5851,7 +5851,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ava @ 225 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "MIRIAM$", 8 @ pre-battle speech .2byte EC_WORD_OH @@ -5877,7 +5877,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Miriam @ 226 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "CARRIE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5903,7 +5903,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Carrie @ 227 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "GILLIAN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5929,7 +5929,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gillian2 @ 228 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "TYLER$", 8 @ pre-battle speech .2byte EC_WORD_YO @@ -5955,7 +5955,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Tyler @ 229 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "CHAZ$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -5981,7 +5981,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Chaz @ 230 - .4byte FACILITY_CLASS_PKMN_RANGER_1 + .4byte FACILITY_CLASS_PKMN_RANGER_M .string "NELSON$", 8 @ pre-battle speech .2byte EC_WORD_WELL_THEN @@ -6007,7 +6007,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nelson @ 231 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "SHANIA$", 8 @ pre-battle speech .2byte EC_WORD_ALL @@ -6033,7 +6033,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Shania @ 232 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "STELLA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -6059,7 +6059,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Stella @ 233 - .4byte FACILITY_CLASS_PKMN_RANGER_2 + .4byte FACILITY_CLASS_PKMN_RANGER_F .string "DORINE$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -6319,7 +6319,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Alana @ 243 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "ALEXAS$", 8 @ pre-battle speech .2byte EC_WORD_GOOD @@ -6345,7 +6345,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Alexas @ 244 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "WESTON$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -6371,7 +6371,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Weston @ 245 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "JASPER$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -6475,7 +6475,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Emma @ 249 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "ROLANDO$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -6501,7 +6501,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Rolando @ 250 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "STANLY$", 8 @ pre-battle speech .2byte EC_WORD_THIS @@ -6527,7 +6527,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Stanly @ 251 - .4byte FACILITY_CLASS_PSYCHIC_1 + .4byte FACILITY_CLASS_PSYCHIC_M .string "DARIO$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -6553,7 +6553,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dario @ 252 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "KARLEE$", 8 @ pre-battle speech .2byte EC_WORD_SOMETHING @@ -6579,7 +6579,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Karlee @ 253 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "JAYLIN$", 8 @ pre-battle speech .2byte EC_WORD_EVERY @@ -6605,7 +6605,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jaylin @ 254 - .4byte FACILITY_CLASS_PSYCHIC_2 + .4byte FACILITY_CLASS_PSYCHIC_F .string "INGRID$", 8 @ pre-battle speech .2byte EC_WORD_I_AM diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc index 4975f0cd4..675314eb3 100644 --- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc +++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc @@ -339,7 +339,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Conrad @ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "MAKENNA$", 8 @ pre-battle speech .2byte EC_WORD_SHOW @@ -365,7 +365,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Makenna @ 14 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "BRAYAN$", 8 @ pre-battle speech .2byte EC_WORD_CAN @@ -391,7 +391,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Brayan @ 15 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "MARIANA$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -469,7 +469,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Gianna @ 18 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "YAHIR$", 8 @ pre-battle speech .2byte EC_WORD_YOU diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc index 6fdd85215..051514b94 100644 --- a/data/battle_frontier/slateport_battle_tent_trainers.inc +++ b/data/battle_frontier/slateport_battle_tent_trainers.inc @@ -339,7 +339,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Kyler @ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "MAGGIE$", 8 @ pre-battle speech .2byte EC_POKEMON(VULPIX) @@ -365,7 +365,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Maggie @ 14 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "STEPHON$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -391,7 +391,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Stephon @ 15 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "REBECCA$", 8 @ pre-battle speech .2byte EC_WORD_THAT @@ -469,7 +469,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Janae @ 18 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "CAIDEN$", 8 @ pre-battle speech .2byte EC_WORD_MY diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc index a31f52ba6..b375ce811 100644 --- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc +++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc @@ -339,7 +339,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Ernesto @ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_2 + .4byte FACILITY_CLASS_SCHOOL_KID_F .string "NALA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -365,7 +365,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Nala @ 14 - .4byte FACILITY_CLASS_COOLTRAINER_1 + .4byte FACILITY_CLASS_COOLTRAINER_M .string "DARNELL$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -391,7 +391,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Darnell @ 15 - .4byte FACILITY_CLASS_COOLTRAINER_2 + .4byte FACILITY_CLASS_COOLTRAINER_F .string "ASHLYN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -469,7 +469,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Justine @ 18 - .4byte FACILITY_CLASS_EXPERT_1 + .4byte FACILITY_CLASS_EXPERT_M .string "TYSON$", 8 @ pre-battle speech .2byte EC_WORD_YOU_RE 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..b65087d7a 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" @@ -21,31 +22,31 @@ gUnknown_082FF2B8:: @ 82FF2B8 .align 2 gUnknown_082FF3A8:: @ 82FF3A8 - .byte 0x00, 0x80, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x88, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x90, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x98, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0x8000, 0x800 + obj_frame_tiles gHeap + 0x8800, 0x800 + obj_frame_tiles gHeap + 0x9000, 0x800 + obj_frame_tiles gHeap + 0x9800, 0x800 .align 2 gUnknown_082FF3C8:: @ 82FF3C8 - .byte 0x00, 0xa0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xa8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xb0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xb8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xA000, 0x800 + obj_frame_tiles gHeap + 0xA800, 0x800 + obj_frame_tiles gHeap + 0xB000, 0x800 + obj_frame_tiles gHeap + 0xB800, 0x800 .align 2 gUnknown_082FF3E8:: @ 82FF3E8 - .byte 0x00, 0xc0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xc8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xd0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xd8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xC000, 0x800 + obj_frame_tiles gHeap + 0xC800, 0x800 + obj_frame_tiles gHeap + 0xD000, 0x800 + obj_frame_tiles gHeap + 0xD800, 0x800 .align 2 gUnknown_082FF408:: @ 82FF408 - .byte 0x00, 0xe0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xe8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xf0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xf8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xE000, 0x800 + obj_frame_tiles gHeap + 0xE800, 0x800 + obj_frame_tiles gHeap + 0xF000, 0x800 + obj_frame_tiles gHeap + 0xF800, 0x800 .align 2 gUnknown_082FF428:: @ 82FF428 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" diff --git a/data/data2e.s b/data/data2e.s deleted file mode 100644 index 597d53067..000000000 --- a/data/data2e.s +++ /dev/null @@ -1,151 +0,0 @@ -#include "constants/abilities.h" -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - -@ 83299EC - .include "data/graphics/pokemon/front_anim_ids_table.inc" - -@ 8329B87 - .include "data/graphics/pokemon/animation_delay_table.inc" - - .align 1 -gUnknown_08329D22:: @ 8329D22 -@ Masks for getting PP Up count, also PP Max values - .byte 0x03, 0x0c, 0x30, 0xc0 - - .align 1 -gUnknown_08329D26:: @ 8329D26 -@ Masks for setting PP Up count - .byte 0xfc, 0xf3, 0xcf, 0x3f - - .align 1 -gUnknown_08329D2A:: @ 8329D2A -@ Values added to PP Up count - .byte 0x01, 0x04, 0x10, 0x40 - - .align 1 -gStatStageRatios:: @ 8329D2E - .byte 0x0a, 0x28 - .byte 0x0a, 0x23 - .byte 0x0a, 0x1e - .byte 0x0a, 0x19 - .byte 0x0a, 0x14 - .byte 0x0a, 0x0f - .byte 0x0a, 0x0a - .byte 0x0f, 0x0a - .byte 0x14, 0x0a - .byte 0x19, 0x0a - .byte 0x1e, 0x0a - .byte 0x23, 0x0a - .byte 0x28, 0x0a - - .align 1 -gUnknown_08329D48:: @ 8329D48 - .2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a - - .align 1 -gUnknown_08329D54:: @ 8329D54 - .2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019 - .2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014 - - .align 1 -gHoldEffectToType:: @ 8329D74 - .byte 0x1f, 0x06 - .byte 0x2a, 0x08 - .byte 0x2e, 0x04 - .byte 0x2f, 0x05 - .byte 0x30, 0x0c - .byte 0x31, 0x11 - .byte 0x32, 0x01 - .byte 0x33, 0x0d - .byte 0x34, 0x0b - .byte 0x35, 0x02 - .byte 0x36, 0x03 - .byte 0x37, 0x0f - .byte 0x38, 0x07 - .byte 0x39, 0x0e - .byte 0x3a, 0x0a - .byte 0x3b, 0x10 - .byte 0x3c, 0x00 - .byte 0x00, 0x00 - - .align 2 -gUnknown_08329D98:: @ 8329D98 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent - - .align 2 -gUnknown_08329DF8:: @ 8329DF8 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4 - spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4 - -gSecretBaseTrainerClasses:: @ 8329EB8 - .byte FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOLTRAINER_1 - .byte FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_2, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOLTRAINER_2 - -gUnknown_08329EC2:: @ 8329EC2 - .byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e - -gUnknown_08329EC8:: @ 8329EC8 - .byte 1, 1, 3, 2, 4, 6 - -gUnknown_08329ECE:: @ 8329ECE -@ Happiness deltas - .byte 0x05, 0x03, 0x02 - .byte 0x05, 0x03, 0x02 - .byte 0x01, 0x01, 0x00 - .byte 0x03, 0x02, 0x01 - .byte 0x01, 0x01, 0x00 - .byte 0x01, 0x01, 0x01 - .byte 0xff, 0xff, 0xff - .byte 0xfb, 0xfb, 0xf6 - .byte 0xfb, 0xfb, 0xf6 - - .align 1 -gHMMoves:: @ 8329EEA - .2byte MOVE_CUT - .2byte MOVE_FLY - .2byte MOVE_SURF - .2byte MOVE_STRENGTH - .2byte MOVE_FLASH - .2byte MOVE_ROCK_SMASH - .2byte MOVE_WATERFALL - .2byte MOVE_DIVE - .2byte 0xffff - - .align 1 -gAlteringCaveWildMonHeldItems:: @ 8329EFC - .2byte 0, ITEM_NONE - .2byte SPECIES_MAREEP, ITEM_GANLON_BERRY - .2byte SPECIES_PINECO, ITEM_APICOT_BERRY - .2byte SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM - .2byte SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY - .2byte SPECIES_AIPOM, ITEM_BERRY_JUICE - .2byte SPECIES_SHUCKLE, ITEM_BERRY_JUICE - .2byte SPECIES_STANTLER, ITEM_PETAYA_BERRY - .2byte SPECIES_SMEARGLE, ITEM_SALAC_BERRY - - .align 2 -gUnknown_08329F20:: @ 8329F20 - .byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_08329F28:: @ 8329F28 - spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - diff --git a/data/graphics/pokemon/animation_delay_table.inc b/data/graphics/pokemon/animation_delay_table.inc deleted file mode 100644 index be517649b..000000000 --- a/data/graphics/pokemon/animation_delay_table.inc +++ /dev/null @@ -1,412 +0,0 @@ -gMonAnimationDelayTable:: @ 8329B87 - .byte 0x00 @ SPECIES_BULBASAUR - .byte 0x00 @ SPECIES_IVYSAUR - .byte 0x00 @ SPECIES_VENUSAUR - .byte 0x00 @ SPECIES_CHARMANDER - .byte 0x00 @ SPECIES_CHARMELEON - .byte 0x00 @ SPECIES_CHARIZARD - .byte 0x00 @ SPECIES_SQUIRTLE - .byte 0x00 @ SPECIES_WARTORTLE - .byte 0x32 @ SPECIES_BLASTOISE - .byte 0x00 @ SPECIES_CATERPIE - .byte 0x00 @ SPECIES_METAPOD - .byte 0x00 @ SPECIES_BUTTERFREE - .byte 0x0a @ SPECIES_WEEDLE - .byte 0x14 @ SPECIES_KAKUNA - .byte 0x23 @ SPECIES_BEEDRILL - .byte 0x00 @ SPECIES_PIDGEY - .byte 0x19 @ SPECIES_PIDGEOTTO - .byte 0x00 @ SPECIES_PIDGEOT - .byte 0x00 @ SPECIES_RATTATA - .byte 0x00 @ SPECIES_RATICATE - .byte 0x00 @ SPECIES_SPEAROW - .byte 0x02 @ SPECIES_FEAROW - .byte 0x1e @ SPECIES_EKANS - .byte 0x00 @ SPECIES_ARBOK - .byte 0x00 @ SPECIES_PIKACHU - .byte 0x00 @ SPECIES_RAICHU - .byte 0x00 @ SPECIES_SANDSHREW - .byte 0x00 @ SPECIES_SANDSLASH - .byte 0x1c @ SPECIES_NIDORAN_F - .byte 0x00 @ SPECIES_NIDORINA - .byte 0x00 @ SPECIES_NIDOQUEEN - .byte 0x00 @ SPECIES_NIDORAN_M - .byte 0x00 @ SPECIES_NIDORINO - .byte 0x19 @ SPECIES_NIDOKING - .byte 0x00 @ SPECIES_CLEFAIRY - .byte 0x00 @ SPECIES_CLEFABLE - .byte 0x00 @ SPECIES_VULPIX - .byte 0x00 @ SPECIES_NINETALES - .byte 0x00 @ SPECIES_JIGGLYPUFF - .byte 0x00 @ SPECIES_WIGGLYTUFF - .byte 0x00 @ SPECIES_ZUBAT - .byte 0x00 @ SPECIES_GOLBAT - .byte 0x00 @ SPECIES_ODDISH - .byte 0x00 @ SPECIES_GLOOM - .byte 0x00 @ SPECIES_VILEPLUME - .byte 0x0a @ SPECIES_PARAS - .byte 0x2d @ SPECIES_PARASECT - .byte 0x14 @ SPECIES_VENONAT - .byte 0x00 @ SPECIES_VENOMOTH - .byte 0x19 @ SPECIES_DIGLETT - .byte 0x23 @ SPECIES_DUGTRIO - .byte 0x28 @ SPECIES_MEOWTH - .byte 0x14 @ SPECIES_PERSIAN - .byte 0x00 @ SPECIES_PSYDUCK - .byte 0x00 @ SPECIES_GOLDUCK - .byte 0x14 @ SPECIES_MANKEY - .byte 0x00 @ SPECIES_PRIMEAPE - .byte 0x1e @ SPECIES_GROWLITHE - .byte 0x28 @ SPECIES_ARCANINE - .byte 0x00 @ SPECIES_POLIWAG - .byte 0x05 @ SPECIES_POLIWHIRL - .byte 0x00 @ SPECIES_POLIWRATH - .byte 0x00 @ SPECIES_ABRA - .byte 0x00 @ SPECIES_KADABRA - .byte 0x00 @ SPECIES_ALAKAZAM - .byte 0x00 @ SPECIES_MACHOP - .byte 0x00 @ SPECIES_MACHOKE - .byte 0x00 @ SPECIES_MACHAMP - .byte 0x00 @ SPECIES_BELLSPROUT - .byte 0x03 @ SPECIES_WEEPINBELL - .byte 0x00 @ SPECIES_VICTREEBEL - .byte 0x00 @ SPECIES_TENTACOOL - .byte 0x00 @ SPECIES_TENTACRUEL - .byte 0x00 @ SPECIES_GEODUDE - .byte 0x00 @ SPECIES_GRAVELER - .byte 0x00 @ SPECIES_GOLEM - .byte 0x00 @ SPECIES_PONYTA - .byte 0x00 @ SPECIES_RAPIDASH - .byte 0x00 @ SPECIES_SLOWPOKE - .byte 0x00 @ SPECIES_SLOWBRO - .byte 0x00 @ SPECIES_MAGNEMITE - .byte 0x00 @ SPECIES_MAGNETON - .byte 0x00 @ SPECIES_FARFETCHD - .byte 0x00 @ SPECIES_DODUO - .byte 0x00 @ SPECIES_DODRIO - .byte 0x00 @ SPECIES_SEEL - .byte 0x00 @ SPECIES_DEWGONG - .byte 0x00 @ SPECIES_GRIMER - .byte 0x2d @ SPECIES_MUK - .byte 0x14 @ SPECIES_SHELLDER - .byte 0x00 @ SPECIES_CLOYSTER - .byte 0x00 @ SPECIES_GASTLY - .byte 0x17 @ SPECIES_HAUNTER - .byte 0x00 @ SPECIES_GENGAR - .byte 0x00 @ SPECIES_ONIX - .byte 0x30 @ SPECIES_DROWZEE - .byte 0x28 @ SPECIES_HYPNO - .byte 0x00 @ SPECIES_KRABBY - .byte 0x00 @ SPECIES_KINGLER - .byte 0x00 @ SPECIES_VOLTORB - .byte 0x00 @ SPECIES_ELECTRODE - .byte 0x00 @ SPECIES_EXEGGCUTE - .byte 0x00 @ SPECIES_EXEGGUTOR - .byte 0x00 @ SPECIES_CUBONE - .byte 0x00 @ SPECIES_MAROWAK - .byte 0x00 @ SPECIES_HITMONLEE - .byte 0x19 @ SPECIES_HITMONCHAN - .byte 0x00 @ SPECIES_LICKITUNG - .byte 0x00 @ SPECIES_KOFFING - .byte 0x00 @ SPECIES_WEEZING - .byte 0x00 @ SPECIES_RHYHORN - .byte 0x00 @ SPECIES_RHYDON - .byte 0x00 @ SPECIES_CHANSEY - .byte 0x00 @ SPECIES_TANGELA - .byte 0x00 @ SPECIES_KANGASKHAN - .byte 0x00 @ SPECIES_HORSEA - .byte 0x00 @ SPECIES_SEADRA - .byte 0x00 @ SPECIES_GOLDEEN - .byte 0x00 @ SPECIES_SEAKING - .byte 0x00 @ SPECIES_STARYU - .byte 0x00 @ SPECIES_STARMIE - .byte 0x00 @ SPECIES_MR_MIME - .byte 0x0a @ SPECIES_SCYTHER - .byte 0x00 @ SPECIES_JYNX - .byte 0x00 @ SPECIES_ELECTABUZZ - .byte 0x00 @ SPECIES_MAGMAR - .byte 0x00 @ SPECIES_PINSIR - .byte 0x0a @ SPECIES_TAUROS - .byte 0x00 @ SPECIES_MAGIKARP - .byte 0x00 @ SPECIES_GYARADOS - .byte 0x00 @ SPECIES_LAPRAS - .byte 0x00 @ SPECIES_DITTO - .byte 0x00 @ SPECIES_EEVEE - .byte 0x00 @ SPECIES_VAPOREON - .byte 0x00 @ SPECIES_JOLTEON - .byte 0x00 @ SPECIES_FLAREON - .byte 0x00 @ SPECIES_PORYGON - .byte 0x00 @ SPECIES_OMANYTE - .byte 0x00 @ SPECIES_OMASTAR - .byte 0x00 @ SPECIES_KABUTO - .byte 0x00 @ SPECIES_KABUTOPS - .byte 0x00 @ SPECIES_AERODACTYL - .byte 0x00 @ SPECIES_SNORLAX - .byte 0x00 @ SPECIES_ARTICUNO - .byte 0x00 @ SPECIES_ZAPDOS - .byte 0x00 @ SPECIES_MOLTRES - .byte 0x00 @ SPECIES_DRATINI - .byte 0x00 @ SPECIES_DRAGONAIR - .byte 0x00 @ SPECIES_DRAGONITE - .byte 0x00 @ SPECIES_MEWTWO - .byte 0x00 @ SPECIES_MEW - .byte 0x00 @ SPECIES_CHIKORITA - .byte 0x00 @ SPECIES_BAYLEEF - .byte 0x00 @ SPECIES_MEGANIUM - .byte 0x00 @ SPECIES_CYNDAQUIL - .byte 0x00 @ SPECIES_QUILAVA - .byte 0x14 @ SPECIES_TYPHLOSION - .byte 0x00 @ SPECIES_TOTODILE - .byte 0x00 @ SPECIES_CROCONAW - .byte 0x05 @ SPECIES_FERALIGATR - .byte 0x00 @ SPECIES_SENTRET - .byte 0x00 @ SPECIES_FURRET - .byte 0x00 @ SPECIES_HOOTHOOT - .byte 0x00 @ SPECIES_NOCTOWL - .byte 0x00 @ SPECIES_LEDYBA - .byte 0x00 @ SPECIES_LEDIAN - .byte 0x00 @ SPECIES_SPINARAK - .byte 0x00 @ SPECIES_ARIADOS - .byte 0x00 @ SPECIES_CROBAT - .byte 0x00 @ SPECIES_CHINCHOU - .byte 0x00 @ SPECIES_LANTURN - .byte 0x00 @ SPECIES_PICHU - .byte 0x00 @ SPECIES_CLEFFA - .byte 0x00 @ SPECIES_IGGLYBUFF - .byte 0x00 @ SPECIES_TOGEPI - .byte 0x00 @ SPECIES_TOGETIC - .byte 0x1e @ SPECIES_NATU - .byte 0x00 @ SPECIES_XATU - .byte 0x32 @ SPECIES_MAREEP - .byte 0x00 @ SPECIES_FLAAFFY - .byte 0x0a @ SPECIES_AMPHAROS - .byte 0x00 @ SPECIES_BELLOSSOM - .byte 0x00 @ SPECIES_MARILL - .byte 0x00 @ SPECIES_AZUMARILL - .byte 0x00 @ SPECIES_SUDOWOODO - .byte 0x28 @ SPECIES_POLITOED - .byte 0x00 @ SPECIES_HOPPIP - .byte 0x00 @ SPECIES_SKIPLOOM - .byte 0x00 @ SPECIES_JUMPLUFF - .byte 0x00 @ SPECIES_AIPOM - .byte 0x00 @ SPECIES_SUNKERN - .byte 0x00 @ SPECIES_SUNFLORA - .byte 0x00 @ SPECIES_YANMA - .byte 0x00 @ SPECIES_WOOPER - .byte 0x00 @ SPECIES_QUAGSIRE - .byte 0x00 @ SPECIES_ESPEON - .byte 0x00 @ SPECIES_UMBREON - .byte 0x00 @ SPECIES_MURKROW - .byte 0x00 @ SPECIES_SLOWKING - .byte 0x00 @ SPECIES_MISDREAVUS - .byte 0x00 @ SPECIES_UNOWN - .byte 0x00 @ SPECIES_WOBBUFFET - .byte 0x00 @ SPECIES_GIRAFARIG - .byte 0x00 @ SPECIES_PINECO - .byte 0x00 @ SPECIES_FORRETRESS - .byte 0x0a @ SPECIES_DUNSPARCE - .byte 0x00 @ SPECIES_GLIGAR - .byte 0x2d @ SPECIES_STEELIX - .byte 0x00 @ SPECIES_SNUBBULL - .byte 0x00 @ SPECIES_GRANBULL - .byte 0x27 @ SPECIES_QWILFISH - .byte 0x13 @ SPECIES_SCIZOR - .byte 0x00 @ SPECIES_SHUCKLE - .byte 0x00 @ SPECIES_HERACROSS - .byte 0x00 @ SPECIES_SNEASEL - .byte 0x00 @ SPECIES_TEDDIURSA - .byte 0x00 @ SPECIES_URSARING - .byte 0x00 @ SPECIES_SLUGMA - .byte 0x00 @ SPECIES_MAGCARGO - .byte 0x00 @ SPECIES_SWINUB - .byte 0x00 @ SPECIES_PILOSWINE - .byte 0x00 @ SPECIES_CORSOLA - .byte 0x00 @ SPECIES_REMORAID - .byte 0x14 @ SPECIES_OCTILLERY - .byte 0x00 @ SPECIES_DELIBIRD - .byte 0x00 @ SPECIES_MANTINE - .byte 0x00 @ SPECIES_SKARMORY - .byte 0x00 @ SPECIES_HOUNDOUR - .byte 0x00 @ SPECIES_HOUNDOOM - .byte 0x00 @ SPECIES_KINGDRA - .byte 0x00 @ SPECIES_PHANPY - .byte 0x00 @ SPECIES_DONPHAN - .byte 0x00 @ SPECIES_PORYGON2 - .byte 0x00 @ SPECIES_STANTLER - .byte 0x00 @ SPECIES_SMEARGLE - .byte 0x00 @ SPECIES_TYROGUE - .byte 0x00 @ SPECIES_HITMONTOP - .byte 0x28 @ SPECIES_SMOOCHUM - .byte 0x00 @ SPECIES_ELEKID - .byte 0x00 @ SPECIES_MAGBY - .byte 0x00 @ SPECIES_MILTANK - .byte 0x00 @ SPECIES_BLISSEY - .byte 0x00 @ SPECIES_RAIKOU - .byte 0x00 @ SPECIES_ENTEI - .byte 0x00 @ SPECIES_SUICUNE - .byte 0x00 @ SPECIES_LARVITAR - .byte 0x00 @ SPECIES_PUPITAR - .byte 0x0a @ SPECIES_TYRANITAR - .byte 0x14 @ SPECIES_LUGIA - .byte 0x00 @ SPECIES_HO_OH - .byte 0x00 @ SPECIES_CELEBI - .byte 0x00 @ 252 - .byte 0x00 @ 253 - .byte 0x00 @ 254 - .byte 0x00 @ 255 - .byte 0x00 @ 256 - .byte 0x00 @ 257 - .byte 0x00 @ 258 - .byte 0x00 @ 259 - .byte 0x00 @ 260 - .byte 0x00 @ 261 - .byte 0x00 @ 262 - .byte 0x00 @ 263 - .byte 0x00 @ 264 - .byte 0x00 @ 265 - .byte 0x00 @ 266 - .byte 0x00 @ 267 - .byte 0x00 @ 268 - .byte 0x00 @ 269 - .byte 0x00 @ 270 - .byte 0x00 @ 271 - .byte 0x00 @ 272 - .byte 0x00 @ 273 - .byte 0x00 @ 274 - .byte 0x00 @ 275 - .byte 0x00 @ 276 - .byte 0x00 @ SPECIES_TREECKO - .byte 0x00 @ SPECIES_GROVYLE - .byte 0x00 @ SPECIES_SCEPTILE - .byte 0x00 @ SPECIES_TORCHIC - .byte 0x00 @ SPECIES_COMBUSKEN - .byte 0x00 @ SPECIES_BLAZIKEN - .byte 0x00 @ SPECIES_MUDKIP - .byte 0x00 @ SPECIES_MARSHTOMP - .byte 0x00 @ SPECIES_SWAMPERT - .byte 0x00 @ SPECIES_POOCHYENA - .byte 0x00 @ SPECIES_MIGHTYENA - .byte 0x00 @ SPECIES_ZIGZAGOON - .byte 0x00 @ SPECIES_LINOONE - .byte 0x00 @ SPECIES_WURMPLE - .byte 0x00 @ SPECIES_SILCOON - .byte 0x00 @ SPECIES_BEAUTIFLY - .byte 0x00 @ SPECIES_CASCOON - .byte 0x00 @ SPECIES_DUSTOX - .byte 0x00 @ SPECIES_LOTAD - .byte 0x00 @ SPECIES_LOMBRE - .byte 0x00 @ SPECIES_LUDICOLO - .byte 0x00 @ SPECIES_SEEDOT - .byte 0x00 @ SPECIES_NUZLEAF - .byte 0x00 @ SPECIES_SHIFTRY - .byte 0x00 @ SPECIES_NINCADA - .byte 0x00 @ SPECIES_NINJASK - .byte 0x00 @ SPECIES_SHEDINJA - .byte 0x00 @ SPECIES_TAILLOW - .byte 0x00 @ SPECIES_SWELLOW - .byte 0x00 @ SPECIES_SHROOMISH - .byte 0x00 @ SPECIES_BRELOOM - .byte 0x00 @ SPECIES_SPINDA - .byte 0x00 @ SPECIES_WINGULL - .byte 0x00 @ SPECIES_PELIPPER - .byte 0x00 @ SPECIES_SURSKIT - .byte 0x00 @ SPECIES_MASQUERAIN - .byte 0x00 @ SPECIES_WAILMER - .byte 0x0a @ SPECIES_WAILORD - .byte 0x00 @ SPECIES_SKITTY - .byte 0x00 @ SPECIES_DELCATTY - .byte 0x1e @ SPECIES_KECLEON - .byte 0x00 @ SPECIES_BALTOY - .byte 0x00 @ SPECIES_CLAYDOL - .byte 0x00 @ SPECIES_NOSEPASS - .byte 0x00 @ SPECIES_TORKOAL - .byte 0x00 @ SPECIES_SABLEYE - .byte 0x00 @ SPECIES_BARBOACH - .byte 0x00 @ SPECIES_WHISCASH - .byte 0x00 @ SPECIES_LUVDISC - .byte 0x00 @ SPECIES_CORPHISH - .byte 0x00 @ SPECIES_CRAWDAUNT - .byte 0x00 @ SPECIES_FEEBAS - .byte 0x2d @ SPECIES_MILOTIC - .byte 0x00 @ SPECIES_CARVANHA - .byte 0x00 @ SPECIES_SHARPEDO - .byte 0x00 @ SPECIES_TRAPINCH - .byte 0x00 @ SPECIES_VIBRAVA - .byte 0x00 @ SPECIES_FLYGON - .byte 0x00 @ SPECIES_MAKUHITA - .byte 0x00 @ SPECIES_HARIYAMA - .byte 0x00 @ SPECIES_ELECTRIKE - .byte 0x00 @ SPECIES_MANECTRIC - .byte 0x00 @ SPECIES_NUMEL - .byte 0x00 @ SPECIES_CAMERUPT - .byte 0x0f @ SPECIES_SPHEAL - .byte 0x00 @ SPECIES_SEALEO - .byte 0x00 @ SPECIES_WALREIN - .byte 0x00 @ SPECIES_CACNEA - .byte 0x00 @ SPECIES_CACTURNE - .byte 0x14 @ SPECIES_SNORUNT - .byte 0x00 @ SPECIES_GLALIE - .byte 0x00 @ SPECIES_LUNATONE - .byte 0x00 @ SPECIES_SOLROCK - .byte 0x00 @ SPECIES_AZURILL - .byte 0x00 @ SPECIES_SPOINK - .byte 0x0f @ SPECIES_GRUMPIG - .byte 0x00 @ SPECIES_PLUSLE - .byte 0x00 @ SPECIES_MINUN - .byte 0x00 @ SPECIES_MAWILE - .byte 0x00 @ SPECIES_MEDITITE - .byte 0x00 @ SPECIES_MEDICHAM - .byte 0x00 @ SPECIES_SWABLU - .byte 0x00 @ SPECIES_ALTARIA - .byte 0x0f @ SPECIES_WYNAUT - .byte 0x00 @ SPECIES_DUSKULL - .byte 0x1e @ SPECIES_DUSCLOPS - .byte 0x00 @ SPECIES_ROSELIA - .byte 0x00 @ SPECIES_SLAKOTH - .byte 0x00 @ SPECIES_VIGOROTH - .byte 0x00 @ SPECIES_SLAKING - .byte 0x00 @ SPECIES_GULPIN - .byte 0x00 @ SPECIES_SWALOT - .byte 0x00 @ SPECIES_TROPIUS - .byte 0x00 @ SPECIES_WHISMUR - .byte 0x00 @ SPECIES_LOUDRED - .byte 0x00 @ SPECIES_EXPLOUD - .byte 0x00 @ SPECIES_CLAMPERL - .byte 0x00 @ SPECIES_HUNTAIL - .byte 0x00 @ SPECIES_GOREBYSS - .byte 0x2d @ SPECIES_ABSOL - .byte 0x00 @ SPECIES_SHUPPET - .byte 0x00 @ SPECIES_BANETTE - .byte 0x00 @ SPECIES_SEVIPER - .byte 0x00 @ SPECIES_ZANGOOSE - .byte 0x00 @ SPECIES_RELICANTH - .byte 0x00 @ SPECIES_ARON - .byte 0x00 @ SPECIES_LAIRON - .byte 0x00 @ SPECIES_AGGRON - .byte 0x00 @ SPECIES_CASTFORM - .byte 0x00 @ SPECIES_VOLBEAT - .byte 0x00 @ SPECIES_ILLUMISE - .byte 0x00 @ SPECIES_LILEEP - .byte 0x00 @ SPECIES_CRADILY - .byte 0x00 @ SPECIES_ANORITH - .byte 0x00 @ SPECIES_ARMALDO - .byte 0x00 @ SPECIES_RALTS - .byte 0x00 @ SPECIES_KIRLIA - .byte 0x00 @ SPECIES_GARDEVOIR - .byte 0x00 @ SPECIES_BAGON - .byte 0x00 @ SPECIES_SHELGON - .byte 0x46 @ SPECIES_SALAMENCE - .byte 0x00 @ SPECIES_BELDUM - .byte 0x00 @ SPECIES_METANG - .byte 0x00 @ SPECIES_METAGROSS - .byte 0x00 @ SPECIES_REGIROCK - .byte 0x00 @ SPECIES_REGICE - .byte 0x00 @ SPECIES_REGISTEEL - .byte 0x3c @ SPECIES_KYOGRE - .byte 0x00 @ SPECIES_GROUDON - .byte 0x3c @ SPECIES_RAYQUAZA - .byte 0x00 @ SPECIES_LATIAS - .byte 0x00 @ SPECIES_LATIOS - .byte 0x00 @ SPECIES_JIRACHI - .byte 0x00 @ SPECIES_DEOXYS - .byte 0x00 @ SPECIES_CHIMECHO diff --git a/data/graphics/pokemon/front_anim_ids_table.inc b/data/graphics/pokemon/front_anim_ids_table.inc deleted file mode 100644 index 4f225348a..000000000 --- a/data/graphics/pokemon/front_anim_ids_table.inc +++ /dev/null @@ -1,412 +0,0 @@ -gMonFrontAnimIdsTable:: @ 83299EC - .byte 0x06 @ SPECIES_BULBASAUR - .byte 0x17 @ SPECIES_IVYSAUR - .byte 0x2f @ SPECIES_VENUSAUR - .byte 0x52 @ SPECIES_CHARMANDER - .byte 0x25 @ SPECIES_CHARMELEON - .byte 0x10 @ SPECIES_CHARIZARD - .byte 0x0b @ SPECIES_SQUIRTLE - .byte 0x13 @ SPECIES_WARTORTLE - .byte 0x19 @ SPECIES_BLASTOISE - .byte 0x0b @ SPECIES_CATERPIE - .byte 0x0b @ SPECIES_METAPOD - .byte 0x1d @ SPECIES_BUTTERFREE - .byte 0x46 @ SPECIES_WEEDLE - .byte 0x20 @ SPECIES_KAKUNA - .byte 0x02 @ SPECIES_BEEDRILL - .byte 0x47 @ SPECIES_PIDGEY - .byte 0x17 @ SPECIES_PIDGEOTTO - .byte 0x29 @ SPECIES_PIDGEOT - .byte 0x43 @ SPECIES_RATTATA - .byte 0x2b @ SPECIES_RATICATE - .byte 0x18 @ SPECIES_SPEAROW - .byte 0x2b @ SPECIES_FEAROW - .byte 0x16 @ SPECIES_EKANS - .byte 0x17 @ SPECIES_ARBOK - .byte 0x2c @ SPECIES_PIKACHU - .byte 0x17 @ SPECIES_RAICHU - .byte 0x2d @ SPECIES_SANDSHREW - .byte 0x17 @ SPECIES_SANDSLASH - .byte 0x00 @ SPECIES_NIDORAN_F - .byte 0x17 @ SPECIES_NIDORINA - .byte 0x0f @ SPECIES_NIDOQUEEN - .byte 0x09 @ SPECIES_NIDORAN_M - .byte 0x13 @ SPECIES_NIDORINO - .byte 0x0f @ SPECIES_NIDOKING - .byte 0x00 @ SPECIES_CLEFAIRY - .byte 0x4a @ SPECIES_CLEFABLE - .byte 0x17 @ SPECIES_VULPIX - .byte 0x10 @ SPECIES_NINETALES - .byte 0x48 @ SPECIES_JIGGLYPUFF - .byte 0x31 @ SPECIES_WIGGLYTUFF - .byte 0x00 @ SPECIES_ZUBAT - .byte 0x1d @ SPECIES_GOLBAT - .byte 0x00 @ SPECIES_ODDISH - .byte 0x45 @ SPECIES_GLOOM - .byte 0x49 @ SPECIES_VILEPLUME - .byte 0x46 @ SPECIES_PARAS - .byte 0x0f @ SPECIES_PARASECT - .byte 0x06 @ SPECIES_VENONAT - .byte 0x4b @ SPECIES_VENOMOTH - .byte 0x10 @ SPECIES_DIGLETT - .byte 0x4c @ SPECIES_DUGTRIO - .byte 0x52 @ SPECIES_MEOWTH - .byte 0x17 @ SPECIES_PERSIAN - .byte 0x06 @ SPECIES_PSYDUCK - .byte 0x4c @ SPECIES_GOLDUCK - .byte 0x32 @ SPECIES_MANKEY - .byte 0x48 @ SPECIES_PRIMEAPE - .byte 0x25 @ SPECIES_GROWLITHE - .byte 0x02 @ SPECIES_ARCANINE - .byte 0x00 @ SPECIES_POLIWAG - .byte 0x32 @ SPECIES_POLIWHIRL - .byte 0x19 @ SPECIES_POLIWRATH - .byte 0x31 @ SPECIES_ABRA - .byte 0x09 @ SPECIES_KADABRA - .byte 0x17 @ SPECIES_ALAKAZAM - .byte 0x00 @ SPECIES_MACHOP - .byte 0x10 @ SPECIES_MACHOKE - .byte 0x31 @ SPECIES_MACHAMP - .byte 0x17 @ SPECIES_BELLSPROUT - .byte 0x0d @ SPECIES_WEEPINBELL - .byte 0x32 @ SPECIES_VICTREEBEL - .byte 0x00 @ SPECIES_TENTACOOL - .byte 0x00 @ SPECIES_TENTACRUEL - .byte 0x48 @ SPECIES_GEODUDE - .byte 0x48 @ SPECIES_GRAVELER - .byte 0x2f @ SPECIES_GOLEM - .byte 0x20 @ SPECIES_PONYTA - .byte 0x11 @ SPECIES_RAPIDASH - .byte 0x45 @ SPECIES_SLOWPOKE - .byte 0x0b @ SPECIES_SLOWBRO - .byte 0x54 @ SPECIES_MAGNEMITE - .byte 0x2c @ SPECIES_MAGNETON - .byte 0x48 @ SPECIES_FARFETCHD - .byte 0x4c @ SPECIES_DODUO - .byte 0x41 @ SPECIES_DODRIO - .byte 0x0b @ SPECIES_SEEL - .byte 0x45 @ SPECIES_DEWGONG - .byte 0x46 @ SPECIES_GRIMER - .byte 0x30 @ SPECIES_MUK - .byte 0x12 @ SPECIES_SHELLDER - .byte 0x1d @ SPECIES_CLOYSTER - .byte 0x15 @ SPECIES_GASTLY - .byte 0x35 @ SPECIES_HAUNTER - .byte 0x3a @ SPECIES_GENGAR - .byte 0x43 @ SPECIES_ONIX - .byte 0x4f @ SPECIES_DROWZEE - .byte 0x09 @ SPECIES_HYPNO - .byte 0x03 @ SPECIES_KRABBY - .byte 0x4b @ SPECIES_KINGLER - .byte 0x00 @ SPECIES_VOLTORB - .byte 0x00 @ SPECIES_ELECTRODE - .byte 0x46 @ SPECIES_EXEGGCUTE - .byte 0x32 @ SPECIES_EXEGGUTOR - .byte 0x48 @ SPECIES_CUBONE - .byte 0x05 @ SPECIES_MAROWAK - .byte 0x16 @ SPECIES_HITMONLEE - .byte 0x09 @ SPECIES_HITMONCHAN - .byte 0x45 @ SPECIES_LICKITUNG - .byte 0x13 @ SPECIES_KOFFING - .byte 0x04 @ SPECIES_WEEZING - .byte 0x10 @ SPECIES_RHYHORN - .byte 0x13 @ SPECIES_RHYDON - .byte 0x45 @ SPECIES_CHANSEY - .byte 0x48 @ SPECIES_TANGELA - .byte 0x17 @ SPECIES_KANGASKHAN - .byte 0x12 @ SPECIES_HORSEA - .byte 0x04 @ SPECIES_SEADRA - .byte 0x0d @ SPECIES_GOLDEEN - .byte 0x1c @ SPECIES_SEAKING - .byte 0x4e @ SPECIES_STARYU - .byte 0x12 @ SPECIES_STARMIE - .byte 0x46 @ SPECIES_MR_MIME - .byte 0x02 @ SPECIES_SCYTHER - .byte 0x17 @ SPECIES_JYNX - .byte 0x2c @ SPECIES_ELECTABUZZ - .byte 0x0f @ SPECIES_MAGMAR - .byte 0x09 @ SPECIES_PINSIR - .byte 0x19 @ SPECIES_TAUROS - .byte 0x05 @ SPECIES_MAGIKARP - .byte 0x48 @ SPECIES_GYARADOS - .byte 0x17 @ SPECIES_LAPRAS - .byte 0x01 @ SPECIES_DITTO - .byte 0x17 @ SPECIES_EEVEE - .byte 0x17 @ SPECIES_VAPOREON - .byte 0x00 @ SPECIES_JOLTEON - .byte 0x17 @ SPECIES_FLAREON - .byte 0x52 @ SPECIES_PORYGON - .byte 0x51 @ SPECIES_OMANYTE - .byte 0x09 @ SPECIES_OMASTAR - .byte 0x1d @ SPECIES_KABUTO - .byte 0x0f @ SPECIES_KABUTOPS - .byte 0x47 @ SPECIES_AERODACTYL - .byte 0x0b @ SPECIES_SNORLAX - .byte 0x09 @ SPECIES_ARTICUNO - .byte 0x2c @ SPECIES_ZAPDOS - .byte 0x45 @ SPECIES_MOLTRES - .byte 0x00 @ SPECIES_DRATINI - .byte 0x10 @ SPECIES_DRAGONAIR - .byte 0x47 @ SPECIES_DRAGONITE - .byte 0x09 @ SPECIES_MEWTWO - .byte 0x0d @ SPECIES_MEW - .byte 0x00 @ SPECIES_CHIKORITA - .byte 0x00 @ SPECIES_BAYLEEF - .byte 0x17 @ SPECIES_MEGANIUM - .byte 0x52 @ SPECIES_CYNDAQUIL - .byte 0x17 @ SPECIES_QUILAVA - .byte 0x10 @ SPECIES_TYPHLOSION - .byte 0x31 @ SPECIES_TOTODILE - .byte 0x0f @ SPECIES_CROCONAW - .byte 0x0f @ SPECIES_FERALIGATR - .byte 0x00 @ SPECIES_SENTRET - .byte 0x32 @ SPECIES_FURRET - .byte 0x47 @ SPECIES_HOOTHOOT - .byte 0x17 @ SPECIES_NOCTOWL - .byte 0x52 @ SPECIES_LEDYBA - .byte 0x47 @ SPECIES_LEDIAN - .byte 0x4f @ SPECIES_SPINARAK - .byte 0x0f @ SPECIES_ARIADOS - .byte 0x00 @ SPECIES_CROBAT - .byte 0x45 @ SPECIES_CHINCHOU - .byte 0x51 @ SPECIES_LANTURN - .byte 0x1e @ SPECIES_PICHU - .byte 0x52 @ SPECIES_CLEFFA - .byte 0x0c @ SPECIES_IGGLYBUFF - .byte 0x0b @ SPECIES_TOGEPI - .byte 0x00 @ SPECIES_TOGETIC - .byte 0x31 @ SPECIES_NATU - .byte 0x09 @ SPECIES_XATU - .byte 0x00 @ SPECIES_MAREEP - .byte 0x1e @ SPECIES_FLAAFFY - .byte 0x2c @ SPECIES_AMPHAROS - .byte 0x0b @ SPECIES_BELLOSSOM - .byte 0x00 @ SPECIES_MARILL - .byte 0x4a @ SPECIES_AZUMARILL - .byte 0x46 @ SPECIES_SUDOWOODO - .byte 0x32 @ SPECIES_POLITOED - .byte 0x1c @ SPECIES_HOPPIP - .byte 0x18 @ SPECIES_SKIPLOOM - .byte 0x51 @ SPECIES_JUMPLUFF - .byte 0x32 @ SPECIES_AIPOM - .byte 0x52 @ SPECIES_SUNKERN - .byte 0x00 @ SPECIES_SUNFLORA - .byte 0x2b @ SPECIES_YANMA - .byte 0x00 @ SPECIES_WOOPER - .byte 0x16 @ SPECIES_QUAGSIRE - .byte 0x09 @ SPECIES_ESPEON - .byte 0x10 @ SPECIES_UMBREON - .byte 0x00 @ SPECIES_MURKROW - .byte 0x13 @ SPECIES_SLOWKING - .byte 0x1c @ SPECIES_MISDREAVUS - .byte 0x0a @ SPECIES_UNOWN - .byte 0x30 @ SPECIES_WOBBUFFET - .byte 0x1e @ SPECIES_GIRAFARIG - .byte 0x0b @ SPECIES_PINECO - .byte 0x10 @ SPECIES_FORRETRESS - .byte 0x00 @ SPECIES_DUNSPARCE - .byte 0x13 @ SPECIES_GLIGAR - .byte 0x0f @ SPECIES_STEELIX - .byte 0x17 @ SPECIES_SNUBBULL - .byte 0x10 @ SPECIES_GRANBULL - .byte 0x3a @ SPECIES_QWILFISH - .byte 0x02 @ SPECIES_SCIZOR - .byte 0x0b @ SPECIES_SHUCKLE - .byte 0x41 @ SPECIES_HERACROSS - .byte 0x16 @ SPECIES_SNEASEL - .byte 0x17 @ SPECIES_TEDDIURSA - .byte 0x10 @ SPECIES_URSARING - .byte 0x17 @ SPECIES_SLUGMA - .byte 0x17 @ SPECIES_MAGCARGO - .byte 0x00 @ SPECIES_SWINUB - .byte 0x0f @ SPECIES_PILOSWINE - .byte 0x03 @ SPECIES_CORSOLA - .byte 0x52 @ SPECIES_REMORAID - .byte 0x17 @ SPECIES_OCTILLERY - .byte 0x52 @ SPECIES_DELIBIRD - .byte 0x0d @ SPECIES_MANTINE - .byte 0x17 @ SPECIES_SKARMORY - .byte 0x17 @ SPECIES_HOUNDOUR - .byte 0x10 @ SPECIES_HOUNDOOM - .byte 0x42 @ SPECIES_KINGDRA - .byte 0x32 @ SPECIES_PHANPY - .byte 0x19 @ SPECIES_DONPHAN - .byte 0x00 @ SPECIES_PORYGON2 - .byte 0x00 @ SPECIES_STANTLER - .byte 0x31 @ SPECIES_SMEARGLE - .byte 0x16 @ SPECIES_TYROGUE - .byte 0x02 @ SPECIES_HITMONTOP - .byte 0x09 @ SPECIES_SMOOCHUM - .byte 0x2c @ SPECIES_ELEKID - .byte 0x00 @ SPECIES_MAGBY - .byte 0x45 @ SPECIES_MILTANK - .byte 0x00 @ SPECIES_BLISSEY - .byte 0x2c @ SPECIES_RAIKOU - .byte 0x09 @ SPECIES_ENTEI - .byte 0x10 @ SPECIES_SUICUNE - .byte 0x52 @ SPECIES_LARVITAR - .byte 0x10 @ SPECIES_PUPITAR - .byte 0x0f @ SPECIES_TYRANITAR - .byte 0x3a @ SPECIES_LUGIA - .byte 0x09 @ SPECIES_HO_OH - .byte 0x18 @ SPECIES_CELEBI - .byte 0x00 @ 252 - .byte 0x00 @ 253 - .byte 0x00 @ 254 - .byte 0x00 @ 255 - .byte 0x00 @ 256 - .byte 0x00 @ 257 - .byte 0x00 @ 258 - .byte 0x00 @ 259 - .byte 0x00 @ 260 - .byte 0x00 @ 261 - .byte 0x00 @ 262 - .byte 0x00 @ 263 - .byte 0x00 @ 264 - .byte 0x00 @ 265 - .byte 0x00 @ 266 - .byte 0x00 @ 267 - .byte 0x00 @ 268 - .byte 0x00 @ 269 - .byte 0x00 @ 270 - .byte 0x00 @ 271 - .byte 0x00 @ 272 - .byte 0x00 @ 273 - .byte 0x00 @ 274 - .byte 0x00 @ 275 - .byte 0x00 @ 276 - .byte 0x00 @ SPECIES_TREECKO - .byte 0x17 @ SPECIES_GROVYLE - .byte 0x10 @ SPECIES_SCEPTILE - .byte 0x16 @ SPECIES_TORCHIC - .byte 0x06 @ SPECIES_COMBUSKEN - .byte 0x0f @ SPECIES_BLAZIKEN - .byte 0x01 @ SPECIES_MUDKIP - .byte 0x04 @ SPECIES_MARSHTOMP - .byte 0x1e @ SPECIES_SWAMPERT - .byte 0x10 @ SPECIES_POOCHYENA - .byte 0x10 @ SPECIES_MIGHTYENA - .byte 0x03 @ SPECIES_ZIGZAGOON - .byte 0x09 @ SPECIES_LINOONE - .byte 0x00 @ SPECIES_WURMPLE - .byte 0x00 @ SPECIES_SILCOON - .byte 0x04 @ SPECIES_BEAUTIFLY - .byte 0x04 @ SPECIES_CASCOON - .byte 0x06 @ SPECIES_DUSTOX - .byte 0x00 @ SPECIES_LOTAD - .byte 0x00 @ SPECIES_LOMBRE - .byte 0x49 @ SPECIES_LUDICOLO - .byte 0x05 @ SPECIES_SEEDOT - .byte 0x00 @ SPECIES_NUZLEAF - .byte 0x02 @ SPECIES_SHIFTRY - .byte 0x00 @ SPECIES_NINCADA - .byte 0x46 @ SPECIES_NINJASK - .byte 0x1c @ SPECIES_SHEDINJA - .byte 0x1e @ SPECIES_TAILLOW - .byte 0x01 @ SPECIES_SWELLOW - .byte 0x00 @ SPECIES_SHROOMISH - .byte 0x00 @ SPECIES_BRELOOM - .byte 0x31 @ SPECIES_SPINDA - .byte 0x1b @ SPECIES_WINGULL - .byte 0x1c @ SPECIES_PELIPPER - .byte 0x00 @ SPECIES_SURSKIT - .byte 0x00 @ SPECIES_MASQUERAIN - .byte 0x01 @ SPECIES_WAILMER - .byte 0x1c @ SPECIES_WAILORD - .byte 0x00 @ SPECIES_SKITTY - .byte 0x17 @ SPECIES_DELCATTY - .byte 0x35 @ SPECIES_KECLEON - .byte 0x1d @ SPECIES_BALTOY - .byte 0x51 @ SPECIES_CLAYDOL - .byte 0x49 @ SPECIES_NOSEPASS - .byte 0x17 @ SPECIES_TORKOAL - .byte 0x15 @ SPECIES_SABLEYE - .byte 0x49 @ SPECIES_BARBOACH - .byte 0x49 @ SPECIES_WHISCASH - .byte 0x1d @ SPECIES_LUVDISC - .byte 0x10 @ SPECIES_CORPHISH - .byte 0x09 @ SPECIES_CRAWDAUNT - .byte 0x49 @ SPECIES_FEEBAS - .byte 0x22 @ SPECIES_MILOTIC - .byte 0x49 @ SPECIES_CARVANHA - .byte 0x56 @ SPECIES_SHARPEDO - .byte 0x10 @ SPECIES_TRAPINCH - .byte 0x0f @ SPECIES_VIBRAVA - .byte 0x4b @ SPECIES_FLYGON - .byte 0x0b @ SPECIES_MAKUHITA - .byte 0x34 @ SPECIES_HARIYAMA - .byte 0x00 @ SPECIES_ELECTRIKE - .byte 0x00 @ SPECIES_MANECTRIC - .byte 0x04 @ SPECIES_NUMEL - .byte 0x10 @ SPECIES_CAMERUPT - .byte 0x53 @ SPECIES_SPHEAL - .byte 0x17 @ SPECIES_SEALEO - .byte 0x0f @ SPECIES_WALREIN - .byte 0x49 @ SPECIES_CACNEA - .byte 0x04 @ SPECIES_CACTURNE - .byte 0x45 @ SPECIES_SNORUNT - .byte 0x0a @ SPECIES_GLALIE - .byte 0x0e @ SPECIES_LUNATONE - .byte 0x08 @ SPECIES_SOLROCK - .byte 0x00 @ SPECIES_AZURILL - .byte 0x56 @ SPECIES_SPOINK - .byte 0x32 @ SPECIES_GRUMPIG - .byte 0x00 @ SPECIES_PLUSLE - .byte 0x01 @ SPECIES_MINUN - .byte 0x00 @ SPECIES_MAWILE - .byte 0x05 @ SPECIES_MEDITITE - .byte 0x45 @ SPECIES_MEDICHAM - .byte 0x04 @ SPECIES_SWABLU - .byte 0x16 @ SPECIES_ALTARIA - .byte 0x32 @ SPECIES_WYNAUT - .byte 0x0a @ SPECIES_DUSKULL - .byte 0x02 @ SPECIES_DUSCLOPS - .byte 0x45 @ SPECIES_ROSELIA - .byte 0x45 @ SPECIES_SLAKOTH - .byte 0x31 @ SPECIES_VIGOROTH - .byte 0x45 @ SPECIES_SLAKING - .byte 0x00 @ SPECIES_GULPIN - .byte 0x45 @ SPECIES_SWALOT - .byte 0x10 @ SPECIES_TROPIUS - .byte 0x03 @ SPECIES_WHISMUR - .byte 0x49 @ SPECIES_LOUDRED - .byte 0x19 @ SPECIES_EXPLOUD - .byte 0x12 @ SPECIES_CLAMPERL - .byte 0x09 @ SPECIES_HUNTAIL - .byte 0x1c @ SPECIES_GOREBYSS - .byte 0x11 @ SPECIES_ABSOL - .byte 0x1c @ SPECIES_SHUPPET - .byte 0x0d @ SPECIES_BANETTE - .byte 0x17 @ SPECIES_SEVIPER - .byte 0x09 @ SPECIES_ZANGOOSE - .byte 0x1a @ SPECIES_RELICANTH - .byte 0x45 @ SPECIES_ARON - .byte 0x00 @ SPECIES_LAIRON - .byte 0x19 @ SPECIES_AGGRON - .byte 0x1d @ SPECIES_CASTFORM - .byte 0x00 @ SPECIES_VOLBEAT - .byte 0x05 @ SPECIES_ILLUMISE - .byte 0x17 @ SPECIES_LILEEP - .byte 0x19 @ SPECIES_CRADILY - .byte 0x12 @ SPECIES_ANORITH - .byte 0x10 @ SPECIES_ARMALDO - .byte 0x45 @ SPECIES_RALTS - .byte 0x00 @ SPECIES_KIRLIA - .byte 0x00 @ SPECIES_GARDEVOIR - .byte 0x19 @ SPECIES_BAGON - .byte 0x04 @ SPECIES_SHELGON - .byte 0x0f @ SPECIES_SALAMENCE - .byte 0x0f @ SPECIES_BELDUM - .byte 0x04 @ SPECIES_METANG - .byte 0x10 @ SPECIES_METAGROSS - .byte 0x01 @ SPECIES_REGIROCK - .byte 0x44 @ SPECIES_REGICE - .byte 0x09 @ SPECIES_REGISTEEL - .byte 0x2d @ SPECIES_KYOGRE - .byte 0x10 @ SPECIES_GROUDON - .byte 0x0f @ SPECIES_RAYQUAZA - .byte 0x2d @ SPECIES_LATIAS - .byte 0x10 @ SPECIES_LATIOS - .byte 0x0d @ SPECIES_JIRACHI - .byte 0x1b @ SPECIES_DEOXYS - .byte 0x1d @ SPECIES_CHIMECHO diff --git a/data/item_menu.s b/data/item_menu.s deleted file mode 100644 index 1b11c5e59..000000000 --- a/data/item_menu.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08613F90:: @ 8613F90 - .4byte 0x11F0, 0x1E1, 0x21DE - -@ possibly a struct -gUnknown_08613F9C:: @ 8613F9C - .4byte 0 - .4byte bag_menu_change_item_callback - .4byte sub_81AB520 - .4byte 0 - .4byte 0x80000 - .4byte 0x7003011 - -gUnknown_08613FB4:: @ 8613FB4 - .4byte gMenuText_Use, ItemMenu_UseOutOfBattle - .4byte gMenuText_Toss, ItemMenu_Toss - .4byte gMenuText_Register, ItemMenu_Register - .4byte gMenuText_Give, ItemMenu_Give - .4byte gText_Cancel2, ItemMenu_Cancel - .4byte gMenuText_Use, ItemMenu_UseInBattle - .4byte gMenuText_Check, ItemMenu_UseOutOfBattle - .4byte gMenuText_Walk, ItemMenu_UseOutOfBattle - .4byte gMenuText_Deselect, ItemMenu_Register - .4byte gMenuText_CheckTag, ItemMenu_CheckTag - .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm - .4byte gMenuText_Show, unknown_ItemMenu_Show - .4byte gMenuText_Give2, unknown_ItemMenu_Give2 - .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2 - .4byte gText_EmptyString2, NULL - -gUnknown_0861402C:: @ 861402C - .byte 0, 3, 1, 4 - -gUnknown_08614030:: @ 8614030 - .byte 0, 2, 14, 4 - -gUnknown_08614034:: @ 8614034 - .byte 3, 14, 1, 4 - -gUnknown_08614038:: @ 8614038 - .byte 0, 3, 14, 4 - -gUnknown_0861403C:: @ 861403C - .byte 9, 14, 0, 3, 1, 4 - -gUnknown_08614042:: @ 8614042 - .byte 5, 4 - -gUnknown_08614044:: @ 8614044 - .byte 3, 4 - -gUnknown_08614046:: @ 8614046 - .byte 4 - -gUnknown_08614047:: @ 8614047 - .byte 10, 9, 14, 4 - -gUnknown_0861404B:: @ 861404B - .byte 11, 4 - -gUnknown_0861404D:: @ 861404D - .byte 12, 4 - -gUnknown_0861404F:: @ 861404F - .byte 13, 4 - - .align 2 -gUnknown_08614054:: @ 8614054 - .4byte unknown_item_menu_type - .4byte unknown_item_menu_type - .4byte item_menu_type_2 - .4byte display_sell_item_ask_str - .4byte unknown_ItemMenu_Confirm - .4byte unknown_item_menu_type - .4byte display_deposit_item_ask_str - .4byte unknown_item_menu_type - .4byte unknown_item_menu_type - .4byte unknown_item_menu_type - .4byte NULL - .4byte item_menu_type_b - - .align 2 -gUnknown_08614084:: @ 8614084 - .4byte BagMenuActuallyToss - .4byte BagMenuCancelToss - -gUnknown_0861408C:: @ 861408C - .4byte sub_81AD84C - .4byte sub_81AD6FC - -@ probably a struct -gUnknown_08614094:: @ 8614094 - .4byte 0x1101C00 - .4byte 0xFFFF1064 - .4byte 0x6FFFFF - .4byte 0x6F - -gUnknown_086140A4:: @ 86140A4 - .incbin "graphics/interface/select_button.4bpp" - -gUnknown_08614164:: @ 8614164 - .byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0 - -gUnknown_08614174:: @ 8614174 - window_template 0, 14, 2, 15, 16, 1, 0x27 - window_template 0, 0, 13, 14, 6, 1, 0x117 - window_template 0, 4, 1, 8, 2, 1, 0x1A1 - window_template 0, 1, 13, 5, 6, 12, 0x16B - window_template 0, 7, 13, 4, 6, 12, 0x189 - window_template 1, 2, 15, 27, 4, 15, 0x1B1 - null_window_template - -gUnknown_086141AC:: @ 86141AC - window_template 1, 22, 17, 7, 2, 15, 0x21D - window_template 1, 22, 15, 7, 4, 15, 0x21D - window_template 1, 15, 15, 14, 4, 15, 0x21D - window_template 1, 15, 13, 14, 6, 15, 0x21D - window_template 1, 2, 15, 27, 4, 15, 0x1B1 - window_template 1, 24, 15, 5, 4, 15, 0x21D - window_template 1, 21, 9, 5, 4, 15, 0x21D - window_template 1, 24, 17, 5, 2, 15, 0x21D - window_template 1, 18, 11, 10, 2, 15, 0x245 - window_template 1, 1, 1, 10, 2, 15, 0x231 diff --git a/data/main_menu.s b/data/main_menu.s deleted file mode 100644 index 019fdfab8..000000000 --- a/data/main_menu.s +++ /dev/null @@ -1,141 +0,0 @@ -@ the second big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_082FECFC:: @ 82FECFC - .incbin "graphics/birch_speech/bg0.gbapal" - .incbin "graphics/birch_speech/bg1.gbapal" - - .align 2 -gBirchIntroShadowGfx:: @ 82FED3C - .incbin "graphics/birch_speech/shadow.4bpp.lz" - - .align 2 -gUnknown_082FEEF0:: @ 82FEEF0 - .incbin "graphics/birch_speech/map.bin.lz" - - .align 2 -gUnknown_082FF018:: @ 82FF018 - .incbin "graphics/birch_speech/bg2.gbapal" - - .align 2 -gUnknown_082FF028:: @ 82FF028 - .space 16 - - .align 2 -gUnknown_082FF038:: @ 82FF038 - window_template 0x00, 0x02, 0x01, 0x1a, 0x02, 0x0f, 0x0001 - window_template 0x00, 0x02, 0x05, 0x1a, 0x02, 0x0f, 0x0035 - - .align 2 -gUnknown_082FF048:: @ 82FF048 - window_template 0x00, 0x02, 0x01, 0x1a, 0x06, 0x0f, 0x0001 - window_template 0x00, 0x02, 0x09, 0x1a, 0x02, 0x0f, 0x009d - window_template 0x00, 0x02, 0x0d, 0x1a, 0x02, 0x0f, 0x00d1 - window_template 0x00, 0x02, 0x11, 0x1a, 0x02, 0x0f, 0x0105 - window_template 0x00, 0x02, 0x15, 0x1a, 0x02, 0x0f, 0x0139 - - .align 2 -gUnknown_082FF070:: @ 82FF070 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d - null_window_template - - .align 2 -gUnknown_082FF080:: @ 82FF080 - window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0001 - - .align 2 -gUnknown_082FF088:: @ 82FF088 - window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d - window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085 - null_window_template - - .align 2 -gMainMenuBgPal:: @ 82FF0A0 - .incbin "graphics/misc/main_menu_bg.gbapal" - - .align 2 -gMainMenuTextPal:: @ 82FF0C0 - .incbin "graphics/misc/main_menu_text.gbapal" - - .align 2 -gUnknown_082FF0E0:: @ 82FF0E0 - .byte 0x0a, 0x0b, 0x0c - -gUnknown_082FF0E3:: @ 82FF0E3 - .byte 0x0a, 0x01, 0x0c - - .align 2 -gUnknown_082FF0E8:: @ 82FF0E8 - .4byte 0x000001e8, 0x00003071 - - .align 2 -gUnknown_082FF0F0:: @ 82FF0F0 - .4byte 0x000001ec - - .align 2 -gUnknown_082FF0F4:: @ 82FF0F4 - .byte 0x02, 0x78, 0x08, 0x03, 0x78, 0x98, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_082FF104:: @ 82FF104 - .2byte 0xfffe, 0xfffe, 0x3000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF114:: @ 82FF114 - .4byte gUnknown_082FF104 - - .align 2 -gUnknown_082FF118:: @ 82FF118 - .4byte gText_BirchBoy, 0x00000000 - .4byte gText_BirchGirl, 0x00000000 - - .align 2 -gMalePresetNames:: @ 82FF128 - .4byte gText_DefaultNameStu - .4byte gText_DefaultNameMilton - .4byte gText_DefaultNameTom - .4byte gText_DefaultNameKenny - .4byte gText_DefaultNameReid - .4byte gText_DefaultNameJude - .4byte gText_DefaultNameJaxson - .4byte gText_DefaultNameEaston - .4byte gText_DefaultNameWalker - .4byte gText_DefaultNameTeru - .4byte gText_DefaultNameJohnny - .4byte gText_DefaultNameBrett - .4byte gText_DefaultNameSeth - .4byte gText_DefaultNameTerry - .4byte gText_DefaultNameCasey - .4byte gText_DefaultNameDarren - .4byte gText_DefaultNameLandon - .4byte gText_DefaultNameCollin - .4byte gText_DefaultNameStanley - .4byte gText_DefaultNameQuincy - - .align 2 -gFemalePresetNames:: @ 82FF178 - .4byte gText_DefaultNameKimmy - .4byte gText_DefaultNameTiara - .4byte gText_DefaultNameBella - .4byte gText_DefaultNameJayla - .4byte gText_DefaultNameAllie - .4byte gText_DefaultNameLianna - .4byte gText_DefaultNameSara - .4byte gText_DefaultNameMonica - .4byte gText_DefaultNameCamila - .4byte gText_DefaultNameAubree - .4byte gText_DefaultNameRuthie - .4byte gText_DefaultNameHazel - .4byte gText_DefaultNameNadine - .4byte gText_DefaultNameTanja - .4byte gText_DefaultNameYasmin - .4byte gText_DefaultNameNicola - .4byte gText_DefaultNameLillie - .4byte gText_DefaultNameTerra - .4byte gText_DefaultNameLucy - .4byte gText_DefaultNameHalie diff --git a/data/link.s b/data/rom_8011DC0.s index 39f97644f..df212a640 100644 --- a/data/link.s +++ b/data/rom_8011DC0.s @@ -7,306 +7,7 @@ .section .rodata .align 2 -gWirelessLinkDisplayPal:: @ 82EC86C - .incbin "graphics/interface/wireless_link_display.gbapal" -gWirelessLinkDisplayGfx:: @ 82EC88C - .incbin "graphics/interface/wireless_link_display.4bpp.lz" - -gWirelessLinkDisplayTilemap:: @ 82ECD34 - .incbin "graphics/interface/wireless_link_display.bin.lz" - -gLinkTestDigitsPal:: @ 82ECF20 - .incbin "graphics/interface/link_test_digits.gbapal" - -gLinkTestDigitsGfx:: @ 82ECF40 - .incbin "graphics/interface/link_test_digits.4bpp" - - .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE}$" - - .align 2 -g2BlankTilesGfx:: @ 82ED168 - .incbin "graphics/interface/blank_1x2.4bpp" - -gUnknown_082ED1A8:: @ 82ED1A8 - .4byte gBlockSendBuffer - .4byte 0x000000C8 - .4byte gBlockSendBuffer - .4byte 0x000000C8 - .4byte gBlockSendBuffer - .4byte 0x00000064 - .4byte gBlockSendBuffer - .4byte 0x000000DC - .4byte gBlockSendBuffer - .4byte 0x00000028 - -gUnknown_082ED1D0:: @ 82ED1D0 - .byte 0x8, 0xA, 0xC, 0xE - -gASCIIGameFreakInc:: @ 82ED1D4 - .ascii "GameFreak inc." - - .align 2 -gASCIITestPrint:: @ 82ED1E4 - .ascii "TEST PRINT\nP0\nP1\nP2\nP3" - - .align 2 -gUnknown_082ED1FC:: @ 82ED1FC BgTemplate - .4byte 0x000001F8 - .4byte 0x00001081 - - .align 2 -gUnknown_082ED204:: @ 82ED204 - window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 - window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 - window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - null_window_template - - .align 2 -gUnknown_082ED224:: @ 82ED224 - .byte 0x00, 0x01, 0x02, 0x00, 0xff, 0xfe, 0xff, 0x00 - - .align 2 -gWirelessLinkIconPalette:: @ 82ED22C - .incbin "graphics/interface/wireless_link_icon.gbapal" - - .align 2 -gWirelessLinkIconPic:: @ 82ED22C - .incbin "graphics/interface/wireless_link_icon.4bpp.lz" - - .align 2 -gUnknown_082ED370:: @ 82ED370 - .byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37 - .byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f - .byte 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 - .byte 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f - .byte 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba - .byte 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8 - .byte 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f - .byte 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1 - .byte 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9 - .byte 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1 - .byte 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6 - .byte 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb - .byte 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3 - .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb - .byte 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32 - .byte 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02 - .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a - .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 - .byte 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - .byte 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f - .byte 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0 - .byte 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57 - .byte 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f - .byte 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67 - .byte 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f - .byte 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77 - .byte 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac - .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 - .byte 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b - .byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c - .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 - - .align 2 -gUnknown_082ED470:: @ 82ED470 - .byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c - .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 - .byte 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c - .byte 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3 - .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb - .byte 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c - .byte 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07 - .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 - .byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f - .byte 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 - .byte 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf - .byte 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 - .byte 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf - .byte 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7 - .byte 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7 - .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2 - .byte 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa - .byte 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03 - .byte 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f - .byte 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 - .byte 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5 - .byte 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20 - .byte 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45 - .byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d - .byte 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55 - .byte 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63 - .byte 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b - .byte 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73 - .byte 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20 - .byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20 - .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 - - .align 2 -gUnknown_082ED570:: @ 82ED570 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_082ED578:: @ 82ED578 - .2byte 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x0005, 0x0010, 0x000a - .2byte 0x000c, 0x0005, 0x0008, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_082ED594:: @ 82ED594 - .2byte 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x000a, 0x0008, 0x0005 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_082ED5A8:: @ 82ED5A8 - .2byte 0x0004, 0x0005, 0x0008, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_082ED5B4:: @ 82ED5B4 - .2byte 0x0004, 0x000a, 0x0014, 0x000a, 0xfffe, 0x0000 - - .align 2 -gUnknown_082ED5C0:: @ 82ED5C0 - .2byte 0x0018, 0x000a, 0x0004, 0x000a, 0xfffe, 0x0000 - - .align 2 -gUnknown_082ED5CC:: @ 82ED5CC - .4byte gUnknown_082ED578 - .4byte gUnknown_082ED594 - .4byte gUnknown_082ED5A8 - .4byte gUnknown_082ED5B4 - .4byte gUnknown_082ED5C0 - - .align 2 -gUnknown_082ED5E0:: @ 82ED5E0 - obj_tiles gWirelessLinkIconPic, 0x0380, 0xD431 - - .align 2 -gUnknown_082ED5E8:: @ 82ED5E8 - obj_pal gWirelessLinkIconPalette, 0xD432 - - .align 2 -gUnknown_082ED5F0:: @ 82ED5F0 - spr_template 0xD431, 0xD432, gUnknown_082ED570, gUnknown_082ED5CC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_082ED608:: @ 82ED608 - .byte 0x04, 0x20, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00 - .byte 0x14, 0x2b, 0x02, 0x02, 0x22, 0x2b, 0x02, 0x02 - .byte 0x01, 0x00, 0x58, 0x02, 0x2c, 0x01, 0x00, 0x00 - - .align 2 -gUnknown_082ED620:: @ 82ED620 - .byte 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_082ED628:: @ 82ED628 - .4byte 0x00000000, 0x00000001, 0x00000003, 0x00000007 - .4byte 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f - .4byte 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff - .4byte 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff - .4byte 0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff - .4byte 0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff - .4byte 0x00ffffff - -gUnknown_082ED68C:: @ 82ED68C - .byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02 - .byte 0x03 - -gUnknown_082ED695:: @ 82ED695 - .byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x03 - .byte 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04 - -gUnknown_082ED6A5:: @ 82ED6A5 - .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00 - .byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00 - .byte 0x00, 0x00, 0x00 - - .align 2 -gUnknown_082ED6B8:: @ 82ED6B8 - .4byte gBlockSendBuffer - .4byte 0x000000c8 - .4byte gBlockSendBuffer - .4byte 0x000000c8 - .4byte gBlockSendBuffer - .4byte 0x00000064 - .4byte gBlockSendBuffer - .4byte 0x000000dc - .4byte gBlockSendBuffer - .4byte 0x00000028 - - .align 2 -gUnknown_082ED6E0:: @ 82ED6E0 - .2byte 0x0002, 0x7f7d, 0x0000, 0xffff - - .ascii "RFU WAIT" - .space 7 - - .ascii "RFU BOOT" - .space 7 - - .ascii "RFU ERROR" - .space 6 - - .ascii "RFU RESET" - .space 6 - - .ascii "RFU CONFIG" - .space 5 - - .ascii "RFU START" - .space 6 - - .ascii "RFU SC POLL" - .space 4 - - .ascii "RFU SP POLL" - .space 4 - - .ascii "RFU START" - .space 6 - - .ascii "RFU SEND ERR" - .space 3 - - .ascii "RFU CP POLL" - .space 4 - - .ascii " " - .space 2 - - .ascii "RECOVER START " - .space 2 - - .ascii "DISSCONECT " - .space 2 - - .ascii "RECOVER SUUSES" - .space 2 - - .ascii "RECOVER FAILED" - .space 2 - - .align 2 -gUnknown_082ED7E0:: @ 82ED7E0 - .4byte sub_801084C - .4byte sub_8010AAC - .4byte sub_8010D0C - - .align 2 -gUnknown_082ED7EC:: @ 82ED7EC - .ascii "PokemonSioInfo" - - .align 2 -gUnknown_082ED7FC:: @ 82ED7FC - .ascii "LINK LOSS DISCONNECT!" - - .align 2 -gUnknown_082ED814:: @ 82ED814 - .ascii "LINK LOSS RECOVERY NOW" - - .align 2 gUnknown_082ED82C:: @ 82ED82C .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 @@ -323,25 +24,25 @@ gUnknown_082ED85B:: @ 82ED85B gUnknown_082ED868:: @ 82ED868 .asciz "NOWSLOT" - + .asciz " " - + .asciz "CLOCK DRIFT" .asciz "BUSY SEND " - + .asciz "CMD REJECT " - + .asciz "CLOCK SLAVE" - + .ascii "CHILD " - + .align 2 .ascii "PARENT" - + .align 2 .ascii "SEARCH" - + .align 2 gText_EmptyString:: @ 82ED8C4 .string "$" @@ -371,7 +72,7 @@ gText_AwaitingCommunication:: @ 82ED960 gText_AwaitingLink:: @ 82ED990 .string "{STR_VAR_1}! Awaiting link!\nPress START when everyone’s ready.$" - + .align 2 gJPText_SingleBattle:: @ 82ED9C8 .string "シングルバトルを かいさいする$" @ "shingurubatoruwo kaisaisuru" ("hold a single battle" in Japanese) @@ -387,7 +88,7 @@ gJPText_MultiBattle:: @ 82ED9E8 .align 2 gJPText_TradePokemon:: @ 82ED9F8 .string "ポケモンこうかんを かいさいする$" @ "pokemonkoukanwo kaisaisuru" ("trade Pokémon" in Japanese) - + .align 2 gJPText_Chat:: @ 82EDA0C .string "チャットを かいさいする$" @ "chattowo kaisaisuru" ("chat" in Japanese) @@ -459,7 +160,7 @@ gText_3PlayerMode:: @ 82EDB35 gText_4PlayerMode:: @ 82EDB43 .string "4-PLAYER\nMODE$" - + gText_5PlayerMode:: @ 82EDB51 .string "5-PLAYER\nMODE$" @@ -710,7 +411,7 @@ gUnknown_082EE2E8:: @ 82EE2E8 .align 2 gUnknown_082EE308:: @ 82EE308 .string "{STR_VAR_1} has contacted you.{PAUSE 60}$" - + .align 2 gUnknown_082EE324:: @ 82EE324 .4byte gUnknown_082EE2E8 @@ -719,7 +420,7 @@ gUnknown_082EE324:: @ 82EE324 .align 2 gUnknown_082EE32C:: @ 82EE32C .string "Awaiting a response from\nthe other TRAINER…$" - + .align 2 gUnknown_082EE358:: @ 82EE358 .string "Awaiting a response from\n{STR_VAR_1}…$" @@ -1622,7 +1323,7 @@ gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate .align 2 gUnknown_082F021C:: @ 82F021C window_template 0x00, 0x14, 0x05, 0x10, 0x08, 0x0f, 0x0001 - + .align 2 gUnknown_082F0224:: @ 82F0224 .4byte gUnknown_082EFD70, 0x00000208 @@ -1708,7 +1409,7 @@ gUnknown_082F0354:: @ 82F0354 .4byte gText_EmptyString, 0x00000006 .4byte gText_EmptyString, 0x00000007 .4byte gUnknown_082EFD84, 0x00000008 - + .align 2 gUnknown_082F03A4:: @ 82F03A4 .4byte gUnknown_082F0354 @@ -1719,7 +1420,7 @@ gUnknown_082F03A4:: @ 82F03A4 .align 2 window_template 0x00, 0x01, 0x05, 0x1c, 0x0c, 0x0d, 0x0039 - + .align 2 gUnknown_082F03C4:: @ 82F03C4 .4byte gText_EmptyString, 0x00000000 @@ -1745,7 +1446,7 @@ gUnknown_082F03C4:: @ 82F03C4 .4byte nullsub_14 .byte 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x40, 0x01 - + .align 2 gUnknown_082F045C:: @ 82F045C .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -2006,7 +1707,7 @@ gUnknown_082F06F8:: @ 82F06F8 .align 2 gUnknown_082F0720:: @ 82F0720 .byte 0x00, 0x01, 0x02 - + .align 2 .byte 0x00, 0x01, 0x02 @@ -2185,7 +1886,7 @@ gWonderCardBgGfx3:: @ 82F1300 .align 2 gWonderCardBgTilemap3:: @ 82F13D4 .incbin "graphics/wonder_transfers/wonder_card_3.bin.lz" - + .align 2 gWonderCardBgGfx7:: @ 82F14A8 .incbin "graphics/wonder_transfers/wonder_card_7.4bpp.lz" @@ -2193,7 +1894,7 @@ gWonderCardBgGfx7:: @ 82F14A8 .align 2 gWonderCardBgTilemap7:: @ 82F16DC .incbin "graphics/wonder_transfers/wonder_card_7.bin.lz" - + .align 2 gWonderCardBgGfx8:: @ 82F1824 .incbin "graphics/wonder_transfers/wonder_card_8.4bpp.lz" @@ -2233,7 +1934,7 @@ gWonderCardShadowPal7:: @ 82F1C5C .align 2 gWonderCardShadowPal8:: @ 82F1C7C .incbin "graphics/wonder_transfers/wonder_card_shadow_8.gbapal" - + .align 2 gWonderCardShadowGfx:: @ 82F1C9C .incbin "graphics/wonder_transfers/wonder_card_shadow.4bpp.lz" @@ -2248,31 +1949,31 @@ gUnknown_082F1D00:: @ 82F1D00 struct CompressedSpriteSheet gUnknown_082F1D08:: @ 82F1D08 struct SpritePalette .4byte gWonderCardShadowPal1 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal2 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal3 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal4 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal5 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal6 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal7 .2byte 0x8000 - + .align 2 .4byte gWonderCardShadowPal8 .2byte 0x8000 @@ -2553,7 +2254,7 @@ gUnknown_082F2800:: @ 82F2800 .align 2 gUnknown_082F2884:: @ 82F2884 .byte 0x12, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00 - + .4byte gUnknown_082F25F8 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00 @@ -2581,13 +2282,13 @@ gUnknown_082F28E4:: @ 82F28E4 .4byte gUnknown_082F2884 .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - + .4byte gUnknown_082F2788 .align 2 gUnknown_082F292C:: @ 82F292C .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 - + .4byte gUnknown_082F26A8 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 @@ -2595,7 +2296,7 @@ gUnknown_082F292C:: @ 82F292C .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 .byte 0x10, 0x00, 0x00, 0x00 - + .4byte gUnknown_082F25E8 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 @@ -2639,7 +2340,7 @@ gUnknown_082F29EC:: @ 82F29EC .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - + .4byte gUnknown_082F26F8 .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 @@ -2836,15 +2537,15 @@ gUnknown_082F2DF0:: @ 82F2DF0 .align 2 gUnknown_082F2E10:: @ 82F2E10 .incbin "graphics/interface/unk_cursor.4bpp.lz" - + .align 2 gUnknown_082F3094:: @ 82F3094 .incbin "graphics/interface/unk_dash.4bpp.lz" - + .align 2 gUnknown_082F30B4:: @ 82F30B4 .incbin "graphics/interface/unk_cursor_arrow.4bpp.lz" - + .align 2 gUnknown_082F30E0:: @ 82F30E0 .incbin "graphics/interface/unk_rbutton.4bpp.lz" @@ -2916,7 +2617,7 @@ gUnknown_082F31D4:: @ 82F31D4 .align 2 gUnknown_082F31EC:: @ 82F31EC .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - + .align 2 gUnknown_082F31F4:: @ 82F31F4 .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 @@ -3192,25 +2893,25 @@ gUnknown_082F42D0:: @ 82F42D0 .align 2 gUnknown_082F42E8:: @ 82F42E8 .4byte gUnknown_082F423C - + .align 2 gUnknown_082F42EC:: @ 82F42EC .4byte gUnknown_082F4244 .4byte gUnknown_082F4254 - + .align 2 gUnknown_082F42F4:: @ 82F42F4 .4byte gUnknown_082F4268 .4byte gUnknown_082F4284 - + .align 2 gUnknown_082F42FC:: @ 82F42FC .4byte gUnknown_082F42A8 - + .align 2 gUnknown_082F4300:: @ 82F4300 .4byte gUnknown_082F42B0 - + .align 2 gUnknown_082F4304:: @ 82F4304 .4byte gUnknown_082F42B8 diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index afaf9a605..0435692f4 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -86,7 +86,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8004, 410 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index d3132b202..23bdac560 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -143,7 +143,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8004, 151 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index dc99ec7f7..cce93e624 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -59,7 +59,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8004, 249 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index af3586554..07a90e7b7 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -63,7 +63,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 057c4581d..cbaaa905a 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -121,14 +121,14 @@ SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 setvar VAR_0x8004, 408 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 setvar VAR_0x8004, 407 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA diff --git a/data/specials.inc b/data/specials.inc index ac4a47b69..a4bd17699 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -490,7 +490,7 @@ gSpecials:: @ 81DBA64 def_special sub_813AF48 def_special sub_813AFC8 def_special sub_813B1D0 - def_special DoScriptedWildBattle + def_special CreateObedientEnemyMon def_special sub_81BEB54 def_special sub_81BEB68 def_special sub_81BEB7C |