More scripts, start to figure out mapscripts

3 files changed, 248 insertions, 233 deletions

diff --git a/src/constants/event_constants.asm b/src/constants/event_constants.asm
deleted file mode 100644
index f6ac803..0000000
--- a/src/constants/event_constants.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-; EVENT_JOSHUA_STATE    ; $33
-JOSHUA_TALKED     EQU 1
-JOSHUA_BEATEN     EQU 2
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index 9e3911c..5ae8f99 100644
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -77,119 +77,119 @@ NPC_DATA_LENGTH EQU const_value
 	const AARON_PIC     ; $29
 
 	const_def 1
-	const DRMASON       ; $01
-	const RONALD1       ; $02
-	const ISHIHARA      ; $03
-	const IMAKUNI       ; $04
+	const DRMASON                     ; $01
+	const RONALD1                     ; $02
+	const ISHIHARA                    ; $03
+	const IMAKUNI                     ; $04
 const_value = const_value+1 ; DRMASON duplicate
 const_value = const_value+1 ; DRMASON duplicate
-	const SAM           ; $07
-	const TECH1         ; $08
-	const TECH2         ; $09
-	const TECH3         ; $0a
-	const TECH4         ; $0b
-	const TECH5         ; $0c
-	const TECH6         ; $0d
-	const CLERK1        ; $0e
-	const CLERK2        ; $0f
-	const CLERK3        ; $10
-	const CLERK4        ; $11
-	const CLERK5        ; $12
-	const CLERK6        ; $13
-	const CLERK7        ; $14
-	const CLERK8        ; $15
-	const CLERK9        ; $16
-	const CHRIS         ; $17
-	const MICHAEL       ; $18
-	const JESSICA       ; $19
-	const MITCH         ; $1a
-	const MATTHEW       ; $1b
-	const RYAN          ; $1c
-	const ANDREW        ; $1d
-	const GENE          ; $1e
-	const SARA          ; $1f
-	const AMANDA        ; $20
-	const JOSHUA        ; $21
-	const AMY           ; $22
-	const JENNIFER      ; $23
-	const NICHOLAS      ; $24
-	const BRANDON       ; $25
-	const ISAAC         ; $26
-	const BRITTANY      ; $27
-	const KRISTIN       ; $28
-	const HEATHER       ; $29
-	const NIKKI         ; $2a
-	const ROBERT        ; $2b
-	const DANIEL        ; $2c
-	const STEPHANIE     ; $2d
-	const MURRAY1       ; $2e
-	const JOSEPH        ; $2f
-	const DAVID         ; $30
-	const ERIK          ; $31
-	const RICK          ; $32
-	const JOHN          ; $33
-	const ADAM          ; $34
-	const JONATHAN      ; $35
-	const KEN           ; $36
-	const COURTNEY      ; $37
-	const STEVE         ; $38
-	const JACK          ; $39
-	const ROD           ; $3a
-	const CLERK10       ; $3b
-	const CLERK11       ; $3c
-	const MAN1          ; $3d
-	const WOMAN1        ; $3e
-	const CHAP1         ; $3f
-	const GAL1          ; $40
-	const LASS1         ; $41
-	const CHAP2         ; $42
-	const LASS2         ; $43
-	const PAPPY1        ; $44
-	const LAD1          ; $45
-	const LAD2          ; $46
-	const CHAP3         ; $47
-	const CLERK12       ; $48
-	const CLERK13       ; $49
-	const HOST          ; $4a
-	const SPECS1        ; $4b
-	const BUTCH         ; $4c
-	const GRANNY1       ; $4d
-	const LASS3         ; $4e
-	const MAN2          ; $4f
-	const PAPPY2        ; $50
-	const LASS4         ; $51
-	const HOOD1         ; $52
-	const GRANNY2       ; $53
-	const GAL2          ; $54
-	const LAD3          ; $55
-	const GAL3          ; $56
-	const CHAP4         ; $57
-	const MAN3          ; $58
-	const SPECS2        ; $59
-	const SPECS3        ; $5a
-	const WOMAN2        ; $5b
-	const MANIA         ; $5c
-	const PAPPY3        ; $5d
-	const GAL4          ; $5e
-	const CHAMP         ; $5f
-	const HOOD2         ; $60
-	const LASS5         ; $61
-	const CHAP5         ; $62
-	const AARON         ; $63
-	const GUIDE         ; $64
-	const TECH7         ; $65
-	const TECH8         ; $66
-	const _11F18        ; $67
-	const _11F1F        ; $68
-	const _11F26        ; $69
-	const _11F2D        ; $6a
-	const _11F34        ; $6b
-	const _11F3B        ; $6c
-	const _11F42        ; $6d
-	const _11F49        ; $6e
+	const SAM                         ; $07
+	const TECH1                       ; $08
+	const TECH2                       ; $09
+	const TECH3                       ; $0a
+	const TECH4                       ; $0b
+	const TECH5                       ; $0c
+	const TECH6                       ; $0d
+	const CLERK1                      ; $0e
+	const CLERK2                      ; $0f
+	const CLERK3                      ; $10
+	const CLERK4                      ; $11
+	const CLERK5                      ; $12
+	const CLERK6                      ; $13
+	const CLERK7                      ; $14
+	const CLERK8                      ; $15
+	const CLERK9                      ; $16
+	const CHRIS                       ; $17
+	const MICHAEL                     ; $18
+	const JESSICA                     ; $19
+	const MITCH                       ; $1a
+	const MATTHEW                     ; $1b
+	const RYAN                        ; $1c
+	const ANDREW                      ; $1d
+	const GENE                        ; $1e
+	const SARA                        ; $1f
+	const AMANDA                      ; $20
+	const JOSHUA                      ; $21
+	const AMY                         ; $22
+	const JENNIFER                    ; $23
+	const NICHOLAS                    ; $24
+	const BRANDON                     ; $25
+	const ISAAC                       ; $26
+	const BRITTANY                    ; $27
+	const KRISTIN                     ; $28
+	const HEATHER                     ; $29
+	const NIKKI                       ; $2a
+	const ROBERT                      ; $2b
+	const DANIEL                      ; $2c
+	const STEPHANIE                   ; $2d
+	const MURRAY1                     ; $2e
+	const JOSEPH                      ; $2f
+	const DAVID                       ; $30
+	const ERIK                        ; $31
+	const RICK                        ; $32
+	const JOHN                        ; $33
+	const ADAM                        ; $34
+	const JONATHAN                    ; $35
+	const KEN                         ; $36
+	const COURTNEY                    ; $37
+	const STEVE                       ; $38
+	const JACK                        ; $39
+	const ROD                         ; $3a
+	const CLERK10                     ; $3b
+	const GIFT_CENTER_CLERK           ; $3c
+	const MAN1                        ; $3d
+	const WOMAN1                      ; $3e
+	const CHAP1                       ; $3f
+	const GAL1                        ; $40
+	const LASS1                       ; $41
+	const CHAP2                       ; $42
+	const LASS2                       ; $43
+	const PAPPY1                      ; $44
+	const LAD1                        ; $45
+	const LAD2                        ; $46
+	const CHAP3                       ; $47
+	const CLERK12                     ; $48
+	const CLERK13                     ; $49
+	const HOST                        ; $4a
+	const SPECS1                      ; $4b
+	const BUTCH                       ; $4c
+	const GRANNY1                     ; $4d
+	const LASS3                       ; $4e
+	const MAN2                        ; $4f
+	const PAPPY2                      ; $50
+	const LASS4                       ; $51
+	const HOOD1                       ; $52
+	const GRANNY2                     ; $53
+	const GAL2                        ; $54
+	const LAD3                        ; $55
+	const GAL3                        ; $56
+	const CHAP4                       ; $57
+	const MAN3                        ; $58
+	const SPECS2                      ; $59
+	const SPECS3                      ; $5a
+	const WOMAN2                      ; $5b
+	const MANIA                       ; $5c
+	const PAPPY3                      ; $5d
+	const GAL4                        ; $5e
+	const CHAMP                       ; $5f
+	const HOOD2                       ; $60
+	const LASS5                       ; $61
+	const CHAP5                       ; $62
+	const AARON                       ; $63
+	const GUIDE                       ; $64
+	const TECH7                       ; $65
+	const TECH8                       ; $66
+	const _11F18                      ; $67
+	const LEGEND_CARDS_TOP_LEFT       ; $68
+	const LEGEND_CARDS_TOP_RIGHT      ; $69
+	const LEGEND_CARDS_LEFT_SPARK     ; $6a
+	const LEGEND_CARDS_BOTTOM_LEFT    ; $6b
+	const LEGEND_CARDS_BOTTOM_RIGHT   ; $6c
+	const LEGEND_CARDS_RIGHT_SPARK    ; $6d
+	const _11F49                      ; $6e
 const_value = const_value+1 ; _11F49 duplicate
-	const MURRAY2       ; $70
-	const RONALD2       ; $71
-	const RONALD3       ; $72
+	const MURRAY2                     ; $70
+	const RONALD2                     ; $71
+	const RONALD3                     ; $72
 const_value = const_value+1 ; _11f49 duplicate
 
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm
index 398eeb3..2ce9a54 100644
--- a/src/constants/script_constants.asm
+++ b/src/constants/script_constants.asm
@@ -1,125 +1,143 @@
 	const_def
-	const EVENT_FLAG_00    
-	const EVENT_FLAG_01    
-	const EVENT_FLAG_02    
-	const EVENT_FLAG_03    
-	const EVENT_FLAG_04    
-	const EVENT_FLAG_05    
-	const EVENT_FLAG_06    
-	const EVENT_FLAG_07    
-	const EVENT_FLAG_08    
-	const EVENT_FLAG_09    
-	const EVENT_FLAG_0A    
-	const EVENT_BEAT_AMY   
-	const EVENT_FLAG_0C    
-	const EVENT_FLAG_0D    
-	const EVENT_FLAG_0E    
-	const EVENT_FLAG_0F    
-	const EVENT_FLAG_10    
-	const EVENT_FLAG_11    
-	const EVENT_FLAG_12    
-	const EVENT_FLAG_13    
-	const EVENT_FLAG_14    
-	const EVENT_BEAT_SARA  
-	const EVENT_BEAT_AMANDA
-	const EVENT_FLAG_17    
-	const EVENT_FLAG_18    
-	const EVENT_FLAG_19    
-	const EVENT_FLAG_1A    
-	const EVENT_FLAG_1B    
-	const EVENT_FLAG_1C    
-	const EVENT_FLAG_1D    
-	const EVENT_FLAG_1E    
-	const EVENT_FLAG_1F    
-	const EVENT_FLAG_20    
-	const EVENT_FLAG_21    
-	const EVENT_FLAG_22    
-	const EVENT_FLAG_23    
-	const EVENT_FLAG_24    
-	const EVENT_FLAG_25    
-	const EVENT_FLAG_26    
-	const EVENT_FLAG_27    
-	const EVENT_FLAG_28    
-	const EVENT_FLAG_29    
-	const EVENT_FLAG_2A    
-	const EVENT_FLAG_2B    
-	const EVENT_FLAG_2C    
-	const EVENT_FLAG_2D    
-	const EVENT_FLAG_2E    
-	const EVENT_FLAG_2F    
-	const EVENT_FLAG_30    
-	const EVENT_FLAG_31    
-	const EVENT_FLAG_32    
-	const EVENT_JOSHUA_STATE
-	const EVENT_FLAG_34    
-	const EVENT_FLAG_35    
-	const EVENT_FLAG_36    
-	const EVENT_FLAG_37    
-	const EVENT_FLAG_38    
-	const EVENT_FLAG_39    
-	const EVENT_FLAG_3A    
-	const EVENT_FLAG_3B    
-	const FLAG_BEAT_BRITTANY
-	const EVENT_FLAG_3D    
-	const EVENT_FLAG_3E    
-	const EVENT_FLAG_3F    
-	const EVENT_FLAG_40    
-	const EVENT_FLAG_41    
-	const EVENT_FLAG_42    
-	const EVENT_FLAG_43    
-	const EVENT_FLAG_44    
-	const EVENT_FLAG_45    
-	const EVENT_FLAG_46    
-	const EVENT_FLAG_47    
-	const EVENT_FLAG_48    
-	const EVENT_FLAG_49    
-	const EVENT_FLAG_4A    
-	const EVENT_FLAG_4B    
-	const EVENT_FLAG_4C    
-	const EVENT_FLAG_4D    
-	const EVENT_FLAG_4E    
-	const EVENT_FLAG_4F    
-	const EVENT_FLAG_50    
-	const EVENT_FLAG_51    
-	const EVENT_FLAG_52    
-	const EVENT_FLAG_53    
-	const EVENT_FLAG_54    
-	const EVENT_FLAG_55    
-	const EVENT_FLAG_56    
-	const EVENT_FLAG_57    
-	const EVENT_FLAG_58    
-	const EVENT_FLAG_59    
-	const EVENT_FLAG_5A    
-	const EVENT_FLAG_5B    
-	const EVENT_FLAG_5C    
-	const EVENT_FLAG_5D    
-	const EVENT_FLAG_5E    
-	const EVENT_FLAG_5F    
-	const EVENT_FLAG_60    
-	const EVENT_FLAG_61    
-	const EVENT_FLAG_62    
-	const EVENT_FLAG_63    
-	const EVENT_FLAG_64    
-	const EVENT_FLAG_65    
-	const EVENT_FLAG_66    
-	const EVENT_FLAG_67    
-	const EVENT_FLAG_68    
-	const EVENT_FLAG_69    
-	const EVENT_FLAG_6A    
-	const EVENT_FLAG_6B    
-	const EVENT_FLAG_6C    
-	const EVENT_FLAG_6D    
-	const EVENT_FLAG_6E    
-	const EVENT_FLAG_6F    
-	const EVENT_FLAG_70    
-	const EVENT_FLAG_71    
-	const EVENT_FLAG_72    
-	const EVENT_FLAG_73    
-	const EVENT_FLAG_74    
-	const EVENT_FLAG_75    
-	const EVENT_FLAG_76    
+	const EVENT_FLAG_00                         ; $00
+	const EVENT_FLAG_01                         ; $01
+	const EVENT_TEMP_TALKED_TO_IMAKUNI          ; $02
+	const EVENT_TEMP_BATTLED_IMAKUNI            ; $03
+	const EVENT_FLAG_04                         ; $04
+	const EVENT_FLAG_05                         ; $05
+	const EVENT_FLAG_06                         ; $06
+	const EVENT_FLAG_07                         ; $07
+	const EVENT_FLAG_08                         ; $08
+	const EVENT_FLAG_09                         ; $09
+	const EVENT_FLAG_0A                         ; $0a
+	const EVENT_BEAT_AMY                        ; $0b
+	const EVENT_FLAG_0C                         ; $0c
+	const EVENT_FLAG_0D                         ; $0d
+	const EVENT_FLAG_0E                         ; $0e
+	const EVENT_FLAG_0F                         ; $0f
+	const EVENT_FLAG_10                         ; $10
+	const EVENT_FLAG_11                         ; $11
+	const EVENT_FLAG_12                         ; $12
+	const EVENT_IMAKUNI_STATE                   ; $13
+	const EVENT_FLAG_14                         ; $14
+	const EVENT_BEAT_SARA                       ; $15
+	const EVENT_BEAT_AMANDA                     ; $16
+	const EVENT_FLAG_17                         ; $17
+	const EVENT_FLAG_18                         ; $18
+	const EVENT_FLAG_19                         ; $19
+	const EVENT_FLAG_1A                         ; $1a
+	const EVENT_FLAG_1B                         ; $1b
+	const EVENT_FLAG_1C                         ; $1c
+	const EVENT_FLAG_1D                         ; $1d
+	const EVENT_FLAG_1E                         ; $1e
+	const EVENT_FLAG_1F                         ; $1f
+	const EVENT_FLAG_20                         ; $20
+	const EVENT_FLAG_21                         ; $21
+	const EVENT_FLAG_22                         ; $22
+	const EVENT_FLAG_23                         ; $23
+	const EVENT_FLAG_24                         ; $24
+	const EVENT_FLAG_25                         ; $25
+	const EVENT_FLAG_26                         ; $26
+	const EVENT_FLAG_27                         ; $27
+	const EVENT_FLAG_28                         ; $28
+	const EVENT_FLAG_29                         ; $29
+	const EVENT_FLAG_2A                         ; $2a
+	const EVENT_FLAG_2B                         ; $2b
+	const EVENT_FLAG_2C                         ; $2c
+	const EVENT_FLAG_2D                         ; $2d
+	const EVENT_MEDAL_COUNT                     ; $2e
+	const EVENT_FLAG_2F                         ; $2f
+	const EVENT_FLAG_30                         ; $30
+	const EVENT_FLAG_31                         ; $31
+	const EVENT_FLAG_32                         ; $32
+	const EVENT_JOSHUA_STATE                    ; $33
+	const EVENT_IMAKUNI_ROOM                    ; $34
+	const EVENT_FLAG_35                         ; $35
+	const EVENT_IMAKUNI_WIN_COUNT               ; $36
+	const EVENT_FLAG_37                         ; $37
+	const EVENT_FLAG_38                         ; $38
+	const EVENT_FLAG_39                         ; $39
+	const EVENT_FLAG_3A                         ; $3a
+	const EVENT_FLAG_3B                         ; $3b
+	const FLAG_BEAT_BRITTANY                    ; $3c
+	const EVENT_FLAG_3D                         ; $3d
+	const EVENT_FLAG_3E                         ; $3e
+	const EVENT_FLAG_3F                         ; $3f
+	const EVENT_FLAG_40                         ; $40
+	const EVENT_FLAG_41                         ; $41
+	const EVENT_FLAG_42                         ; $42
+	const EVENT_FLAG_43                         ; $43
+	const EVENT_FLAG_44                         ; $44
+	const EVENT_FLAG_45                         ; $45
+	const EVENT_FLAG_46                         ; $46
+	const EVENT_FLAG_47                         ; $47
+	const EVENT_FLAG_48                         ; $48
+	const EVENT_FLAG_49                         ; $49
+	const EVENT_FLAG_4A                         ; $4a
+	const EVENT_FLAG_4B                         ; $4b
+	const EVENT_FLAG_4C                         ; $4c
+	const EVENT_FLAG_4D                         ; $4d
+	const EVENT_FLAG_4E                         ; $4e
+	const EVENT_FLAG_4F                         ; $4f
+	const EVENT_FLAG_50                         ; $50
+	const EVENT_FLAG_51                         ; $51
+	const EVENT_FLAG_52                         ; $52
+	const EVENT_FLAG_53                         ; $53
+	const EVENT_FLAG_54                         ; $54
+	const EVENT_FLAG_55                         ; $55
+	const EVENT_FLAG_56                         ; $56
+	const EVENT_FLAG_57                         ; $57
+	const EVENT_FLAG_58                         ; $58
+	const EVENT_FLAG_59                         ; $59
+	const EVENT_FLAG_5A                         ; $5a
+	const EVENT_FLAG_5B                         ; $5b
+	const EVENT_FLAG_5C                         ; $5c
+	const EVENT_FLAG_5D                         ; $5d
+	const EVENT_FLAG_5E                         ; $5e
+	const EVENT_FLAG_5F                         ; $5f
+	const EVENT_FLAG_60                         ; $60
+	const EVENT_FLAG_61                         ; $61
+	const EVENT_FLAG_62                         ; $62
+	const EVENT_FLAG_63                         ; $63
+	const EVENT_FLAG_64                         ; $64
+	const EVENT_FLAG_65                         ; $65
+	const EVENT_FLAG_66                         ; $66
+	const EVENT_FLAG_67                         ; $67
+	const EVENT_FLAG_68                         ; $68
+	const EVENT_FLAG_69                         ; $69
+	const EVENT_FLAG_6A                         ; $6a
+	const EVENT_FLAG_6B                         ; $6b
+	const EVENT_FLAG_6C                         ; $6c
+	const EVENT_FLAG_6D                         ; $6d
+	const EVENT_FLAG_6E                         ; $6e
+	const EVENT_FLAG_6F                         ; $6f
+	const EVENT_FLAG_70                         ; $70
+	const EVENT_FLAG_71                         ; $71
+	const EVENT_FLAG_72                         ; $72
+	const EVENT_FLAG_73                         ; $73
+	const EVENT_FLAG_74                         ; $74
+	const EVENT_FLAG_75                         ; $75
+	const EVENT_FLAG_76                         ; $76
 EVENT_FLAG_AMOUNT EQU const_value
 
+EVENT_FLAG_BYTES EQU $40
+
+; EVENT_IMAKUNI_STATE
+; Starts at 0, Talking to lass moves it to MENTIONED (1), then
+; talking to Imakuni at least once sets it to TALKED (2)
+IMAKUNI_MENTIONED   EQU 1
+IMAKUNI_TALKED      EQU 2
+
+; EVENT_JOSHUA_STATE
+JOSHUA_TALKED     EQU 1
+JOSHUA_BEATEN     EQU 2
+
+; EVENT_IMAKUNI_ROOM
+IMAKUNI_FIGHTING_CLUB     EQU 0
+IMAKUNI_SCIENCE_CLUB      EQU 1
+IMAKUNI_LIGHTNING_CLUB    EQU 2
+IMAKUNI_WATER_CLUB        EQU 3
+
 NO_JUMP EQU $0000
 
 NORTH    EQU $00