More duel related disassembly and more DUELVAR constants

2 files changed, 35 insertions, 28 deletions

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index d5a44bf..fb17a53 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -64,7 +64,7 @@ CARD_DATA_UNKNOWN2              EQU $40
 
 PKMN_CARD_DATA_LENGTH EQU $41
 
-; generic type constants
+; generic type (color) constants
 	const_def
 	const FIRE        ; $0
 	const GRASS       ; $1
@@ -78,25 +78,25 @@ NUM_COLORED_TYPES EQU const_value
 NUM_TYPES EQU const_value
 
 ; CARD_DATA_TYPE constants
-TYPE_PKMN_FIRE               EQUS "FIRE"
-TYPE_PKMN_GRASS              EQUS "GRASS"
-TYPE_PKMN_LIGHTNING          EQUS "LIGHTNING"
-TYPE_PKMN_WATER              EQUS "WATER"
-TYPE_PKMN_FIGHTING           EQUS "FIGHTING"
-TYPE_PKMN_PSYCHIC            EQUS "PSYCHIC"
-TYPE_PKMN_COLORLESS          EQUS "COLORLESS"
-TYPE_PKMN_UNUSED             EQUS "UNUSED_TYPE"
+TYPE_PKMN_FIRE      EQU FIRE
+TYPE_PKMN_GRASS     EQU GRASS
+TYPE_PKMN_LIGHTNING EQU LIGHTNING
+TYPE_PKMN_WATER     EQU WATER
+TYPE_PKMN_FIGHTING  EQU FIGHTING
+TYPE_PKMN_PSYCHIC   EQU PSYCHIC
+TYPE_PKMN_COLORLESS EQU COLORLESS
+TYPE_PKMN_UNUSED    EQU UNUSED_TYPE
 	const_def TYPE_PKMN_UNUSED + 1 - TYPE_PKMN_FIRE
-	const TYPE_ENERGY_FIRE              ; $8
-	const TYPE_ENERGY_GRASS             ; $9
-	const TYPE_ENERGY_LIGHTNING         ; $A
-	const TYPE_ENERGY_WATER             ; $B
-	const TYPE_ENERGY_FIGHTING          ; $C
-	const TYPE_ENERGY_PSYCHIC           ; $D
-	const TYPE_ENERGY_DOUBLE_COLORLESS  ; $E
-	const TYPE_ENERGY_UNUSED            ; $F
-	const TYPE_TRAINER                  ; $10
-	const TYPE_TRAINER_UNUSED           ; $11
+	const TYPE_ENERGY_FIRE             ; $08
+	const TYPE_ENERGY_GRASS            ; $09
+	const TYPE_ENERGY_LIGHTNING        ; $0a
+	const TYPE_ENERGY_WATER            ; $0b
+	const TYPE_ENERGY_FIGHTING         ; $0c
+	const TYPE_ENERGY_PSYCHIC          ; $0d
+	const TYPE_ENERGY_DOUBLE_COLORLESS ; $0e
+	const TYPE_ENERGY_UNUSED           ; $0f
+	const TYPE_TRAINER                 ; $10
+	const TYPE_TRAINER_UNUSED          ; $11
 NUM_CARD_TYPES EQU const_value + -1
 
 TYPE_PKMN      EQU %111
@@ -107,7 +107,7 @@ TYPE_TRAINER_F EQU 4
 CIRCLE    EQU $0
 DIAMOND   EQU $1
 STAR      EQU $2
-PROMOSTAR EQU $FF
+PROMOSTAR EQU $ff
 
 ; CARD_DATA_SET constants (set 1)
 COLOSSEUM   EQU $00
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 956f84d..ebbb4c9 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -1,7 +1,7 @@
-DECK_NAME_SIZE      EQU 24
-DECK_SIZE           EQU 60
-BENCH_SIZE          EQU 5
-MAX_POKEMON_IN_PLAY EQU 6 ; arena + bench
+DECK_NAME_SIZE        EQU 24
+DECK_SIZE             EQU 60
+MAX_BENCH_POKEMON     EQU 5
+MAX_PLAY_AREA_POKEMON EQU 6 ; arena + bench
 
 ; hWhoseTurn constants
 PLAYER_TURN   EQUS "HIGH(wPlayerDuelVariables)"
@@ -35,11 +35,17 @@ DUELVARS_BENCH2_CARD_HP                  EQUS "LOW(wPlayerBench2CardHP)"
 DUELVARS_BENCH3_CARD_HP                  EQUS "LOW(wPlayerBench3CardHP)"               ; cb
 DUELVARS_BENCH4_CARD_HP                  EQUS "LOW(wPlayerBench4CardHP)"               ; cc
 DUELVARS_BENCH5_CARD_HP                  EQUS "LOW(wPlayerBench5CardHP)"               ; cd
+DUELVARS_ARENA_CARD_CHANGED_TYPE         EQUS "LOW(wPlayerArenaCardChangedType)"       ; d4
+DUELVARS_BENCH1_CARD_CHANGED_TYPE        EQUS "LOW(wPlayerBench1CardChangedType)"      ; d5
+DUELVARS_BENCH2_CARD_CHANGED_TYPE        EQUS "LOW(wPlayerBench2CardChangedType)"      ; d6
+DUELVARS_BENCH3_CARD_CHANGED_TYPE        EQUS "LOW(wPlayerBench3CardChangedType)"      ; d7
+DUELVARS_BENCH4_CARD_CHANGED_TYPE        EQUS "LOW(wPlayerBench4CardChangedType)"      ; d8
+DUELVARS_BENCH5_CARD_CHANGED_TYPE        EQUS "LOW(wPlayerBench5CardChangedType)"      ; d9
 DUELVARS_ARENA_CARD_SUBSTATUS1           EQUS "LOW(wPlayerArenaCardSubstatus1)"        ; e7
 DUELVARS_ARENA_CARD_SUBSTATUS2           EQUS "LOW(wPlayerArenaCardSubstatus2)"        ; e8
-DUELVARS_ARENA_CARD_SUBSTATUS3           EQUS "LOW(wPlayerArenaCardSubstatus3)"        ; e9
-DUELVARS_ARENA_CARD_SUBSTATUS4           EQUS "LOW(wPlayerArenaCardSubstatus4)"        ; ea
-DUELVARS_ARENA_CARD_SUBSTATUS5           EQUS "LOW(wPlayerArenaCardSubstatus5)"        ; eb
+DUELVARS_ARENA_CARD_CHANGED_WEAKNESS     EQUS "LOW(wPlayerArenaCardChangedWeakness)"   ; e9
+DUELVARS_ARENA_CARD_CHANGED_RESISTANCE   EQUS "LOW(wPlayerArenaCardChangedResistance)" ; ea
+DUELVARS_ARENA_CARD_SUBSTATUS3           EQUS "LOW(wPlayerArenaCardSubstatus3)"        ; eb
 DUELVARS_PRIZES                          EQUS "LOW(wPlayerPrizes)"                     ; ec
 DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "LOW(wPlayerNumberOfCardsInDiscardPile)" ; ed
 DUELVARS_NUMBER_OF_CARDS_IN_HAND         EQUS "LOW(wPlayerNumberOfCardsInHand)"        ; ee
@@ -108,7 +114,8 @@ SUBSTATUS2_UNABLE_RETREAT EQU $09
 SUBSTATUS2_BONE_ATTACK    EQU $0b
 SUBSTATUS2_GROWL          EQU $12
 
-SUBSTATUS5_THIS_TURN_DOUBLE_DAMAGE EQU 0
+SUBSTATUS3_THIS_TURN_DOUBLE_DAMAGE EQU 0
+SUBSTATUS3_HEADACHE                EQU 1
 
 ; wNoDamageOrEffect constants
 NO_DAMAGE_OR_EFFECT_AGILITY      EQU $01