summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-02-16 00:31:46 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-02-16 00:31:46 +0100
commit6c0eece9c9836e0d91d88501f1cb7f3ee1c360ff (patch)
tree4e83ca0e5457d4c27db05b1a21f10e1ed7f2b75e
parent8032394e823e6fe972ba6cd49dfeac87212465b8 (diff)
define duelvar constants
-rwxr-xr-xsrc/constants.asm2
-rw-r--r--src/constants/duel_constants.asm21
-rw-r--r--src/constants/misc_constants.asm4
3 files changed, 22 insertions, 5 deletions
diff --git a/src/constants.asm b/src/constants.asm
index c3b9f2d..3cf9cd1 100755
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -1,11 +1,11 @@
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/duel_constants.asm"
INCLUDE "constants/duelist_constants.asm"
INCLUDE "constants/card_constants.asm"
INCLUDE "constants/deck_constants.asm"
INCLUDE "constants/card_data_constants.asm"
-INCLUDE "constants/set_constants.asm"
INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/hardware_constants.asm"
INCLUDE "constants/sgb_constants.asm"
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
new file mode 100644
index 0000000..7eb8b27
--- /dev/null
+++ b/src/constants/duel_constants.asm
@@ -0,0 +1,21 @@
+PLAYER_TURN EQUS "wPlayerDuelVariables >> $8"
+OPPONENT_TURN EQUS "wOpponentDuelVariables >> $8"
+
+DUELVAR_CARD_LOCATIONS EQUS "wPlayerCardLocations & $ff"
+DUELVAR_HAND EQUS "wPlayerHand & $ff"
+DUELVAR_DECK_CARDS EQUS "wPlayerDeckCards & $ff"
+DUELVAR_NUMBER_OF_CARDS_NOT_IN_DECK EQUS "wPlayerNumberOfCardsNotInDeck & $ff"
+DUELVAR_ARENA_CARD EQUS "wPlayerArenaCard & $ff"
+DUELVAR_BENCH EQUS "wPlayerBench & $ff"
+DUELVAR_ARENA_CARD_HP EQUS "wPlayerArenaCardHP & $ff"
+DUELVAR_BENCH1_CARD_HP EQUS "wPlayerBench1CardHP & $ff"
+DUELVAR_BENCH2_CARD_HP EQUS "wPlayerBench2CardHP & $ff"
+DUELVAR_BENCH3_CARD_HP EQUS "wPlayerBench3CardHP & $ff"
+DUELVAR_BENCH4_CARD_HP EQUS "wPlayerBench4CardHP & $ff"
+DUELVAR_BENCH5_CARD_HP EQUS "wPlayerBench5CardHP & $ff"
+DUELVAR_PRIZES EQUS "wPlayerPrizes & $ff"
+DUELVAR_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "wPlayerNumberOfCardsInDiscardPile & $ff"
+DUELVAR_NUMBER_OF_CARDS_IN_HAND EQUS "wPlayerNumberOfCardsInHand & $ff"
+DUELVAR_NUMBER_OF_POKEMON_IN_PLAY EQUS "wPlayerNumberOfPokemonInPlay & $ff"
+DUELVAR_ARENA_CARD_STATUS EQUS "wPlayerArenaCardStatus & $ff"
+DUELVAR_DUELIST_TYPE EQUS "wPlayerDuelistType & $ff"
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