Skip to content

Commit 263da90

Browse files
committed
Better descriptions for attack effect parameters in card data
1 parent b9be424 commit 263da90

File tree

5 files changed

+115
-109
lines changed

5 files changed

+115
-109
lines changed

src/constants/card_data_constants.asm

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ DEF HEAL_USER_F EQU %001
203203
DEF NULLIFY_OR_WEAKEN_ATTACK_F EQU %010
204204
DEF DISCARD_ENERGY_F EQU %011
205205
DEF ATTACHED_ENERGY_BOOST_F EQU %100
206-
DEF FLAG_2_BIT_5_F EQU %101
207-
DEF FLAG_2_BIT_6_F EQU %110
206+
DEF IGNORE_THIS_ATTACK_F EQU %101
207+
DEF ENCOURAGE_THIS_ATTACK_F EQU %110
208208
DEF FLAG_2_BIT_7_F EQU %111
209209

210210
; CARD_DATA_ATTACK*_FLAG3 constants
@@ -230,8 +230,8 @@ DEF HEAL_USER EQU $1 << HEAL_USER_F
230230
DEF NULLIFY_OR_WEAKEN_ATTACK EQU $1 << NULLIFY_OR_WEAKEN_ATTACK_F
231231
DEF DISCARD_ENERGY EQU $1 << DISCARD_ENERGY_F
232232
DEF ATTACHED_ENERGY_BOOST EQU $1 << ATTACHED_ENERGY_BOOST_F
233-
DEF FLAG_2_BIT_5 EQU $1 << FLAG_2_BIT_5_F
234-
DEF FLAG_2_BIT_6 EQU $1 << FLAG_2_BIT_6_F
233+
DEF IGNORE_THIS_ATTACK EQU $1 << IGNORE_THIS_ATTACK_F
234+
DEF ENCOURAGE_THIS_ATTACK EQU $1 << ENCOURAGE_THIS_ATTACK_F
235235
DEF FLAG_2_BIT_7 EQU $1 << FLAG_2_BIT_7_F
236236

237237
; CARD_DATA_ATTACK*_FLAG3_F constants
@@ -247,6 +247,11 @@ DEF UNABLE_RETREAT EQU $64
247247
DEF FIRST_ATTACK_OR_PKMN_POWER EQU $0
248248
DEF SECOND_ATTACK EQU $1
249249

250+
; special EFFECT_PARAM values to be used with the HEAL_USER flag
251+
DEF HEALING_EQUALS_10_HP EQU $1
252+
DEF HEALING_EQUALS_HALF_DAMAGE_DEALT EQU $2
253+
DEF HEALING_EQUALS_DAMAGE_DEALT EQU $3
254+
250255
; whether attack with the ATTACHED_ENERGY_BOOST flag
251256
; has limit on attached energy cards boost.
252257
DEF MAX_ENERGY_BOOST_IS_LIMITED EQU $2

0 commit comments

Comments
 (0)