summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-02-08 00:35:13 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-02-08 00:35:13 +0100
commita10fd5a7c4d92551c579baacf07c499b6f434619 (patch)
tree59ac639704f70fb6ec19e1e0dbb1844241fd8b73
parentcaf9af321d913e6938f5c70188ad0aca5e5eefeb (diff)
create more battle constants
Diffstat
-rw-r--r--constants/battle_constants.inc162
-rw-r--r--constants/battle_script_constants.inc103
-rw-r--r--constants/battle_text.inc375
-rw-r--r--data/battle_ai_scripts.s13
-rw-r--r--data/battle_anim_scripts.s2
-rw-r--r--data/battle_scripts_1.s306
-rw-r--r--data/battle_scripts_2.s14
-rw-r--r--include/battle.h289
-rw-r--r--include/constants/battle.h284
-rw-r--r--include/constants/battle_ai.h6
-rw-r--r--include/constants/battle_string_ids.h (renamed from include/battle_string_ids.h)7
-rw-r--r--src/battle_main.c12
-rw-r--r--src/battle_message.c2
-rw-r--r--src/battle_script_commands.c4
-rw-r--r--src/battle_setup.c4
-rw-r--r--src/battle_util.c2
-rw-r--r--src/evolution_scene.c2
-rw-r--r--src/safari_zone.c4
-rw-r--r--src/tv.c8
19 files changed, 485 insertions, 1114 deletions
diff --git a/constants/battle_constants.inc b/constants/battle_constants.inc
index 0a5dd1094..e122f8eb2 100644
--- a/constants/battle_constants.inc
+++ b/constants/battle_constants.inc
@@ -1,118 +1,3 @@
-@ battle types
- .set BATTLE_TYPE_DOUBLE , 0x0001
- .set BATTLE_TYPE_LINK, 0x0002
- .set BATTLE_TYPE_WILD, 0x0004
- .set BATTLE_TYPE_TRAINER, 0x0008
- .set BATTLE_TYPE_FIRST_BATTLE, 0x0010
- .set BATTLE_TYPE_20, 0x0020
- .set BATTLE_TYPE_MULTI, 0x0040
- .set BATTLE_TYPE_SAFARI, 0x0080
- .set BATTLE_TYPE_BATTLE_TOWER, 0x0100
- .set BATTLE_TYPE_WALLY_TUTORIAL, 0x0200
- .set BATTLE_TYPE_ROAMER, 0x0400
- .set BATTLE_TYPE_EREADER_TRAINER, 0x0800
- .set BATTLE_TYPE_KYOGRE_GROUDON, 0x1000
- .set BATTLE_TYPE_LEGENDARY, 0x2000
- .set BATTLE_TYPE_REGI, 0x4000
- .set BATTLE_TYPE_TWO_OPPONENTS, 0x8000
- .set BATTLE_TYPE_DOME, 0x10000
- .set BATTLE_TYPE_PALACE, 0x20000
- .set BATTLE_TYPE_ARENA, 0x40000
- .set BATTLE_TYPE_FACTORY, 0x80000
- .set BATTLE_TYPE_PIKE, 0x100000
- .set BATTLE_TYPE_PYRAMID, 0x200000
- .set BATTLE_TYPE_INGAME_PARTNER, 0x400000
- .set BATTLE_TYPE_x800000, 0x800000
- .set BATTLE_TYPE_RECORDED, 0x1000000
- .set BATTLE_TYPE_x2000000, 0x2000000
- .set BATTLE_TYPE_x4000000, 0x4000000
- .set BATTLE_TYPE_SECRET_BASE, 0x8000000
- .set BATTLE_TYPE_GROUDON, 0x10000000
- .set BATTLE_TYPE_KYOGRE, 0x20000000
- .set BATTLE_TYPE_RAYQUAZA, 0x40000000
- .set BATTLE_TYPE_x80000000, 0x80000000
-
-@ battle outcomes
- .set WON, 0x1
- .set LOST, 0x2
- .set DREW, 0x3
- .set RAN, 0x4
- .set PLAYER_TELEPORTED, 0x5
- .set MON_FLED, 0x6
- .set CAUGHT, 0x7
- .set OUT_OF_BALLS, 0x8
- .set FORFEITED, 0x9
- .set OPPONENT_TELEPORTED, 0xA
-
-@ identities
- .set B_POSITION_PLAYER_LEFT, 0
- .set B_POSITION_OPPONENT_LEFT, 1
- .set B_POSITION_PLAYER_RIGHT, 2
- .set B_POSITION_OPPONENT_RIGHT, 3
-
-@ status 1
- .set STATUS1_SLEEP, 0x7
- .set STATUS1_POISON, 0x8
- .set STATUS1_BURN, 0x10
- .set STATUS1_FREEZE, 0x20
- .set STATUS1_PARALYSIS, 0x40
- .set STATUS1_TOXIC_POISON, 0x80
- .set STATUS1_TOXIC_COUNTER, 0xF00
-
- .set STATUS1_ANY, STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON
-
-@ status 2
- .set STATUS2_CONFUSION, 0x00000007
- .set STATUS2_FLINCHED, 0x00000008
- .set STATUS2_UPROAR, 0x00000070
- .set STATUS2_BIDE, 0x00000300
- .set STATUS2_LOCK_CONFUSE, 0x00000C00
- .set STATUS2_MULTIPLETURNS, 0x00001000
- .set STATUS2_WRAPPED, 0x0000E000
- .set STATUS2_INFATUATION, 0x000F0000
- .set STATUS2_FOCUS_ENERGY, 0x00100000
- .set STATUS2_TRANSFORMED, 0x00200000
- .set STATUS2_RECHARGE, 0x00400000
- .set STATUS2_RAGE, 0x00800000
- .set STATUS2_SUBSTITUTE, 0x01000000
- .set STATUS2_DESTINY_BOND, 0x02000000
- .set STATUS2_ESCAPE_PREVENTION, 0x04000000
- .set STATUS2_NIGHTMARE, 0x08000000
- .set STATUS2_CURSED, 0x10000000
- .set STATUS2_FORESIGHT, 0x20000000
- .set STATUS2_DEFENSE_CURL, 0x40000000
- .set STATUS2_TORMENT, 0x80000000
-
-@ status 3
- .set STATUS3_LEECHSEED_BANK, 0x3
- .set STATUS3_LEECHSEED, 0x4
- .set STATUS3_ALWAYS_HITS, 0x18
- .set STATUS3_PERISH_SONG, 0x20
- .set STATUS3_ON_AIR, 0x40
- .set STATUS3_UNDERGROUND, 0x80
- .set STATUS3_MINIMIZED, 0x100
- .set STATUS3_ROOTED, 0x400
- .set STATUS3_CHARGED_UP, 0x200
- .set STATUS3_YAWN, 0x1800
- .set STATUS3_IMPRISONED_OTHERS, 0x2000
- .set STATUS3_GRUDGE, 0x4000
- .set STATUS3_CANT_SCORE_A_CRIT, 0x8000
- .set STATUS3_MUDSPORT, 0x10000
- .set STATUS3_WATERSPORT, 0x20000
- .set STATUS3_UNDERWATER, 0x40000
- .set STATUS3_INTIMIDATE_POKES, 0x80000
- .set STATUS3_TRACE, 0x100000
-
-@ side status
- .set SIDE_STATUS_REFLECT, 0x1
- .set SIDE_STATUS_LIGHTSCREEN, 0x2
- .set SIDE_STATUS_X4, 0x4
- .set SIDE_STATUS_SPIKES, 0x10
- .set SIDE_STATUS_SAFEGUARD, 0x20
- .set SIDE_STATUS_FUTUREATTACK, 0x40
- .set SIDE_STATUS_MIST, 0x100
- .set SIDE_STATUS_SPIKES_DAMAGED, 0x200
-
@ stats
.set HP, 0x0
.set ATK, 0x1
@@ -122,50 +7,3 @@
.set SPDEF, 0x5
.set ACC, 0x6
.set EVASION, 0x7
-
-@ weather flags
- .set WEATHER_RAIN_TEMPORARY, 0x01
- .set WEATHER_RAIN_DOWNPOUR, 0x02
- .set WEATHER_RAIN_PERMANENT, 0x04
- .set WEATHER_SANDSTORM_TEMPORARY, 0x08
- .set WEATHER_SANDSTORM_PERMANENT, 0x10
- .set WEATHER_SUN_TEMPORARY, 0x20
- .set WEATHER_SUN_PERMANENT, 0x40
- .set WEATHER_HAIL, 0x80
-
-@ hitmarker
- .set HITMARKER_x10, 0x00000010
- .set HITMARKER_x20, 0x00000020
- .set HITMARKER_DESTINYBOND, 0x00000040
- .set HITMARKER_NO_ANIMATIONS, 0x00000080
- .set HITMARKER_IGNORE_SUBSTITUTE, 0x00000100
- .set HITMARKER_NO_ATTACKSTRING, 0x00000200
- .set HITMARKER_ATTACKSTRING_PRINTED, 0x00000400
- .set HITMARKER_NO_PPDEDUCT, 0x00000800
- .set HITMARKER_PURSUIT_TRAP, 0x00001000
- .set HITMARKER_IGNORE_SAFEGUARD, 0x00002000
- .set HITMARKER_SYNCHRONISE_EFFECT, 0x00004000
- .set HITMARKER_RUN, 0x00008000
- .set HITMARKER_IGNORE_ON_AIR, 0x00010000
- .set HITMARKER_IGNORE_UNDERGROUND, 0x00020000
- .set HITMARKER_IGNORE_UNDERWATER, 0x00040000
- .set HITMARKER_UNABLE_TO_USE_MOVE, 0x00080000
- .set HITMARKER_x100000, 0x00100000
- .set HITMARKER_x200000, 0x00200000
- .set HITMARKER_x400000, 0x00400000
- .set HITMARKER_x800000, 0x00800000
- .set HITMARKER_GRUDGE, 0x01000000
- .set HITMARKER_OBEYS, 0x02000000
- .set HITMARKER_x4000000, 0x04000000
- .set HITMARKER_x8000000, 0x08000000
-
-@ move flags
- .set MOVE_RESULT_MISSED, 0x1
- .set MOVE_RESULT_SUPER_EFFECTIVE, 0x2
- .set MOVE_RESULT_NOT_VERY_EFFECTIVE, 0x4
- .set MOVE_RESULT_DOESNT_AFFECT_FOE, 0x8
- .set MOVE_RESULT_ONE_HIT_KO, 0x10
- .set MOVE_RESULT_FAILED, 0x20
- .set MOVE_RESULT_FOE_ENDURED, 0x40
- .set MOVE_RESULT_FOE_HUNG_ON, 0x80
- .set MOVE_RESULT_NO_EFFECT, (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
diff --git a/constants/battle_script_constants.inc b/constants/battle_script_constants.inc
index fe0e7dddc..532ab174f 100644
--- a/constants/battle_script_constants.inc
+++ b/constants/battle_script_constants.inc
@@ -1,28 +1,3 @@
-@ 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
@@ -36,74 +11,6 @@
.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
@@ -112,7 +19,7 @@
@ bank values
.set TARGET, 0x0
.set ATTACKER, 0x1
- .set EFFECT_BANK, 0x2
+ .set MOVE_EFFECT_BANK, 0x2
.set GBANK_1, 0x3
.set ATTACKER_WITH_PARTNER, 0x4 @ only for cmd98
.set BANK0, 0x7
@@ -142,15 +49,15 @@
.equiv sMULTIHIT_STRING, gBattleScripting + 8
.equiv sDMG_MULTIPLIER, gBattleScripting + 0xE
.equiv sTWOTURN_STRINGID, gBattleScripting + 0xF
- .equiv sANIM_ARG1, gBattleScripting + 0x10
- .equiv sANIM_ARG2, gBattleScripting + 0x11
+ .equiv sB_ANIM_ARG1, gBattleScripting + 0x10
+ .equiv sB_ANIM_ARG2, gBattleScripting + 0x11
.equiv sTRIPLE_KICK_POWER, gBattleScripting + 0x12
.equiv sMOVEEND_STATE, gBattleScripting + 0x14
.equiv sBANK_WITH_ABILITY, gBattleScripting + 0x15
.equiv sMULTIHIT_EFFECT, gBattleScripting + 0x16
.equiv sBANK, gBattleScripting + 0x17
- .equiv sANIM_TURN, gBattleScripting + 0x18
- .equiv sANIM_TARGETS_HIT, gBattleScripting + 0x19
+ .equiv sB_ANIM_TURN, gBattleScripting + 0x18
+ .equiv sB_ANIM_TARGETS_HIT, gBattleScripting + 0x19
.equiv sSTATCHANGER, gBattleScripting + 0x1A
.equiv sFIELD_1B, gBattleScripting + 0x1B
.equiv sGIVEEXP_STATE, gBattleScripting + 0x1C
diff --git a/constants/battle_text.inc b/constants/battle_text.inc
deleted file mode 100644
index 1d3a5f346..000000000
--- a/constants/battle_text.inc
+++ /dev/null
@@ -1,375 +0,0 @@
- .set STRINGID_INTROMSG, 0
- .set STRINGID_INTROSENDOUT, 1
- .set STRINGID_RETURNMON, 2
- .set STRINGID_SWITCHINMON, 3
- .set STRINGID_USEDMOVE, 4
- .set STRINGID_BATTLEEND, 5
- .set STRINGID_TRAINER1LOSETEXT, 12
- .set STRINGID_PKMNGAINEDEXP, 13
- .set STRINGID_PKMNGREWTOLV, 14
- .set STRINGID_PKMNLEARNEDMOVE, 15
- .set STRINGID_TRYTOLEARNMOVE1, 16
- .set STRINGID_TRYTOLEARNMOVE2, 17
- .set STRINGID_TRYTOLEARNMOVE3, 18
- .set STRINGID_PKMNFORGOTMOVE, 19
- .set STRINGID_STOPLEARNINGMOVE, 20
- .set STRINGID_DIDNOTLEARNMOVE, 21
- .set STRINGID_PKMNLEARNEDMOVE2, 22
- .set STRINGID_ATTACKMISSED, 23
- .set STRINGID_PKMNPROTECTEDITSELF, 24
- .set STRINGID_STATSWONTINCREASE2, 25
- .set STRINGID_AVOIDEDDAMAGE, 26
- .set STRINGID_ITDOESNTAFFECT, 27
- .set STRINGID_ATTACKERFAINTED, 28
- .set STRINGID_TARGETFAINTED, 29
- .set STRINGID_PLAYERGOTMONEY, 30
- .set STRINGID_PLAYERWHITEOUT, 31
- .set STRINGID_PLAYERWHITEOUT2, 32
- .set STRINGID_PREVENTSESCAPE, 33
- .set STRINGID_HITXTIMES, 34
- .set STRINGID_PKMNFELLASLEEP, 35
- .set STRINGID_PKMNMADESLEEP, 36
- .set STRINGID_PKMNALREADYASLEEP, 37
- .set STRINGID_PKMNALREADYASLEEP2, 38
- .set STRINGID_PKMNWASNTAFFECTED, 39
- .set STRINGID_PKMNWASPOISONED, 40
- .set STRINGID_PKMNPOISONEDBY, 41
- .set STRINGID_PKMNHURTBYPOISON, 42
- .set STRINGID_PKMNALREADYPOISONED, 43
- .set STRINGID_PKMNBADLYPOISONED, 44
- .set STRINGID_PKMNENERGYDRAINED, 45
- .set STRINGID_PKMNWASBURNED, 46
- .set STRINGID_PKMNBURNEDBY, 47
- .set STRINGID_PKMNHURTBYBURN, 48
- .set STRINGID_PKMNWASFROZEN, 49
- .set STRINGID_PKMNFROZENBY, 50
- .set STRINGID_PKMNISFROZEN, 51
- .set STRINGID_PKMNWASDEFROSTED, 52
- .set STRINGID_PKMNWASDEFROSTED2, 53
- .set STRINGID_PKMNWASDEFROSTEDBY, 54
- .set STRINGID_PKMNWASPARALYZED, 55
- .set STRINGID_PKMNWASPARALYZEDBY, 56
- .set STRINGID_PKMNISPARALYZED, 57
- .set STRINGID_PKMNISALREADYPARALYZED, 58
- .set STRINGID_PKMNHEALEDPARALYSIS, 59
- .set STRINGID_PKMNDREAMEATEN, 60
- .set STRINGID_STATSWONTINCREASE, 61
- .set STRINGID_STATSWONTDECREASE, 62
- .set STRINGID_TEAMSTOPPEDWORKING, 63
- .set STRINGID_FOESTOPPEDWORKING, 64
- .set STRINGID_PKMNISCONFUSED, 65
- .set STRINGID_PKMNHEALEDCONFUSION, 66
- .set STRINGID_PKMNWASCONFUSED, 67
- .set STRINGID_PKMNALREADYCONFUSED, 68
- .set STRINGID_PKMNFELLINLOVE, 69
- .set STRINGID_PKMNINLOVE, 70
- .set STRINGID_PKMNIMMOBILIZEDBYLOVE, 71
- .set STRINGID_PKMNBLOWNAWAY, 72
- .set STRINGID_PKMNCHANGEDTYPE, 73
- .set STRINGID_PKMNFLINCHED, 74
- .set STRINGID_PKMNREGAINEDHEALTH, 75
- .set STRINGID_PKMNHPFULL, 76
- .set STRINGID_PKMNRAISEDSPDEF, 77
- .set STRINGID_PKMNRAISEDDEF, 78
- .set STRINGID_PKMNCOVEREDBYVEIL, 79
- .set STRINGID_PKMNUSEDSAFEGUARD, 80
- .set STRINGID_PKMNSAFEGUARDEXPIRED, 81
- .set STRINGID_PKMNWENTTOSLEEP, 82
- .set STRINGID_PKMNSLEPTHEALTHY, 83
- .set STRINGID_PKMNWHIPPEDWHIRLWIND, 84
- .set STRINGID_PKMNTOOKSUNLIGHT, 85
- .set STRINGID_PKMNLOWEREDHEAD, 86
- .set STRINGID_PKMNISGLOWING, 87
- .set STRINGID_PKMNFLEWHIGH, 88
- .set STRINGID_PKMNDUGHOLE, 89
- .set STRINGID_PKMNSQUEEZEDBYBIND, 90
- .set STRINGID_PKMNTRAPPEDINVORTEX, 91
- .set STRINGID_PKMNWRAPPEDBY, 92
- .set STRINGID_PKMNCLAMPED, 93
- .set STRINGID_PKMNHURTBY, 94
- .set STRINGID_PKMNFREEDFROM, 95
- .set STRINGID_PKMNCRASHED, 96
- .set STRINGID_PKMNSHROUDEDINMIST, 97
- .set STRINGID_PKMNPROTECTEDBYMIST, 98
- .set STRINGID_PKMNGETTINGPUMPED, 99
- .set STRINGID_PKMNHITWITHRECOIL, 100
- .set STRINGID_PKMNPROTECTEDITSELF2, 101
- .set STRINGID_PKMNBUFFETEDBYSANDSTORM, 102
- .set STRINGID_PKMNPELTEDBYHAIL, 103
- .set STRINGID_PKMNSEEDED, 104
- .set STRINGID_PKMNEVADEDATTACK, 105
- .set STRINGID_PKMNSAPPEDBYLEECHSEED, 106
- .set STRINGID_PKMNFASTASLEEP, 107
- .set STRINGID_PKMNWOKEUP, 108
- .set STRINGID_PKMNUPROARKEPTAWAKE, 109
- .set STRINGID_PKMNWOKEUPINUPROAR, 110
- .set STRINGID_PKMNCAUSEDUPROAR, 111
- .set STRINGID_PKMNMAKINGUPROAR, 112
- .set STRINGID_PKMNCALMEDDOWN, 113
- .set STRINGID_PKMNCANTSLEEPINUPROAR, 114
- .set STRINGID_PKMNSTOCKPILED, 115
- .set STRINGID_PKMNCANTSTOCKPILE, 116
- .set STRINGID_PKMNCANTSLEEPINUPROAR2, 117
- .set STRINGID_UPROARKEPTPKMNAWAKE, 118
- .set STRINGID_PKMNSTAYEDAWAKEUSING, 119
- .set STRINGID_PKMNSTORINGENERGY, 120
- .set STRINGID_PKMNUNLEASHEDENERGY, 121
- .set STRINGID_PKMNFATIGUECONFUSION, 122
- .set STRINGID_PKMNPICKEDUPITEM, 123
- .set STRINGID_PKMNUNAFFECTED, 124
- .set STRINGID_PKMNTRANSFORMEDINTO, 125
- .set STRINGID_PKMNMADESUBSTITUTE, 126
- .set STRINGID_PKMNHASSUBSTITUTE, 127
- .set STRINGID_SUBSTITUTEDAMAGED, 128
- .set STRINGID_PKMNSUBSTITUTEFADED, 129
- .set STRINGID_PKMNMUSTRECHARGE, 130
- .set STRINGID_PKMNRAGEBUILDING, 131
- .set STRINGID_PKMNMOVEWASDISABLED, 132
- .set STRINGID_PKMNMOVEISDISABLED, 133
- .set STRINGID_PKMNMOVEDISABLEDNOMORE, 134
- .set STRINGID_PKMNGOTENCORE, 135
- .set STRINGID_PKMNENCOREENDED, 136
- .set STRINGID_PKMNTOOKAIM, 137
- .set STRINGID_PKMNSKETCHEDMOVE, 138
- .set STRINGID_PKMNTRYINGTOTAKEFOE, 139
- .set STRINGID_PKMNTOOKFOE, 140
- .set STRINGID_PKMNREDUCEDPP, 141
- .set STRINGID_PKMNSTOLEITEM, 142
- .set STRINGID_TARGETCANTESCAPENOW, 143
- .set STRINGID_PKMNFELLINTONIGHTMARE, 144
- .set STRINGID_PKMNLOCKEDINNIGHTMARE, 145
- .set STRINGID_PKMNLAIDCURSE, 146
- .set STRINGID_PKMNAFFLICTEDBYCURSE, 147
- .set STRINGID_SPIKESSCATTERED, 148
- .set STRINGID_PKMNHURTBYSPIKES, 149
- .set STRINGID_PKMNIDENTIFIED, 150
- .set STRINGID_PKMNPERISHCOUNTFELL, 151
- .set STRINGID_PKMNBRACEDITSELF, 152
- .set STRINGID_PKMNENDUREDHIT, 153
- .set STRINGID_MAGNITUDESTRENGTH, 154
- .set STRINGID_PKMNCUTHPMAXEDATTACK, 155
- .set STRINGID_PKMNCOPIEDSTATCHANGES, 156
- .set STRINGID_PKMNGOTFREE, 157
- .set STRINGID_PKMNSHEDLEECHSEED, 158
- .set STRINGID_PKMNBLEWAWAYSPIKES, 159
- .set STRINGID_PKMNFLEDFROMBATTLE, 160
- .set STRINGID_PKMNFORESAWATTACK, 161
- .set STRINGID_PKMNTOOKATTACK, 162
- .set STRINGID_PKMNATTACK, 163
- .set STRINGID_PKMNCENTERATTENTION, 164
- .set STRINGID_PKMNCHARGINGPOWER, 165
- .set STRINGID_NATUREPOWERTURNEDINTO, 166
- .set STRINGID_PKMNSTATUSNORMAL, 167
- .set STRINGID_PKMNHASNOMOVESLEFT, 168
- .set STRINGID_PKMNSUBJECTEDTOTORMENT, 169
- .set STRINGID_PKMNCANTUSEMOVETORMENT, 170
- .set STRINGID_PKMNTIGHTENINGFOCUS, 171
- .set STRINGID_PKMNFELLFORTAUNT, 172
- .set STRINGID_PKMNCANTUSEMOVETAUNT, 173
- .set STRINGID_PKMNREADYTOHELP, 174
- .set STRINGID_PKMNSWITCHEDITEMS, 175
- .set STRINGID_PKMNCOPIEDFOE, 176
- .set STRINGID_PKMNMADEWISH, 177
- .set STRINGID_PKMNWISHCAMETRUE, 178
- .set STRINGID_PKMNPLANTEDROOTS, 179
- .set STRINGID_PKMNABSORBEDNUTRIENTS, 180
- .set STRINGID_PKMNANCHOREDITSELF, 181
- .set STRINGID_PKMNWASMADEDROWSY, 182
- .set STRINGID_PKMNKNOCKEDOFF, 183
- .set STRINGID_PKMNSWAPPEDABILITIES, 184
- .set STRINGID_PKMNSEALEDOPPONENTMOVE, 185
- .set STRINGID_PKMNCANTUSEMOVESEALED, 186
- .set STRINGID_PKMNWANTSGRUDGE, 187
- .set STRINGID_PKMNLOSTPPGRUDGE, 188
- .set STRINGID_PKMNSHROUDEDITSELF, 189
- .set STRINGID_PKMNMOVEBOUNCED, 190
- .set STRINGID_PKMNWAITSFORTARGET, 191
- .set STRINGID_PKMNSNATCHEDMOVE, 192
- .set STRINGID_PKMNMADEITRAIN, 193
- .set STRINGID_PKMNRAISEDSPEED, 194
- .set STRINGID_PKMNPROTECTEDBY, 195
- .set STRINGID_PKMNPREVENTSUSAGE, 196
- .set STRINGID_PKMNRESTOREDHPUSING, 197
- .set STRINGID_PKMNCHANGEDTYPEWITH, 198
- .set STRINGID_PKMNPREVENTSPARALYSISWITH, 199
- .set STRINGID_PKMNPREVENTSROMANCEWITH, 200
- .set STRINGID_PKMNPREVENTSPOISONINGWITH, 201
- .set STRINGID_PKMNPREVENTSCONFUSIONWITH, 202
- .set STRINGID_PKMNRAISEDFIREPOWERWITH, 203
- .set STRINGID_PKMNANCHORSITSELFWITH, 204
- .set STRINGID_PKMNCUTSATTACKWITH, 205
- .set STRINGID_PKMNPREVENTSSTATLOSSWITH, 206
- .set STRINGID_PKMNHURTSWITH, 207
- .set STRINGID_PKMNTRACED, 208
- .set STRINGID_STATSHARPLY, 209
- .set STRINGID_STATROSE, 210
- .set STRINGID_STATHARSHLY, 211
- .set STRINGID_STATFELL, 212
- .set STRINGID_PKMNSSTATCHANGED, 213
- .set STRINGID_PKMNSSTATCHANGED2, 214
- .set STRINGID_PKMNSSTATCHANGED3, 215
- .set STRINGID_PKMNSSTATCHANGED4, 216
- .set STRINGID_CRITICALHIT, 217
- .set STRINGID_ONEHITKO, 218
- .set STRINGID_123POOF, 219
- .set STRINGID_ANDELLIPSIS, 220
- .set STRINGID_NOTVERYEFFECTIVE, 221
- .set STRINGID_SUPEREFFECTIVE, 222
- .set STRINGID_GOTAWAYSAFELY, 223
- .set STRINGID_WILDPKMNFLED, 224
- .set STRINGID_NORUNNINGFROMTRAINERS, 225
- .set STRINGID_CANTESCAPE, 226
- .set STRINGID_DONTLEAVEBIRCH, 227
- .set STRINGID_BUTNOTHINGHAPPENED, 228
- .set STRINGID_BUTITFAILED, 229
- .set STRINGID_ITHURTCONFUSION, 230
- .set STRINGID_MIRRORMOVEFAILED, 231
- .set STRINGID_STARTEDTORAIN, 232
- .set STRINGID_DOWNPOURSTARTED, 233
- .set STRINGID_RAINCONTINUES, 234
- .set STRINGID_DOWNPOURCONTINUES, 235
- .set STRINGID_RAINSTOPPED, 236
- .set STRINGID_SANDSTORMBREWED, 237
- .set STRINGID_SANDSTORMRAGES, 238
- .set STRINGID_SANDSTORMSUBSIDED, 239
- .set STRINGID_SUNLIGHTGOTBRIGHT, 240
- .set STRINGID_SUNLIGHTSTRONG, 241
- .set STRINGID_SUNLIGHTFADED, 242
- .set STRINGID_STARTEDHAIL, 243
- .set STRINGID_HAILCONTINUES, 244
- .set STRINGID_HAILSTOPPED, 245
- .set STRINGID_FAILEDTOSPITUP, 246
- .set STRINGID_FAILEDTOSWALLOW, 247
- .set STRINGID_WINDBECAMEHEATWAVE, 248
- .set STRINGID_STATCHANGESGONE, 249
- .set STRINGID_COINSSCATTERED, 250
- .set STRINGID_TOOWEAKFORSUBSTITUTE, 251
- .set STRINGID_SHAREDPAIN, 252
- .set STRINGID_BELLCHIMED, 253
- .set STRINGID_FAINTINTHREE, 254
- .set STRINGID_NOPPLEFT, 255
- .set STRINGID_BUTNOPPLEFT, 256
- .set STRINGID_PLAYERUSEDITEM, 257
- .set STRINGID_WALLYUSEDITEM, 258
- .set STRINGID_TRAINERBLOCKEDBALL, 259
- .set STRINGID_DONTBEATHIEF, 260
- .set STRINGID_ITDODGEDBALL, 261
- .set STRINGID_YOUMISSEDPKMN, 262
- .set STRINGID_PKMNBROKEFREE, 263
- .set STRINGID_ITAPPEAREDCAUGHT, 264
- .set STRINGID_AARGHALMOSTHADIT, 265
- .set STRINGID_SHOOTSOCLOSE, 266
- .set STRINGID_GOTCHAPKMNCAUGHT, 267
- .set STRINGID_GOTCHAPKMNCAUGHT2, 268
- .set STRINGID_GIVENICKNAMECAPTURED, 269
- .set STRINGID_PKMNSENTTOPC, 270
- .set STRINGID_PKMNDATAADDEDTODEX, 271
- .set STRINGID_ITISRAINING, 272
- .set STRINGID_SANDSTORMISRAGING, 273
- .set STRINGID_CANTESCAPE2, 274
- .set STRINGID_PKMNIGNORESASLEEP, 275
- .set STRINGID_PKMNIGNOREDORDERS, 276
- .set STRINGID_PKMNBEGANTONAP, 277
- .set STRINGID_PKMNLOAFING, 278
- .set STRINGID_PKMNWONTOBEY, 279
- .set STRINGID_PKMNTURNEDAWAY, 280
- .set STRINGID_PKMNPRETENDNOTNOTICE, 281
- .set STRINGID_ENEMYABOUTTOSWITCHPKMN, 282
- .set STRINGID_CREPTCLOSER, 283
- .set STRINGID_CANTGETCLOSER, 284
- .set STRINGID_PKMNWATCHINGCAREFULLY, 285
- .set STRINGID_PKMNCURIOUSABOUTX, 286
- .set STRINGID_PKMNENTHRALLEDBYX, 287
- .set STRINGID_PKMNIGNOREDX, 288
- .set STRINGID_THREWPOKEBLOCKATPKMN, 289
- .set STRINGID_OUTOFSAFARIBALLS, 290
- .set STRINGID_PKMNSITEMCUREDPARALYSIS, 291
- .set STRINGID_PKMNSITEMCUREDPOISON, 292
- .set STRINGID_PKMNSITEMHEALEDBURN, 293
- .set STRINGID_PKMNSITEMDEFROSTEDIT, 294
- .set STRINGID_PKMNSITEMWOKEIT, 295
- .set STRINGID_PKMNSITEMSNAPPEDOUT, 296
- .set STRINGID_PKMNSITEMCUREDPROBLEM, 297
- .set STRINGID_PKMNSITEMRESTOREDHEALTH, 298
- .set STRINGID_PKMNSITEMRESTOREDPP, 299
- .set STRINGID_PKMNSITEMRESTOREDSTATUS, 300
- .set STRINGID_PKMNSITEMRESTOREDHPALITTLE, 301
- .set STRINGID_ITEMALLOWSONLYYMOVE, 302
- .set STRINGID_PKMNHUNGONWITHX, 303
- .set STRINGID_EMPTYSTRING3, 304
- .set STRINGID_PKMNSXPREVENTSBURNS, 305
- .set STRINGID_PKMNSXBLOCKSY, 306
- .set STRINGID_PKMNSXRESTOREDHPALITTLE2, 307
- .set STRINGID_PKMNSXWHIPPEDUPSANDSTORM, 308
- .set STRINGID_PKMNSXPREVENTSYLOSS, 309
- .set STRINGID_PKMNSXINFATUATEDY, 310
- .set STRINGID_PKMNSXMADEYINEFFECTIVE, 311
- .set STRINGID_PKMNSXCUREDYPROBLEM, 312
- .set STRINGID_ITSUCKEDLIQUIDOOZE, 313
- .set STRINGID_PKMNTRANSFORMED, 314
- .set STRINGID_ELECTRICITYWEAKENED, 315
- .set STRINGID_FIREWEAKENED, 316
- .set STRINGID_PKMNHIDUNDERWATER, 317
- .set STRINGID_PKMNSPRANGUP, 318
- .set STRINGID_HMMOVESCANTBEFORGOTTEN, 319
- .set STRINGID_XFOUNDONEY, 320
- .set STRINGID_PLAYERDEFEATEDTRAINER1, 321
- .set STRINGID_SOOTHINGAROMA, 322
- .set STRINGID_ITEMSCANTBEUSEDNOW, 323
- .set STRINGID_FORXCOMMAYZ, 324
- .set STRINGID_USINGXTHEYOFZN, 325
- .set STRINGID_PKMNUSEDXTOGETPUMPED, 326
- .set STRINGID_PKMNSXMADEYUSELESS, 327
- .set STRINGID_PKMNTRAPPEDBYSANDTOMB, 328
- .set STRINGID_EMPTYSTRING4, 329
- .set STRINGID_ABOOSTED, 330
- .set STRINGID_PKMNSXINTENSIFIEDSUN, 331
- .set STRINGID_PKMNMAKESGROUNDMISS, 332
- .set STRINGID_YOUTHROWABALLNOWRIGHT, 333
- .set STRINGID_PKMNSXTOOKATTACK, 334
- .set STRINGID_PKMNCHOSEXASDESTINY, 335
- .set STRINGID_PKMNLOSTFOCUS, 336
- .set STRINGID_USENEXTPKMN, 337
- .set STRINGID_PKMNFLEDUSINGITS, 338
- .set STRINGID_PKMNFLEDUSING, 339
- .set STRINGID_PKMNWASDRAGGEDOUT, 340
- .set STRINGID_PREVENTEDFROMWORKING, 341
- .set STRINGID_PKMNSITEMNORMALIZEDSTATUS, 342
- .set STRINGID_TRAINER1USEDITEM, 343
- .set STRINGID_BOXISFULL, 344
- .set STRINGID_PKMNAVOIDEDATTACK, 345
- .set STRINGID_PKMNSXMADEITINEFFECTIVE, 346
- .set STRINGID_PKMNSXPREVENTSFLINCHING, 347
- .set STRINGID_PKMNALREADYHASBURN, 348
- .set STRINGID_STATSWONTDECREASE2, 349
- .set STRINGID_PKMNSXBLOCKSY2, 350
- .set STRINGID_PKMNSXWOREOFF, 351
- .set STRINGID_PKMNRAISEDDEFALITTLE, 352
- .set STRINGID_PKMNRAISEDSPDEFALITTLE, 353
- .set STRINGID_THEWALLSHATTERED, 354
- .set STRINGID_PKMNSXPREVENTSYSZ, 355
- .set STRINGID_PKMNSXCUREDITSYPROBLEM, 356
- .set STRINGID_ATTACKERCANTESCAPE, 357
- .set STRINGID_PKMNOBTAINEDX, 358
- .set STRINGID_PKMNOBTAINEDX2, 359
- .set STRINGID_PKMNOBTAINEDXYOBTAINEDZ, 360
- .set STRINGID_BUTNOEFFECT, 361
- .set STRINGID_PKMNSXHADNOEFFECTONY, 362
- .set STRINGID_TWOENEMIESDEFEATED, 363
- .set STRINGID_TRAINER2LOSETEXT, 364
- .set STRINGID_PKMNINCAPABLEOFPOWER, 365
- .set STRINGID_GLINTAPPEARSINEYE, 366
- .set STRINGID_PKMNGETTINGINTOPOSITION, 367
- .set STRINGID_PKMNBEGANGROWLINGDEEPLY, 368
- .set STRINGID_PKMNEAGERFORMORE, 369
- .set STRINGID_DEFEATEDOPPONENTBYREFEREE, 370
- .set STRINGID_LOSTTOOPPONENTBYREFEREE, 371
- .set STRINGID_TIEDOPPONENTBYREFEREE, 372
- .set STRINGID_QUESTIONFORFEITMATCH, 373
- .set STRINGID_FORFEITEDMATCH, 374
- .set STRINGID_PKMNTRANSFERREDSOMEONESPC, 375
- .set STRINGID_PKMNTRANSFERREDLANETTESPC, 376
- .set STRINGID_PKMNBOXSOMEONESPCFULL, 377
- .set STRINGID_PKMNBOXLANETTESPCFULL, 378
- .set STRINGID_TRAINER1WINTEXT, 379
- .set STRINGID_TRAINER2WINTEXT, 380
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index afe365231..b519293c7 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -1,9 +1,10 @@
- .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.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/battle_constants.inc"
.include "constants/type_constants.inc"
.include "asm/macros/battle_ai_script.inc"
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_scripts_1.s b/data/battle_scripts_1.s
index 4d8b22186..f11567ffd 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1,3 +1,6 @@
+#include "constants/battle.h"
+#include "constants/battle_anim.h"
+#include "constants/battle_string_ids.h"
#include "constants/abilities.h"
#include "constants/moves.h"
#include "constants/songs.h"
@@ -6,7 +9,6 @@
.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
@@ -310,7 +312,7 @@ BattleScript_EffectSleep::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_SLEEP
+ setmoveeffect MOVE_EFFECT_SLEEP
seteffectprimary
goto BattleScript_MoveEnd
@@ -335,7 +337,7 @@ BattleScript_CantMakeAsleep::
BattleScript_EffectPoisonHit::
BattleScript_EffectPoisonTail::
- setmoveeffect EFFECT_POISON
+ setmoveeffect MOVE_EFFECT_POISON
goto BattleScript_EffectHit
BattleScript_EffectAbsorb::
@@ -379,15 +381,15 @@ BattleScript_AbsorbTryFainting::
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::
@@ -511,7 +513,7 @@ BattleScript_EffectStatUp::
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
- statbuffchange AFFECTS_USER | 0x1, BattleScript_StatUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_StatUpEnd
jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
pause 0x20
goto BattleScript_StatUpPrintString
@@ -520,7 +522,7 @@ BattleScript_StatUpAttackAnim::
waitanimation
BattleScript_StatUpDoAnim::
setgraphicalstatchangevalues
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_StatUpPrintString::
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -528,7 +530,7 @@ BattleScript_StatUpEnd::
goto BattleScript_MoveEnd
BattleScript_StatUp::
- playanimation EFFECT_BANK, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation MOVE_EFFECT_BANK, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
return
@@ -566,7 +568,7 @@ BattleScript_StatDownDoAnim::
attackanimation
waitanimation
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation 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 MOVE_EFFECT_BANK, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
waitmessage 0x40
return
@@ -689,7 +691,7 @@ BattleScript_EffectConversion::
goto BattleScript_MoveEnd
BattleScript_EffectFlinchHit::
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
BattleScript_EffectRestoreHp::
@@ -721,7 +723,7 @@ BattleScript_EffectToxic::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_TOXIC
+ setmoveeffect MOVE_EFFECT_TOXIC
seteffectprimary
resultmessage
waitmessage 0x40
@@ -741,7 +743,7 @@ BattleScript_ImmunityProtected::
goto BattleScript_MoveEnd
BattleScript_EffectPayDay::
- setmoveeffect EFFECT_PAYDAY
+ setmoveeffect MOVE_EFFECT_PAYDAY
goto BattleScript_EffectHit
BattleScript_EffectLightScreen::
@@ -752,7 +754,7 @@ BattleScript_EffectLightScreen::
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectTriAttack::
- setmoveeffect EFFECT_TRI_ATTACK
+ setmoveeffect MOVE_EFFECT_TRI_ATTACK
goto BattleScript_EffectHit
BattleScript_EffectRest::
@@ -807,12 +809,12 @@ BattleScript_EffectRazorWind::
BattleScript_TwoTurnMovesSecondTurn::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- setbyte sANIM_TURN, 0x1
+ setmoveeffect MOVE_EFFECT_CHARGING
+ setbyte sB_ANIM_TURN, 0x1
clearstatusfromeffect 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
@@ -856,7 +858,7 @@ BattleScript_EffectTrap::
orword gHitMarker, HITMARKER_IGNORE_UNDERWATER
setbyte sDMG_MULTIPLIER, 0x2
BattleScript_DoWrapEffect::
- setmoveeffect EFFECT_WRAP
+ setmoveeffect MOVE_EFFECT_WRAP
goto BattleScript_EffectHit
BattleScript_EffectDoubleHit::
@@ -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
@@ -934,7 +936,7 @@ BattleScript_EffectConfuse::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_CONFUSION
+ setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
resultmessage
waitmessage 0x40
@@ -1021,7 +1023,7 @@ BattleScript_EffectPoison::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_POISON
+ setmoveeffect MOVE_EFFECT_POISON
seteffectprimary
resultmessage
waitmessage 0x40
@@ -1041,7 +1043,7 @@ BattleScript_EffectParalyze::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_PARALYSIS
+ setmoveeffect MOVE_EFFECT_PARALYSIS
seteffectprimary
resultmessage
waitmessage 0x40
@@ -1061,27 +1063,27 @@ BattleScript_LimberProtected::
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::
@@ -1092,13 +1094,13 @@ BattleScript_EffectSkyAttack::
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
@@ -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,12 +1147,12 @@ 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
+ setmoveeffect MOVE_EFFECT_RAGE
clearstatusfromeffect ATTACKER
goto BattleScript_PrintMoveMissed
@@ -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::
@@ -1292,7 +1294,7 @@ BattleScript_DoSnore::
attackstring
ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_HitFromCritCalc
BattleScript_EffectConversion2::
@@ -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::
@@ -1463,7 +1465,7 @@ BattleScript_TripleKickEnd::
end
BattleScript_EffectThief::
- setmoveeffect EFFECT_STEAL_ITEM
+ setmoveeffect MOVE_EFFECT_STEAL_ITEM
goto BattleScript_EffectHit
BattleScript_EffectMeanLook::
@@ -1475,7 +1477,7 @@ BattleScript_EffectMeanLook::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
attackanimation
waitanimation
- setmoveeffect EFFECT_PREVENT_ESCAPE
+ setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE
seteffectprimary
printstring STRINGID_TARGETCANTESCAPENOW
waitmessage 0x40
@@ -1492,7 +1494,7 @@ BattleScript_EffectNightmare::
BattleScript_NightmareWorked::
attackanimation
waitanimation
- setmoveeffect EFFECT_NIGHTMARE
+ setmoveeffect MOVE_EFFECT_NIGHTMARE
seteffectprimary
printstring STRINGID_PKMNFELLINTONIGHTMARE
waitmessage 0x40
@@ -1514,21 +1516,21 @@ BattleScript_EffectCurse::
jumpifstat ATTACKER, EQUAL, 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
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_CurseTryAttack::
setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryDefence
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryDefence
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseTryDefence::
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseEnd::
@@ -1544,7 +1546,7 @@ BattleScript_DoGhostCurse::
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
@@ -1643,13 +1645,13 @@ BattleScript_EffectSwagger::
statbuffchange 0x1, BattleScript_SwaggerTryConfuse
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation 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
+ 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::
@@ -1739,7 +1741,7 @@ BattleScript_EffectBatonPass::
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::
@@ -1839,10 +1841,10 @@ BattleScript_EffectSkullBash::
setbyte sTWOTURN_STRINGID, 0x2
call BattleScriptFirstChargingTurn
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_SkullBashEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_SkullBashEnd
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
setgraphicalstatchangevalues
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_SkullBashEnd::
@@ -1853,7 +1855,7 @@ BattleScript_EffectTwister::
orword gHitMarker, HITMARKER_IGNORE_ON_AIR
setbyte sDMG_MULTIPLIER, 0x2
BattleScript_FlinchEffect::
- setmoveeffect EFFECT_FLINCH
+ setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit
BattleScript_EffectEarthquake::
@@ -1939,13 +1941,13 @@ BattleScript_SolarbeamDecideTurn::
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
@@ -2024,12 +2026,12 @@ BattleScript_FirstTurnSemiInvulnerable::
BattleScript_SecondTurnSemiInvulnerable::
attackcanceler
- setmoveeffect EFFECT_CHARGING
- setbyte sANIM_TURN, 0x1
+ setmoveeffect MOVE_EFFECT_CHARGING
+ setbyte sB_ANIM_TURN, 0x1
clearstatusfromeffect 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
@@ -2045,7 +2047,7 @@ BattleScript_EffectDefenseCurl::
ppreduce
setdefensecurlbit
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
attackanimation
waitanimation
@@ -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,7 +2102,7 @@ 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
ppreduce
@@ -2189,13 +2191,13 @@ BattleScript_EffectFlatter::
statbuffchange 0x1, BattleScript_FlatterTryConfuse
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation 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
+ setmoveeffect MOVE_EFFECT_CONFUSION
seteffectprimary
goto BattleScript_MoveEnd
@@ -2212,7 +2214,7 @@ BattleScript_EffectWillOWisp::
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
waitanimation
- setmoveeffect EFFECT_BURN
+ setmoveeffect MOVE_EFFECT_BURN
seteffectprimary
goto BattleScript_MoveEnd
@@ -2292,7 +2294,7 @@ BattleScript_EffectFocusPunch::
BattleScript_EffectSmellingsalt::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
- setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN
+ setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN
jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
@@ -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,12 +2453,12 @@ BattleScript_EffectBrickBreak::
damagecalc
typecalc
adjustnormaldamage
- jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_BrickBreakAnim
+ jumpifbyte 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 LESS_THAN, sB_ANIM_TURN, 0x2, BattleScript_BrickBreakDoHit
printstring STRINGID_THEWALLSHATTERED
waitmessage 0x40
BattleScript_BrickBreakDoHit::
@@ -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::
@@ -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,7 +2603,7 @@ 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
@@ -2665,7 +2667,7 @@ BattleScript_EffectWaterSport::
goto BattleScript_MoveEnd
BattleScript_EffectPoisonFang::
- setmoveeffect EFFECT_TOXIC
+ setmoveeffect MOVE_EFFECT_TOXIC
goto BattleScript_EffectHit
BattleScript_EffectWeatherBall::
@@ -2673,7 +2675,7 @@ 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::
@@ -2723,13 +2725,13 @@ BattleScript_CosmicPowerDoMoveAnim::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x24, 0x0
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CosmicPowerTrySpDef::
setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2752,13 +2754,13 @@ BattleScript_BulkUpDoMoveAnim::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x6, 0x0
setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_BulkUpTryDef::
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpEnd
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2777,13 +2779,13 @@ BattleScript_CalmMindDoMoveAnim::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x30, 0x0
setstatchanger SPATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CalmMindTrySpDef::
setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindEnd
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2809,13 +2811,13 @@ BattleScript_DragonDanceDoMoveAnim::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0xA, 0x0
setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_DragonDanceTrySpeed::
setstatchanger SPEED, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2978,7 +2980,7 @@ BattleScript_LocalBattleLostPrintWhiteOut::
BattleScript_LocalBattleLostEnd::
end2
BattleScript_CheckDomeDrew::
- jumpifbyte EQUAL, gBattleOutcome, DREW, BattleScript_LocalBattleLostEnd_
+ jumpifbyte EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostPrintWhiteOut
returnopponentmon1toball ATTACKER
@@ -3070,7 +3072,7 @@ BattleScript_82DAADA::
end2
BattleScript_SmokeBallEscape::
- playanimation ATTACKER, ANIM_SMOKEBALL_ESCAPE, NULL
+ playanimation ATTACKER, B_ANIM_SMOKEBALL_ESCAPE, NULL
printstring STRINGID_PKMNFLEDUSINGITS
waitmessage 0x40
end2
@@ -3218,14 +3220,14 @@ BattleScript_RainContinuesOrEnds::
printfromtable gRainContinuesStringIds
waitmessage 0x40
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_RainContinuesOrEndsEnd
- playanimation ATTACKER, ANIM_RAIN_CONTINUES, NULL
+ playanimation ATTACKER, B_ANIM_RAIN_CONTINUES, NULL
BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
waitmessage 0x40
- playanimation2 ATTACKER, sANIM_ARG1, NULL
+ playanimation2 ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
@@ -3256,7 +3258,7 @@ BattleScript_SandStormHailEnds::
BattleScript_SunlightContinues::
printstring STRINGID_SUNLIGHTSTRONG
waitmessage 0x40
- playanimation ATTACKER, ANIM_SUN_CONTINUES, NULL
+ playanimation 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 ATTACKER, sB_ANIM_ARG1, NULL
end3
BattleScript_SideStatusWoreOff::
@@ -3288,7 +3290,7 @@ BattleScript_SafeguardEnds::
end2
BattleScript_LeechSeedTurnDrain::
- playanimation ATTACKER, ANIM_LEECH_SEED_DRAIN, sANIM_ARG1
+ playanimation ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate ATTACKER
datahpupdate ATTACKER
@@ -3316,7 +3318,7 @@ BattleScript_BideStoringEnergy::
BattleScript_BideAttack::
attackcanceler
- setmoveeffect EFFECT_CHARGING
+ setmoveeffect MOVE_EFFECT_CHARGING
clearstatusfromeffect ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage 0x40
@@ -3325,7 +3327,7 @@ 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
@@ -3340,7 +3342,7 @@ BattleScript_BideAttack::
BattleScript_BideNoEnergyToAttack::
attackcanceler
- setmoveeffect EFFECT_CHARGING
+ setmoveeffect MOVE_EFFECT_CHARGING
clearstatusfromeffect ATTACKER
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage 0x40
@@ -3488,27 +3490,27 @@ BattleScript_AllStatsUpAtk::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x3E, 0x0
setstatchanger ATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpDef::
setstatchanger DEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpeed::
setstatchanger SPEED, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpAtk::
setstatchanger SPATK, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpDef::
setstatchanger SPDEF, 1, FALSE
- statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpRet::
@@ -3545,10 +3547,10 @@ BattleScript_CheckDoomDesireMiss::
BattleScript_FutureAttackAnimate::
adjustnormaldamage2
jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x0, BattleScript_FutureHitAnimDoomDesire
- playanimation ATTACKER, ANIM_FUTURE_SIGHT_HIT, NULL
+ playanimation ATTACKER, B_ANIM_FUTURE_SIGHT_HIT, NULL
goto BattleScript_DoFutureAttackHit
BattleScript_FutureHitAnimDoomDesire::
- playanimation ATTACKER, ANIM_DOOM_DESIRE_HIT, NULL
+ playanimation ATTACKER, B_ANIM_DOOM_DESIRE_HIT, NULL
BattleScript_DoFutureAttackHit::
effectivenesssound
hitanimation TARGET
@@ -3619,7 +3621,7 @@ BattleScript_SelectingNotAllowedMoveTauntInPalace::
BattleScript_WishComesTrue::
trywish 0x1, BattleScript_WishButFullHp
- playanimation TARGET, ANIM_WISH_HEAL, NULL
+ playanimation TARGET, B_ANIM_WISH_HEAL, NULL
printstring STRINGID_PKMNWISHCAMETRUE
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@@ -3638,7 +3640,7 @@ BattleScript_WishButFullHp::
end2
BattleScript_IngrainTurnHeal::
- playanimation ATTACKER, ANIM_INGRAIN_HEAL, NULL
+ playanimation ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
printstring STRINGID_PKMNABSORBEDNUTRIENTS
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@@ -3657,14 +3659,14 @@ BattleScript_AtkDefDown::
playstatchangeanimation ATTACKER, 0x6, 0xD
playstatchangeanimation ATTACKER, 0x2, 0x9
setstatchanger ATK, 1, TRUE
- statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_82DB144
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB144
jumpifbyte 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
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB167
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -3672,7 +3674,7 @@ BattleScript_82DB167::
return
BattleScript_KnockedOff::
- playanimation TARGET, ANIM_ITEM_KNOCKOFF, NULL
+ playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, NULL
printstring STRINGID_PKMNKNOCKEDOFF
waitmessage 0x40
return
@@ -3709,7 +3711,7 @@ BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbanks
- playanimation TARGET, ANIM_SNATCH_MOVE, NULL
+ playanimation TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
@@ -3730,7 +3732,7 @@ BattleScript_SAtkDown2::
setbyte sFIELD_1B, 0x0
playstatchangeanimation ATTACKER, 0x10, 0xB
setstatchanger SPATK, 2, TRUE
- statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_82DB1FE
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB1FE
jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB1FE
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -3740,7 +3742,7 @@ BattleScript_82DB1FE::
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
- playanimation ATTACKER, ANIM_x14, NULL
+ playanimation ATTACKER, B_ANIM_x14, NULL
printstring STRINGID_PKMNTIGHTENINGFOCUS
waitmessage 0x40
end2
@@ -3858,7 +3860,7 @@ BattleScript_PrintPayDayMoneyString::
return
BattleScript_WrapTurnDmg::
- playanimation ATTACKER, ANIM_TURN_TRAP, sANIM_ARG1
+ playanimation ATTACKER, B_ANIM_TURN_TRAP, sB_ANIM_ARG1
printstring STRINGID_PKMNHURTBY
waitmessage 0x40
goto BattleScript_DoTurnDmg
@@ -3898,43 +3900,43 @@ BattleScript_TargetPRLZHeal::
return
BattleScript_MoveEffectSleep::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printfromtable gFellAsleepStringIds
waitmessage 0x40
BattleScript_UpdateEffectStatusIconRet::
- updatestatusicon EFFECT_BANK
+ updatestatusicon MOVE_EFFECT_BANK
waitstate
return
BattleScript_YawnMakesAsleep::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printstring STRINGID_PKMNFELLASLEEP
waitmessage 0x40
- updatestatusicon EFFECT_BANK
+ updatestatusicon MOVE_EFFECT_BANK
waitstate
- makevisible EFFECT_BANK
+ makevisible MOVE_EFFECT_BANK
end2
BattleScript_MoveEffectPoison::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printfromtable gGotPoisonedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectBurn::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printfromtable gGotBurnedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectFreeze::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printfromtable gGotFrozenStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
BattleScript_MoveEffectParalysis::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printfromtable gGotParalyzedStringIds
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
@@ -3945,7 +3947,7 @@ BattleScript_MoveEffectUproar::
return
BattleScript_MoveEffectToxic::
- statusanimation EFFECT_BANK
+ statusanimation MOVE_EFFECT_BANK
printstring STRINGID_PKMNBADLYPOISONED
waitmessage 0x40
goto BattleScript_UpdateEffectStatusIconRet
@@ -3961,7 +3963,7 @@ BattleScript_MoveEffectWrap::
return
BattleScript_MoveEffectConfusion::
- chosenstatus2animation EFFECT_BANK, STATUS2_CONFUSION
+ chosenstatus2animation MOVE_EFFECT_BANK, STATUS2_CONFUSION
printstring STRINGID_PKMNWASCONFUSED
waitmessage 0x40
return
@@ -3980,7 +3982,7 @@ BattleScript_Recoil33End::
return
BattleScript_ItemSteal::
- playanimation TARGET, ANIM_ITEM_STEAL, NULL
+ playanimation 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 BANK0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
BattleScript_SpeedBoostActivates::
- playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNRAISEDSPEED
waitmessage 0x40
end3
@@ -4017,7 +4019,7 @@ BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
- playanimation BANK0, ANIM_SANDSTORM_CONTINUES, NULL
+ playanimation BANK0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4064,7 +4066,7 @@ BattleScript_82DB4CD::
statbuffchange 0x21, BattleScript_82DB510
jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510
setgraphicalstatchangevalues
- playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1
+ playanimation 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 BANK0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -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 TARGET, B_ANIM_SUBSTITUTE_FADE, NULL
printstring STRINGID_PKMNSUBSTITUTEFADED
return
@@ -4298,7 +4300,7 @@ BattleScript_BerryCurePrlzEnd2::
end2
BattleScript_BerryCureParRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4310,7 +4312,7 @@ BattleScript_BerryCurePsnEnd2::
end2
BattleScript_BerryCurePsnRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPOISON
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4322,7 +4324,7 @@ BattleScript_BerryCureBrnEnd2::
end2
BattleScript_BerryCureBrnRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMHEALEDBURN
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4334,7 +4336,7 @@ BattleScript_BerryCureFrzEnd2::
end2
BattleScript_BerryCureFrzRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMDEFROSTEDIT
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4346,7 +4348,7 @@ BattleScript_BerryCureSlpEnd2::
end2
BattleScript_BerryCureSlpRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMWOKEIT
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4358,7 +4360,7 @@ BattleScript_BerryCureConfusionEnd2::
end2
BattleScript_BerryCureConfusionRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMSNAPPEDOUT
waitmessage 0x40
removeitem SCRIPTING_BANK
@@ -4369,7 +4371,7 @@ BattleScript_BerryCureChosenStatusEnd2::
end2
BattleScript_BerryCureChosenStatusRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printfromtable gBerryEffectStringIds
waitmessage 0x40
updatestatusicon SCRIPTING_BANK
@@ -4381,14 +4383,14 @@ BattleScript_WhiteHerbEnd2::
end2
BattleScript_WhiteHerbRet::
- playanimation SCRIPTING_BANK, ANIM_ITEM_EFFECT, NULL
+ playanimation SCRIPTING_BANK, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
waitmessage 0x40
removeitem SCRIPTING_BANK
return
BattleScript_ItemHealHP_RemoveItem::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@@ -4398,7 +4400,7 @@ BattleScript_ItemHealHP_RemoveItem::
end2
BattleScript_BerryPPHealEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDPP
waitmessage 0x40
removeitem ATTACKER
@@ -4409,7 +4411,7 @@ BattleScript_ItemHealHP_End2::
end2
BattleScript_ItemHealHP_Ret::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@@ -4422,13 +4424,13 @@ BattleScript_SelectingNotAllowedMoveChoiceItem::
endselectionscript
BattleScript_HangedOnMsg::
- playanimation TARGET, ANIM_HANGED_ON, NULL
+ playanimation TARGET, B_ANIM_HANGED_ON, NULL
printstring STRINGID_PKMNHUNGONWITHX
waitmessage 0x40
return
BattleScript_BerryConfuseHealEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@@ -4436,14 +4438,14 @@ BattleScript_BerryConfuseHealEnd2::
datahpupdate ATTACKER
printstring STRINGID_FORXCOMMAYZ
waitmessage 0x40
- setmoveeffect EFFECT_CONFUSION | AFFECTS_USER
+ setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
removeitem ATTACKER
end2
BattleScript_BerryStatRaiseEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
- statbuffchange AFFECTS_USER | 0x1, BattleScript_82DB85B
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
+ statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_82DB85B
BattleScript_82DB85B::
setbyte cMULTISTRING_CHOOSER, 0x4
call BattleScript_StatUp
@@ -4451,7 +4453,7 @@ BattleScript_82DB85B::
end2
BattleScript_BerryFocusEnergyEnd2::
- playanimation ATTACKER, ANIM_ITEM_EFFECT, NULL
+ playanimation ATTACKER, B_ANIM_ITEM_EFFECT, NULL
printstring STRINGID_PKMNUSEDXTOGETPUMPED
waitmessage 0x40
removeitem ATTACKER
@@ -4520,8 +4522,8 @@ BattleScript_82DB8F3::
various9 ATTACKER
pause 0x40
various9 ATTACKER
- various16 EFFECT_BANK
- various17 EFFECT_BANK
+ various16 MOVE_EFFECT_BANK
+ various17 MOVE_EFFECT_BANK
various9 ATTACKER
various16 GBANK_1
various17 GBANK_1
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 9cd6a4d7d..d193310dd 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -1,3 +1,6 @@
+#include "constants/battle.h"
+#include "constants/battle_anim.h"
+#include "constants/battle_string_ids.h"
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc"
@@ -5,7 +8,6 @@
.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
@@ -81,12 +83,12 @@ 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::
@@ -96,7 +98,7 @@ BattleScript_ShakeBallThrow::
jumpifbyte 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
@@ -172,7 +174,7 @@ BattleScript_OpponentUsesGuardSpecs::
BattleScript_RunByUsingItem::
playse SE_NIGERU
- setbyte gBattleOutcome, RAN
+ setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
@@ -188,7 +190,7 @@ BattleScript_ActionGetNear::
BattleScript_ActionThrowPokeblock::
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
- playanimation ATTACKER, ANIM_x4, NULL
+ playanimation ATTACKER, B_ANIM_x4, NULL
printfromtable gSafariPokeblockResultStringIds
waitmessage 0x40
end2
diff --git a/include/battle.h b/include/battle.h
index 3933c5bc4..9e755aaec 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -2,6 +2,7 @@
#define GUARD_BATTLE_H
// should they be included here or included individually by every file?
+#include "constants/battle.h"
#include "battle_util.h"
#include "battle_script_commands.h"
#include "battle_main.h"
@@ -10,210 +11,16 @@
#include "battle_util2.h"
#include "battle_bg.h"
-/*
- * A battler may be in one of four positions on the field. The first bit determines
- * what side the battler is on, either the player's side or the opponent's side.
- * The second bit determines what flank the battler is on, either the left or right.
- * Note that the opponent's flanks are drawn corresponding to their perspective, so
- * their right mon appears on the left, and their left mon appears on the right.
- * The battler ID is usually the same as the position, except in the case of link battles.
- *
- * + ------------------------- +
- * | Opponent's side |
- * | Right Left |
- * | 3 1 |
- * | |
- * | Player's side |
- * | Left Right |
- * | 0 2 |
- * ----------------------------+
- * | |
- * | |
- * +---------------------------+
- */
-
-#define MAX_BATTLERS_COUNT 4
-
-#define B_POSITION_PLAYER_LEFT 0
-#define B_POSITION_OPPONENT_LEFT 1
-#define B_POSITION_PLAYER_RIGHT 2
-#define B_POSITION_OPPONENT_RIGHT 3
-
-// These macros can be used with either battler ID or positions to get the partner or the opposite mon
-#define BATTLE_OPPOSITE(id) ((id) ^ 1)
-#define BATTLE_PARTNER(id) ((id) ^ 2)
-
-#define B_SIDE_PLAYER 0
-#define B_SIDE_OPPONENT 1
-
-#define B_FLANK_LEFT 0
-#define B_FLANK_RIGHT 1
-
-#define BIT_SIDE 1
-#define BIT_FLANK 2
-
#define GET_BATTLER_POSITION(battler) (gBattlerPositions[battler])
#define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE)
#define GET_BATTLER_SIDE2(battler) (GET_BATTLER_POSITION(battler) & BIT_SIDE)
-// Battle Type Flags
-
-#define BATTLE_TYPE_DOUBLE 0x0001
-#define BATTLE_TYPE_LINK 0x0002
-#define BATTLE_TYPE_WILD 0x0004
-#define BATTLE_TYPE_TRAINER 0x0008
-#define BATTLE_TYPE_FIRST_BATTLE 0x0010
-#define BATTLE_TYPE_20 0x0020
-#define BATTLE_TYPE_MULTI 0x0040
-#define BATTLE_TYPE_SAFARI 0x0080
-#define BATTLE_TYPE_BATTLE_TOWER 0x0100
-#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200
-#define BATTLE_TYPE_ROAMER 0x0400
-#define BATTLE_TYPE_EREADER_TRAINER 0x0800
-#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000
-#define BATTLE_TYPE_LEGENDARY 0x2000
-#define BATTLE_TYPE_REGI 0x4000
-#define BATTLE_TYPE_TWO_OPPONENTS 0x8000
-#define BATTLE_TYPE_DOME 0x10000
-#define BATTLE_TYPE_PALACE 0x20000
-#define BATTLE_TYPE_ARENA 0x40000
-#define BATTLE_TYPE_FACTORY 0x80000
-#define BATTLE_TYPE_PIKE 0x100000
-#define BATTLE_TYPE_PYRAMID 0x200000
-#define BATTLE_TYPE_INGAME_PARTNER 0x400000
-#define BATTLE_TYPE_x800000 0x800000
-#define BATTLE_TYPE_RECORDED 0x1000000
-#define BATTLE_TYPE_x2000000 0x2000000
-#define BATTLE_TYPE_x4000000 0x4000000
-#define BATTLE_TYPE_SECRET_BASE 0x8000000
-#define BATTLE_TYPE_GROUDON 0x10000000
-#define BATTLE_TYPE_KYOGRE 0x20000000
-#define BATTLE_TYPE_RAYQUAZA 0x40000000
-#define BATTLE_TYPE_x80000000 0x80000000
-#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
-#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
-
-
#define TRAINER_OPPONENT_3FE 0x3FE
#define TRAINER_OPPONENT_C00 0xC00
#define TRAINER_OPPONENT_800 0x800
#define STEVEN_PARTNER_ID 0xC03
#define SECRET_BASE_OPPONENT 0x400
-#define B_OUTCOME_WON 0x1
-#define B_OUTCOME_LOST 0x2
-#define B_OUTCOME_DREW 0x3
-#define B_OUTCOME_RAN 0x4
-#define B_OUTCOME_PLAYER_TELEPORTED 0x5
-#define B_OUTCOME_POKE_FLED 0x6
-#define B_OUTCOME_CAUGHT_POKE 0x7
-#define B_OUTCOME_NO_SAFARI_BALLS 0x8
-#define B_OUTCOME_FORFEITED 0x9
-#define B_OUTCOME_POKE_TELEPORTED 0xA
-#define B_OUTCOME_LINK_BATTLE_RAN 0x80
-
-
-// Non-volatile status conditions
-// These persist remain outside of battle and after switching out
-#define STATUS1_NONE 0x0
-#define STATUS1_SLEEP 0x7
-#define STATUS1_POISON 0x8
-#define STATUS1_BURN 0x10
-#define STATUS1_FREEZE 0x20
-#define STATUS1_PARALYSIS 0x40
-#define STATUS1_TOXIC_POISON 0x80
-#define STATUS1_TOXIC_COUNTER 0xF00
-#define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON)
-#define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)
-
-// Volatile status ailments
-// These are removed after exiting the battle or switching out
-#define STATUS2_CONFUSION 0x00000007
-#define STATUS2_FLINCHED 0x00000008
-#define STATUS2_UPROAR 0x00000070
-#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200
-#define STATUS2_LOCK_CONFUSE 0x00000C00
-#define STATUS2_MULTIPLETURNS 0x00001000
-#define STATUS2_WRAPPED 0x0000E000
-#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every battler
-#define STATUS2_INFATUATED_WITH(battler) (gBitTable[battler] << 16)
-#define STATUS2_FOCUS_ENERGY 0x00100000
-#define STATUS2_TRANSFORMED 0x00200000
-#define STATUS2_RECHARGE 0x00400000
-#define STATUS2_RAGE 0x00800000
-#define STATUS2_SUBSTITUTE 0x01000000
-#define STATUS2_DESTINY_BOND 0x02000000
-#define STATUS2_ESCAPE_PREVENTION 0x04000000
-#define STATUS2_NIGHTMARE 0x08000000
-#define STATUS2_CURSED 0x10000000
-#define STATUS2_FORESIGHT 0x20000000
-#define STATUS2_DEFENSE_CURL 0x40000000
-#define STATUS2_TORMENT 0x80000000
-
-// Seems like per-battler statuses. Not quite sure how to categorize these
-#define STATUS3_LEECHSEED_BANK 0x3
-#define STATUS3_LEECHSEED 0x4
-#define STATUS3_ALWAYS_HITS 0x18 // two bits
-#define STATUS3_PERISH_SONG 0x20
-#define STATUS3_ON_AIR 0x40
-#define STATUS3_UNDERGROUND 0x80
-#define STATUS3_MINIMIZED 0x100
-#define STATUS3_ROOTED 0x400
-#define STATUS3_CHARGED_UP 0x200
-#define STATUS3_YAWN 0x1800 // two bits
-#define STATUS3_IMPRISONED_OTHERS 0x2000
-#define STATUS3_GRUDGE 0x4000
-#define STATUS3_CANT_SCORE_A_CRIT 0x8000
-#define STATUS3_MUDSPORT 0x10000
-#define STATUS3_WATERSPORT 0x20000
-#define STATUS3_UNDERWATER 0x40000
-#define STATUS3_INTIMIDATE_POKES 0x80000
-#define STATUS3_TRACE 0x100000
-#define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)
-
-
-// Not really sure what a "hitmarker" is.
-
-#define HITMARKER_x10 0x00000010
-#define HITMARKER_x20 0x00000020
-#define HITMARKER_DESTINYBOND 0x00000040
-#define HITMARKER_NO_ANIMATIONS 0x00000080
-#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100
-#define HITMARKER_NO_ATTACKSTRING 0x00000200
-#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400
-#define HITMARKER_NO_PPDEDUCT 0x00000800
-#define HITMARKER_PURSUIT_TRAP 0x00001000
-#define HITMARKER_IGNORE_SAFEGUARD 0x00002000
-#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000
-#define HITMARKER_RUN 0x00008000
-#define HITMARKER_IGNORE_ON_AIR 0x00010000
-#define HITMARKER_IGNORE_UNDERGROUND 0x00020000
-#define HITMARKER_IGNORE_UNDERWATER 0x00040000
-#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
-#define HITMARKER_x100000 0x00100000
-#define HITMARKER_x200000 0x00200000
-#define HITMARKER_x400000 0x00400000
-#define HITMARKER_x800000 0x00800000
-#define HITMARKER_GRUDGE 0x01000000
-#define HITMARKER_OBEYS 0x02000000
-#define HITMARKER_x4000000 0x04000000
-#define HITMARKER_x8000000 0x08000000
-#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
-#define HITMARKER_UNK(battler) (0x10000000 << battler)
-
-
-// Per-side statuses that affect an entire party
-
-#define SIDE_STATUS_REFLECT (1 << 0)
-#define SIDE_STATUS_LIGHTSCREEN (1 << 1)
-#define SIDE_STATUS_X4 (1 << 2)
-#define SIDE_STATUS_SPIKES (1 << 4)
-#define SIDE_STATUS_SAFEGUARD (1 << 5)
-#define SIDE_STATUS_FUTUREATTACK (1 << 6)
-#define SIDE_STATUS_MIST (1 << 8)
-#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
-
-
// Battle Actions
// These determine what each battler will do in a turn
#define B_ACTION_USE_MOVE 0
@@ -233,36 +40,9 @@
#define B_ACTION_NOTHING_FAINTED 13 // when choosing an action
#define B_ACTION_NONE 0xFF
-#define MOVE_RESULT_MISSED (1 << 0)
-#define MOVE_RESULT_SUPER_EFFECTIVE (1 << 1)
-#define MOVE_RESULT_NOT_VERY_EFFECTIVE (1 << 2)
-#define MOVE_RESULT_DOESNT_AFFECT_FOE (1 << 3)
-#define MOVE_RESULT_ONE_HIT_KO (1 << 4)
-#define MOVE_RESULT_FAILED (1 << 5)
-#define MOVE_RESULT_FOE_ENDURED (1 << 6)
-#define MOVE_RESULT_FOE_HUNG_ON (1 << 7)
-#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
-
#define MAX_TRAINER_ITEMS 4
#define MAX_MON_MOVES 4
-// Battle Weather flags
-
-#define WEATHER_RAIN_TEMPORARY (1 << 0)
-#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused
-#define WEATHER_RAIN_PERMANENT (1 << 2)
-#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)
-#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
-#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
-#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
-#define WEATHER_SUN_TEMPORARY (1 << 5)
-#define WEATHER_SUN_PERMANENT (1 << 6)
-#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
-#define WEATHER_HAIL (1 << 7)
-#define WEATHER_HAIL_ANY (WEATHER_HAIL)
-#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
-
-
#define BATTLE_TERRAIN_GRASS 0
#define BATTLE_TERRAIN_LONG_GRASS 1
#define BATTLE_TERRAIN_SAND 2
@@ -274,7 +54,6 @@
#define BATTLE_TERRAIN_BUILDING 8
#define BATTLE_TERRAIN_PLAIN 9
-
// array entries for battle communication
#define MULTIUSE_STATE 0x0
#define CURSOR_POSITION 0x1
@@ -732,72 +511,6 @@ struct BattleStruct
typeArg = gBattleMoves[move].type; \
}
-#define MOVE_EFFECT_SLEEP 0x1
-#define MOVE_EFFECT_POISON 0x2
-#define MOVE_EFFECT_BURN 0x3
-#define MOVE_EFFECT_FREEZE 0x4
-#define MOVE_EFFECT_PARALYSIS 0x5
-#define MOVE_EFFECT_TOXIC 0x6
-#define MOVE_EFFECT_CONFUSION 0x7
-#define MOVE_EFFECT_FLINCH 0x8
-#define MOVE_EFFECT_TRI_ATTACK 0x9
-#define MOVE_EFFECT_UPROAR 0xA
-#define MOVE_EFFECT_PAYDAY 0xB
-#define MOVE_EFFECT_CHARGING 0xC
-#define MOVE_EFFECT_WRAP 0xD
-#define MOVE_EFFECT_RECOIL_25 0xE
-#define MOVE_EFFECT_ATK_PLUS_1 0xF
-#define MOVE_EFFECT_DEF_PLUS_1 0x10
-#define MOVE_EFFECT_SPD_PLUS_1 0x11
-#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12
-#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13
-#define MOVE_EFFECT_ACC_PLUS_1 0x14
-#define MOVE_EFFECT_EVS_PLUS_1 0x15
-#define MOVE_EFFECT_ATK_MINUS_1 0x16
-#define MOVE_EFFECT_DEF_MINUS_1 0x17
-#define MOVE_EFFECT_SPD_MINUS_1 0x18
-#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19
-#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A
-#define MOVE_EFFECT_ACC_MINUS_1 0x1B
-#define MOVE_EFFECT_EVS_MINUS_1 0x1C
-#define MOVE_EFFECT_RECHARGE 0x1D
-#define MOVE_EFFECT_RAGE 0x1E
-#define MOVE_EFFECT_STEAL_ITEM 0x1F
-#define MOVE_EFFECT_PREVENT_ESCAPE 0x20
-#define MOVE_EFFECT_NIGHTMARE 0x21
-#define MOVE_EFFECT_ALL_STATS_UP 0x22
-#define MOVE_EFFECT_RAPIDSPIN 0x23
-#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24
-#define MOVE_EFFECT_ATK_DEF_DOWN 0x25
-#define MOVE_EFFECT_RECOIL_33_PARALYSIS 0x26
-#define MOVE_EFFECT_ATK_PLUS_2 0x27
-#define MOVE_EFFECT_DEF_PLUS_2 0x28
-#define MOVE_EFFECT_SPD_PLUS_2 0x29
-#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A
-#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B
-#define MOVE_EFFECT_ACC_PLUS_2 0x2C
-#define MOVE_EFFECT_EVS_PLUS_2 0x2D
-#define MOVE_EFFECT_ATK_MINUS_2 0x2E
-#define MOVE_EFFECT_DEF_MINUS_2 0x2F
-#define MOVE_EFFECT_SPD_MINUS_2 0x30
-#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31
-#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32
-#define MOVE_EFFECT_ACC_MINUS_2 0x33
-#define MOVE_EFFECT_EVS_MINUS_2 0x34
-#define MOVE_EFFECT_THRASH 0x35
-#define MOVE_EFFECT_KNOCK_OFF 0x36
-#define MOVE_EFFECT_NOTHING_37 0x37
-#define MOVE_EFFECT_NOTHING_38 0x38
-#define MOVE_EFFECT_NOTHING_39 0x39
-#define MOVE_EFFECT_NOTHING_3A 0x3A
-#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B
-#define MOVE_EFFECT_NOTHING_3C 0x3C
-#define MOVE_EFFECT_NOTHING_3D 0x3D
-#define MOVE_EFFECT_NOTHING_3E 0x3E
-#define MOVE_EFFECT_NOTHING_3F 0x3F
-#define MOVE_EFFECT_AFFECTS_USER 0x40
-#define MOVE_EFFECT_CERTAIN 0x80
-
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
diff --git a/include/constants/battle.h b/include/constants/battle.h
new file mode 100644
index 000000000..f3d7a8e0e
--- /dev/null
+++ b/include/constants/battle.h
@@ -0,0 +1,284 @@
+#ifndef GUARD_CONSTANTS_BATTLE_H
+#define GUARD_CONSTANTS_BATTLE_H
+
+/*
+ * A battler may be in one of four positions on the field. The first bit determines
+ * what side the battler is on, either the player's side or the opponent's side.
+ * The second bit determines what flank the battler is on, either the left or right.
+ * Note that the opponent's flanks are drawn corresponding to their perspective, so
+ * their right mon appears on the left, and their left mon appears on the right.
+ * The battler ID is usually the same as the position, except in the case of link battles.
+ *
+ * + ------------------------- +
+ * | Opponent's side |
+ * | Right Left |
+ * | 3 1 |
+ * | |
+ * | Player's side |
+ * | Left Right |
+ * | 0 2 |
+ * ----------------------------+
+ * | |
+ * | |
+ * +---------------------------+
+ */
+
+#define MAX_BATTLERS_COUNT 4
+
+#define B_POSITION_PLAYER_LEFT 0
+#define B_POSITION_OPPONENT_LEFT 1
+#define B_POSITION_PLAYER_RIGHT 2
+#define B_POSITION_OPPONENT_RIGHT 3
+
+// These macros can be used with either battler ID or positions to get the partner or the opposite mon
+#define BATTLE_OPPOSITE(id) ((id) ^ 1)
+#define BATTLE_PARTNER(id) ((id) ^ 2)
+
+#define B_SIDE_PLAYER 0
+#define B_SIDE_OPPONENT 1
+
+#define B_FLANK_LEFT 0
+#define B_FLANK_RIGHT 1
+
+#define BIT_SIDE 1
+#define BIT_FLANK 2
+
+// Battle Type Flags
+#define BATTLE_TYPE_DOUBLE 0x0001
+#define BATTLE_TYPE_LINK 0x0002
+#define BATTLE_TYPE_WILD 0x0004
+#define BATTLE_TYPE_TRAINER 0x0008
+#define BATTLE_TYPE_FIRST_BATTLE 0x0010
+#define BATTLE_TYPE_20 0x0020
+#define BATTLE_TYPE_MULTI 0x0040
+#define BATTLE_TYPE_SAFARI 0x0080
+#define BATTLE_TYPE_BATTLE_TOWER 0x0100
+#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200
+#define BATTLE_TYPE_ROAMER 0x0400
+#define BATTLE_TYPE_EREADER_TRAINER 0x0800
+#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000
+#define BATTLE_TYPE_LEGENDARY 0x2000
+#define BATTLE_TYPE_REGI 0x4000
+#define BATTLE_TYPE_TWO_OPPONENTS 0x8000
+#define BATTLE_TYPE_DOME 0x10000
+#define BATTLE_TYPE_PALACE 0x20000
+#define BATTLE_TYPE_ARENA 0x40000
+#define BATTLE_TYPE_FACTORY 0x80000
+#define BATTLE_TYPE_PIKE 0x100000
+#define BATTLE_TYPE_PYRAMID 0x200000
+#define BATTLE_TYPE_INGAME_PARTNER 0x400000
+#define BATTLE_TYPE_x800000 0x800000
+#define BATTLE_TYPE_RECORDED 0x1000000
+#define BATTLE_TYPE_x2000000 0x2000000
+#define BATTLE_TYPE_x4000000 0x4000000
+#define BATTLE_TYPE_SECRET_BASE 0x8000000
+#define BATTLE_TYPE_GROUDON 0x10000000
+#define BATTLE_TYPE_KYOGRE 0x20000000
+#define BATTLE_TYPE_RAYQUAZA 0x40000000
+#define BATTLE_TYPE_x80000000 0x80000000
+#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
+#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
+
+// Battle Outcome defines
+#define B_OUTCOME_WON 0x1
+#define B_OUTCOME_LOST 0x2
+#define B_OUTCOME_DREW 0x3
+#define B_OUTCOME_RAN 0x4
+#define B_OUTCOME_PLAYER_TELEPORTED 0x5
+#define B_OUTCOME_MON_FLED 0x6
+#define B_OUTCOME_CAUGHT 0x7
+#define B_OUTCOME_NO_SAFARI_BALLS 0x8
+#define B_OUTCOME_FORFEITED 0x9
+#define B_OUTCOME_MON_TELEPORTED 0xA
+#define B_OUTCOME_LINK_BATTLE_RAN 0x80
+
+// Non-volatile status conditions
+// These persist remain outside of battle and after switching out
+#define STATUS1_NONE 0x0
+#define STATUS1_SLEEP 0x7
+#define STATUS1_POISON 0x8
+#define STATUS1_BURN 0x10
+#define STATUS1_FREEZE 0x20
+#define STATUS1_PARALYSIS 0x40
+#define STATUS1_TOXIC_POISON 0x80
+#define STATUS1_TOXIC_COUNTER 0xF00
+#define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON)
+#define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)
+
+// Volatile status ailments
+// These are removed after exiting the battle or switching out
+#define STATUS2_CONFUSION 0x00000007
+#define STATUS2_FLINCHED 0x00000008
+#define STATUS2_UPROAR 0x00000070
+#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200
+#define STATUS2_LOCK_CONFUSE 0x00000C00
+#define STATUS2_MULTIPLETURNS 0x00001000
+#define STATUS2_WRAPPED 0x0000E000
+#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every battler
+#define STATUS2_INFATUATED_WITH(battler) (gBitTable[battler] << 16)
+#define STATUS2_FOCUS_ENERGY 0x00100000
+#define STATUS2_TRANSFORMED 0x00200000
+#define STATUS2_RECHARGE 0x00400000
+#define STATUS2_RAGE 0x00800000
+#define STATUS2_SUBSTITUTE 0x01000000
+#define STATUS2_DESTINY_BOND 0x02000000
+#define STATUS2_ESCAPE_PREVENTION 0x04000000
+#define STATUS2_NIGHTMARE 0x08000000
+#define STATUS2_CURSED 0x10000000
+#define STATUS2_FORESIGHT 0x20000000
+#define STATUS2_DEFENSE_CURL 0x40000000
+#define STATUS2_TORMENT 0x80000000
+
+// Seems like per-battler statuses. Not quite sure how to categorize these
+#define STATUS3_LEECHSEED_BANK 0x3
+#define STATUS3_LEECHSEED 0x4
+#define STATUS3_ALWAYS_HITS 0x18 // two bits
+#define STATUS3_PERISH_SONG 0x20
+#define STATUS3_ON_AIR 0x40
+#define STATUS3_UNDERGROUND 0x80
+#define STATUS3_MINIMIZED 0x100
+#define STATUS3_ROOTED 0x400
+#define STATUS3_CHARGED_UP 0x200
+#define STATUS3_YAWN 0x1800 // two bits
+#define STATUS3_IMPRISONED_OTHERS 0x2000
+#define STATUS3_GRUDGE 0x4000
+#define STATUS3_CANT_SCORE_A_CRIT 0x8000
+#define STATUS3_MUDSPORT 0x10000
+#define STATUS3_WATERSPORT 0x20000
+#define STATUS3_UNDERWATER 0x40000
+#define STATUS3_INTIMIDATE_POKES 0x80000
+#define STATUS3_TRACE 0x100000
+#define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)
+
+// Not really sure what a "hitmarker" is.
+#define HITMARKER_x10 0x00000010
+#define HITMARKER_x20 0x00000020
+#define HITMARKER_DESTINYBOND 0x00000040
+#define HITMARKER_NO_ANIMATIONS 0x00000080
+#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100
+#define HITMARKER_NO_ATTACKSTRING 0x00000200
+#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400
+#define HITMARKER_NO_PPDEDUCT 0x00000800
+#define HITMARKER_PURSUIT_TRAP 0x00001000
+#define HITMARKER_IGNORE_SAFEGUARD 0x00002000
+#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000
+#define HITMARKER_RUN 0x00008000
+#define HITMARKER_IGNORE_ON_AIR 0x00010000
+#define HITMARKER_IGNORE_UNDERGROUND 0x00020000
+#define HITMARKER_IGNORE_UNDERWATER 0x00040000
+#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
+#define HITMARKER_x100000 0x00100000
+#define HITMARKER_x200000 0x00200000
+#define HITMARKER_x400000 0x00400000
+#define HITMARKER_x800000 0x00800000
+#define HITMARKER_GRUDGE 0x01000000
+#define HITMARKER_OBEYS 0x02000000
+#define HITMARKER_x4000000 0x04000000
+#define HITMARKER_x8000000 0x08000000
+#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
+#define HITMARKER_UNK(battler) (0x10000000 << battler)
+
+// Per-side statuses that affect an entire party
+#define SIDE_STATUS_REFLECT (1 << 0)
+#define SIDE_STATUS_LIGHTSCREEN (1 << 1)
+#define SIDE_STATUS_X4 (1 << 2)
+#define SIDE_STATUS_SPIKES (1 << 4)
+#define SIDE_STATUS_SAFEGUARD (1 << 5)
+#define SIDE_STATUS_FUTUREATTACK (1 << 6)
+#define SIDE_STATUS_MIST (1 << 8)
+#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
+
+// Flags describing move's result
+#define MOVE_RESULT_MISSED (1 << 0)
+#define MOVE_RESULT_SUPER_EFFECTIVE (1 << 1)
+#define MOVE_RESULT_NOT_VERY_EFFECTIVE (1 << 2)
+#define MOVE_RESULT_DOESNT_AFFECT_FOE (1 << 3)
+#define MOVE_RESULT_ONE_HIT_KO (1 << 4)
+#define MOVE_RESULT_FAILED (1 << 5)
+#define MOVE_RESULT_FOE_ENDURED (1 << 6)
+#define MOVE_RESULT_FOE_HUNG_ON (1 << 7)
+#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
+
+// Battle Weather flags
+#define WEATHER_RAIN_TEMPORARY (1 << 0)
+#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused
+#define WEATHER_RAIN_PERMANENT (1 << 2)
+#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)
+#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
+#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
+#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
+#define WEATHER_SUN_TEMPORARY (1 << 5)
+#define WEATHER_SUN_PERMANENT (1 << 6)
+#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
+#define WEATHER_HAIL (1 << 7)
+#define WEATHER_HAIL_ANY (WEATHER_HAIL)
+#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
+
+// Move Effects
+#define MOVE_EFFECT_SLEEP 0x1
+#define MOVE_EFFECT_POISON 0x2
+#define MOVE_EFFECT_BURN 0x3
+#define MOVE_EFFECT_FREEZE 0x4
+#define MOVE_EFFECT_PARALYSIS 0x5
+#define MOVE_EFFECT_TOXIC 0x6
+#define MOVE_EFFECT_CONFUSION 0x7
+#define MOVE_EFFECT_FLINCH 0x8
+#define MOVE_EFFECT_TRI_ATTACK 0x9
+#define MOVE_EFFECT_UPROAR 0xA
+#define MOVE_EFFECT_PAYDAY 0xB
+#define MOVE_EFFECT_CHARGING 0xC
+#define MOVE_EFFECT_WRAP 0xD
+#define MOVE_EFFECT_RECOIL_25 0xE
+#define MOVE_EFFECT_ATK_PLUS_1 0xF
+#define MOVE_EFFECT_DEF_PLUS_1 0x10
+#define MOVE_EFFECT_SPD_PLUS_1 0x11
+#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12
+#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13
+#define MOVE_EFFECT_ACC_PLUS_1 0x14
+#define MOVE_EFFECT_EVS_PLUS_1 0x15
+#define MOVE_EFFECT_ATK_MINUS_1 0x16
+#define MOVE_EFFECT_DEF_MINUS_1 0x17
+#define MOVE_EFFECT_SPD_MINUS_1 0x18
+#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19
+#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A
+#define MOVE_EFFECT_ACC_MINUS_1 0x1B
+#define MOVE_EFFECT_EVS_MINUS_1 0x1C
+#define MOVE_EFFECT_RECHARGE 0x1D
+#define MOVE_EFFECT_RAGE 0x1E
+#define MOVE_EFFECT_STEAL_ITEM 0x1F
+#define MOVE_EFFECT_PREVENT_ESCAPE 0x20
+#define MOVE_EFFECT_NIGHTMARE 0x21
+#define MOVE_EFFECT_ALL_STATS_UP 0x22
+#define MOVE_EFFECT_RAPIDSPIN 0x23
+#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24
+#define MOVE_EFFECT_ATK_DEF_DOWN 0x25
+#define MOVE_EFFECT_RECOIL_33_PARALYSIS 0x26
+#define MOVE_EFFECT_ATK_PLUS_2 0x27
+#define MOVE_EFFECT_DEF_PLUS_2 0x28
+#define MOVE_EFFECT_SPD_PLUS_2 0x29
+#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A
+#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B
+#define MOVE_EFFECT_ACC_PLUS_2 0x2C
+#define MOVE_EFFECT_EVS_PLUS_2 0x2D
+#define MOVE_EFFECT_ATK_MINUS_2 0x2E
+#define MOVE_EFFECT_DEF_MINUS_2 0x2F
+#define MOVE_EFFECT_SPD_MINUS_2 0x30
+#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31
+#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32
+#define MOVE_EFFECT_ACC_MINUS_2 0x33
+#define MOVE_EFFECT_EVS_MINUS_2 0x34
+#define MOVE_EFFECT_THRASH 0x35
+#define MOVE_EFFECT_KNOCK_OFF 0x36
+#define MOVE_EFFECT_NOTHING_37 0x37
+#define MOVE_EFFECT_NOTHING_38 0x38
+#define MOVE_EFFECT_NOTHING_39 0x39
+#define MOVE_EFFECT_NOTHING_3A 0x3A
+#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B
+#define MOVE_EFFECT_NOTHING_3C 0x3C
+#define MOVE_EFFECT_NOTHING_3D 0x3D
+#define MOVE_EFFECT_NOTHING_3E 0x3E
+#define MOVE_EFFECT_NOTHING_3F 0x3F
+#define MOVE_EFFECT_AFFECTS_USER 0x40
+#define MOVE_EFFECT_CERTAIN 0x80
+
+#endif // GUARD_CONSTANTS_BATTLE_H
diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
index 92eac11fa..7d2c70307 100644
--- a/include/constants/battle_ai.h
+++ b/include/constants/battle_ai.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_AI_H
-#define GUARD_BATTLE_AI_H
+#ifndef GUARD_CONSTANTS_BATTLE_AI_H
+#define GUARD_CONSTANTS_BATTLE_AI_H
// battlers
#define AI_TARGET 0
@@ -49,4 +49,4 @@
#define AI_SCRIPT_SAFARI (1 << 30)
#define AI_SCRIPT_FIRST_BATTLE (1 << 31)
-#endif // GUARD_BATTLE_AI_H
+#endif // GUARD_CONSTANTS_BATTLE_AI_H
diff --git a/include/battle_string_ids.h b/include/constants/battle_string_ids.h
index f242284b0..db9ed59bd 100644
--- a/include/battle_string_ids.h
+++ b/include/constants/battle_string_ids.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_STRING_IDS_H
-#define GUARD_BATTLE_STRING_IDS_H
+#ifndef GUARD_CONSTANTS_BATTLE_STRING_IDS_H
+#define GUARD_CONSTANTS_BATTLE_STRING_IDS_H
#define BATTLESTRINGS_COUNT 369
@@ -12,7 +12,6 @@
#define STRINGID_USEDMOVE 4
#define STRINGID_BATTLEEND 5
-
// todo: make some of those names less vague: attacker/target vs pkmn, etc.
#define STRINGID_TRAINER1LOSETEXT 12
#define STRINGID_PKMNGAINEDEXP 13
@@ -384,4 +383,4 @@
#define STRINGID_TRAINER1WINTEXT 379
#define STRINGID_TRAINER2WINTEXT 380
-#endif // GUARD_BATTLE_STRING_IDS_H
+#endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H
diff --git a/src/battle_main.c b/src/battle_main.c
index be0e3d2b0..22468196f 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -43,7 +43,7 @@
#include "roamer.h"
#include "tv.h"
#include "safari_zone.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
#include "data2.h"
#include "decompress.h"
@@ -330,11 +330,11 @@ static void (* const sEndTurnFuncsTable[])(void) =
HandleEndTurn_BattleLost, // B_OUTCOME_DREW
HandleEndTurn_RanFromBattle, // B_OUTCOME_RAN
HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED
- HandleEndTurn_MonFled, // B_OUTCOME_POKE_FLED
- HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT_POKE
+ HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED
+ HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT
HandleEndTurn_FinishBattle, // battle outcome 8
HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED
- HandleEndTurn_FinishBattle, // B_OUTCOME_POKE_TELEPORTED
+ HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED
};
const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@@ -5025,7 +5025,7 @@ static void ReturnFromBattleToOverworld(void)
if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
{
UpdateRoamerHPStatus(&gEnemyParty[0]);
- if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+ if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT)
SetRoamerInactive();
}
@@ -5496,7 +5496,7 @@ static void HandleAction_Run(void)
else
{
gCurrentTurnActionNumber = gBattlersCount;
- gBattleOutcome = B_OUTCOME_POKE_FLED;
+ gBattleOutcome = B_OUTCOME_MON_FLED;
}
}
}
diff --git a/src/battle_message.c b/src/battle_message.c
index e37a6883f..2f7124554 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "battle.h"
#include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
#include "constants/moves.h"
#include "text.h"
#include "string_util.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 57aff68ec..753dd1f7e 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -38,7 +38,7 @@
#include "pokemon_storage_system.h"
#include "task.h"
#include "naming_screen.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
#include "battle_setup.h"
#include "overworld.h"
@@ -7053,7 +7053,7 @@ static void atk76_various(void)
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
else
- gBattleOutcome = B_OUTCOME_POKE_TELEPORTED;
+ gBattleOutcome = B_OUTCOME_MON_TELEPORTED;
break;
case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
BtlController_EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 04496ffcd..81600cab7 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -993,8 +993,8 @@ static bool32 IsPlayerDefeated(u32 battleOutcome)
case B_OUTCOME_WON:
case B_OUTCOME_RAN:
case B_OUTCOME_PLAYER_TELEPORTED:
- case B_OUTCOME_POKE_FLED:
- case B_OUTCOME_CAUGHT_POKE:
+ case B_OUTCOME_MON_FLED:
+ case B_OUTCOME_CAUGHT:
return FALSE;
default:
return FALSE;
diff --git a/src/battle_util.c b/src/battle_util.c
index 861ef0f58..06d80d7ca 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -15,7 +15,7 @@
#include "text.h"
#include "string_util.h"
#include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
#include "battle_ai_script_commands.h"
#include "battle_controllers.h"
#include "event_data.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 3004af93c..e7a9d7cbd 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -21,7 +21,7 @@
#include "constants/songs.h"
#include "overworld.h"
#include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
#include "gpu_regs.h"
#include "bg.h"
#include "link.h"
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 12da73090..dd3cf3733 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -108,7 +108,7 @@ void SafariZoneRetirePrompt(void)
void CB2_EndSafariBattle(void)
{
sSafariZoneFleedMons += gBattleResults.field_1F;
- if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+ if (gBattleOutcome == B_OUTCOME_CAUGHT)
sSafariZoneCaughtMons++;
if (gNumSafariBalls != 0)
{
@@ -121,7 +121,7 @@ void CB2_EndSafariBattle(void)
gFieldCallback = sub_80AF6F0;
SetMainCallback2(c2_load_new_map);
}
- else if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+ else if (gBattleOutcome == B_OUTCOME_CAUGHT)
{
ScriptContext1_SetupScript(EventScript_2A4B9B);
ScriptContext1_Stop();
diff --git a/src/tv.c b/src/tv.c
index 0fb2997ad..ddcff9f1d 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1208,7 +1208,7 @@ void PutPokemonTodayFailedOnTheAir(void)
{
ct = 0xFF;
}
- if (ct > 2 && (gBattleOutcome == B_OUTCOME_POKE_FLED || gBattleOutcome == B_OUTCOME_WON))
+ if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON))
{
sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE)
@@ -2406,7 +2406,7 @@ void sub_80EE184(void)
case B_OUTCOME_DREW:
show->breakingNews.kind = TVSHOW_OFF_AIR;
return;
- case B_OUTCOME_CAUGHT_POKE:
+ case B_OUTCOME_CAUGHT:
show->breakingNews.outcome = 0;
break;
case B_OUTCOME_WON:
@@ -2417,8 +2417,8 @@ void sub_80EE184(void)
case B_OUTCOME_NO_SAFARI_BALLS:
show->breakingNews.outcome = 2;
break;
- case B_OUTCOME_POKE_FLED:
- case B_OUTCOME_POKE_TELEPORTED:
+ case B_OUTCOME_MON_FLED:
+ case B_OUTCOME_MON_TELEPORTED:
show->breakingNews.outcome = 3;
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 15:55:15 +0000