Rename all event constants

JappaWakka · Jan 19, 2021 · 8a71ce3 · 8a71ce3
1 parent 3ced01a
commit 8a71ce3
Show file tree

Hide file tree

Showing 5 changed files with 1,037 additions and 1,025 deletions.
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm
@@ -1,123 +1,123 @@
 	const_def
-	const EVENT_FLAG_00                         ; $00
-	const EVENT_FLAG_01                         ; $01
-	const EVENT_TEMP_TALKED_TO_IMAKUNI          ; $02
-	const EVENT_TEMP_DUELED_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_RECEIVED_LEGENDARY_CARD         ; $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 EVENT_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
+	const EVENT_TEMP_TRADED_WITH_ISHIHARA              ; $00
+	const EVENT_TEMP_GIFTED_TO_MAN1                    ; $01
+	const EVENT_TEMP_TALKED_TO_IMAKUNI                 ; $02
+	const EVENT_TEMP_DUELED_IMAKUNI                    ; $03
+	const EVENT_TEMP_TRADED_WITH_LASS2                 ; $04
+	const EVENT_TEMP_05                                ; $05
+	const EVENT_TEMP_06                                ; $06
+	const EVENT_TEMP_07                                ; $07
+	const EVENT_BEAT_NIKKI                             ; $08
+	const EVENT_BEAT_RICK                              ; $09
+	const EVENT_BEAT_KEN                               ; $0a
+	const EVENT_BEAT_AMY                               ; $0b
+	const EVENT_BEAT_ISAAC                             ; $0c
+	const EVENT_BEAT_MURRAY                            ; $0d
+	const EVENT_BEAT_GENE                              ; $0e
+	const EVENT_BEAT_MITCH                             ; $0f
+	const EVENT_MEDAL_FLAGS                            ; $10
+	const EVENT_PUPIL_MICHAEL_STATE                    ; $11
+	const EVENT_GAL1_TRADE_STATE                       ; $12
+	const EVENT_IMAKUNI_STATE                          ; $13
+	const EVENT_LASS1_MENTIONED_IMAKUNI                ; $14
+	const EVENT_BEAT_SARA                              ; $15
+	const EVENT_BEAT_AMANDA                            ; $16
+	const EVENT_PUPIL_CHRIS_STATE                      ; $17
+	const EVENT_MATTHEW_STATE                          ; $18
+	const EVENT_CHAP2_TRADE_STATE                      ; $19
+	const EVENT_DAVID_STATE                            ; $1a
+	const EVENT_JOSEPH_STATE                           ; $1b
+	const EVENT_ISHIHARA_MENTIONED                     ; $1c
+	const EVENT_ISHIHARA_MET                           ; $1d
+	const EVENT_ISHIHARAS_HOUSE_MENTIONED              ; $1e
+	const EVENT_ISHIHARA_TRADE_STATE                   ; $1f
+	const EVENT_PUPIL_JESSICA_STATE                    ; $20
+	const EVENT_LAD2_STATE                             ; $21
+	const EVENT_RECEIVED_LEGENDARY_CARDS               ; $22
+	const EVENT_KEN_HAD_ENOUGH_CARDS                   ; $23
+	const EVENT_KEN_TALKED                             ; $24
+	const EVENT_BEAT_JENNIFER                          ; $25
+	const EVENT_BEAT_NICHOLAS                          ; $26
+	const EVENT_BEAT_BRANDON                           ; $27
+	const EVENT_ISAAC_TALKED                           ; $28
+	const EVENT_MAN1_TALKED                            ; $29
+	const EVENT_MAN1_WAITING_FOR_CARD                  ; $2a
+	const EVENT_MAN1_REQUESTED_CARD_ID                 ; $2b
+	const EVENT_MAN1_GIFT_SEQUENCE_STATE               ; $2c
+	const EVENT_MAN1_GIFTED_CARD_FLAGS                 ; $2d
+	const EVENT_MEDAL_COUNT                            ; $2e
+	const EVENT_DANIEL_TALKED                          ; $2f
+	const EVENT_MURRAY_TALKED                          ; $30
+	const EVENT_PAPPY1_STATE                           ; $31
+	const EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER    ; $32
+	const EVENT_JOSHUA_STATE                           ; $33
+	const EVENT_IMAKUNI_ROOM                           ; $34
+	const EVENT_NIKKI_STATE                            ; $35
+	const EVENT_IMAKUNI_WIN_COUNT                      ; $36
+	const EVENT_LASS2_TRADE_STATE                      ; $37
+	const EVENT_ISHIHARA_WANTS_TO_TRADE                ; $38
+	const EVENT_ISHIHARA_CONGRATULATED_PLAYER          ; $39
+	const EVENT_BEAT_KRISTIN                           ; $3a
+	const EVENT_BEAT_HEATHER                           ; $3b
+	const EVENT_BEAT_BRITTANY                          ; $3c
+	const EVENT_DRMASON_CONGRATULATED_PLAYER           ; $3d
+	const EVENT_MASON_LAB_STATE                        ; $3e
+	const EVENT_CHALLENGE_CUP_1_STATE                  ; $3f
+	const EVENT_CHALLENGE_CUP_2_STATE                  ; $40
+	const EVENT_CHALLENGE_CUP_3_STATE                  ; $41
+	const EVENT_CHALLENGE_CUP_STARTING                 ; $42
+	const EVENT_CHALLENGE_CUP_STAGE_VISITED            ; $43
+	const EVENT_CHALLENGE_CUP_NUMBER                   ; $44
+	const EVENT_CHALLENGE_CUP_OPPONENT_NUMBER          ; $45
+	const EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN          ; $46
+	const EVENT_CHALLENGE_CUP_IN_MENU                  ; $47
+	const EVENT_CHALLENGE_CUP_1_RESULT                 ; $48
+	const EVENT_CHALLENGE_CUP_2_RESULT                 ; $49
+	const EVENT_CHALLENGE_CUP_3_RESULT                 ; $4a
+	const EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER   ; $4b
+	const EVENT_RONALD_FIRST_DUEL_STATE                ; $4c
+	const EVENT_RONALD_SECOND_DUEL_STATE               ; $4d
+	const EVENT_RONALD_TALKED                          ; $4e
+	const EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER ; $4f
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_1    ; $50
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2    ; $51
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_3    ; $52
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_4    ; $53
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_5    ; $54
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6    ; $55
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_7    ; $56
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_8    ; $57
+	const EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE      ; $58
+	const EVENT_PLAYER_ENTERED_CHALLENGE_CUP           ; $59
+	const EVENT_FIGHTING_DECK_MACHINE_ACTIVE           ; $5a
+	const EVENT_ROCK_DECK_MACHINE_ACTIVE               ; $5b
+	const EVENT_WATER_DECK_MACHINE_ACTIVE              ; $5c
+	const EVENT_LIGHTNING_DECK_MACHINE_ACTIVE          ; $5d
+	const EVENT_GRASS_DECK_MACHINE_ACTIVE              ; $5e
+	const EVENT_PSYCHIC_DECK_MACHINE_ACTIVE            ; $5f
+	const EVENT_SCIENCE_DECK_MACHINE_ACTIVE            ; $60
+	const EVENT_FIRE_DECK_MACHINE_ACTIVE               ; $61
+	const EVENT_ALL_DECK_MACHINE_FLAGS                 ; $62
+	const EVENT_HALL_OF_HONOR_DOORS_OPEN               ; $63
+	const EVENT_CHALLENGED_GRAND_MASTERS               ; $64
+	const EVENT_POKEMON_DOME_STATE                     ; $65
+	const EVENT_POKEMON_DOME_IN_MENU                   ; $66
+	const EVENT_CHALLENGED_RONALD                      ; $67
+	const EVENT_COURTNEY_STATE                         ; $68
+	const EVENT_STEVE_STATE                            ; $69
+	const EVENT_JACK_STATE                             ; $6a
+	const EVENT_ROD_STATE                              ; $6b
+	const EVENT_RONALD_POKEMON_DOME_STATE              ; $6c
+	const EVENT_RECEIVED_ZAPDOS                        ; $6d
+	const EVENT_RECEIVED_MOLTRES                       ; $6e
+	const EVENT_RECEIVED_ARTICUNO                      ; $6f
+	const EVENT_RECEIVED_DRAGONITE                     ; $70
+	const EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS         ; $71
+	const EVENT_GIFT_CENTER_MENU_CHOICE                ; $72
+	const EVENT_AARON_BOOSTER_REWARD                   ; $73
+	const EVENT_CONSOLE                                ; $74
+	const EVENT_SAM_TUTORIAL_MENU_CHOICE               ; $75
+	const EVENT_AARON_DECK_MENU_CHOICE                 ; $76
 EVENT_FLAG_AMOUNT EQU const_value
 
 EVENT_FLAG_BYTES EQU $40