clean up script and event constants

6 files changed, 125 insertions, 117 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/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/bank03.asm b/src/engine/bank03.asm
index e53fc38..8979d23 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -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
@@ -3025,7 +3025,7 @@ OWSequence_Sara: ; e177 (3:6177)
 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
@@ -3063,7 +3063,7 @@ OWSequence_Amanda: ; e19e (03:619e)
 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/bank04.asm b/src/engine/bank04.asm
index 5140705..9bf84f3 100644
--- a/src/engine/bank04.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/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
+