From f0e9be4ffaeacc880fe197e4ef37741b678a4a33 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Thu, 24 Jul 2014 21:55:13 -0500 Subject: Switch sam's practice deck constants it turns out I was wrong, and the first of the two ids is the id used to load Sam's deck --- constants/deck_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants') diff --git a/constants/deck_constants.asm b/constants/deck_constants.asm index 01de10d..5eab054 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_PRACTICE_DECK2 EQU $04 CHARMANDER_AND_FRIENDS_DECK EQU $05 CHARMANDER_EXTRA_DECK EQU $06 SQUIRTLE_AND_FRIENDS_DECK EQU $07 -- cgit v1.2.3 From ba5c5e4e62c68bef335685d15d967ff3044eb82f Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 25 Jul 2014 00:50:46 -0500 Subject: Start duel engine disassembly, add duelist constants --- constants/card_constants.asm | 2 +- constants/deck_constants.asm | 4 +++- constants/duelist_constants.asm | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 constants/duelist_constants.asm (limited to 'constants') diff --git a/constants/card_constants.asm b/constants/card_constants.asm index f56b45c..bef5f3f 100755 --- a/constants/card_constants.asm +++ b/constants/card_constants.asm @@ -197,7 +197,7 @@ IMPOSTER_PROFESSOR_OAK EQU $C4 BILL EQU $C5 MR_FUJI EQU $C6 LASS EQU $C7 -IMAKUNI EQU $C8 +IMAKUNI_CARD EQU $C8 POKEMON_TRADER EQU $C9 POKEMON_BREEDER EQU $CA CLEFAIRY_DOLL EQU $CB diff --git a/constants/deck_constants.asm b/constants/deck_constants.asm index 5eab054..9f2198b 100755 --- a/constants/deck_constants.asm +++ b/constants/deck_constants.asm @@ -2,7 +2,7 @@ UNNAMED_DECK_DECK EQU $00 UNNAMED_DECK_DECK2 EQU $01 SAMS_PRACTICE_DECK EQU $02 PRACTICE_PLAYER_DECK EQU $03 -SAMS_PRACTICE_DECK2 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 diff --git a/constants/duelist_constants.asm b/constants/duelist_constants.asm new file mode 100755 index 0000000..2fbb190 --- /dev/null +++ b/constants/duelist_constants.asm @@ -0,0 +1,41 @@ +PLAYER EQU $01 +RONALD EQU $02 +SAM EQU $03 +IMAKUNI EQU $04 +NIKKI EQU $05 +RICK EQU $06 +KEN EQU $07 +AMY EQU $08 +ISAAC EQU $09 +MITCH EQU $0A +GENE EQU $0B +MURRAY EQU $0C +COURTNEY EQU $0D +STEVE EQU $0E +JACK EQU $0F +ROD EQU $10 +JOSEPH EQU $11 +DAVID EQU $12 +ERIK EQU $13 +JOHN EQU $14 +ADAM EQU $15 +JONATHAN EQU $16 +JOSHUA EQU $17 +NICHOLAS EQU $18 +BRANDON EQU $19 +MATTHEW EQU $1A +RYAN EQU $1B +ANDREW EQU $1C +CHRIS EQU $1D +MICHAEL EQU $1E +DANIEL EQU $1F +ROBERT EQU $20 +BRITTANY EQU $21 +KRISTIN EQU $22 +HEATHER EQU $23 +SARA EQU $24 +AMANDA EQU $25 +JENNIFER EQU $26 +JESSICA EQU $27 +STEPHANIE EQU $28 +AARON EQU $29 -- cgit v1.2.3