Merge remote-tracking branch 'refs/remotes/pret/master'

4 files changed, 53 insertions, 28 deletions

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 7c1359c..6ea7a74 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -2,7 +2,7 @@ CARD_DATA_LENGTH EQU $41
 DECK_SIZE        EQU  60
 BENCH_SIZE       EQU   5
 
-;;; card types (byte 1 of every card data)
+;;; card types
 FIRE      EQU $0
 GRASS     EQU $1
 LIGHTNING EQU $2
@@ -21,7 +21,32 @@ DOUBLE_COLORLESS_ENERGY_CARD EQU $E
 
 TRAINER_CARD EQU $10
 
-;;; weakness/resistance (bytes 2 and 3 of Pokemon cards post-move data)
+;;; rarity
+CIRCLE    EQU $0
+DIAMOND   EQU $1
+STAR      EQU $2
+PROMOSTAR EQU $FF
+
+;;; set
+COLOSSEUM   EQU $00
+EVOLUTION   EQU $10
+MYSTERY     EQU $20
+LABORATORY  EQU $30
+PROMOTIONAL EQU $40
+ENERGY      EQU $50
+
+NONE   EQU $0
+JUNGLE EQU $1
+FOSSIL EQU $2
+GB     EQU $7
+PRO    EQU $8
+
+;;; evolution stage
+BASIC  EQU $0
+STAGE1 EQU $1
+STAGE2 EQU $2
+
+;;; weakness/resistance
 WR_FIRE      EQU $80
 WR_GRASS     EQU $40
 WR_LIGHTNING EQU $20
@@ -58,7 +83,7 @@ FLAG_2_BIT_5             EQU %00100000
 FLAG_2_BIT_6             EQU %01000000
 FLAG_2_BIT_7             EQU %10000000
 
-;;; flags 2 (10th param of Pokemon cards move data)
+;;; flags 3 (10th param of Pokemon cards move data)
 ; bit 1 covers a wide variety of effects
 ; bits 2-7 are unused
 BOOST_IF_TAKEN_DAMAGE    EQU %00000001
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
new file mode 100644
index 0000000..0eb4b5b
--- /dev/null
+++ b/src/constants/duel_constants.asm
@@ -0,0 +1,25 @@
+PLAYER_TURN   EQUS "wPlayerDuelVariables >> $8"
+OPPONENT_TURN EQUS "wOpponentDuelVariables >> $8"
+
+DUEL_WON  EQU $1
+DUEL_LOST EQU $2
+DUEL_DRAW EQU $3
+
+DUELVARS_CARD_LOCATIONS                  EQUS "wPlayerCardLocations & $ff"              ; 00
+DUELVARS_HAND                            EQUS "wPlayerHand & $ff"                       ; 42
+DUELVARS_DECK_CARDS                      EQUS "wPlayerDeckCards & $ff"                  ; 7e
+DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK     EQUS "wPlayerNumberOfCardsNotInDeck & $ff"     ; ba
+DUELVARS_ARENA_CARD                      EQUS "wPlayerArenaCard & $ff"                  ; bb
+DUELVARS_BENCH                           EQUS "wPlayerBench & $ff"                      ; bc
+DUELVARS_ARENA_CARD_HP                   EQUS "wPlayerArenaCardHP & $ff"                ; c8
+DUELVARS_BENCH1_CARD_HP                  EQUS "wPlayerBench1CardHP & $ff"               ; c9
+DUELVARS_BENCH2_CARD_HP                  EQUS "wPlayerBench2CardHP & $ff"               ; ca
+DUELVARS_BENCH3_CARD_HP                  EQUS "wPlayerBench3CardHP & $ff"               ; cb
+DUELVARS_BENCH4_CARD_HP                  EQUS "wPlayerBench4CardHP & $ff"               ; cc
+DUELVARS_BENCH5_CARD_HP                  EQUS "wPlayerBench5CardHP & $ff"               ; cd
+DUELVARS_PRIZES                          EQUS "wPlayerPrizes & $ff"                     ; ec
+DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "wPlayerNumberOfCardsInDiscardPile & $ff" ; ed
+DUELVARS_NUMBER_OF_CARDS_IN_HAND         EQUS "wPlayerNumberOfCardsInHand & $ff"        ; ee
+DUELVARS_NUMBER_OF_POKEMON_IN_PLAY       EQUS "wPlayerNumberOfPokemonInPlay & $ff"      ; ef
+DUELVARS_ARENA_CARD_STATUS               EQUS "wPlayerArenaCardStatus & $ff"            ; f0
+DUELVARS_DUELIST_TYPE                    EQUS "wPlayerDuelistType & $ff"                ; f1
diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm
index 08b6c35..d985e77 100644
--- a/src/constants/misc_constants.asm
+++ b/src/constants/misc_constants.asm
@@ -2,7 +2,3 @@
 CONSOLE_DMG                 EQU $00
 CONSOLE_SGB                 EQU $01
 CONSOLE_CGB                 EQU $02
-
-; dueling constants
-PLAYER_TURN   EQUS "wPlayerDuelVariables >> $8"
-OPPONENT_TURN EQUS "wOpponentDuelVariables >> $8"
\ No newline at end of file
diff --git a/src/constants/set_constants.asm b/src/constants/set_constants.asm
deleted file mode 100755
index d3cfa57..0000000
--- a/src/constants/set_constants.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-COLOSSEUM   EQU $00
-EVOLUTION   EQU $10
-MYSTERY     EQU $20
-LABORATORY  EQU $30
-PROMOTIONAL EQU $40
-ENERGY      EQU $50
-
-NONE   EQU $0
-JUNGLE EQU $1
-FOSSIL EQU $2
-GB     EQU $7
-PRO    EQU $8
-
-BASIC  EQU $0
-STAGE1 EQU $1
-STAGE2 EQU $2
-
-CIRCLE    EQU $0
-DIAMOND   EQU $1
-STAR      EQU $2
-PROMOSTAR EQU $FF