diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-04-10 10:27:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 10:27:18 -0500 |
| commit | 7cce23ef764bcc3bfaed851f8d72dcadde1400f6 (patch) | |
| tree | 0371e3e80bcc1d99979f5dfb97e52ce668316b9b /src/engine/home.asm | |
| parent | d5e21ce300222d80c3e4c35ada6451a67817a9ea (diff) | |
| parent | 217eff6eda39082b1f31a0bf5c28834e032ab43a (diff) | |
Merge pull request #40 from xCrystal/master
Create *_DECK_ID constants ; minor style changes
Diffstat (limited to 'src/engine/home.asm')
| -rw-r--r-- | src/engine/home.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index c416abe..240d016 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -7206,9 +7206,9 @@ LoadOpponentDeck: ; 2b78 (0:2b78) xor a ld [wIsPracticeDuel], a ld a, [wOpponentDeckID] - cp SAMS_NORMAL_DECK - 2 + cp SAMS_NORMAL_DECK_ID jr z, .normal_sam_duel - or a ; cp SAMS_PRACTICE_DECK - 2 + or a ; cp SAMS_PRACTICE_DECK_ID jr nz, .not_practice_duel ; only practice duels will display help messages, but @@ -7233,12 +7233,12 @@ LoadOpponentDeck: ; 2b78 (0:2b78) .not_practice_duel inc a - inc a + inc a ; convert from *_DECK_ID constant read from wOpponentDeckID to *_DECK constant call LoadDeck ld a, [wOpponentDeckID] cp DECKS_END jr c, .valid_deck - ld a, PRACTICE_PLAYER_DECK - 2 + ld a, PRACTICE_PLAYER_DECK_ID ld [wOpponentDeckID], a .valid_deck |