diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-04-10 16:13:20 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-04-10 16:13:20 +0200 |
| commit | 6895547b0d2c86d769b29dc8eb5f5021723fc763 (patch) | |
| tree | 4aeb9f6b02cf9814d1ab34723ff72a02fd917b7f /src/engine | |
| parent | d5e21ce300222d80c3e4c35ada6451a67817a9ea (diff) | |
define *_DECK_ID constants ; split macros/code.asm
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/bank3.asm | 6 | ||||
| -rw-r--r-- | src/engine/home.asm | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index 1df0b19..e53fc38 100644 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -1733,7 +1733,7 @@ OWScript_AskQuestionJump: ; cce9 (3:4ce9) .asm_ccfe jp IncreaseOWScriptPointerBy5 -; args - prize cards, deck index - 2, duel theme index +; args - prize cards, deck id, duel theme index ; sets a battle up, doesn't start until we break out of the script system. OWScript_StartBattle: ; cd01 (3:4d01) call Func_cd66 @@ -3018,7 +3018,7 @@ OWSequence_Sara: ; e177 (3:6177) tx Text042f run_script OWScript_StartBattle db 2 - db WATERFRONT_POKEMON_DECK - 2 ; 6189 + db WATERFRONT_POKEMON_DECK_ID ; 6189 db MUSIC_DUEL_THEME_1 run_script OWScript_EndScriptCloseText @@ -3056,7 +3056,7 @@ OWSequence_Amanda: ; e19e (03:619e) tx Text0436 run_script OWScript_StartBattle db 03 - db LONELY_FRIENDS_DECK - 2 + db LONELY_FRIENDS_DECK_ID db MUSIC_DUEL_THEME_1 run_script OWScript_EndScriptCloseText 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 |