Began Disassembling Scripting system and AI.

6 files changed, 197 insertions, 157 deletions

diff --git a/src/constants/booster_constants.asm b/src/constants/booster_constants.asm
new file mode 100755
index 0000000..163b5cf
--- /dev/null
+++ b/src/constants/booster_constants.asm
@@ -0,0 +1,41 @@
+BOOSTER_CARD_TYPE_GRASS     EQU $00

+BOOSTER_CARD_TYPE_FIRE      EQU $01

+BOOSTER_CARD_TYPE_LIGHTNING EQU $03

+BOOSTER_CARD_TYPE_WATER     EQU $02

+BOOSTER_CARD_TYPE_FIGHTING  EQU $04

+BOOSTER_CARD_TYPE_PSYCHIC   EQU $05

+BOOSTER_CARD_TYPE_COLORLESS EQU $06

+BOOSTER_CARD_TYPE_TRAINER   EQU $07

+BOOSTER_CARD_TYPE_ENERGY    EQU $08

+BOOSTER_CARD_TYPE_AMOUNT    EQU $09

+

+BOOSTER_ColoNeutral					EQU $00

+BOOSTER_ColoGrass					EQU $01

+BOOSTER_ColoFire					EQU $02

+BOOSTER_ColoWater					EQU $03

+BOOSTER_ColoLightning				EQU $04

+BOOSTER_ColoFighting				EQU $05

+BOOSTER_ColoTrainer					EQU $06

+BOOSTER_EvoNeutral					EQU $07

+BOOSTER_EvoGrass					EQU $08

+BOOSTER_EvoNeutralFireEnergy		EQU $09

+BOOSTER_EvoWater					EQU $0a

+BOOSTER_EvoFighting					EQU $0b

+BOOSTER_EvoPsychic					EQU $0c

+BOOSTER_EvoTrainer					EQU $0d

+BOOSTER_MysteryNeutral				EQU $0e

+BOOSTER_MysteryGrassColorless		EQU $0f

+BOOSTER_MysteryWaterColorless		EQU $10

+BOOSTER_LightningColorless			EQU $11

+BOOSTER_MysteryFightingColorless	EQU $12

+BOOSTER_MysteryTrainerColorless		EQU $13

+BOOSTER_LabTrainerLessFighting		EQU $14

+BOOSTER_LabGrass					EQU $15

+BOOSTER_LabWater					EQU $16

+BOOSTER_LabPsychic					EQU $17

+BOOSTER_LabTrainer					EQU $18

+BOOSTER_EnergyLightningFire			EQU $19

+BOOSTER_EnergyWaterFighting			EQU $1a

+BOOSTER_EnergyGrassPsychic			EQU $1b

+BOOSTER_RandomEnergies				EQU $1c

+NO_BOOSTER							EQU $ff

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 8ee2ed3..637eb90 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -102,15 +102,3 @@ FLAG_3_BIT_1             EQU %00000010
 UNABLE_RETREAT EQU $64
 
 CARD_COLLECTION_SIZE EQU $100
-
-;----BOOSTER CARD TYPES----
-BOOSTER_CARD_TYPE_GRASS     EQU $00
-BOOSTER_CARD_TYPE_FIRE      EQU $01
-BOOSTER_CARD_TYPE_LIGHTNING EQU $03
-BOOSTER_CARD_TYPE_WATER     EQU $02
-BOOSTER_CARD_TYPE_FIGHTING  EQU $04
-BOOSTER_CARD_TYPE_PSYCHIC   EQU $05
-BOOSTER_CARD_TYPE_COLORLESS EQU $06
-BOOSTER_CARD_TYPE_TRAINER   EQU $07
-BOOSTER_CARD_TYPE_ENERGY    EQU $08
-BOOSTER_CARD_TYPE_AMOUNT    EQU $09
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 0411888..15e4662 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -42,6 +42,9 @@ CARD_LOCATION_BENCH_3      EQU $13
 CARD_LOCATION_BENCH_4      EQU $14
 CARD_LOCATION_BENCH_5      EQU $15
 
+;;; constant values
+DUEL_MAX_POKEMON_IN_PLAY	EQU $06
+
 ;;; status conditions
 ; two statuses can be combined if they are identified by a different nybble
 NO_STATUS       EQU $00
diff --git a/src/constants/duelist_constants.asm b/src/constants/duelist_constants.asm
deleted file mode 100755
index 2fbb190..0000000
--- a/src/constants/duelist_constants.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-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
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
new file mode 100755
index 0000000..af412d6
--- /dev/null
+++ b/src/constants/npc_constants.asm
@@ -0,0 +1,44 @@
+PLAYER_PIC    EQU $01
+RONALD_PIC    EQU $02
+SAM_PIC       EQU $03
+IMAKUNI_PIC   EQU $04
+NIKKI_PIC     EQU $05
+RICK_PIC      EQU $06
+KEN_PIC       EQU $07
+AMY_PIC       EQU $08
+ISAAC_PIC     EQU $09
+MITCH_PIC     EQU $0A
+GENE_PIC      EQU $0B
+MURRAY_PIC    EQU $0C
+COURTNEY_PIC  EQU $0D
+STEVE_PIC     EQU $0E
+JACK_PIC      EQU $0F
+ROD_PIC       EQU $10
+JOSEPH_PIC    EQU $11
+DAVID_PIC     EQU $12
+ERIK_PIC      EQU $13
+JOHN_PIC      EQU $14
+ADAM_PIC      EQU $15
+JONATHAN_PIC  EQU $16
+JOSHUA_PIC    EQU $17
+NICHOLAS_PIC  EQU $18
+BRANDON_PIC   EQU $19
+MATTHEW_PIC   EQU $1A
+RYAN_PIC      EQU $1B
+ANDREW_PIC    EQU $1C
+CHRIS_PIC     EQU $1D
+MICHAEL_PIC   EQU $1E
+DANIEL_PIC    EQU $1F
+ROBERT_PIC    EQU $20
+BRITTANY_PIC  EQU $21
+KRISTIN_PIC   EQU $22
+HEATHER_PIC   EQU $23
+SARA_PIC      EQU $24
+AMANDA_PIC    EQU $25
+JENNIFER_PIC  EQU $26
+JESSICA_PIC   EQU $27
+STEPHANIE_PIC EQU $28
+AARON_PIC     EQU $29
+
+SARA          EQU $1f
+AMANDA        EQU $20
\ No newline at end of file
diff --git a/src/constants/overworld_script_constants.asm b/src/constants/overworld_script_constants.asm
index 2306c38..ef76827 100755
--- a/src/constants/overworld_script_constants.asm
+++ b/src/constants/overworld_script_constants.asm
@@ -1,106 +1,111 @@
 start_script EQUS "rst $20"
 
-Func_ccbe_0					EQU $00
-Func_ccc6_index				EQU $01
-Func_ccd4_index				EQU $02
-Func_ccdc_index				EQU $03
-Func_cce9_index				EQU $04
-Func_cd01_index				EQU $05
-Func_cd83_index				EQU $06
-Func_cda8_index				EQU $07
-Func_cdb9_index				EQU $08
-Func_cdcb_index				EQU $09
-Func_ce26_index				EQU $0a
-Func_ce84_index				EQU $0b
-Func_ce8a_index				EQU $0c
-Func_cf0c_index 			EQU $0d
-Func_cf12_index 			EQU $0e
-Func_cf3f_index 			EQU $0f
-Func_cf4c_index 			EQU $10
-Func_cf53_index 			EQU $11
-Func_cf7b_index 			EQU $12
-Func_cf2d_index 			EQU $13
-Func_cf96_index 			EQU $14
-Func_cfc6_index 			EQU $15
-Func_cfd4_index 			EQU $16
-Func_d00b_index 			EQU $17
-Func_d025_index 			EQU $18
-Func_d032_index 			EQU $19
-Func_d03f_index 			EQU $1a
-Func_d049_index 			EQU $1b
-Func_d04f_index 			EQU $1c
-Func_d055_index 			EQU $1d
-OWScript_MovePlayer_index	EQU $1e
-Func_cee2_index 			EQU $1f
-Func_d080_index 			EQU $20
-Func_d088_index 			EQU $21
-Func_d095_index 			EQU $22
-Func_d0be_index 			EQU $23
-Func_d0ce_index 			EQU $24
-Func_d0d9_index 			EQU $25
-Func_d0f2_index 			EQU $26
-Func_ce4a_index 			EQU $27
-Func_ceba_index 			EQU $28
-Func_d103_index 			EQU $29
-Func_d125_index 			EQU $2a
-Func_d135_index 			EQU $2b
-Func_d16b_index 			EQU $2c
-Func_cd4f_index 			EQU $2d
-Func_cd94_index 			EQU $2e
-Func_ce52_index 			EQU $2f
-Func_cdd8_index 			EQU $30
-Func_cdf5_index 			EQU $31
-Func_d195_index 			EQU $32
-Func_d1ad_index 			EQU $33
-Func_d1b3_index 			EQU $34
-Func_cccc_index 			EQU $35
-Func_d244_index 			EQU $36
-Func_d24c_index 			EQU $37
-DeckMachine_d336_index		EQU $38
-Func_d271_index				EQU $39
-Func_d36d_index				EQU $3a
-Func_ce6f_index				EQU $3b
-Func_d209_index				EQU $3c
-Func_d38f_index				EQU $3d
-Func_d396_index				EQU $3e
-Func_cd76_index				EQU $3f
-Func_d39d_index				EQU $40
-Func_d3b9_index				EQU $41
-Func_d3c9_index				EQU $42
-Func_d3d1_index				EQU $43
-Func_d3d4_index				EQU $44
-Func_d3e0_index				EQU $45
-Func_d3fe_index				EQU $46
-Func_d408_index				EQU $47
-Func_d40f_index				EQU $48
-Func_d416_index				EQU $49
-Func_d423_index				EQU $4a
-Func_d429_index				EQU $4b
-Func_d41d_index				EQU $4c
-Func_d42f_index				EQU $4d
-Func_d435_index				EQU $4e
-Func_cce4_index				EQU $4f
-Func_d2f6_index				EQU $50
-Func_d317_index				EQU $51
-Func_d43d_index				EQU $52
-Func_ccbe_53				EQU $53
-Func_ccbe_54				EQU $54
-Func_ccbe_55				EQU $55
-Func_ccbe_56				EQU $56
-Func_ccbe_57				EQU $57
-Func_d44a_index				EQU $58
-Func_d460_index				EQU $59
-Func_d47b_index				EQU $5a
-Func_d484_index				EQU $5b
-Func_d49e_index				EQU $5c
-Func_d4a6_index				EQU $5d
-Func_d4ae_index				EQU $5e
-Func_d4bc_index				EQU $5f
-Func_d4c3_index				EQU $60
-Func_d4ca_index				EQU $61
-Func_d4df_index				EQU $62
-Func_d452_index				EQU $63
-Func_ccbe_64				EQU $64
-Func_ccbe_65				EQU $65
-Func_ccbe_66				EQU $66
-Func_ccbe_67				EQU $67
\ No newline at end of file
+OWScript_EndScriptLoop_0				EQU $00
+OWScript_CloseTextBox_index				EQU $01
+OWScript_PrintTextString_index			EQU $02
+Func_ccdc_index							EQU $03
+OWScript_AskQuestionJump_index			EQU $04
+OWScript_StartBattle_index				EQU $05
+Func_cd83_index							EQU $06
+Func_cda8_index							EQU $07
+OWScript_PrintTextCloseBox_index		EQU $08
+Func_cdcb_index							EQU $09
+Func_ce26_index							EQU $0a
+Func_ce84_index							EQU $0b
+OWScript_GiveBoosterPacks_index			EQU $0c
+Func_cf0c_index 						EQU $0d
+Func_cf12_index 						EQU $0e
+Func_cf3f_index 						EQU $0f
+Func_cf4c_index 						EQU $10
+Func_cf53_index 						EQU $11
+Func_cf7b_index 						EQU $12
+Func_cf2d_index 						EQU $13
+Func_cf96_index 						EQU $14
+Func_cfc6_index 						EQU $15
+Func_cfd4_index 						EQU $16
+Func_d00b_index 						EQU $17
+Func_d025_index 						EQU $18
+Func_d032_index 						EQU $19
+Func_d03f_index 						EQU $1a
+OWScript_ScriptJump_index 				EQU $1b
+Func_d04f_index 						EQU $1c
+Func_d055_index 						EQU $1d
+OWScript_MovePlayer_index				EQU $1e
+Func_cee2_index 						EQU $1f
+Func_d080_index 						EQU $20
+Func_d088_index 						EQU $21
+Func_d095_index 						EQU $22
+Func_d0be_index 						EQU $23
+Func_d0ce_index 						EQU $24
+Func_d0d9_index 						EQU $25
+Func_d0f2_index 						EQU $26
+Func_ce4a_index 						EQU $27
+Func_ceba_index 						EQU $28
+Func_d103_index 						EQU $29
+Func_d125_index 						EQU $2a
+Func_d135_index 						EQU $2b
+Func_d16b_index 						EQU $2c
+Func_cd4f_index 						EQU $2d
+Func_cd94_index 						EQU $2e
+Func_ce52_index 						EQU $2f
+Func_cdd8_index 						EQU $30
+Func_cdf5_index 						EQU $31
+Func_d195_index 						EQU $32
+Func_d1ad_index 						EQU $33
+Func_d1b3_index 						EQU $34
+OWScript_EndScriptCloseText_index 		EQU $35
+Func_d244_index 						EQU $36
+Func_d24c_index 						EQU $37
+DeckMachine_d336_index					EQU $38
+Func_d271_index							EQU $39
+Func_d36d_index							EQU $3a
+Func_ce6f_index							EQU $3b
+Func_d209_index							EQU $3c
+Func_d38f_index							EQU $3d
+Func_d396_index							EQU $3e
+Func_cd76_index							EQU $3f
+Func_d39d_index							EQU $40
+Func_d3b9_index							EQU $41
+Func_d3c9_index							EQU $42
+Func_d3d1_index							EQU $43
+Func_d3d4_index							EQU $44
+Func_d3e0_index							EQU $45
+Func_d3fe_index							EQU $46
+Func_d408_index							EQU $47
+Func_d40f_index							EQU $48
+Func_d416_index							EQU $49
+Func_d423_index							EQU $4a
+Func_d429_index							EQU $4b
+Func_d41d_index							EQU $4c
+Func_d42f_index							EQU $4d
+Func_d435_index							EQU $4e
+Func_cce4_index							EQU $4f
+Func_d2f6_index							EQU $50
+Func_d317_index							EQU $51
+Func_d43d_index							EQU $52
+OWScript_EndScriptLoop_53				EQU $53
+OWScript_EndScriptLoop_54				EQU $54
+OWScript_EndScriptLoop_55				EQU $55
+OWScript_EndScriptLoop_56				EQU $56
+OWScript_EndScriptLoop_57				EQU $57
+OWScript_CustomModifyEventFlags_index	EQU $58
+Func_d460_index							EQU $59
+OWScript_JumpIfFlagSet_index			EQU $5a
+Func_d484_index							EQU $5b
+Func_d49e_index							EQU $5c
+Func_d4a6_index							EQU $5d
+Func_d4ae_index							EQU $5e
+OWScript_SetEventFlags_index			EQU $5f
+Func_d4c3_index							EQU $60
+Func_d4ca_index							EQU $61
+OWScript_JumpIfFlagNotSet_index			EQU $62
+Func_d452_index							EQU $63
+OWScript_EndScriptLoop_64				EQU $64
+OWScript_EndScriptLoop_65				EQU $65
+OWScript_EndScriptLoop_66				EQU $66
+OWScript_EndScriptLoop_67				EQU $67
+
+; Script Flags
+FLAG_BEAT_SARA      EQU $15
+FLAG_BEAT_AMANDA    EQU $16
+