merged

5 files changed, 162 insertions, 66 deletions

diff --git a/constants/battle.inc b/constants/battle.inc
index dfaa14779..287e9abf6 100644
--- a/constants/battle.inc
+++ b/constants/battle.inc
@@ -53,49 +53,3 @@
 	enum SP_DEFENSE
 	enum ACCURACY
 	enum EVASION
-
-@ status animation table
-.equiv B_ANIM_STATUS_PSN,              0x0
-.equiv B_ANIM_STATUS_CONFUSION,        0x1
-.equiv B_ANIM_STATUS_BRN,              0x2
-.equiv B_ANIM_STATUS_INFATUATION,      0x3
-.equiv B_ANIM_STATUS_SLP,              0x4
-.equiv B_ANIM_STATUS_PRZ,              0x5
-.equiv B_ANIM_STATUS_FRZ,              0x6
-.equiv B_ANIM_STATUS_CURSED,           0x7
-.equiv B_ANIM_STATUS_NIGHTMARE,        0x8
-.equiv B_ANIM_STATUS_WRAPPED,          0x9
-
-@ general animation table
-.equiv B_ANIM_CASTFORM_CHANGE,         0x0
-.equiv B_ANIM_STATS_CHANGE,            0x1
-.equiv B_ANIM_SUBSTITUTE_FADE,         0x2
-.equiv B_ANIM_SUBSTITUTE_APPEAR,       0x3
-.equiv B_ANIM_POKEBLOCK_THROW,         0x4
-.equiv B_ANIM_ITEM_KNOCKOFF,           0x5
-.equiv B_ANIM_TURN_TRAP,               0x6
-.equiv B_ANIM_ITEM_EFFECT,             0x7
-.equiv B_ANIM_SMOKEBALL_ESCAPE,        0x8
-.equiv B_ANIM_HANGED_ON,               0x9
-.equiv B_ANIM_RAIN_CONTINUES,          0xA
-.equiv B_ANIM_SUN_CONTINUES,           0xB
-.equiv B_ANIM_SANDSTORM_CONTINUES,     0xC
-.equiv B_ANIM_HAIL_CONTINUES,          0xD
-.equiv B_ANIM_LEECH_SEED_DRAIN,        0xE
-.equiv B_ANIM_MON_HIT,                 0xF
-.equiv B_ANIM_ITEM_STEAL,              0x10
-.equiv B_ANIM_SNATCH_MOVE,             0x11
-.equiv B_ANIM_FUTURE_SIGHT_HIT,        0x12
-.equiv B_ANIM_DOOM_DESIRE_HIT,         0x13
-.equiv B_ANIM_FOCUS_PUNCH_SET_UP,      0x14
-.equiv B_ANIM_INGRAIN_HEAL,            0x15
-.equiv B_ANIM_WISH_HEAL,               0x16
-
-@ special animation table
-.equiv B_ANIM_LVL_UP,                  0x0
-.equiv B_ANIM_SWITCH_OUT_PLAYER_MON,   0x1
-.equiv B_ANIM_SWITCH_OUT_OPPONENT_MON, 0x2
-.equiv B_ANIM_BALL_THROW,              0x3
-.equiv B_ANIM_SAFARI_BALL_THROW,       0x4
-.equiv B_ANIM_SUBSTITUTE_TO_MON,       0x5
-.equiv B_ANIM_MON_TO_SUBSTITUTE,       0x6
diff --git a/constants/battle_move_constants.inc b/constants/battle_move_constants.inc
deleted file mode 100644
index a05da3db3..000000000
--- a/constants/battle_move_constants.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-	.set TARGET_SELECTED_POKEMON, 0
-
-	.set F_TARGET_SPECIAL,         1 << 0
-	.set F_TARGET_RANDOM,          1 << 2
-	.set F_TARGET_BOTH_ENEMIES,    1 << 3
-	.set F_TARGET_USER,            1 << 4
-	.set F_TARGET_ALL_EXCEPT_USER, 1 << 5
-	.set F_TARGET_ENEMY_SIDE,      1 << 6
-
-	.set F_MAKES_CONTACT,          1 << 0
-	.set F_AFFECTED_BY_PROTECT,    1 << 1
-	.set F_AFFECTED_BY_MAGIC_COAT, 1 << 2
-	.set F_AFFECTED_BY_SNATCH,     1 << 3
-	.set F_MIRROR_MOVE_COMPATIBLE, 1 << 4
-	.set F_AFFECTED_BY_KINGS_ROCK, 1 << 5
diff --git a/constants/battle_script_constants.inc b/constants/battle_script_constants.inc
new file mode 100644
index 000000000..f35c80543
--- /dev/null
+++ b/constants/battle_script_constants.inc
@@ -0,0 +1,162 @@
+@ animation ids
+	.set ANIM_CASTFORM_CHANGE, 0x0
+	.set ANIM_STATS_CHANGE, 0x1
+	.set ANIM_SUBSTITUTE_FADE, 0x2
+	.set ANIM_SUBSTITUTE_APPEAR, 0x3
+	.set ANIM_x4, 0x4
+	.set ANIM_ITEM_KNOCKOFF, 0x5
+	.set ANIM_TURN_TRAP, 0x6
+	.set ANIM_ITEM_EFFECT, 0x7
+	.set ANIM_SMOKEBALL_ESCAPE, 0x8
+	.set ANIM_HANGED_ON, 0x9
+	.set ANIM_RAIN_CONTINUES, 0xA
+	.set ANIM_SUN_CONTINUES, 0xB
+	.set ANIM_SANDSTORM_CONTINUES, 0xC
+	.set ANIM_HAIL_CONTINUES, 0xD
+	.set ANIM_LEECH_SEED_DRAIN, 0xE
+	.set ANIM_MON_HIT, 0xF
+	.set ANIM_ITEM_STEAL, 0x10
+	.set ANIM_SNATCH_MOVE, 0x11
+	.set ANIM_FUTURE_SIGHT_HIT, 0x12
+	.set ANIM_DOOM_DESIRE_HIT, 0x13
+	.set ANIM_x14, 0x14
+	.set ANIM_INGRAIN_HEAL, 0x15
+	.set ANIM_WISH_HEAL, 0x16
+		
+@ atk 80
+	.set ATK80_DMG_CHANGE_SIGN, 0x0
+	.set ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP, 0x1
+	.set ATK80_DMG_DOUBLED, 0x2
+	
+@ compare operands
+	.set EQUAL, 0x0
+	.set NOT_EQUAL, 0x1
+	.set GREATER_THAN, 0x2
+	.set LESS_THAN, 0x3
+	.set COMMON_BITS, 0x4
+	.set NO_COMMON_BITS, 0x5
+	
+@ move effects
+	.set EFFECT_SLEEP, 0x1
+	.set EFFECT_POISON, 0x2
+	.set EFFECT_BURN, 0x3
+	.set EFFECT_FREEZE, 0x4
+	.set EFFECT_PARALYSIS, 0x5
+	.set EFFECT_TOXIC, 0x6
+	.set EFFECT_CONFUSION, 0x7
+	.set EFFECT_FLINCH, 0x8
+	.set EFFECT_TRI_ATTACK, 0x9
+	.set EFFECT_UPROAR, 0xA
+	.set EFFECT_PAYDAY, 0xB
+	.set EFFECT_CHARGING, 0xC
+	.set EFFECT_WRAP, 0xD
+	.set EFFECT_RECOIL_25, 0xE
+	.set EFFECT_ATK_PLUS_1, 0xF
+	.set EFFECT_DEF_PLUS_1, 0x10
+	.set EFFECT_SPD_PLUS_1, 0x11
+	.set EFFECT_SP_ATK_PLUS_1, 0x12
+	.set EFFECT_SP_DEF_PLUS_1, 0x13
+	.set EFFECT_ACC_PLUS_1, 0x14
+	.set EFFECT_EVS_PLUS_1, 0x15
+	.set EFFECT_ATK_MINUS_1, 0x16
+	.set EFFECT_DEF_MINUS_1, 0x17
+	.set EFFECT_SPD_MINUS_1, 0x18
+	.set EFFECT_SP_ATK_MINUS_1, 0x19
+	.set EFFECT_SP_DEF_MINUS_1, 0x1A
+	.set EFFECT_ACC_MINUS_1, 0x1B
+	.set EFFECT_EVS_MINUS_1, 0x1C
+	.set EFFECT_RECHARGE, 0x1D
+	.set EFFECT_RAGE, 0x1E
+	.set EFFECT_STEAL_ITEM, 0x1F
+	.set EFFECT_PREVENT_ESCAPE, 0x20
+	.set EFFECT_NIGHTMARE, 0x21
+	.set EFFECT_ALL_STATS_UP, 0x22
+	.set EFFECT_RAPIDSPIN, 0x23
+	.set EFFECT_REMOVE_PARALYSIS, 0x24
+	.set EFFECT_ATK_DEF_DOWN, 0x25
+	.set EFFECT_RECOIL_33_PARALYSIS, 0x26
+	.set EFFECT_ATK_PLUS_2, 0x27
+	.set EFFECT_DEF_PLUS_2, 0x28
+	.set EFFECT_SPD_PLUS_2, 0x29
+	.set EFFECT_SP_ATK_PLUS_2, 0x2A
+	.set EFFECT_SP_DEF_PLUS_2, 0x2B
+	.set EFFECT_ACC_PLUS_2, 0x2C
+	.set EFFECT_EVS_PLUS_2, 0x2D
+	.set EFFECT_ATK_MINUS_2, 0x2E
+	.set EFFECT_DEF_MINUS_2, 0x2F
+	.set EFFECT_SPD_MINUS_2, 0x30
+	.set EFFECT_SP_ATK_MINUS_2, 0x31
+	.set EFFECT_SP_DEF_MINUS_2, 0x32
+	.set EFFECT_ACC_MINUS_2, 0x33
+	.set EFFECT_EVS_MINUS_2, 0x34
+	.set EFFECT_THRASH, 0x35
+	.set EFFECT_KNOCK_OFF, 0x36
+	.set EFFECT_NOTHING_37, 0x37
+	.set EFFECT_NOTHING_38, 0x38
+	.set EFFECT_NOTHING_39, 0x39
+	.set EFFECT_NOTHING_3A, 0x3A
+	.set EFFECT_SP_ATK_TWO_DOWN, 0x3B
+	.set EFFECT_NOTHING_3C, 0x3C
+	.set EFFECT_NOTHING_3D, 0x3D
+	.set EFFECT_NOTHING_3E, 0x3E
+	.set EFFECT_NOTHING_3F, 0x3F
+	
+	.set AFFECTS_USER, 0x40
+	.set CERTAIN, 0x80
+	
+@ accuracy calc
+	.set NO_ACC_CALC, 0xFFFE
+	.set NO_ACC_CALC_CHECK_LOCK_ON, 0xFFFF
+	.set ACC_CURR_MOVE, 0x0
+
+@ bank values
+	.set EFFECT_BANK, 0x2
+	.set GBANK_1, 0x3
+	.set ATTACKER_WITH_PARTNER, 0x4 @ only for cmd98
+	.set BANK0, 0x7
+	.set SCRIPTING_BANK, 0xA
+	.set OPPONENT1, 0xC
+	
+@ various
+	.set VARIOUS_CANCEL_MULTI_TURN_MOVES, 0
+	.set VARIOUS_SET_MAGIC_COAT_TARGET, 1
+	.set VARIOUS_IS_RUNNING_IMPOSSIBLE, 2
+	.set VARIOUS_GET_MOVE_TARGET, 3
+	.set VARIOUS_RESET_INTIMIDATE_TRACE_BITS, 5
+	.set VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP, 6
+	.set VARIOUS_EMIT_YESNOBOX, 13
+	.set VARIOUS_WAIT_CRY, 18
+	.set VARIOUS_RETURN_OPPONENT_MON1, 19
+	.set VARIOUS_RETURN_OPPONENT_MON2, 20
+	.set VARIOUS_SET_TELEPORT_OUTCOME, 25
+	.set VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC, 26
+	
+@ jumpifcant switch flag argument
+	.set ATK4F_DONT_CHECK_STATUSES, 0x80
+
+@ battle scripting struct
+	.equiv sANIM_TURN,         gSharedMem + 0x16002
+	.equiv sBANK,              gSharedMem + 0x16003
+	.equiv sMOVEEND_STATE,     gSharedMem + 0x1600C
+	.equiv sGIVEEXP_STATE,     gSharedMem + 0x1600F
+	.equiv sPAINSPLIT_HP,      gSharedMem + 0x16014
+	.equiv sLEARNMOVE_STATE,   gSharedMem + 0x1601A
+	.equiv sSTATCHANGER,       gSharedMem + 0x1601E
+	.equiv sDMG_MULTIPLIER,    gSharedMem + 0x1601F
+	.equiv sTWOTURN_STRINGID,  gSharedMem + 0x16055
+	.equiv sBATTLE_STYLE,      gSharedMem + 0x16084
+	.equiv sBIDE_DMG,          gSharedMem + 0x16090
+	.equiv sLVLBOX_STATE,      gSharedMem + 0x1609C
+	.equiv sANIM_TARGETS_HIT,  gSharedMem + 0x160A1
+	.equiv sANIM_ARG1,         gSharedMem + 0x160A4
+	.equiv sANIM_ARG2,         gSharedMem + 0x160A5
+	.equiv sFIELD_1B,          gSharedMem + 0x160DC
+	.equiv sTRIPLE_KICK_POWER, gSharedMem + 0x160DE
+	.equiv sMULTIHIT_STRING,   gSharedMem + 0x160E0
+	.equiv sBANK_WITH_ABILITY, gSharedMem + 0x160F8
+	.equiv sMULTIHIT_EFFECT,   gSharedMem + 0x16112
+
+
+@ battle communication struct
+	.equiv cEFFECT_CHOOSER, gBattleCommunication + 3
+	.equiv cMULTISTRING_CHOOSER, gBattleCommunication + 5
diff --git a/constants/constants.inc b/constants/constants.inc
index 1ec25462f..57b6ae2a5 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -3,7 +3,6 @@
 	.include "constants/type_constants.inc"
 	.include "constants/contest_constants.inc"
 	.include "constants/item_data_constants.inc"
-	.include "constants/battle_move_constants.inc"
 	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc
index 5f4330928..bf90fcd1e 100644
--- a/constants/misc_constants.inc
+++ b/constants/misc_constants.inc
@@ -45,7 +45,3 @@
 	.equiv PLAYER_TYPE1,  2
 	.equiv PLAYER_TYPE2,  3
 	.equiv CURRENT_MOVE,  4
-	
-	.equiv LESS_THAN, 0
-	.equiv GREATER_THAN, 1
-	.equiv EQUAL, 2