Merge pull request #40 from xCrystal/master

Create *_DECK_ID constants ; minor style changes

9 files changed, 13 insertions, 13 deletions

diff --git a/src/engine/bank1.asm b/src/engine/bank01.asm
index 7933fc4..7933fc4 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank01.asm
diff --git a/src/engine/bank2.asm b/src/engine/bank02.asm
index e9f2868..e9f2868 100644
--- a/src/engine/bank2.asm
+++ b/src/engine/bank02.asm
diff --git a/src/engine/bank3.asm b/src/engine/bank03.asm
index 1df0b19..8979d23 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank03.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
@@ -2642,7 +2642,7 @@ Func_d317: ; d317 (3:5317)
 
 	INCROM $d32b, $d336
 
-DeckMachine_d336: ; d336 (3:5336)
+OWScript_OpenDeckMachine: ; d336 (3:5336)
 	push bc
 	call Func_c2a3
 	call PauseSong
@@ -3018,14 +3018,14 @@ 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
 
 OWSequence_BeatSara: ; e18c (3:618c)
 	start_script
 	run_script OWScript_SetEventFlags
-	db FLAG_BEAT_SARA
+	db EVENT_BEAT_SARA
 	run_script OWScript_PrintTextString
 	tx Text0430
 	run_script OWScript_GiveBoosterPacks
@@ -3056,14 +3056,14 @@ 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
 
 OWSequence_BeatAmanda: ; e1b3 (03:61b3)
 	start_script
 	run_script OWScript_SetEventFlags
-	db FLAG_BEAT_AMANDA
+	db EVENT_BEAT_AMANDA
 	run_script OWScript_PrintTextString
 	tx Text0437
 	run_script OWScript_GiveBoosterPacks
@@ -3085,10 +3085,10 @@ OWSequence_NotReadyToSeeAmy:
 OWSequence_Joshua:
 	start_script
 	run_script OWScript_JumpIfFlagNotSet
-	db FLAG_BEAT_AMANDA
+	db EVENT_BEAT_AMANDA
 	dw .sara_and_amanda_not_beaten
 	run_script OWScript_JumpIfFlagNotSet
-	db FLAG_BEAT_SARA
+	db EVENT_BEAT_SARA
 	dw .sara_and_amanda_not_beaten
 	run_script OWScript_ScriptJump
 	dw .beat_sara_and_amanda
diff --git a/src/engine/bank4.asm b/src/engine/bank04.asm
index 5140705..9bf84f3 100644
--- a/src/engine/bank4.asm
+++ b/src/engine/bank04.asm
@@ -1023,7 +1023,7 @@ OverworldScriptTable: ; 1217b (4:617b)
 	dw OWScript_EndScriptCloseText
 	dw Func_d244
 	dw Func_d24c
-	dw DeckMachine_d336
+	dw OWScript_OpenDeckMachine
 	dw Func_d271
 	dw Func_d36d
 	dw Func_ce6f
diff --git a/src/engine/bank5.asm b/src/engine/bank05.asm
index 0fd6f82..0fd6f82 100644
--- a/src/engine/bank5.asm
+++ b/src/engine/bank05.asm
diff --git a/src/engine/bank6.asm b/src/engine/bank06.asm
index 1a85a24..1a85a24 100644
--- a/src/engine/bank6.asm
+++ b/src/engine/bank06.asm
diff --git a/src/engine/bank7.asm b/src/engine/bank07.asm
index 725b51b..725b51b 100644
--- a/src/engine/bank7.asm
+++ b/src/engine/bank07.asm
diff --git a/src/engine/bank8.asm b/src/engine/bank08.asm
index ca52ca5..ca52ca5 100644
--- a/src/engine/bank8.asm
+++ b/src/engine/bank08.asm
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