diff options
| author | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:02:57 +0200 |
|---|---|---|
| committer | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:04:02 +0200 |
| commit | 7819cfecca89160914984544ec9c20e7247c94e2 (patch) | |
| tree | 3933e93a0feeb58c7ce0549cf3f8910f0d623087 /constants/deck_constants.asm | |
| parent | 125bc94a0542a6948aef485aa10fd73ff3f95fe6 (diff) | |
| parent | ba5c5e4e62c68bef335685d15d967ff3044eb82f (diff) | |
Merge http://github.com/dannye/tcg
Conflicts:
wram.asm
Diffstat (limited to 'constants/deck_constants.asm')
| -rwxr-xr-x | constants/deck_constants.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/constants/deck_constants.asm b/constants/deck_constants.asm index 01de10d..9f2198b 100755 --- a/constants/deck_constants.asm +++ b/constants/deck_constants.asm @@ -1,8 +1,8 @@ UNNAMED_DECK_DECK EQU $00 UNNAMED_DECK_DECK2 EQU $01 -SAMS_PRACTICE_DECK2 EQU $02 +SAMS_PRACTICE_DECK EQU $02 PRACTICE_PLAYER_DECK EQU $03 -SAMS_PRACTICE_DECK EQU $04 +SAMS_NORMAL_DECK EQU $04 CHARMANDER_AND_FRIENDS_DECK EQU $05 CHARMANDER_EXTRA_DECK EQU $06 SQUIRTLE_AND_FRIENDS_DECK EQU $07 @@ -53,3 +53,5 @@ ANGER_DECK EQU $33 FLAMETHROWER_DECK EQU $34 RESHUFFLE_DECK EQU $35 IMAKUNI_DECK EQU $36 + +NUMBER_OF_DECKS EQU $36 |