diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2016-02-16 01:06:59 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2016-02-16 18:24:39 +0100 |
| commit | e1e282d5e76f61bab261a0c122514dfc007d76e3 (patch) | |
| tree | ec8f8d6fb711ac32298ef2b1bb5d140e29760c44 /src/engine/home.asm | |
| parent | 1628203dc098262ce328983e3796822a775ae086 (diff) | |
duel state constants and DUELVAR->DUELVARS
Diffstat (limited to 'src/engine/home.asm')
| -rwxr-xr-x | src/engine/home.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index aa6e9a8..afdea5c 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2131,10 +2131,10 @@ ShuffleDeck: ; 10bc (0:10bc) ld h, a ld d, a ld a, DECK_SIZE - ld l, DUELVAR_NUMBER_OF_CARDS_NOT_IN_DECK + ld l, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK sub [hl] ld b, a - ld a, DUELVAR_DECK_CARDS + ld a, DUELVARS_DECK_CARDS add [hl] ld l, a ; hl = position in the wPlayerDeckCards or wOpponentDeckCards array of the first (top) card in the deck ld a, b ; a = number of cards in the deck @@ -2146,7 +2146,7 @@ ShuffleDeck: ; 10bc (0:10bc) ; returns c if deck is empty, nc if a card was succesfully drawn DrawCardFromDeck: ; 10cf (0:10cf) push hl - ld a, DUELVAR_NUMBER_OF_CARDS_NOT_IN_DECK + ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK call GetTurnDuelistVariable cp DECK_SIZE jr nc, .emptyDeck @@ -2154,7 +2154,7 @@ DrawCardFromDeck: ; 10cf (0:10cf) inc a ld [hl], a ; point to top card in the deck - add DUELVAR_DECK_CARDS - 1 + add DUELVARS_DECK_CARDS - 1 ld l, a ; grab card number (0-59) from wPlayerDeckCards or wOpponentDeckCards array ld a, [hl] @@ -2186,10 +2186,10 @@ AddCardToHand: ; 1123 (0:1123) ; write $1 (hand) into the location of this card ld [hl], $1 ; increment number of cards in hand - ld l, DUELVAR_NUMBER_OF_CARDS_IN_HAND + ld l, DUELVARS_NUMBER_OF_CARDS_IN_HAND inc [hl] ; add card to hand - ld a, DUELVAR_HAND - 1 + ld a, DUELVARS_HAND - 1 add [hl] ld l, a ld [hl], e @@ -3732,7 +3732,7 @@ LoadOpponentDeck: ; 2b78 (0:2b78) .validDeck ; set opponent as controlled by AI - ld a, DUELVAR_DUELIST_TYPE + ld a, DUELVARS_DUELIST_TYPE call GetTurnDuelistVariable ld a, [wOpponentDeckId] or $80 |