Merge pull request #40 from xCrystal/master

Create *_DECK_ID constants ; minor style changes

20 files changed, 252 insertions, 234 deletions

diff --git a/src/constants.asm b/src/constants.asm
index 90c6a06..7755766 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -3,12 +3,12 @@ INCLUDE "constants/card_constants.asm"
 INCLUDE "constants/card_data_constants.asm"
 INCLUDE "constants/deck_constants.asm"
 INCLUDE "constants/duel_constants.asm"
+INCLUDE "constants/event_constants.asm"
 INCLUDE "constants/gfx_constants.asm"
 INCLUDE "constants/hardware_constants.asm"
 INCLUDE "constants/map_constants.asm"
 INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/npc_constants.asm"
-INCLUDE "constants/overworld_script_constants.asm"
 INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/text_constants.asm"
diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm
index d6e5b1a..6b16d63 100644
--- a/src/constants/deck_constants.asm
+++ b/src/constants/deck_constants.asm
@@ -1,57 +1,61 @@
+; Both *_DECK and *_DECK_ID constants are defined here.
+; *_DECK constants are to be used with LoadDeck and related routines.
+; *_DECK_ID constants are specific to be loaded into wOpponentDeckID.
+; Always, *_DECK_ID = *_DECK - 2. UNNAMED_DECK_ID and UNNAMED_2_DECK_ID do not exist.
 	const_def
-	const UNNAMED_DECK                ; $00
-	const UNNAMED_DECK_2              ; $01
-	const SAMS_PRACTICE_DECK          ; $02
-	const PRACTICE_PLAYER_DECK        ; $03
-	const SAMS_NORMAL_DECK            ; $04
-	const CHARMANDER_AND_FRIENDS_DECK ; $05
-	const CHARMANDER_EXTRA_DECK       ; $06
-	const SQUIRTLE_AND_FRIENDS_DECK   ; $07
-	const SQUIRTLE_EXTRA_DECK         ; $08
-	const BULBASAUR_AND_FRIENDS_DECK  ; $09
-	const BULBASAUR_EXTRA_DECK        ; $0A
-	const LIGHTNING_AND_FIRE_DECK     ; $0B
-	const WATER_AND_FIGHTING_DECK     ; $0C
-	const GRASS_AND_PSYCHIC_DECK      ; $0D
-	const LEGENDARY_MOLTRES_DECK      ; $0E
-	const LEGENDARY_ZAPDOS_DECK       ; $0F
-	const LEGENDARY_ARTICUNO_DECK     ; $10
-	const LEGENDARY_DRAGONITE_DECK    ; $11
-	const FIRST_STRIKE_DECK           ; $12
-	const ROCK_CRUSHER_DECK           ; $13
-	const GO_GO_RAIN_DANCE_DECK       ; $14
-	const ZAPPING_SELFDESTRUCT_DECK   ; $15
-	const FLOWER_POWER_DECK           ; $16
-	const STRANGE_PSYSHOCK_DECK       ; $17
-	const WONDERS_OF_SCIENCE_DECK     ; $18
-	const FIRE_CHARGE_DECK            ; $19
-	const IM_RONALD_DECK              ; $1A
-	const POWERFUL_RONALD_DECK        ; $1B
-	const INVINCIBLE_RONALD_DECK      ; $1C
-	const LEGENDARY_RONALD_DECK       ; $1D
-	const MUSCLES_FOR_BRAINS_DECK     ; $1E
-	const HEATED_BATTLE_DECK          ; $1F
-	const LOVE_TO_BATTLE_DECK         ; $20
-	const EXCAVATION_DECK             ; $21
-	const BLISTERING_POKEMON_DECK     ; $22
-	const HARD_POKEMON_DECK           ; $23
-	const WATERFRONT_POKEMON_DECK     ; $24
-	const LONELY_FRIENDS_DECK         ; $25
-	const SOUND_OF_THE_WAVES_DECK     ; $26
-	const PIKACHU_DECK                ; $27
-	const BOOM_BOOM_SELFDESTRUCT_DECK ; $28
-	const POWER_GENERATOR_DECK        ; $29
-	const ETCETERA_DECK               ; $2A
-	const FLOWER_GARDEN_DECK          ; $2B
-	const KALEIDOSCOPE_DECK           ; $2C
-	const GHOST_DECK                  ; $2D
-	const NAP_TIME_DECK               ; $2E
-	const STRANGE_POWER_DECK          ; $2F
-	const FLYIN_POKEMON_DECK          ; $30
-	const LOVELY_NIDORAN_DECK         ; $31
-	const POISON_DECK                 ; $32
-	const ANGER_DECK                  ; $33
-	const FLAMETHROWER_DECK           ; $34
-	const RESHUFFLE_DECK              ; $35
-	const IMAKUNI_DECK                ; $36
+	deck_const UNNAMED_DECK                ; $00
+	deck_const UNNAMED_2_DECK              ; $01
+	deck_const SAMS_PRACTICE_DECK          ; $02
+	deck_const PRACTICE_PLAYER_DECK        ; $03
+	deck_const SAMS_NORMAL_DECK            ; $04
+	deck_const CHARMANDER_AND_FRIENDS_DECK ; $05
+	deck_const CHARMANDER_EXTRA_DECK       ; $06
+	deck_const SQUIRTLE_AND_FRIENDS_DECK   ; $07
+	deck_const SQUIRTLE_EXTRA_DECK         ; $08
+	deck_const BULBASAUR_AND_FRIENDS_DECK  ; $09
+	deck_const BULBASAUR_EXTRA_DECK        ; $0A
+	deck_const LIGHTNING_AND_FIRE_DECK     ; $0B
+	deck_const WATER_AND_FIGHTING_DECK     ; $0C
+	deck_const GRASS_AND_PSYCHIC_DECK      ; $0D
+	deck_const LEGENDARY_MOLTRES_DECK      ; $0E
+	deck_const LEGENDARY_ZAPDOS_DECK       ; $0F
+	deck_const LEGENDARY_ARTICUNO_DECK     ; $10
+	deck_const LEGENDARY_DRAGONITE_DECK    ; $11
+	deck_const FIRST_STRIKE_DECK           ; $12
+	deck_const ROCK_CRUSHER_DECK           ; $13
+	deck_const GO_GO_RAIN_DANCE_DECK       ; $14
+	deck_const ZAPPING_SELFDESTRUCT_DECK   ; $15
+	deck_const FLOWER_POWER_DECK           ; $16
+	deck_const STRANGE_PSYSHOCK_DECK       ; $17
+	deck_const WONDERS_OF_SCIENCE_DECK     ; $18
+	deck_const FIRE_CHARGE_DECK            ; $19
+	deck_const IM_RONALD_DECK              ; $1A
+	deck_const POWERFUL_RONALD_DECK        ; $1B
+	deck_const INVINCIBLE_RONALD_DECK      ; $1C
+	deck_const LEGENDARY_RONALD_DECK       ; $1D
+	deck_const MUSCLES_FOR_BRAINS_DECK     ; $1E
+	deck_const HEATED_BATTLE_DECK          ; $1F
+	deck_const LOVE_TO_BATTLE_DECK         ; $20
+	deck_const EXCAVATION_DECK             ; $21
+	deck_const BLISTERING_POKEMON_DECK     ; $22
+	deck_const HARD_POKEMON_DECK           ; $23
+	deck_const WATERFRONT_POKEMON_DECK     ; $24
+	deck_const LONELY_FRIENDS_DECK         ; $25
+	deck_const SOUND_OF_THE_WAVES_DECK     ; $26
+	deck_const PIKACHU_DECK                ; $27
+	deck_const BOOM_BOOM_SELFDESTRUCT_DECK ; $28
+	deck_const POWER_GENERATOR_DECK        ; $29
+	deck_const ETCETERA_DECK               ; $2A
+	deck_const FLOWER_GARDEN_DECK          ; $2B
+	deck_const KALEIDOSCOPE_DECK           ; $2C
+	deck_const GHOST_DECK                  ; $2D
+	deck_const NAP_TIME_DECK               ; $2E
+	deck_const STRANGE_POWER_DECK          ; $2F
+	deck_const FLYIN_POKEMON_DECK          ; $30
+	deck_const LOVELY_NIDORAN_DECK         ; $31
+	deck_const POISON_DECK                 ; $32
+	deck_const ANGER_DECK                  ; $33
+	deck_const FLAMETHROWER_DECK           ; $34
+	deck_const RESHUFFLE_DECK              ; $35
+	deck_const IMAKUNI_DECK                ; $36
 DECKS_END EQU const_value + -1
diff --git a/src/constants/event_constants.asm b/src/constants/event_constants.asm
new file mode 100644
index 0000000..496f5a3
--- /dev/null
+++ b/src/constants/event_constants.asm
@@ -0,0 +1,3 @@
+; Event Flags
+EVENT_BEAT_SARA      EQU $15
+EVENT_BEAT_AMANDA    EQU $16
diff --git a/src/constants/overworld_script_constants.asm b/src/constants/overworld_script_constants.asm
deleted file mode 100644
index 167537c..0000000
--- a/src/constants/overworld_script_constants.asm
+++ /dev/null
@@ -1,109 +0,0 @@
-	const_def
-	const OWScript_EndScriptLoop1_index         ; $00
-	const OWScript_CloseTextBox_index           ; $01
-	const OWScript_PrintTextString_index        ; $02
-	const Func_ccdc_index                       ; $03
-	const OWScript_AskQuestionJump_index        ; $04
-	const OWScript_StartBattle_index            ; $05
-	const Func_cd83_index                       ; $06
-	const Func_cda8_index                       ; $07
-	const OWScript_PrintTextCloseBox_index      ; $08
-	const Func_cdcb_index                       ; $09
-	const Func_ce26_index                       ; $0a
-	const Func_ce84_index                       ; $0b
-	const OWScript_GiveBoosterPacks_index       ; $0c
-	const Func_cf0c_index                       ; $0d
-	const Func_cf12_index                       ; $0e
-	const Func_cf3f_index                       ; $0f
-	const Func_cf4c_index                       ; $10
-	const Func_cf53_index                       ; $11
-	const Func_cf7b_index                       ; $12
-	const Func_cf2d_index                       ; $13
-	const Func_cf96_index                       ; $14
-	const Func_cfc6_index                       ; $15
-	const Func_cfd4_index                       ; $16
-	const Func_d00b_index                       ; $17
-	const Func_d025_index                       ; $18
-	const Func_d032_index                       ; $19
-	const Func_d03f_index                       ; $1a
-	const OWScript_ScriptJump_index             ; $1b
-	const Func_d04f_index                       ; $1c
-	const Func_d055_index                       ; $1d
-	const OWScript_MovePlayer_index             ; $1e
-	const Func_cee2_index                       ; $1f
-	const Func_d080_index                       ; $20
-	const Func_d088_index                       ; $21
-	const Func_d095_index                       ; $22
-	const Func_d0be_index                       ; $23
-	const Func_d0ce_index                       ; $24
-	const Func_d0d9_index                       ; $25
-	const Func_d0f2_index                       ; $26
-	const Func_ce4a_index                       ; $27
-	const Func_ceba_index                       ; $28
-	const Func_d103_index                       ; $29
-	const Func_d125_index                       ; $2a
-	const Func_d135_index                       ; $2b
-	const Func_d16b_index                       ; $2c
-	const Func_cd4f_index                       ; $2d
-	const Func_cd94_index                       ; $2e
-	const Func_ce52_index                       ; $2f
-	const Func_cdd8_index                       ; $30
-	const Func_cdf5_index                       ; $31
-	const Func_d195_index                       ; $32
-	const Func_d1ad_index                       ; $33
-	const Func_d1b3_index                       ; $34
-	const OWScript_EndScriptCloseText_index     ; $35
-	const Func_d244_index                       ; $36
-	const Func_d24c_index                       ; $37
-	const DeckMachine_d336_index                ; $38
-	const Func_d271_index                       ; $39
-	const Func_d36d_index                       ; $3a
-	const Func_ce6f_index                       ; $3b
-	const Func_d209_index                       ; $3c
-	const Func_d38f_index                       ; $3d
-	const Func_d396_index                       ; $3e
-	const Func_cd76_index                       ; $3f
-	const Func_d39d_index                       ; $40
-	const Func_d3b9_index                       ; $41
-	const Func_d3c9_index                       ; $42
-	const Func_d3d1_index                       ; $43
-	const Func_d3d4_index                       ; $44
-	const Func_d3e0_index                       ; $45
-	const Func_d3fe_index                       ; $46
-	const Func_d408_index                       ; $47
-	const Func_d40f_index                       ; $48
-	const Func_d416_index                       ; $49
-	const Func_d423_index                       ; $4a
-	const Func_d429_index                       ; $4b
-	const Func_d41d_index                       ; $4c
-	const Func_d42f_index                       ; $4d
-	const Func_d435_index                       ; $4e
-	const Func_cce4_index                       ; $4f
-	const Func_d2f6_index                       ; $50
-	const Func_d317_index                       ; $51
-	const Func_d43d_index                       ; $52
-	const OWScript_EndScriptLoop2_index         ; $53
-	const OWScript_EndScriptLoop3_index         ; $54
-	const OWScript_EndScriptLoop4_index         ; $55
-	const OWScript_EndScriptLoop5_index         ; $56
-	const OWScript_EndScriptLoop6_index         ; $57
-	const OWScript_CustomModifyEventFlags_index ; $58
-	const Func_d460_index                       ; $59
-	const OWScript_JumpIfFlagSet_index          ; $5a
-	const Func_d484_index                       ; $5b
-	const Func_d49e_index                       ; $5c
-	const Func_d4a6_index                       ; $5d
-	const Func_d4ae_index                       ; $5e
-	const OWScript_SetEventFlags_index          ; $5f
-	const Func_d4c3_index                       ; $60
-	const Func_d4ca_index                       ; $61
-	const OWScript_JumpIfFlagNotSet_index       ; $62
-	const Func_d452_index                       ; $63
-	const OWScript_EndScriptLoop7_index         ; $64
-	const OWScript_EndScriptLoop8_index         ; $65
-	const OWScript_EndScriptLoop9_index         ; $66
-	const OWScript_EndScriptLoop10_index        ; $67
-
-; Script Flags
-FLAG_BEAT_SARA      EQU $15
-FLAG_BEAT_AMANDA    EQU $16
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
diff --git a/src/macros.asm b/src/macros.asm
index 837bfb2..7425977 100644
--- a/src/macros.asm
+++ b/src/macros.asm
@@ -1,5 +1,6 @@
 INCLUDE "macros/audio.asm"
 INCLUDE "macros/code.asm"
+INCLUDE "macros/constants.asm"
 INCLUDE "macros/data.asm"
 INCLUDE "macros/scripts.asm"
 INCLUDE "macros/wram.asm"
diff --git a/src/macros/code.asm b/src/macros/code.asm
index 276bd6a..9e8a4ce 100644
--- a/src/macros/code.asm
+++ b/src/macros/code.asm
@@ -1,20 +1,3 @@
-INCROM: MACRO
-INCBIN "baserom.gbc", \1, \2 - \1
-ENDM
-
-const_def: MACRO
-if _NARG > 0
-const_value = \1
-else
-const_value = 0
-endc
-ENDM
-
-const: MACRO
-\1 EQU const_value
-const_value = const_value + 1
-ENDM
-
 lb: MACRO ; r, hi, lo
 	ld \1, (\2) << 8 + ((\3) & $ff)
 ENDM
@@ -39,19 +22,6 @@ else
 endc
 ENDM
 
-; the rst $38 handler is a single ret
+; the rst $38 handler is a single ret instruction
 ; probably used for testing purposes during development
 debug_ret EQUS "rst $38"
-
-emptybank: MACRO
-	rept $4000
-	db $ff
-	endr
-ENDM
-
-textpointer: MACRO
-	dw ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) & $ffff
-	db ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) >> 16
-	const \1_
-GLOBAL \1_
-ENDM
diff --git a/src/macros/constants.asm b/src/macros/constants.asm
new file mode 100644
index 0000000..ceb0c7f
--- /dev/null
+++ b/src/macros/constants.asm
@@ -0,0 +1,19 @@
+const_def: MACRO
+if _NARG > 0
+const_value = \1
+else
+const_value = 0
+endc
+ENDM
+
+const: MACRO
+\1 EQU const_value
+const_value = const_value + 1
+ENDM
+
+deck_const: MACRO
+if const_value >= 2
+\1_ID EQU const_value + -2
+endc
+	const \1
+ENDM
diff --git a/src/macros/data.asm b/src/macros/data.asm
index 2fd4b7d..80978b7 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -1,3 +1,7 @@
+INCROM: MACRO
+INCBIN "baserom.gbc", \1, \2 - \1
+ENDM
+
 dn: MACRO
 	db \1 << 4 | \2
 ENDM
@@ -40,7 +44,20 @@ rgb: MACRO
 	dw (\3 << 10 | \2 << 5 | \1)
 ENDM
 
-; macros used in data/cards.asm, but might be useful elsewhere eventually
+emptybank: MACRO
+	rept $4000
+	db $ff
+	endr
+ENDM
+
+; poketcg specific macros below
+
+textpointer: MACRO
+	dw ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) & $ffff
+	db ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) >> 16
+	const \1_
+GLOBAL \1_
+ENDM
 
 energy: MACRO
 en = 0
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index 9c46f96..b9ab4ec 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -4,4 +4,118 @@ run_script: MACRO
 	db \1_index
 ENDM
 
-; TODO: macros for scripts (constants/overworld_scripts_constants.asm)
+; TODO: create macros for overworld scripts after their usage and arguments are figured out.
+; For example (current OWScript_GiveBoosterPacks_index):
+
+;	const SCRIPT_GIVE_BOOSTER_PACKS ; $0c
+;give_booster_packs: MACRO
+;	db SCRIPT_GIVE_BOOSTER_PACKS
+;	db \1, \2, \3
+;ENDM
+
+	const_def
+	const OWScript_EndScriptLoop1_index         ; $00
+	const OWScript_CloseTextBox_index           ; $01
+	const OWScript_PrintTextString_index        ; $02
+	const Func_ccdc_index                       ; $03
+	const OWScript_AskQuestionJump_index        ; $04
+	const OWScript_StartBattle_index            ; $05
+	const Func_cd83_index                       ; $06
+	const Func_cda8_index                       ; $07
+	const OWScript_PrintTextCloseBox_index      ; $08
+	const Func_cdcb_index                       ; $09
+	const Func_ce26_index                       ; $0a
+	const Func_ce84_index                       ; $0b
+	const OWScript_GiveBoosterPacks_index       ; $0c
+	const Func_cf0c_index                       ; $0d
+	const Func_cf12_index                       ; $0e
+	const Func_cf3f_index                       ; $0f
+	const Func_cf4c_index                       ; $10
+	const Func_cf53_index                       ; $11
+	const Func_cf7b_index                       ; $12
+	const Func_cf2d_index                       ; $13
+	const Func_cf96_index                       ; $14
+	const Func_cfc6_index                       ; $15
+	const Func_cfd4_index                       ; $16
+	const Func_d00b_index                       ; $17
+	const Func_d025_index                       ; $18
+	const Func_d032_index                       ; $19
+	const Func_d03f_index                       ; $1a
+	const OWScript_ScriptJump_index             ; $1b
+	const Func_d04f_index                       ; $1c
+	const Func_d055_index                       ; $1d
+	const OWScript_MovePlayer_index             ; $1e
+	const Func_cee2_index                       ; $1f
+	const Func_d080_index                       ; $20
+	const Func_d088_index                       ; $21
+	const Func_d095_index                       ; $22
+	const Func_d0be_index                       ; $23
+	const Func_d0ce_index                       ; $24
+	const Func_d0d9_index                       ; $25
+	const Func_d0f2_index                       ; $26
+	const Func_ce4a_index                       ; $27
+	const Func_ceba_index                       ; $28
+	const Func_d103_index                       ; $29
+	const Func_d125_index                       ; $2a
+	const Func_d135_index                       ; $2b
+	const Func_d16b_index                       ; $2c
+	const Func_cd4f_index                       ; $2d
+	const Func_cd94_index                       ; $2e
+	const Func_ce52_index                       ; $2f
+	const Func_cdd8_index                       ; $30
+	const Func_cdf5_index                       ; $31
+	const Func_d195_index                       ; $32
+	const Func_d1ad_index                       ; $33
+	const Func_d1b3_index                       ; $34
+	const OWScript_EndScriptCloseText_index     ; $35
+	const Func_d244_index                       ; $36
+	const Func_d24c_index                       ; $37
+	const OWScript_OpenDeckMachine_index        ; $38
+	const Func_d271_index                       ; $39
+	const Func_d36d_index                       ; $3a
+	const Func_ce6f_index                       ; $3b
+	const Func_d209_index                       ; $3c
+	const Func_d38f_index                       ; $3d
+	const Func_d396_index                       ; $3e
+	const Func_cd76_index                       ; $3f
+	const Func_d39d_index                       ; $40
+	const Func_d3b9_index                       ; $41
+	const Func_d3c9_index                       ; $42
+	const Func_d3d1_index                       ; $43
+	const Func_d3d4_index                       ; $44
+	const Func_d3e0_index                       ; $45
+	const Func_d3fe_index                       ; $46
+	const Func_d408_index                       ; $47
+	const Func_d40f_index                       ; $48
+	const Func_d416_index                       ; $49
+	const Func_d423_index                       ; $4a
+	const Func_d429_index                       ; $4b
+	const Func_d41d_index                       ; $4c
+	const Func_d42f_index                       ; $4d
+	const Func_d435_index                       ; $4e
+	const Func_cce4_index                       ; $4f
+	const Func_d2f6_index                       ; $50
+	const Func_d317_index                       ; $51
+	const Func_d43d_index                       ; $52
+	const OWScript_EndScriptLoop2_index         ; $53
+	const OWScript_EndScriptLoop3_index         ; $54
+	const OWScript_EndScriptLoop4_index         ; $55
+	const OWScript_EndScriptLoop5_index         ; $56
+	const OWScript_EndScriptLoop6_index         ; $57
+	const OWScript_CustomModifyEventFlags_index ; $58
+	const Func_d460_index                       ; $59
+	const OWScript_JumpIfFlagSet_index          ; $5a
+	const Func_d484_index                       ; $5b
+	const Func_d49e_index                       ; $5c
+	const Func_d4a6_index                       ; $5d
+	const Func_d4ae_index                       ; $5e
+	const OWScript_SetEventFlags_index          ; $5f
+	const Func_d4c3_index                       ; $60
+	const Func_d4ca_index                       ; $61
+	const OWScript_JumpIfFlagNotSet_index       ; $62
+	const Func_d452_index                       ; $63
+	const OWScript_EndScriptLoop7_index         ; $64
+	const OWScript_EndScriptLoop8_index         ; $65
+	const OWScript_EndScriptLoop9_index         ; $66
+	const OWScript_EndScriptLoop10_index        ; $67
+
diff --git a/src/main.asm b/src/main.asm
index 6e89c9d..8e60df6 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -3,37 +3,37 @@ INCLUDE "constants.asm"
 
 INCLUDE "engine/home.asm"
 
-SECTION "bank1", ROMX
-INCLUDE "engine/bank1.asm"
+SECTION "Bank 1", ROMX
+INCLUDE "engine/bank01.asm"
 
-SECTION "bank2", ROMX
-INCLUDE "engine/bank2.asm"
+SECTION "Bank 2", ROMX
+INCLUDE "engine/bank02.asm"
 
-SECTION "bank3", ROMX
-INCLUDE "engine/bank3.asm"
+SECTION "Bank 3", ROMX
+INCLUDE "engine/bank03.asm"
 
-SECTION "bank4", ROMX
-INCLUDE "engine/bank4.asm"
+SECTION "Bank 4", ROMX
+INCLUDE "engine/bank04.asm"
 
-SECTION "bank5", ROMX
-INCLUDE "engine/bank5.asm"
+SECTION "Bank 5", ROMX
+INCLUDE "engine/bank05.asm"
 
-SECTION "bank6", ROMX
-INCLUDE "engine/bank6.asm"
+SECTION "Bank 6", ROMX
+INCLUDE "engine/bank06.asm"
 
-SECTION "bank7", ROMX
-INCLUDE "engine/bank7.asm"
+SECTION "Bank 7", ROMX
+INCLUDE "engine/bank07.asm"
 
 SECTION "Booster Packs", ROMX
 INCLUDE "engine/booster_packs.asm"
 
-SECTION "bank8", ROMX
-INCLUDE "engine/bank8.asm"
+SECTION "Bank 8", ROMX
+INCLUDE "engine/bank08.asm"
 
-SECTION "bank9", ROMX
+SECTION "Bank 9", ROMX
 	emptybank
 
-SECTION "bankA", ROMX
+SECTION "Bank A", ROMX
 	emptybank
 
 SECTION "Effect Functions", ROMX
@@ -45,8 +45,8 @@ INCLUDE "data/decks.asm"
 SECTION "Cards", ROMX
 INCLUDE "data/cards.asm"
 
-SECTION "bank1C", ROMX
+SECTION "Bank 1C", ROMX
 INCLUDE "engine/bank1c.asm"
 
-SECTION "bank20", ROMX
+SECTION "Bank 20", ROMX
 INCLUDE "engine/bank20.asm"
diff --git a/src/wram.asm b/src/wram.asm
index d957273..84cd374 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -732,9 +732,8 @@ wcc0c:: ; cc0c
 wDuelistType:: ; cc0d
 	ds $1
 
-; this seems to hold the current opponent's deck id - 2,
-; perhaps to account for the two unused pointers at the
-; beginning of DeckPointers
+; this holds the current opponent's deck minus 2 (that is, a *_DECK_ID constant),
+; perhaps to account for the two unused pointers at the beginning of DeckPointers.
 wOpponentDeckID:: ; cc0e
 	ds $1