Merge https://github.com/pret/poketcg

author: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-16 15:57:28 +0000
committer: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-16 16:07:19 +0000
commit: d7c76675f7424803928526449bf51f0cc8d62cee (patch)
tree: 1da9468d6a751a3666b1c7f9bff256edbc2c0a16 /src
parent: 220422a25c5b7463ccf50e5ae44228dd3418de57 (diff)
parent: 95f2f3f87df689671384c251f3527b06d6a78f8a (diff)
30 files changed, 3560 insertions, 1807 deletions
diff --git a/src/constants.asm b/src/constants.asm
index 733dd8c..5fcb2ac 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -13,6 +13,7 @@ INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/name_constants.asm"
 INCLUDE "constants/npc_constants.asm"
 INCLUDE "constants/palette_constants.asm"
+INCLUDE "constants/scene_constants.asm"
 INCLUDE "constants/script_constants.asm"
 INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
diff --git a/src/constants/booster_constants.asm b/src/constants/booster_constants.asm
index f5efb9b..9bc9f09 100644
--- a/src/constants/booster_constants.asm
+++ b/src/constants/booster_constants.asm
@@ -13,6 +13,12 @@ NUM_CARDS_IN_BOOSTER EQU 10
 NUM_BOOSTER_CARD_TYPES EQU const_value
 
 	const_def
+	const BOOSTER_COLOSSEUM  ; $00
+	const BOOSTER_EVOLUTION  ; $01
+	const BOOSTER_MYSTERY    ; $02
+	const BOOSTER_LABORATORY ; $03
+
+	const_def
 	const BOOSTER_COLOSSEUM_NEUTRAL           ; $00
 	const BOOSTER_COLOSSEUM_GRASS             ; $01
 	const BOOSTER_COLOSSEUM_FIRE              ; $02
diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm
index 74ec7d7..84656c4 100644
--- a/src/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
@@ -34,6 +34,21 @@
 	const POKEMON_DOME            ; $20
 	const HALL_OF_HONOR           ; $21
 
+; overworld map selections
+	const_def 1
+	const OWMAP_MASON_LABORATORY ; $01
+	const OWMAP_ISHIHARAS_HOUSE  ; $02
+	const OWMAP_FIGHTING_CLUB    ; $03
+	const OWMAP_ROCK_CLUB        ; $04
+	const OWMAP_WATER_CLUB       ; $05
+	const OWMAP_LIGHTNING_CLUB   ; $06
+	const OWMAP_GRASS_CLUB       ; $07
+	const OWMAP_PSYCHIC_CLUB     ; $08
+	const OWMAP_SCIENCE_CLUB     ; $09
+	const OWMAP_FIRE_CLUB        ; $0A
+	const OWMAP_CHALLENGE_HALL   ; $0B
+	const OWMAP_POKEMON_DOME     ; $0C
+	const OWMAP_MYSTERY_HOUSE    ; $0D for OverworldMapNames
 
 ; Size of map data. See data/npc_map_data.asm and data/map_objects.asm
 ; for more info on what these represent
diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm
index d9ebb2b..9acb87a 100644
--- a/src/constants/music_constants.asm
+++ b/src/constants/music_constants.asm
@@ -30,3 +30,5 @@
 	const MUSIC_BOOSTER_PACK   ; $1c
 	const MUSIC_MEDAL          ; $1d
 	const MUSIC_UNUSED_1E      ; $1e
+
+NUM_SONGS = const_value
diff --git a/src/constants/scene_constants.asm b/src/constants/scene_constants.asm
new file mode 100644
index 0000000..1a4a5be
--- /dev/null
+++ b/src/constants/scene_constants.asm
@@ -0,0 +1,29 @@
+	const_def
+	const SCENE_TITLE_SCREEN                  ; $00
+	const SCENE_COLOSSEUM_BOOSTER             ; $01
+	const SCENE_EVOLUTION_BOOSTER             ; $02
+	const SCENE_MYSTERY_BOOSTER               ; $03
+	const SCENE_LABORATORY_BOOSTER            ; $04
+	const SCENE_CHARIZARD_INTRO               ; $05
+	const SCENE_SCYTHER_INTRO                 ; $06
+	const SCENE_AERODACTYL_INTRO              ; $07
+	const SCENE_GRADIENT_BLACK_AND_RED        ; $08
+	const SCENE_GRADIENT_WHITE_AND_RED        ; $09
+	const SCENE_GRADIENT_BLACK_AND_GREEN      ; $0a
+	const SCENE_GRADIENT_WHITE_AND_GREEN      ; $0b
+	const SCENE_COLOR_WHEEL                   ; $0c
+	const SCENE_COLOR_TEST                    ; $0d
+	const SCENE_GAMEBOY_LINK_CONNECTING       ; $0e
+	const SCENE_GAMEBOY_LINK_TRANSMITTING     ; $0f
+	const SCENE_GAMEBOY_LINK_NOT_CONNECTED    ; $10
+	const SCENE_GAMEBOY_PRINTER_TRANSMITTING  ; $11
+	const SCENE_GAMEBOY_PRINTER_NOT_CONNECTED ; $12
+	const SCENE_CARD_POP                      ; $13
+	const SCENE_CARD_POP_ERROR                ; $14
+	const SCENE_JAPANESE_TITLE_SCREEN         ; $15
+	const SCENE_NINTENDO                      ; $16
+	const SCENE_COMPANIES                     ; $17
+	const SCENE_JAPANESE_TITLE_SCREEN_2       ; $18
+	const SCENE_COPYRIGHT                     ; $19
+	const SCENE_JAPANESE_TITLE_SCREEN_2_COPY  ; $1a
+	const SCENE_COLOR_PALETTE                 ; $1b
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm
index 29f8eae..a6a05be 100644
--- a/src/constants/script_constants.asm
+++ b/src/constants/script_constants.asm
@@ -120,7 +120,7 @@
 	const EVENT_AARON_DECK_MENU_CHOICE                 ; $76
 EVENT_FLAG_AMOUNT EQU const_value
 
-EVENT_FLAG_BYTES EQU $40
+EVENT_VAR_BYTES EQU $40
 
 ; EVENT_PUPIL_MICHAEL_STATE
 ; EVENT_PUPIL_CHRIS_STATE
@@ -277,4 +277,4 @@ SOUTH    EQU $02
 WEST     EQU $03
 NO_MOVE  EQU %10000000 ; For rotations without movement
 
-VARIABLE_CARD	EQU 0 ; use the card located in wd697 instead of using the script's argument
+VARIABLE_CARD	EQU 0 ; use the card located in wCardReceived instead of using the script's argument
diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm
index cb12931..19761fa 100644
--- a/src/constants/tilemap_constants.asm
+++ b/src/constants/tilemap_constants.asm
@@ -1,107 +1,107 @@
-	const_def
-	const TILEMAP_OVERWORLD_MAP               ; $00
-	const TILEMAP_OVERWORLD_MAP_CGB           ; $01
-	const TILEMAP_MASON_LABORATORY            ; $02
-	const TILEMAP_MASON_LABORATORY_CGB        ; $03
-	const TILEMAP_UNUSED_1                    ; $04
-	const TILEMAP_UNUSED_2                    ; $05
-	const TILEMAP_DECK_MACHINE_ROOM           ; $06
-	const TILEMAP_DECK_MACHINE_ROOM_CGB       ; $07
-	const TILEMAP_UNUSED_3                    ; $08
-	const TILEMAP_UNUSED_4                    ; $09
-	const TILEMAP_ISHIHARA                    ; $0a
-	const TILEMAP_ISHIHARA_CGB                ; $0b
-	const TILEMAP_FIGHTING_CLUB_ENTRANCE      ; $0c
-	const TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB  ; $0d
-	const TILEMAP_ROCK_CLUB_ENTRANCE          ; $0e
-	const TILEMAP_ROCK_CLUB_ENTRANCE_CGB      ; $0f
-	const TILEMAP_WATER_CLUB_ENTRANCE         ; $10
-	const TILEMAP_WATER_CLUB_ENTRANCE_CGB     ; $11
-	const TILEMAP_LIGHTNING_CLUB_ENTRANCE     ; $12
-	const TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB ; $13
-	const TILEMAP_GRASS_CLUB_ENTRANCE         ; $14
-	const TILEMAP_GRASS_CLUB_ENTRANCE_CGB     ; $15
-	const TILEMAP_PSYCHIC_CLUB_ENTRANCE       ; $16
-	const TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB   ; $17
-	const TILEMAP_SCIENCE_CLUB_ENTRANCE       ; $18
-	const TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB   ; $19
-	const TILEMAP_FIRE_CLUB_ENTRANCE          ; $1a
-	const TILEMAP_FIRE_CLUB_ENTRANCE_CGB      ; $1b
-	const TILEMAP_CHALLENGE_HALL_ENTRANCE     ; $1c
-	const TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB ; $1d
-	const TILEMAP_CLUB_LOBBY                  ; $1e
-	const TILEMAP_CLUB_LOBBY_CGB              ; $1f
-	const TILEMAP_FIGHTING_CLUB               ; $20
-	const TILEMAP_FIGHTING_CLUB_CGB           ; $21
-	const TILEMAP_ROCK_CLUB                   ; $22
-	const TILEMAP_ROCK_CLUB_CGB               ; $23
-	const TILEMAP_WATER_CLUB                  ; $24
-	const TILEMAP_WATER_CLUB_CGB              ; $25
-	const TILEMAP_LIGHTNING_CLUB              ; $26
-	const TILEMAP_LIGHTNING_CLUB_CGB          ; $27
-	const TILEMAP_GRASS_CLUB                  ; $28
-	const TILEMAP_GRASS_CLUB_CGB              ; $29
-	const TILEMAP_PSYCHIC_CLUB                ; $2a
-	const TILEMAP_PSYCHIC_CLUB_CGB            ; $2b
-	const TILEMAP_SCIENCE_CLUB                ; $2c
-	const TILEMAP_SCIENCE_CLUB_CGB            ; $2d
-	const TILEMAP_FIRE_CLUB                   ; $2e
-	const TILEMAP_FIRE_CLUB_CGB               ; $2f
-	const TILEMAP_CHALLENGE_HALL              ; $30
-	const TILEMAP_CHALLENGE_HALL_CGB          ; $31
-	const TILEMAP_POKEMON_DOME_ENTRANCE       ; $32
-	const TILEMAP_POKEMON_DOME_ENTRANCE_CGB   ; $33
-	const TILEMAP_UNUSED_5                    ; $34
-	const TILEMAP_UNUSED_6                    ; $35
-	const TILEMAP_POKEMON_DOME                ; $36
-	const TILEMAP_POKEMON_DOME_CGB            ; $37
-	const TILEMAP_UNUSED_7                    ; $38
-	const TILEMAP_UNUSED_8                    ; $39
-	const TILEMAP_HALL_OF_HONOR               ; $3a
-	const TILEMAP_HALL_OF_HONOR_CGB           ; $3b
-	const TILEMAP_CARD_POP_1                  ; $3c
-	const TILEMAP_CARD_POP_1_CGB              ; $3d
-	const TILEMAP_GRASS_MEDAL                 ; $3e
-	const TILEMAP_SCIENCE_MEDAL               ; $3f
-	const TILEMAP_FIRE_MEDAL                  ; $40
-	const TILEMAP_WATER_MEDAL                 ; $41
-	const TILEMAP_LIGHTNING_MEDAL             ; $42
-	const TILEMAP_FIGHTING_MEDAL              ; $43
-	const TILEMAP_ROCK_MEDAL                  ; $44
-	const TILEMAP_PSYCHIC_MEDAL               ; $45
-	const TILEMAP_CARD_POP_2                  ; $46
-	const TILEMAP_CARD_POP_2_CGB              ; $47
-	const TILEMAP_CARD_POP_2_UNKNOWN_1        ; $48
-	const TILEMAP_CARD_POP_2_UNKNOWN_2        ; $49
-	const TILEMAP_CARD_POP_3                  ; $4a
-	const TILEMAP_CARD_POP_3_CGB              ; $4b
-	const TILEMAP_COLOSSEUM                   ; $4c
-	const TILEMAP_COLOSSEUM_CGB               ; $4d
-	const TILEMAP_EVOLUTION                   ; $4e
-	const TILEMAP_EVOLUTION_CGB               ; $4f
-	const TILEMAP_MYSTERY                     ; $50
-	const TILEMAP_MYSTERY_CGB                 ; $51
-	const TILEMAP_LABORATORY                  ; $52
-	const TILEMAP_LABORATORY_CGB              ; $53
-	const TILEMAP_CHARIZARD_INTRO             ; $54
-	const TILEMAP_CHARIZARD_INTRO_CGB         ; $55
-	const TILEMAP_SCYTHER_INTRO               ; $56
-	const TILEMAP_SCYTHER_INTRO_CGB           ; $57
-	const TILEMAP_AERODACTYL_INTRO            ; $58
-	const TILEMAP_AERODACTYL_INTRO_CGB        ; $59
-	const TILEMAP_TITLE_SCREEN_1              ; $5a
-	const TILEMAP_TITLE_SCREEN_2              ; $5b
-	const TILEMAP_SOLID_TILES_1               ; $5c
-	const TILEMAP_SOLID_TILES_2               ; $5d
-	const TILEMAP_SOLID_TILES_3               ; $5e
-	const TILEMAP_TITLE_SCREEN_3              ; $5f
-	const TILEMAP_TITLE_SCREEN_4              ; $60
-	const TILEMAP_SOLID_TILES_4               ; $61
-	const TILEMAP_PLAYER                      ; $62
-	const TILEMAP_OPPONENT                    ; $63
-	const TILEMAP_TITLE_SCREEN_5              ; $64
-	const TILEMAP_TITLE_SCREEN_6              ; $65
-	const TILEMAP_COPYRIGHT                   ; $66
-	const TILEMAP_COPYRIGHT_CGB               ; $67
-	const TILEMAP_NINTENDO                    ; $68
-	const TILEMAP_COMPANIES                   ; $69
+	const_def
+	const TILEMAP_OVERWORLD_MAP               ; $00
+	const TILEMAP_OVERWORLD_MAP_CGB           ; $01
+	const TILEMAP_MASON_LABORATORY            ; $02
+	const TILEMAP_MASON_LABORATORY_CGB        ; $03
+	const TILEMAP_UNUSED_1                    ; $04
+	const TILEMAP_UNUSED_2                    ; $05
+	const TILEMAP_DECK_MACHINE_ROOM           ; $06
+	const TILEMAP_DECK_MACHINE_ROOM_CGB       ; $07
+	const TILEMAP_UNUSED_3                    ; $08
+	const TILEMAP_UNUSED_4                    ; $09
+	const TILEMAP_ISHIHARA                    ; $0a
+	const TILEMAP_ISHIHARA_CGB                ; $0b
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE      ; $0c
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB  ; $0d
+	const TILEMAP_ROCK_CLUB_ENTRANCE          ; $0e
+	const TILEMAP_ROCK_CLUB_ENTRANCE_CGB      ; $0f
+	const TILEMAP_WATER_CLUB_ENTRANCE         ; $10
+	const TILEMAP_WATER_CLUB_ENTRANCE_CGB     ; $11
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE     ; $12
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB ; $13
+	const TILEMAP_GRASS_CLUB_ENTRANCE         ; $14
+	const TILEMAP_GRASS_CLUB_ENTRANCE_CGB     ; $15
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE       ; $16
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB   ; $17
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE       ; $18
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB   ; $19
+	const TILEMAP_FIRE_CLUB_ENTRANCE          ; $1a
+	const TILEMAP_FIRE_CLUB_ENTRANCE_CGB      ; $1b
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE     ; $1c
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB ; $1d
+	const TILEMAP_CLUB_LOBBY                  ; $1e
+	const TILEMAP_CLUB_LOBBY_CGB              ; $1f
+	const TILEMAP_FIGHTING_CLUB               ; $20
+	const TILEMAP_FIGHTING_CLUB_CGB           ; $21
+	const TILEMAP_ROCK_CLUB                   ; $22
+	const TILEMAP_ROCK_CLUB_CGB               ; $23
+	const TILEMAP_WATER_CLUB                  ; $24
+	const TILEMAP_WATER_CLUB_CGB              ; $25
+	const TILEMAP_LIGHTNING_CLUB              ; $26
+	const TILEMAP_LIGHTNING_CLUB_CGB          ; $27
+	const TILEMAP_GRASS_CLUB                  ; $28
+	const TILEMAP_GRASS_CLUB_CGB              ; $29
+	const TILEMAP_PSYCHIC_CLUB                ; $2a
+	const TILEMAP_PSYCHIC_CLUB_CGB            ; $2b
+	const TILEMAP_SCIENCE_CLUB                ; $2c
+	const TILEMAP_SCIENCE_CLUB_CGB            ; $2d
+	const TILEMAP_FIRE_CLUB                   ; $2e
+	const TILEMAP_FIRE_CLUB_CGB               ; $2f
+	const TILEMAP_CHALLENGE_HALL              ; $30
+	const TILEMAP_CHALLENGE_HALL_CGB          ; $31
+	const TILEMAP_POKEMON_DOME_ENTRANCE       ; $32
+	const TILEMAP_POKEMON_DOME_ENTRANCE_CGB   ; $33
+	const TILEMAP_UNUSED_5                    ; $34
+	const TILEMAP_UNUSED_6                    ; $35
+	const TILEMAP_POKEMON_DOME                ; $36
+	const TILEMAP_POKEMON_DOME_CGB            ; $37
+	const TILEMAP_UNUSED_7                    ; $38
+	const TILEMAP_UNUSED_8                    ; $39
+	const TILEMAP_HALL_OF_HONOR               ; $3a
+	const TILEMAP_HALL_OF_HONOR_CGB           ; $3b
+	const TILEMAP_CARD_POP_CGB                ; $3c
+	const TILEMAP_CARD_POP                    ; $3d
+	const TILEMAP_GRASS_MEDAL                 ; $3e
+	const TILEMAP_SCIENCE_MEDAL               ; $3f
+	const TILEMAP_FIRE_MEDAL                  ; $40
+	const TILEMAP_WATER_MEDAL                 ; $41
+	const TILEMAP_LIGHTNING_MEDAL             ; $42
+	const TILEMAP_FIGHTING_MEDAL              ; $43
+	const TILEMAP_ROCK_MEDAL                  ; $44
+	const TILEMAP_PSYCHIC_MEDAL               ; $45
+	const TILEMAP_GAMEBOY_LINK_CGB            ; $46
+	const TILEMAP_GAMEBOY_LINK                ; $47
+	const TILEMAP_GAMEBOY_LINK_CONNECTING_CGB ; $48
+	const TILEMAP_GAMEBOY_LINK_CONNECTING     ; $49
+	const TILEMAP_GAMEBOY_PRINTER_CGB         ; $4a
+	const TILEMAP_GAMEBOY_PRINTER             ; $4b
+	const TILEMAP_COLOSSEUM                   ; $4c
+	const TILEMAP_COLOSSEUM_CGB               ; $4d
+	const TILEMAP_EVOLUTION                   ; $4e
+	const TILEMAP_EVOLUTION_CGB               ; $4f
+	const TILEMAP_MYSTERY                     ; $50
+	const TILEMAP_MYSTERY_CGB                 ; $51
+	const TILEMAP_LABORATORY                  ; $52
+	const TILEMAP_LABORATORY_CGB              ; $53
+	const TILEMAP_CHARIZARD_INTRO             ; $54
+	const TILEMAP_CHARIZARD_INTRO_CGB         ; $55
+	const TILEMAP_SCYTHER_INTRO               ; $56
+	const TILEMAP_SCYTHER_INTRO_CGB           ; $57
+	const TILEMAP_AERODACTYL_INTRO            ; $58
+	const TILEMAP_AERODACTYL_INTRO_CGB        ; $59
+	const TILEMAP_JAPANESE_TITLE_SCREEN       ; $5a
+	const TILEMAP_JAPANESE_TITLE_SCREEN_CGB   ; $5b
+	const TILEMAP_SOLID_TILES_1               ; $5c
+	const TILEMAP_SOLID_TILES_2               ; $5d
+	const TILEMAP_SOLID_TILES_3               ; $5e
+	const TILEMAP_JAPANESE_TITLE_SCREEN_2     ; $5f
+	const TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB ; $60
+	const TILEMAP_SOLID_TILES_4               ; $61
+	const TILEMAP_PLAYER                      ; $62
+	const TILEMAP_OPPONENT                    ; $63
+	const TILEMAP_TITLE_SCREEN                ; $64
+	const TILEMAP_TITLE_SCREEN_CGB            ; $65
+	const TILEMAP_COPYRIGHT                   ; $66
+	const TILEMAP_COPYRIGHT_CGB               ; $67
+	const TILEMAP_NINTENDO                    ; $68
+	const TILEMAP_COMPANIES                   ; $69
diff --git a/src/constants/tileset_constants.asm b/src/constants/tileset_constants.asm
index 6e3f8f3..6319263 100644
--- a/src/constants/tileset_constants.asm
+++ b/src/constants/tileset_constants.asm
@@ -1,88 +1,88 @@
-	const_def
-	const TILESET_OVERWORLD_MAP         ; $00
-	const TILESET_MASON_LABORATORY      ; $01
-	const TILESET_ISHIHARA              ; $02
-	const TILESET_CLUB_ENTRANCE         ; $03
-	const TILESET_CLUB_LOBBY            ; $04
-	const TILESET_FIGHTING_CLUB         ; $05
-	const TILESET_ROCK_CLUB             ; $06
-	const TILESET_WATER_CLUB            ; $07
-	const TILESET_LIGHTNING_CLUB        ; $08
-	const TILESET_GRASS_CLUB            ; $09
-	const TILESET_PSYCHIC_CLUB          ; $0a
-	const TILESET_SCIENCE_CLUB          ; $0b
-	const TILESET_FIRE_CLUB             ; $0c
-	const TILESET_CHALLENGE_HALL        ; $0d
-	const TILESET_POKEMON_DOME_ENTRANCE ; $0e
-	const TILESET_POKEMON_DOME          ; $0f
-	const TILESET_HALL_OF_HONOR         ; $10
-	const TILESET_CARD_POP_1            ; $11
-	const TILESET_MEDAL                 ; $12
-	const TILESET_CARD_POP_2            ; $13
-	const TILESET_CARD_POP_3            ; $14
-	const TILESET_COLOSSEUM_1           ; $15
-	const TILESET_COLOSSEUM_2           ; $16
-	const TILESET_EVOLUTION_1           ; $17
-	const TILESET_EVOLUTION_2           ; $18
-	const TILESET_MYSTERY_1             ; $19
-	const TILESET_MYSTERY_2             ; $1a
-	const TILESET_LABORATORY_1          ; $1b
-	const TILESET_LABORATORY_2          ; $1c
-	const TILESET_CHARIZARD_INTRO_1     ; $1d
-	const TILESET_CHARIZARD_INTRO_2     ; $1e
-	const TILESET_SCYTHER_INTRO_1       ; $1f
-	const TILESET_SCYTHER_INTRO_2       ; $20
-	const TILESET_AERODACTYL_INTRO_1    ; $21
-	const TILESET_AERODACTYL_INTRO_2    ; $22
-	const TILESET_TITLE_SCREEN_1        ; $23
-	const TILESET_TITLE_SCREEN_2        ; $24
-	const TILESET_SOLID_TILES_1         ; $25
-	const TILESET_TITLE_SCREEN_3        ; $26
-	const TILESET_TITLE_SCREEN_4        ; $27
-	const TILESET_SOLID_TILES_2         ; $28
-	const TILESET_PLAYER                ; $29
-	const TILESET_RONALD                ; $2a
-	const TILESET_TITLE_SCREEN_5        ; $2b
-	const TILESET_TITLE_SCREEN_6        ; $2c
-	const TILESET_COPYRIGHT             ; $2d
-	const TILESET_NINTENDO              ; $2e
-	const TILESET_COMPANIES             ; $2f
-	const TILESET_SAM                   ; $30
-	const TILESET_IMAKUNI               ; $31
-	const TILESET_NIKKI                 ; $32
-	const TILESET_RICK                  ; $33
-	const TILESET_KEN                   ; $34
-	const TILESET_AMY                   ; $35
-	const TILESET_ISAAC                 ; $36
-	const TILESET_MITCH                 ; $37
-	const TILESET_GENE                  ; $38
-	const TILESET_MURRAY                ; $39
-	const TILESET_COURTNEY              ; $3a
-	const TILESET_STEVE                 ; $3b
-	const TILESET_JACK                  ; $3c
-	const TILESET_ROD                   ; $3d
-	const TILESET_JOSEPH                ; $3e
-	const TILESET_DAVID                 ; $3f
-	const TILESET_ERIK                  ; $40
-	const TILESET_JOHN                  ; $41
-	const TILESET_ADAM                  ; $42
-	const TILESET_JONATHAN              ; $43
-	const TILESET_JOSHUA                ; $44
-	const TILESET_NICHOLAS              ; $45
-	const TILESET_BRANDON               ; $46
-	const TILESET_MATTHEW               ; $47
-	const TILESET_RYAN                  ; $48
-	const TILESET_ANDREW                ; $49
-	const TILESET_CHRIS                 ; $4a
-	const TILESET_MICHAEL               ; $4b
-	const TILESET_DANIEL                ; $4c
-	const TILESET_ROBERT                ; $4d
-	const TILESET_BRITTANY              ; $4e
-	const TILESET_KRISTIN               ; $4f
-	const TILESET_HEATHER               ; $50
-	const TILESET_SARA                  ; $51
-	const TILESET_AMANDA                ; $52
-	const TILESET_JENNIFER              ; $53
-	const TILESET_JESSICA               ; $54
-	const TILESET_STEPHANIE             ; $55
-	const TILESET_AARON                 ; $56
+	const_def
+	const TILESET_OVERWORLD_MAP         ; $00
+	const TILESET_MASON_LABORATORY      ; $01
+	const TILESET_ISHIHARA              ; $02
+	const TILESET_CLUB_ENTRANCE         ; $03
+	const TILESET_CLUB_LOBBY            ; $04
+	const TILESET_FIGHTING_CLUB         ; $05
+	const TILESET_ROCK_CLUB             ; $06
+	const TILESET_WATER_CLUB            ; $07
+	const TILESET_LIGHTNING_CLUB        ; $08
+	const TILESET_GRASS_CLUB            ; $09
+	const TILESET_PSYCHIC_CLUB          ; $0a
+	const TILESET_SCIENCE_CLUB          ; $0b
+	const TILESET_FIRE_CLUB             ; $0c
+	const TILESET_CHALLENGE_HALL        ; $0d
+	const TILESET_POKEMON_DOME_ENTRANCE ; $0e
+	const TILESET_POKEMON_DOME          ; $0f
+	const TILESET_HALL_OF_HONOR         ; $10
+	const TILESET_CARD_POP              ; $11
+	const TILESET_MEDAL                 ; $12
+	const TILESET_GAMEBOY_LINK          ; $13
+	const TILESET_GAMEBOY_PRINTER       ; $14
+	const TILESET_COLOSSEUM_1           ; $15
+	const TILESET_COLOSSEUM_2           ; $16
+	const TILESET_EVOLUTION_1           ; $17
+	const TILESET_EVOLUTION_2           ; $18
+	const TILESET_MYSTERY_1             ; $19
+	const TILESET_MYSTERY_2             ; $1a
+	const TILESET_LABORATORY_1          ; $1b
+	const TILESET_LABORATORY_2          ; $1c
+	const TILESET_CHARIZARD_INTRO_1     ; $1d
+	const TILESET_CHARIZARD_INTRO_2     ; $1e
+	const TILESET_SCYTHER_INTRO_1       ; $1f
+	const TILESET_SCYTHER_INTRO_2       ; $20
+	const TILESET_AERODACTYL_INTRO_1    ; $21
+	const TILESET_AERODACTYL_INTRO_2    ; $22
+	const TILESET_TITLE_SCREEN_1        ; $23
+	const TILESET_TITLE_SCREEN_2        ; $24
+	const TILESET_SOLID_TILES_1         ; $25
+	const TILESET_TITLE_SCREEN_3        ; $26
+	const TILESET_TITLE_SCREEN_4        ; $27
+	const TILESET_SOLID_TILES_2         ; $28
+	const TILESET_PLAYER                ; $29
+	const TILESET_RONALD                ; $2a
+	const TILESET_TITLE_SCREEN_5        ; $2b
+	const TILESET_TITLE_SCREEN_6        ; $2c
+	const TILESET_COPYRIGHT             ; $2d
+	const TILESET_NINTENDO              ; $2e
+	const TILESET_COMPANIES             ; $2f
+	const TILESET_SAM                   ; $30
+	const TILESET_IMAKUNI               ; $31
+	const TILESET_NIKKI                 ; $32
+	const TILESET_RICK                  ; $33
+	const TILESET_KEN                   ; $34
+	const TILESET_AMY                   ; $35
+	const TILESET_ISAAC                 ; $36
+	const TILESET_MITCH                 ; $37
+	const TILESET_GENE                  ; $38
+	const TILESET_MURRAY                ; $39
+	const TILESET_COURTNEY              ; $3a
+	const TILESET_STEVE                 ; $3b
+	const TILESET_JACK                  ; $3c
+	const TILESET_ROD                   ; $3d
+	const TILESET_JOSEPH                ; $3e
+	const TILESET_DAVID                 ; $3f
+	const TILESET_ERIK                  ; $40
+	const TILESET_JOHN                  ; $41
+	const TILESET_ADAM                  ; $42
+	const TILESET_JONATHAN              ; $43
+	const TILESET_JOSHUA                ; $44
+	const TILESET_NICHOLAS              ; $45
+	const TILESET_BRANDON               ; $46
+	const TILESET_MATTHEW               ; $47
+	const TILESET_RYAN                  ; $48
+	const TILESET_ANDREW                ; $49
+	const TILESET_CHRIS                 ; $4a
+	const TILESET_MICHAEL               ; $4b
+	const TILESET_DANIEL                ; $4c
+	const TILESET_ROBERT                ; $4d
+	const TILESET_BRITTANY              ; $4e
+	const TILESET_KRISTIN               ; $4f
+	const TILESET_HEATHER               ; $50
+	const TILESET_SARA                  ; $51
+	const TILESET_AMANDA                ; $52
+	const TILESET_JENNIFER              ; $53
+	const TILESET_JESSICA               ; $54
+	const TILESET_STEPHANIE             ; $55
+	const TILESET_AARON                 ; $56
diff --git a/src/data/overworld_indexes.asm b/src/data/overworld_indexes.asm
index 7df99de..86f20c2 100644
--- a/src/data/overworld_indexes.asm
+++ b/src/data/overworld_indexes.asm
@@ -4,16 +4,16 @@
 ; 2: player's y coordinate when entering the map
 ; 4: 00
 OverworldMapIndexes: ; 10f88 (4:4f88)
-	db $00,$00,$00,$00
-	db MASON_LABORATORY,       $0E,$1A,$00
-	db ISHIHARAS_HOUSE,        $08,$14,$00
-	db FIGHTING_CLUB_ENTRANCE, $08,$0E,$00
-	db ROCK_CLUB_ENTRANCE,     $08,$0E,$00
-	db WATER_CLUB_ENTRANCE,    $08,$0E,$00
-	db LIGHTNING_CLUB_ENTRANCE,$08,$0E,$00
-	db GRASS_CLUB_ENTRANCE,    $08,$0E,$00
-	db PSYCHIC_CLUB_ENTRANCE,  $08,$0E,$00
-	db SCIENCE_CLUB_ENTRANCE,  $08,$0E,$00
-	db FIRE_CLUB_ENTRANCE,     $08,$0E,$00
-	db CHALLENGE_HALL_ENTRANCE,$08,$0E,$00
-	db POKEMON_DOME_ENTRANCE,  $0E,$0E,$00
+	db $00, $00, $00, $00
+	db MASON_LABORATORY,        $0E, $1A, $00
+	db ISHIHARAS_HOUSE,         $08, $14, $00
+	db FIGHTING_CLUB_ENTRANCE,  $08, $0E, $00
+	db ROCK_CLUB_ENTRANCE,      $08, $0E, $00
+	db WATER_CLUB_ENTRANCE,     $08, $0E, $00
+	db LIGHTNING_CLUB_ENTRANCE, $08, $0E, $00
+	db GRASS_CLUB_ENTRANCE,     $08, $0E, $00
+	db PSYCHIC_CLUB_ENTRANCE,   $08, $0E, $00
+	db SCIENCE_CLUB_ENTRANCE,   $08, $0E, $00
+	db FIRE_CLUB_ENTRANCE,      $08, $0E, $00
+	db CHALLENGE_HALL_ENTRANCE, $08, $0E, $00
+	db POKEMON_DOME_ENTRANCE,   $0E, $0E, $00
diff --git a/src/data/warps.asm b/src/data/warps.asm
index cba8053..828db63 100644
--- a/src/data/warps.asm
+++ b/src/data/warps.asm
@@ -43,208 +43,208 @@ WarpDataPointers: ; 1c099 (7:4099)
 ; 5: y coordinate of connected map
 ; double null terminated
 MasonLaboratoryWarpData: ; 1c0dd (7:40dd)
-	db $0E,$1C,OVERWORLD_MAP,    $00,$00
-	db $10,$1C,OVERWORLD_MAP,    $00,$00
-	db $1A,$0A,DECK_MACHINE_ROOM,$02,$0A
-	db $1A,$0C,DECK_MACHINE_ROOM,$02,$0C
-	db $00,$00
+	db $0E, $1C, OVERWORLD_MAP,     $00, $00
+	db $10, $1C, OVERWORLD_MAP,     $00, $00
+	db $1A, $0A, DECK_MACHINE_ROOM, $02, $0A
+	db $1A, $0C, DECK_MACHINE_ROOM, $02, $0C
+	db $00, $00
 
 DeckMachineRoomWarpData: ; 1c0f3 (7:40f3)
-	db $00,$0A,MASON_LABORATORY,$18,$0A
-	db $00,$0C,MASON_LABORATORY,$18,$0C
-	db $00,$00
+	db $00, $0A, MASON_LABORATORY, $18, $0A
+	db $00, $0C, MASON_LABORATORY, $18, $0C
+	db $00, $00
 
 IshiharasHouseWarpData: ; 1c0ff (7:40ff)
-	db $08,$16,OVERWORLD_MAP,$00,$00
-	db $0A,$16,OVERWORLD_MAP,$00,$00
-	db $00,$00
+	db $08, $16, OVERWORLD_MAP, $00, $00
+	db $0A, $16, OVERWORLD_MAP, $00, $00
+	db $00, $00
 
 FightingClubEntranceWarpData: ; 1c10b (7:410b)
-	db $08,$10,OVERWORLD_MAP,      $00,$00
-	db $0A,$10,OVERWORLD_MAP,      $00,$00
-	db $00,$06,FIGHTING_CLUB_LOBBY,$18,$0A
-	db $00,$08,FIGHTING_CLUB_LOBBY,$18,$0C
-	db $08,$00,FIGHTING_CLUB,      $0A,$0E
-	db $0A,$00,FIGHTING_CLUB,      $0C,$0E
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,       $00, $00
+	db $0A, $10, OVERWORLD_MAP,       $00, $00
+	db $00, $06, FIGHTING_CLUB_LOBBY, $18, $0A
+	db $00, $08, FIGHTING_CLUB_LOBBY, $18, $0C
+	db $08, $00, FIGHTING_CLUB,       $0A, $0E
+	db $0A, $00, FIGHTING_CLUB,       $0C, $0E
+	db $00, $00
 
 FightingClubLobbyWarpData: ; 1c12b (7:412b)
-	db $1A,$0A,FIGHTING_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,FIGHTING_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, FIGHTING_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, FIGHTING_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 FightingClubWarpData: ; 1c137 (7:4137)
-	db $0A,$10,FIGHTING_CLUB_ENTRANCE,$08,$02
-	db $0C,$10,FIGHTING_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0A, $10, FIGHTING_CLUB_ENTRANCE, $08, $02
+	db $0C, $10, FIGHTING_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 RockClubEntranceWarpData: ; 1c143 (7:4143)
-	db $08,$10,OVERWORLD_MAP,  $00,$00
-	db $0A,$10,OVERWORLD_MAP,  $00,$00
-	db $00,$06,ROCK_CLUB_LOBBY,$18,$0A
-	db $00,$08,ROCK_CLUB_LOBBY,$18,$0C
-	db $08,$00,ROCK_CLUB,      $0C,$1A
-	db $0A,$00,ROCK_CLUB,      $0E,$1A
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,   $00, $00
+	db $0A, $10, OVERWORLD_MAP,   $00, $00
+	db $00, $06, ROCK_CLUB_LOBBY, $18, $0A
+	db $00, $08, ROCK_CLUB_LOBBY, $18, $0C
+	db $08, $00, ROCK_CLUB,       $0C, $1A
+	db $0A, $00, ROCK_CLUB,       $0E, $1A
+	db $00, $00
 
 RockClubLobbyWarpData: ; 1c163 (7:4163)
-	db $1A,$0A,ROCK_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,ROCK_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, ROCK_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, ROCK_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 RockClubWarpData: ; 1c16f (7:416f)
-	db $0C,$1C,ROCK_CLUB_ENTRANCE,$08,$02
-	db $0E,$1C,ROCK_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1C, ROCK_CLUB_ENTRANCE, $08, $02
+	db $0E, $1C, ROCK_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 WaterClubEntranceWarpData: ; 1c17b (7:417b)
-	db $08,$10,OVERWORLD_MAP,   $00,$00
-	db $0A,$10,OVERWORLD_MAP,   $00,$00
-	db $00,$06,WATER_CLUB_LOBBY,$18,$0A
-	db $00,$08,WATER_CLUB_LOBBY,$18,$0C
-	db $08,$00,WATER_CLUB,      $0C,$1C
-	db $0A,$00,WATER_CLUB,      $0E,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,    $00, $00
+	db $0A, $10, OVERWORLD_MAP,    $00, $00
+	db $00, $06, WATER_CLUB_LOBBY, $18, $0A
+	db $00, $08, WATER_CLUB_LOBBY, $18, $0C
+	db $08, $00, WATER_CLUB,       $0C, $1C
+	db $0A, $00, WATER_CLUB,       $0E, $1C
+	db $00, $00
 
 WaterClubLobbyWarpData: ; 1c19b (7:419b)
-	db $1A,$0A,WATER_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,WATER_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, WATER_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, WATER_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 WaterClubWarpData: ; 1c1a7 (7:41a7)
-	db $0C,$1E,WATER_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,WATER_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1E, WATER_CLUB_ENTRANCE, $08, $02
+	db $0E, $1E, WATER_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 LightningClubEntranceWarpData: ; 1c1b3 (7:41b3)
-	db $08,$10,OVERWORLD_MAP,       $00,$00
-	db $0A,$10,OVERWORLD_MAP,       $00,$00
-	db $00,$06,LIGHTNING_CLUB_LOBBY,$18,$0A
-	db $00,$08,LIGHTNING_CLUB_LOBBY,$18,$0C
-	db $08,$00,LIGHTNING_CLUB,      $0C,$1C
-	db $0A,$00,LIGHTNING_CLUB,      $0E,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,        $00, $00
+	db $0A, $10, OVERWORLD_MAP,        $00, $00
+	db $00, $06, LIGHTNING_CLUB_LOBBY, $18, $0A
+	db $00, $08, LIGHTNING_CLUB_LOBBY, $18, $0C
+	db $08, $00, LIGHTNING_CLUB,       $0C, $1C
+	db $0A, $00, LIGHTNING_CLUB,       $0E, $1C
+	db $00, $00
 
 LightningClubLobbyWarpData: ; 1c1d3 (7:41d3)
-	db $1A,$0A,LIGHTNING_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,LIGHTNING_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, LIGHTNING_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, LIGHTNING_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 LightningClubWarpData: ; 1c1df (7:41df)
-	db $0C,$1E,LIGHTNING_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,LIGHTNING_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1E, LIGHTNING_CLUB_ENTRANCE, $08, $02
+	db $0E, $1E, LIGHTNING_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 GrassClubEntranceWarpData: ; 1c1eb (7:41eb)
-	db $08,$10,OVERWORLD_MAP,   $00,$00
-	db $0A,$10,OVERWORLD_MAP,   $00,$00
-	db $00,$06,GRASS_CLUB_LOBBY,$18,$0A
-	db $00,$08,GRASS_CLUB_LOBBY,$18,$0C
-	db $08,$00,GRASS_CLUB,      $0C,$1C
-	db $0A,$00,GRASS_CLUB,      $0E,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,    $00, $00
+	db $0A, $10, OVERWORLD_MAP,    $00, $00
+	db $00, $06, GRASS_CLUB_LOBBY, $18, $0A
+	db $00, $08, GRASS_CLUB_LOBBY, $18, $0C
+	db $08, $00, GRASS_CLUB,       $0C, $1C
+	db $0A, $00, GRASS_CLUB,       $0E, $1C
+	db $00, $00
 
 GrassClubLobbyWarpData: ; 1c20b (7:420b)
-	db $1A,$0A,GRASS_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,GRASS_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, GRASS_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, GRASS_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 GrassClubWarpData: ; 1c217 (7:4217)
-	db $0C,$1E,GRASS_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,GRASS_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1E, GRASS_CLUB_ENTRANCE, $08, $02
+	db $0E, $1E, GRASS_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 PsychicClubEntranceWarpData: ; 1c223 (7:4223)
-	db $08,$10,OVERWORLD_MAP,     $00,$00
-	db $0A,$10,OVERWORLD_MAP,     $00,$00
-	db $00,$06,PSYCHIC_CLUB_LOBBY,$18,$0A
-	db $00,$08,PSYCHIC_CLUB_LOBBY,$18,$0C
-	db $08,$00,PSYCHIC_CLUB,      $0C,$18
-	db $0A,$00,PSYCHIC_CLUB,      $0E,$18
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,      $00, $00
+	db $0A, $10, OVERWORLD_MAP,      $00, $00
+	db $00, $06, PSYCHIC_CLUB_LOBBY, $18, $0A
+	db $00, $08, PSYCHIC_CLUB_LOBBY, $18, $0C
+	db $08, $00, PSYCHIC_CLUB,       $0C, $18
+	db $0A, $00, PSYCHIC_CLUB,       $0E, $18
+	db $00, $00
 
 PsychicClubLobbyWarpData: ; 1c243 (7:4243)
-	db $1A,$0A,PSYCHIC_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,PSYCHIC_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, PSYCHIC_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, PSYCHIC_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 PsychicClubWarpData: ; 1c24f (7:424f)
-	db $0C,$1A,PSYCHIC_CLUB_ENTRANCE,$08,$02
-	db $0E,$1A,PSYCHIC_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1A, PSYCHIC_CLUB_ENTRANCE, $08, $02
+	db $0E, $1A, PSYCHIC_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 ScienceClubEntranceWarpData: ; 1c25b (7:425b)
-	db $08,$10,OVERWORLD_MAP,     $00,$00
-	db $0A,$10,OVERWORLD_MAP,     $00,$00
-	db $00,$06,SCIENCE_CLUB_LOBBY,$18,$0A
-	db $00,$08,SCIENCE_CLUB_LOBBY,$18,$0C
-	db $08,$00,SCIENCE_CLUB,      $0C,$1C
-	db $0A,$00,SCIENCE_CLUB,      $0E,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,      $00, $00
+	db $0A, $10, OVERWORLD_MAP,      $00, $00
+	db $00, $06, SCIENCE_CLUB_LOBBY, $18, $0A
+	db $00, $08, SCIENCE_CLUB_LOBBY, $18, $0C
+	db $08, $00, SCIENCE_CLUB,       $0C, $1C
+	db $0A, $00, SCIENCE_CLUB,       $0E, $1C
+	db $00, $00
 
 ScienceClubLobbyWarpData: ; 1c27b (7:427b)
-	db $1A,$0A,SCIENCE_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,SCIENCE_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, SCIENCE_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, SCIENCE_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 ScienceClubWarpData: ; 1c287 (7:4287)
-	db $0C,$1E,SCIENCE_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,SCIENCE_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1E, SCIENCE_CLUB_ENTRANCE, $08, $02
+	db $0E, $1E, SCIENCE_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 FireClubEntranceWarpData: ; 1c293 (7:4293)
-	db $08,$10,OVERWORLD_MAP,  $00,$00
-	db $0A,$10,OVERWORLD_MAP,  $00,$00
-	db $00,$06,FIRE_CLUB_LOBBY,$18,$0A
-	db $00,$08,FIRE_CLUB_LOBBY,$18,$0C
-	db $08,$00,FIRE_CLUB,      $0C,$1C
-	db $0A,$00,FIRE_CLUB,      $0E,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,   $00, $00
+	db $0A, $10, OVERWORLD_MAP,   $00, $00
+	db $00, $06, FIRE_CLUB_LOBBY, $18, $0A
+	db $00, $08, FIRE_CLUB_LOBBY, $18, $0C
+	db $08, $00, FIRE_CLUB,       $0C, $1C
+	db $0A, $00, FIRE_CLUB,       $0E, $1C
+	db $00, $00
 
 FireClubLobbyWarpData: ; 1c2b3 (7:42b3)
-	db $1A,$0A,FIRE_CLUB_ENTRANCE,$02,$06
-	db $1A,$0C,FIRE_CLUB_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, FIRE_CLUB_ENTRANCE, $02, $06
+	db $1A, $0C, FIRE_CLUB_ENTRANCE, $02, $08
+	db $00, $00
 
 FireClubWarpData: ; 1c2bf (7:42bf)
-	db $0C,$1E,FIRE_CLUB_ENTRANCE,$08,$02
-	db $0E,$1E,FIRE_CLUB_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0C, $1E, FIRE_CLUB_ENTRANCE, $08, $02
+	db $0E, $1E, FIRE_CLUB_ENTRANCE, $0A, $02
+	db $00, $00
 
 ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb)
-	db $08,$10,OVERWORLD_MAP,       $00,$00
-	db $0A,$10,OVERWORLD_MAP,       $00,$00
-	db $00,$06,CHALLENGE_HALL_LOBBY,$18,$0A
-	db $00,$08,CHALLENGE_HALL_LOBBY,$18,$0C
-	db $08,$00,CHALLENGE_HALL,      $0E,$1C
-	db $0A,$00,CHALLENGE_HALL,      $10,$1C
-	db $00,$00
+	db $08, $10, OVERWORLD_MAP,        $00, $00
+	db $0A, $10, OVERWORLD_MAP,        $00, $00
+	db $00, $06, CHALLENGE_HALL_LOBBY, $18, $0A
+	db $00, $08, CHALLENGE_HALL_LOBBY, $18, $0C
+	db $08, $00, CHALLENGE_HALL,       $0E, $1C
+	db $0A, $00, CHALLENGE_HALL,       $10, $1C
+	db $00, $00
 
 ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb)
-	db $1A,$0A,CHALLENGE_HALL_ENTRANCE,$02,$06
-	db $1A,$0C,CHALLENGE_HALL_ENTRANCE,$02,$08
-	db $00,$00
+	db $1A, $0A, CHALLENGE_HALL_ENTRANCE, $02, $06
+	db $1A, $0C, CHALLENGE_HALL_ENTRANCE, $02, $08
+	db $00, $00
 
 ChallengeHallWarpData: ; 1c2f7 (7:42f7)
-	db $0E,$1E,CHALLENGE_HALL_ENTRANCE,$08,$02
-	db $10,$1E,CHALLENGE_HALL_ENTRANCE,$0A,$02
-	db $00,$00
+	db $0E, $1E, CHALLENGE_HALL_ENTRANCE, $08, $02
+	db $10, $1E, CHALLENGE_HALL_ENTRANCE, $0A, $02
+	db $00, $00
 
 PokemonDomeEntranceWarpData: ; 1c303 (7:4303)
-	db $0E,$10,OVERWORLD_MAP,$00,$00
-	db $10,$10,OVERWORLD_MAP,$00,$00
-	db $16,$00,POKEMON_DOME, $0E,$1C
-	db $18,$00,POKEMON_DOME, $10,$1C
-	db $00,$00
+	db $0E, $10, OVERWORLD_MAP, $00, $00
+	db $10, $10, OVERWORLD_MAP, $00, $00
+	db $16, $00, POKEMON_DOME,  $0E, $1C
+	db $18, $00, POKEMON_DOME,  $10, $1C
+	db $00, $00
 
 PokemonDomeWarpData: ; 1c319 (7:4319)
-	db $0E,$1E,POKEMON_DOME_ENTRANCE,$16,$02
-	db $10,$1E,POKEMON_DOME_ENTRANCE,$18,$02
-	db $0E,$00,HALL_OF_HONOR,        $0A,$16
-	db $10,$00,HALL_OF_HONOR,        $0C,$16
-	db $00,$00
+	db $0E, $1E, POKEMON_DOME_ENTRANCE, $16, $02
+	db $10, $1E, POKEMON_DOME_ENTRANCE, $18, $02
+	db $0E, $00, HALL_OF_HONOR,         $0A, $16
+	db $10, $00, HALL_OF_HONOR,         $0C, $16
+	db $00, $00
 
 HallOfHonorWarpData: ; 1c32f (7:432f)
-	db $0A,$18,POKEMON_DOME,$0E,$02
-	db $0C,$18,POKEMON_DOME,$10,$02
-	db $00,$00
+	db $0A, $18, POKEMON_DOME, $0E, $02
+	db $0C, $18, POKEMON_DOME, $10, $02
+	db $00, $00
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 02e2682..b7fb896 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -90,7 +90,7 @@ StartDuel: ; 409f (1:409f)
 	ldh [hWhoseTurn], a
 	ld a, DUELIST_TYPE_PLAYER
 	ld [wPlayerDuelistType], a
-	ld a, [wcc19]
+	ld a, [wNPCDuelDeckID]
 	ld [wOpponentDeckID], a
 	call LoadPlayerDeck
 	call SwapTurn
@@ -116,7 +116,7 @@ StartDuel: ; 409f (1:409f)
 	xor a
 	ld [wCurrentDuelMenuItem], a
 	call SetupDuel
-	ld a, [wcc18]
+	ld a, [wNPCDuelPrizes]
 	ld [wDuelInitialPrizes], a
 	call InitVariablesToBeginDuel
 	ld a, [wDuelTheme]
@@ -233,7 +233,7 @@ MainDuelLoop: ; 40ee (1:40ee)
 	ld a, [wDuelFinished]
 	cp TURN_PLAYER_TIED
 	jr z, .tied_duel
-	call Func_39fc
+	call PlayDefaultSong
 	call WaitForWideTextBoxInput
 	call Func_3b31
 	call ResetSerial
@@ -4108,9 +4108,9 @@ FlushAllPalettesOrSendPal23Packet: ; 5a34 (1:5a34)
 	ld a, PAL23 << 3 + 1
 	ld hl, wTempSGBPacket
 	ld [hli], a
-	ld a, $9c
+	ld a, LOW(24 << 10 | 28 << 5 | 28)
 	ld [hli], a
-	ld a, $63
+	ld a, HIGH(24 << 10 | 28 << 5 | 28)
 	ld [hld], a
 	dec hl
 	xor a
@@ -8245,7 +8245,7 @@ Func_7364: ; 7364 (1:7364)
 	ret
 .asm_73cd
 	ld a, [wOpponentDeckID]
-	ld [wcc19], a
+	ld [wNPCDuelDeckID], a
 	call Func_3ae8
 	or a
 	ret
@@ -8253,7 +8253,7 @@ Func_7364: ; 7364 (1:7364)
 
 Func_73d8: ; 73d8 (1:73d8)
 	ld a, [wOpponentDeckID]
-	ld [wcc19], a
+	ld [wNPCDuelDeckID], a
 	call Func_3ae8
 	jr c, .asm_73ec
 	xor a
@@ -8268,7 +8268,7 @@ Func_73d8: ; 73d8 (1:73d8)
 	ld a, [wOpponentDeckID]
 	lb bc, 5, 16
 	call WriteTwoByteNumberInTxSymbolFormat
-	ld a, [wcc18]
+	ld a, [wNPCDuelPrizes]
 	lb bc, 15, 10
 	call WriteTwoByteNumberInTxSymbolFormat
 	ret
@@ -8436,8 +8436,8 @@ Func_7594: ; 7594 (1:7594)
 	farcall Func_1a61f
 	ret
 
-Func_7599: ; 7599 (1:7599)
-	farcall Func_1a68d
+OpenBoosterPack: ; 7599 (1:7599)
+	farcall _OpenBoosterPack
 	ret
 
 rept $a62
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index f8c641c..1b4207b 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -43,11 +43,11 @@ LoadMap: ; c000 (3:4000)
 	call Func_c943
 	call Func_c158
 	farcall DoMapOWFrame
-	call Func_c199
+	call SetOverworldDoFrameFunction
 	xor a
 	ld [wd0b4], a
 	ld [wd0c1], a
-	call Func_39fc
+	call PlayDefaultSong
 	farcall Func_10af9
 	call Func_c141
 	call Func_c17a
@@ -94,13 +94,13 @@ HandleOverworldMode: ; c0ce (3:40ce)
 	jp hl
 
 OverworldModePointers: ; c0e0 (3:40e0)
-	dw Func_c0e8         ; on map
+	dw UpdateOverworldMap
 	dw CallHandlePlayerMoveMode
 	dw SetScriptData
 	dw EnterScript
 
-Func_c0e8: ; c0e8 (3:40e8)
-	farcall Func_10e55
+UpdateOverworldMap: ; c0e8 (3:40e8)
+	farcall OverworldMap_Update
 	ret
 
 CallHandlePlayerMoveMode: ; c0ed (3:40ed)
@@ -175,7 +175,7 @@ Func_c158: ; c158 (3:4158)
 	ld a, [wd0c2]
 	cp $1
 	ret nz
-	ld a, [wd0c4]
+	ld a, [wNPCDuelist]
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	jr c, .asm_c179
@@ -209,8 +209,8 @@ Func_c184: ; c184 (3:4184)
 	pop bc
 	ret
 
-Func_c199: ; c199 (3:4199)
-	ld hl, Func_380e
+SetOverworldDoFrameFunction: ; c199 (3:4199)
+	ld hl, OverworldDoFrameFunction
 	call SetDoFrameFunction
 	ret
 
@@ -228,8 +228,8 @@ WhiteOutDMGPals: ; c1a4 (3:41a4)
 	ret
 
 Func_c1b1: ; c1b1 (3:41b1)
-	ld a, $c
-	ld [wd32e], a
+	ld a, OWMAP_POKEMON_DOME
+	ld [wOverworldMapSelection], a
 	ld a, OVERWORLD_MAP
 	ld [wTempMap], a
 	ld a, $c
@@ -264,7 +264,7 @@ Func_c1f8: ; c1f8 (3:41f8)
 	ld [wd0ba], a
 	ld [wd11b], a
 	ld [wd0c2], a
-	ld [wd111], a
+	ld [wDefaultSong], a
 	ld [wd112], a
 	ld [wd3b8], a
 	call EnableSRAM
@@ -276,7 +276,7 @@ Func_c1f8: ; c1f8 (3:41f8)
 	farcall Func_10756
 	ret
 
-Func_c228: ; c228 (3:4228)
+BackupPlayerPosition: ; c228 (3:4228)
 	ld a, [wCurMap]
 	ld [wTempMap], a
 	ld a, [wPlayerXCoord]
@@ -341,7 +341,7 @@ PauseMenuTextList: ; c27c (3:427c)
 	dw NULL
 
 Func_c280: ; c280 (3:4280)
-	call Func_c228
+	call BackupPlayerPosition
 	call Func_3ca0
 	call ZeroObjectPositions
 	ld hl, wVBlankOAMCopyToggle
@@ -400,11 +400,11 @@ Func_c2db: ; c2db (3:42db)
 	ldh [hWhoseTurn], a
 	call Func_c241
 	call EmptyScreen
-	ld a, [wd111]
+	ld a, [wDefaultSong]
 	push af
 	farcall Func_80000
 	pop af
-	ld [wd111], a
+	ld [wDefaultSong], a
 	ld hl, wd0c1
 	res 0, [hl]
 	call Func_c34e
@@ -497,7 +497,7 @@ Func_c38f: ; c38f (3:438f)
 
 	push hl
 	ld b, HIGH(wc000)
-	call InitBGMapDecompression
+	call InitDataDecompression
 	ld a, [wd23d]
 	ld [wTempPointerBank], a
 	ld a, [wBGMapHeight]
@@ -512,7 +512,7 @@ Func_c38f: ; c38f (3:438f)
 .asm_c3b7
 	push bc
 	ld b, $00
-	call DecompressBGMapFromBank
+	call DecompressDataFromBank
 	ld hl, $10
 	add hl, de
 	ld d, h
@@ -586,10 +586,10 @@ Func_c3ff: ; c3ff (3:43ff)
 	ret
 
 Func_c41c: ; c41c (3:441c)
-	ld a, [wd332]
+	ld a, [wPlayerXCoordPixels]
 	sub $40
 	ld [wSCXBuffer], a
-	ld a, [wd333]
+	ld a, [wPlayerYCoordPixels]
 	sub $40
 	ld [wSCYBuffer], a
 	call Func_c430
@@ -670,14 +670,14 @@ Func_c49c: ; c49c (3:449c)
 	rlca
 	rlca
 	rlca
-	ld [wd332], a
+	ld [wPlayerXCoordPixels], a
 	ld a, [wPlayerYCoord]
 	and $1f
 	ld [wPlayerYCoord], a
 	rlca
 	rlca
 	rlca
-	ld [wd333], a
+	ld [wPlayerYCoordPixels], a
 	ret
 
 Func_c4b9: ; c4b9 (3:44b9)
@@ -720,7 +720,7 @@ Func_c4b9: ; c4b9 (3:44b9)
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	jr nz, .not_ow_map
-	farcall Func_10fde
+	farcall OverworldMap_InitCursorSprite
 .not_ow_map
 	ret
 
@@ -765,7 +765,7 @@ Func_c554: ; c554 (3:4554)
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	jr nz, .not_ow_map
-	farcall Func_10e28
+	farcall OverworldMap_UpdatePlayerAndCursorSprites
 	ret
 
 .not_ow_map
@@ -779,11 +779,11 @@ Func_c554: ; c554 (3:4554)
 	ld e, a
 	ld c, SPRITE_ANIM_COORD_X
 	call GetSpriteAnimBufferProperty
-	ld a, [wd332]
+	ld a, [wPlayerXCoordPixels]
 	sub d
 	add $8
 	ld [hli], a
-	ld a, [wd333]
+	ld a, [wPlayerYCoordPixels]
 	sub e
 	add $10
 	ld [hli], a
@@ -1009,7 +1009,7 @@ Func_c694: ; c694 (3:4694)
 
 Func_c6cc: ; c6cc (3:46cc)
 	push hl
-	ld hl, wd332
+	ld hl, wPlayerXCoordPixels
 	add [hl]
 	ld [hl], a
 	pop hl
@@ -1017,7 +1017,7 @@ Func_c6cc: ; c6cc (3:46cc)
 
 Func_c6d4: ; c6d4 (3:46d4)
 	push hl
-	ld hl, wd333
+	ld hl, wPlayerYCoordPixels
 	add [hl]
 	ld [hl], a
 	pop hl
@@ -1219,7 +1219,7 @@ PCMenu: ; c7ea (3:47ea)
 	call CloseAdvancedDialogueBox
 	xor a
 	ld [wd112], a
-	call Func_39fc
+	call PlayDefaultSong
 	ret
 
 PointerTable_c846: ; c846 (3:4846)
@@ -1472,8 +1472,8 @@ Func_c9c7: ; c9c7 (3:49c7)
 Func_c9cb: ; c9cb (3:49cb)
 	push hl
 	push bc
-	ld hl, wEventFlags
-	ld bc, EVENT_FLAG_BYTES
+	ld hl, wEventVars
+	ld bc, EVENT_VAR_BYTES
 .loop
 	xor a
 	ld [hli], a
@@ -1485,10 +1485,10 @@ Func_c9cb: ; c9cb (3:49cb)
 	pop hl
 	ret
 
-; Clears temporary flags before determining Imakuni Room
+; Clears temporary event vars before determining Imakuni Room
 Func_c9dd: ; c9dd (3:49dd)
 	xor a
-	ld [wEventFlags + EVENT_FLAG_BYTES - 1], a
+	ld [wEventVars + EVENT_VAR_BYTES - 1], a
 	call DetermineImakuniRoom
 	call Func_ca0e
 	ret
@@ -1497,7 +1497,7 @@ Func_c9dd: ; c9dd (3:49dd)
 ; Skips current room and does not occur if you haven't talked to Imakuni
 DetermineImakuniRoom: ; c9e8 (3:49e8)
 	ld c, IMAKUNI_FIGHTING_CLUB
-	get_flag_value EVENT_IMAKUNI_STATE
+	get_event_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_TALKED
 	jr c, .skip
 .loop
@@ -1512,7 +1512,7 @@ DetermineImakuniRoom: ; c9e8 (3:49e8)
 	jr z, .loop
 .skip
 	ld a, c
-	set_flag_value EVENT_IMAKUNI_ROOM
+	set_event_value EVENT_IMAKUNI_ROOM
 	ret
 
 ImakuniPossibleRooms: ; ca0a (3:4a04)
@@ -1522,14 +1522,14 @@ ImakuniPossibleRooms: ; ca0a (3:4a04)
 	db WATER_CLUB_LOBBY
 
 Func_ca0e: ; ca0e (3:4a0e)
-	ld a, [wd32e]
-	cp $b
+	ld a, [wOverworldMapSelection]
+	cp OWMAP_CHALLENGE_HALL
 	jr z, .done
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	jr nz, .challenge_cup_three
 ; challenge cup two
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	cp CHALLENGE_CUP_OVER
 	jr z, .done
 	or a ; cp CHALLENGE_CUP_NOT_STARTED
@@ -1537,10 +1537,10 @@ Func_ca0e: ; ca0e (3:4a0e)
 	cp CHALLENGE_CUP_WON
 	jr z, .close_challenge_cup_one
 	ld c, CHALLENGE_CUP_READY_TO_START
-	set_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	set_event_value EVENT_CHALLENGE_CUP_2_STATE
 	jr .close_challenge_cup_one
 .challenge_cup_one
-	get_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	get_event_value EVENT_CHALLENGE_CUP_1_STATE
 	cp CHALLENGE_CUP_OVER
 	jr z, .done
 	or a ; cp CHALLENGE_CUP_NOT_STARTED
@@ -1548,7 +1548,7 @@ Func_ca0e: ; ca0e (3:4a0e)
 	cp CHALLENGE_CUP_WON
 	jr z, .done
 	ld c, CHALLENGE_CUP_READY_TO_START
-	set_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_value EVENT_CHALLENGE_CUP_1_STATE
 	jr .done
 .challenge_cup_three
 	call UpdateRNGSources
@@ -1558,29 +1558,29 @@ Func_ca0e: ; ca0e (3:4a0e)
 	jr z, .start_challenge_cup_three
 	ld c, CHALLENGE_CUP_NOT_STARTED
 .start_challenge_cup_three
-	set_flag_value EVENT_CHALLENGE_CUP_3_STATE
+	set_event_value EVENT_CHALLENGE_CUP_3_STATE
 	jr .close_challenge_cup_two
 .close_challenge_cup_two
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	set_event_value EVENT_CHALLENGE_CUP_2_STATE
 .close_challenge_cup_one
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_value EVENT_CHALLENGE_CUP_1_STATE
 .done
 	ret
 
-GetStackFlagValue: ; ca69 (3:4a69)
+GetStackEventValue: ; ca69 (3:4a69)
 	call GetByteAfterCall
 ;	fallthrough
 
-; returns the event flag's value in a
+; returns the event var's value in a
 ; also ors it with itself before returning
-GetEventFlagValue: ; ca6c (3:4a6c)
+GetEventValue: ; ca6c (3:4a6c)
 	push hl
 	push bc
-	call GetEventFlag
+	call GetEventVar
 	ld c, [hl]
-	ld a, [wLoadedFlagBits]
+	ld a, [wLoadedEventBits]
 .loop
 	bit 0, a
 	jr nz, .done
@@ -1594,27 +1594,27 @@ GetEventFlagValue: ; ca6c (3:4a6c)
 	or a
 	ret
 
-ZeroStackFlagValue2: ; ca84 (3:4a84)
+SetStackEventZero: ; ca84 (3:4a84)
 	call GetByteAfterCall
 	push bc
-	ld c, $00
-	call SetEventFlagValue
+	ld c, 0
+	call SetEventValue
 	pop bc
 	ret
 
-; Use macro set_flag_value. The byte db'd after this func is called
-; is used at the flag argument for SetEventFlagValue
-SetStackFlagValue: ; ca8f (3:4a8f)
+; Use macro set_event_value. The byte db'd after this func is called
+; is used as the event value argument for SetEventValue
+SetStackEventValue: ; ca8f (3:4a8f)
 	call GetByteAfterCall
 ;	fallthrough
 
-; a - flag
-; c - value - truncated to fit only the flag's bounds
-SetEventFlagValue: ; ca92 (3:4a92)
+; a - event
+; c - value - truncated to fit only the event var's bounds
+SetEventValue: ; ca92 (3:4a92)
 	push hl
 	push bc
-	call GetEventFlag
-	ld a, [wLoadedFlagBits]
+	call GetEventVar
+	ld a, [wLoadedEventBits]
 .loop
 	bit 0, a
 	jr nz, .done
@@ -1622,10 +1622,10 @@ SetEventFlagValue: ; ca92 (3:4a92)
 	sla c
 	jr .loop
 .done
-	ld a, [wLoadedFlagBits]
+	ld a, [wLoadedEventBits]
 	and c
 	ld c, a
-	ld a, [wLoadedFlagBits]
+	ld a, [wLoadedEventBits]
 	cpl
 	and [hl]
 	or c
@@ -1651,36 +1651,36 @@ GetByteAfterCall: ; cab3 (3:4ab3)
 	pop hl
 	ret
 
-MaxStackFlagValue: ; cac2 (3:4ac2)
+MaxStackEventValue: ; cac2 (3:4ac2)
 	call GetByteAfterCall
 ;	fallthrough
 
-MaxOutEventFlag: ; cac5 (3:4ac5)
+MaxOutEventValue: ; cac5 (3:4ac5)
 	push bc
 	ld c, $ff
-	call SetEventFlagValue
+	call SetEventValue
 	pop bc
 	ret
 
-ZeroStackFlagValue: ; cacd (3:4acd)
+SetStackEventFalse: ; cacd (3:4acd)
 	call GetByteAfterCall
 ;	fallthrough
 
-ZeroOutEventFlag: ; cad0 (3:4ad0)
+ZeroOutEventValue: ; cad0 (3:4ad0)
 	push bc
-	ld c, $0
-	call SetEventFlagValue
+	ld c, 0
+	call SetEventValue
 	pop bc
 	ret
 
 TryGiveMedalPCPacks: ; cad8 (3:4ad8)
 	push hl
 	push bc
-	ld hl, MedalEventFlags
+	ld hl, MedalEvents
 	lb bc, 0, 8
 .loop
 	ld a, [hli]
-	call GetEventFlagValue
+	call GetEventValue
 	jr z, .no_medal
 	inc b
 .no_medal
@@ -1688,7 +1688,7 @@ TryGiveMedalPCPacks: ; cad8 (3:4ad8)
 	jr nz, .loop
 
 	ld c, b
-	set_flag_value EVENT_MEDAL_COUNT
+	set_event_value EVENT_MEDAL_COUNT
 	ld a, c
 	push af
 	cp 8
@@ -1717,7 +1717,7 @@ TryGiveMedalPCPacks: ; cad8 (3:4ad8)
 	pop hl
 	ret
 
-MedalEventFlags: ; cb15 (3:4b15)
+MedalEvents: ; cb15 (3:4b15)
 	db EVENT_BEAT_NIKKI
 	db EVENT_BEAT_RICK
 	db EVENT_BEAT_KEN
@@ -1727,149 +1727,149 @@ MedalEventFlags: ; cb15 (3:4b15)
 	db EVENT_BEAT_GENE
 	db EVENT_BEAT_MITCH
 
-; returns wEventFlags byte in hl, related bits in wLoadedFlagBits
-GetEventFlag: ; cb1d (3:4b1d)
+; returns wEventVars byte in hl, related bits in wLoadedEventBits
+GetEventVar: ; cb1d (3:4b1d)
 	push bc
 	ld c, a
 	ld b, 0
 	sla c
 	rl b
-	ld hl, EventFlagMasks
+	ld hl, EventVarMasks
 	add hl, bc
 	ld a, [hli]
 	ld c, a
 	ld a, [hl]
-	ld [wLoadedFlagBits], a
+	ld [wLoadedEventBits], a
 	ld b, 0
-	ld hl, wEventFlags
+	ld hl, wEventVars
 	add hl, bc
 	pop bc
 	ret
 
-; location in wEventFlags of each event flag:
-; offset - which byte holds the event flag
+; location in wEventVars of each event var:
+; offset - which byte holds the event value
 ; mask - which bits in the byte hold the value
 ; events 0-7 are reset when game resets
-EventFlagMasks: ; cb37 (3:4b37)
-	flag_def $3f, %10000000 ; EVENT_TEMP_TRADED_WITH_ISHIHARA
-	flag_def $3f, %01000000 ; EVENT_TEMP_GIFTED_TO_MAN1
-	flag_def $3f, %00100000 ; EVENT_TEMP_TALKED_TO_IMAKUNI
-	flag_def $3f, %00010000 ; EVENT_TEMP_DUELED_IMAKUNI
-	flag_def $3f, %00001000 ; EVENT_TEMP_TRADED_WITH_LASS2
-	flag_def $3f, %00000100 ; EVENT_TEMP_05 unused?
-	flag_def $3f, %00000010 ; EVENT_TEMP_06 unused?
-	flag_def $3f, %00000001 ; EVENT_TEMP_07 unused?
-	flag_def $00, %10000000 ; EVENT_BEAT_NIKKI
-	flag_def $00, %01000000 ; EVENT_BEAT_RICK
-	flag_def $00, %00100000 ; EVENT_BEAT_KEN
-	flag_def $00, %00010000 ; EVENT_BEAT_AMY
-	flag_def $00, %00001000 ; EVENT_BEAT_ISAAC
-	flag_def $00, %00000100 ; EVENT_BEAT_MURRAY
-	flag_def $00, %00000010 ; EVENT_BEAT_GENE
-	flag_def $00, %00000001 ; EVENT_BEAT_MITCH
-	flag_def $00, %11111111 ; EVENT_MEDAL_FLAGS
-	flag_def $01, %11110000 ; EVENT_PUPIL_MICHAEL_STATE
-	flag_def $01, %00001111 ; EVENT_GAL1_TRADE_STATE
-	flag_def $02, %11000000 ; EVENT_IMAKUNI_STATE
-	flag_def $02, %00110000 ; EVENT_LASS1_MENTIONED_IMAKUNI
-	flag_def $02, %00001000 ; EVENT_BEAT_SARA
-	flag_def $02, %00000100 ; EVENT_BEAT_AMANDA
-	flag_def $03, %11110000 ; EVENT_PUPIL_CHRIS_STATE
-	flag_def $03, %00001111 ; EVENT_MATTHEW_STATE
-	flag_def $04, %11110000 ; EVENT_CHAP2_TRADE_STATE
-	flag_def $04, %00001111 ; EVENT_DAVID_STATE
-	flag_def $05, %10000000 ; EVENT_BEAT_JOSEPH
-	flag_def $05, %01000000 ; EVENT_ISHIHARA_MENTIONED
-	flag_def $05, %00100000 ; EVENT_ISHIHARA_MET
-	flag_def $05, %00010000 ; EVENT_ISHIHARAS_HOUSE_MENTIONED
-	flag_def $05, %00001111 ; EVENT_ISHIHARA_TRADE_STATE
-	flag_def $06, %11110000 ; EVENT_PUPIL_JESSICA_STATE
-	flag_def $06, %00001100 ; EVENT_LAD2_STATE
-	flag_def $06, %00000010 ; EVENT_RECEIVED_LEGENDARY_CARDS
-	flag_def $06, %00000001 ; EVENT_KEN_HAD_ENOUGH_CARDS
-	flag_def $07, %11000000 ; EVENT_KEN_TALKED
-	flag_def $07, %00100000 ; EVENT_BEAT_JENNIFER
-	flag_def $07, %00010000 ; EVENT_BEAT_NICHOLAS
-	flag_def $07, %00001000 ; EVENT_BEAT_BRANDON
-	flag_def $07, %00000100 ; EVENT_ISAAC_TALKED
-	flag_def $07, %00000010 ; EVENT_MAN1_TALKED
-	flag_def $07, %00000001 ; EVENT_MAN1_WAITING_FOR_CARD
-	flag_def $08, %11111111 ; EVENT_MAN1_REQUESTED_CARD_ID
-	flag_def $09, %11100000 ; EVENT_MAN1_GIFT_SEQUENCE_STATE
-	flag_def $09, %00011111 ; EVENT_MAN1_GIFTED_CARD_FLAGS
-	flag_def $0a, %11110000 ; EVENT_MEDAL_COUNT
-	flag_def $0a, %00001000 ; EVENT_DANIEL_TALKED
-	flag_def $0a, %00000100 ; EVENT_MURRAY_TALKED
-	flag_def $0a, %00000011 ; EVENT_PAPPY1_STATE
-	flag_def $0b, %10000000 ; EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
-	flag_def $0b, %01110000 ; EVENT_JOSHUA_STATE
-	flag_def $0b, %00001100 ; EVENT_IMAKUNI_ROOM
-	flag_def $0b, %00000011 ; EVENT_NIKKI_STATE
-	flag_def $0c, %11100000 ; EVENT_IMAKUNI_WIN_COUNT
-	flag_def $0c, %00011100 ; EVENT_LASS2_TRADE_STATE
-	flag_def $0c, %00000010 ; EVENT_ISHIHARA_WANTS_TO_TRADE
-	flag_def $0c, %00000001 ; EVENT_ISHIHARA_CONGRATULATED_PLAYER
-	flag_def $0d, %10000000 ; EVENT_BEAT_KRISTIN
-	flag_def $0d, %01000000 ; EVENT_BEAT_HEATHER
-	flag_def $0d, %00100000 ; EVENT_BEAT_BRITTANY
-	flag_def $0d, %00010000 ; EVENT_DRMASON_CONGRATULATED_PLAYER
-	flag_def $0d, %00001110 ; EVENT_MASON_LAB_STATE
-	flag_def $0e, %11100000 ; EVENT_CHALLENGE_CUP_1_STATE
-	flag_def $0e, %00011100 ; EVENT_CHALLENGE_CUP_2_STATE
-	flag_def $0f, %11100000 ; EVENT_CHALLENGE_CUP_3_STATE
-	flag_def $10, %10000000 ; EVENT_CHALLENGE_CUP_STARTING
-	flag_def $10, %01000000 ; EVENT_CHALLENGE_CUP_STAGE_VISITED
-	flag_def $10, %00110000 ; EVENT_CHALLENGE_CUP_NUMBER
-	flag_def $10, %00001100 ; EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
-	flag_def $10, %00000010 ; EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
-	flag_def $10, %00000001 ; EVENT_CHALLENGE_CUP_IN_MENU
-	flag_def $11, %11100000 ; EVENT_CHALLENGE_CUP_1_RESULT
-	flag_def $11, %00011100 ; EVENT_CHALLENGE_CUP_2_RESULT
-	flag_def $12, %11100000 ; EVENT_CHALLENGE_CUP_3_RESULT
-	flag_def $13, %10000000 ; EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
-	flag_def $13, %01100000 ; EVENT_RONALD_FIRST_DUEL_STATE
-	flag_def $13, %00011000 ; EVENT_RONALD_SECOND_DUEL_STATE
-	flag_def $13, %00000100 ; EVENT_RONALD_TALKED
-	flag_def $13, %00000010 ; EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER
-	flag_def $14, %10000000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_1
-	flag_def $14, %01000000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
-	flag_def $14, %00100000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_3
-	flag_def $14, %00010000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_4
-	flag_def $14, %00001000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_5
-	flag_def $14, %00000100 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
-	flag_def $14, %00000010 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_7
-	flag_def $14, %00000001 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_8
-	flag_def $15, %11110000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
-	flag_def $15, %00001000 ; EVENT_PLAYER_ENTERED_CHALLENGE_CUP
-	flag_def $16, %10000000 ; EVENT_FIGHTING_DECK_MACHINE_ACTIVE
-	flag_def $16, %01000000 ; EVENT_ROCK_DECK_MACHINE_ACTIVE
-	flag_def $16, %00100000 ; EVENT_WATER_DECK_MACHINE_ACTIVE
-	flag_def $16, %00010000 ; EVENT_LIGHTNING_DECK_MACHINE_ACTIVE
-	flag_def $16, %00001000 ; EVENT_GRASS_DECK_MACHINE_ACTIVE
-	flag_def $16, %00000100 ; EVENT_PSYCHIC_DECK_MACHINE_ACTIVE
-	flag_def $16, %00000010 ; EVENT_SCIENCE_DECK_MACHINE_ACTIVE
-	flag_def $16, %00000001 ; EVENT_FIRE_DECK_MACHINE_ACTIVE
-	flag_def $16, %11111111 ; EVENT_ALL_DECK_MACHINE_FLAGS
-	flag_def $17, %10000000 ; EVENT_HALL_OF_HONOR_DOORS_OPEN
-	flag_def $17, %01000000 ; EVENT_CHALLENGED_GRAND_MASTERS
-	flag_def $17, %00110000 ; EVENT_POKEMON_DOME_STATE
-	flag_def $17, %00001000 ; EVENT_POKEMON_DOME_IN_MENU
-	flag_def $17, %00000100 ; EVENT_CHALLENGED_RONALD
-	flag_def $18, %11000000 ; EVENT_COURTNEY_STATE
-	flag_def $18, %00110000 ; EVENT_STEVE_STATE
-	flag_def $18, %00001100 ; EVENT_JACK_STATE
-	flag_def $18, %00000011 ; EVENT_ROD_STATE
-	flag_def $19, %11000000 ; EVENT_RONALD_POKEMON_DOME_STATE
-	flag_def $19, %00100000 ; EVENT_RECEIVED_ZAPDOS
-	flag_def $19, %00010000 ; EVENT_RECEIVED_MOLTRES
-	flag_def $19, %00001000 ; EVENT_RECEIVED_ARTICUNO
-	flag_def $19, %00000100 ; EVENT_RECEIVED_DRAGONITE
-	flag_def $19, %00111100 ; EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
-	flag_def $1a, %11111100 ; EVENT_GIFT_CENTER_MENU_CHOICE
-	flag_def $1a, %00000011 ; EVENT_AARON_BOOSTER_REWARD
-	flag_def $1b, %11111111 ; EVENT_CONSOLE
-	flag_def $1c, %11110000 ; EVENT_SAM_MENU_CHOICE
-	flag_def $1c, %00001111 ; EVENT_AARON_DECK_MENU_CHOICE
+EventVarMasks: ; cb37 (3:4b37)
+	event_def $3f, %10000000 ; EVENT_TEMP_TRADED_WITH_ISHIHARA
+	event_def $3f, %01000000 ; EVENT_TEMP_GIFTED_TO_MAN1
+	event_def $3f, %00100000 ; EVENT_TEMP_TALKED_TO_IMAKUNI
+	event_def $3f, %00010000 ; EVENT_TEMP_DUELED_IMAKUNI
+	event_def $3f, %00001000 ; EVENT_TEMP_TRADED_WITH_LASS2
+	event_def $3f, %00000100 ; EVENT_TEMP_05 unused?
+	event_def $3f, %00000010 ; EVENT_TEMP_06 unused?
+	event_def $3f, %00000001 ; EVENT_TEMP_07 unused?
+	event_def $00, %10000000 ; EVENT_BEAT_NIKKI
+	event_def $00, %01000000 ; EVENT_BEAT_RICK
+	event_def $00, %00100000 ; EVENT_BEAT_KEN
+	event_def $00, %00010000 ; EVENT_BEAT_AMY
+	event_def $00, %00001000 ; EVENT_BEAT_ISAAC
+	event_def $00, %00000100 ; EVENT_BEAT_MURRAY
+	event_def $00, %00000010 ; EVENT_BEAT_GENE
+	event_def $00, %00000001 ; EVENT_BEAT_MITCH
+	event_def $00, %11111111 ; EVENT_MEDAL_FLAGS
+	event_def $01, %11110000 ; EVENT_PUPIL_MICHAEL_STATE
+	event_def $01, %00001111 ; EVENT_GAL1_TRADE_STATE
+	event_def $02, %11000000 ; EVENT_IMAKUNI_STATE
+	event_def $02, %00110000 ; EVENT_LASS1_MENTIONED_IMAKUNI
+	event_def $02, %00001000 ; EVENT_BEAT_SARA
+	event_def $02, %00000100 ; EVENT_BEAT_AMANDA
+	event_def $03, %11110000 ; EVENT_PUPIL_CHRIS_STATE
+	event_def $03, %00001111 ; EVENT_MATTHEW_STATE
+	event_def $04, %11110000 ; EVENT_CHAP2_TRADE_STATE
+	event_def $04, %00001111 ; EVENT_DAVID_STATE
+	event_def $05, %10000000 ; EVENT_BEAT_JOSEPH
+	event_def $05, %01000000 ; EVENT_ISHIHARA_MENTIONED
+	event_def $05, %00100000 ; EVENT_ISHIHARA_MET
+	event_def $05, %00010000 ; EVENT_ISHIHARAS_HOUSE_MENTIONED
+	event_def $05, %00001111 ; EVENT_ISHIHARA_TRADE_STATE
+	event_def $06, %11110000 ; EVENT_PUPIL_JESSICA_STATE
+	event_def $06, %00001100 ; EVENT_LAD2_STATE
+	event_def $06, %00000010 ; EVENT_RECEIVED_LEGENDARY_CARDS
+	event_def $06, %00000001 ; EVENT_KEN_HAD_ENOUGH_CARDS
+	event_def $07, %11000000 ; EVENT_KEN_TALKED
+	event_def $07, %00100000 ; EVENT_BEAT_JENNIFER
+	event_def $07, %00010000 ; EVENT_BEAT_NICHOLAS
+	event_def $07, %00001000 ; EVENT_BEAT_BRANDON
+	event_def $07, %00000100 ; EVENT_ISAAC_TALKED
+	event_def $07, %00000010 ; EVENT_MAN1_TALKED
+	event_def $07, %00000001 ; EVENT_MAN1_WAITING_FOR_CARD
+	event_def $08, %11111111 ; EVENT_MAN1_REQUESTED_CARD_ID
+	event_def $09, %11100000 ; EVENT_MAN1_GIFT_SEQUENCE_STATE
+	event_def $09, %00011111 ; EVENT_MAN1_GIFTED_CARD_FLAGS
+	event_def $0a, %11110000 ; EVENT_MEDAL_COUNT
+	event_def $0a, %00001000 ; EVENT_DANIEL_TALKED
+	event_def $0a, %00000100 ; EVENT_MURRAY_TALKED
+	event_def $0a, %00000011 ; EVENT_PAPPY1_STATE
+	event_def $0b, %10000000 ; EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
+	event_def $0b, %01110000 ; EVENT_JOSHUA_STATE
+	event_def $0b, %00001100 ; EVENT_IMAKUNI_ROOM
+	event_def $0b, %00000011 ; EVENT_NIKKI_STATE
+	event_def $0c, %11100000 ; EVENT_IMAKUNI_WIN_COUNT
+	event_def $0c, %00011100 ; EVENT_LASS2_TRADE_STATE
+	event_def $0c, %00000010 ; EVENT_ISHIHARA_WANTS_TO_TRADE
+	event_def $0c, %00000001 ; EVENT_ISHIHARA_CONGRATULATED_PLAYER
+	event_def $0d, %10000000 ; EVENT_BEAT_KRISTIN
+	event_def $0d, %01000000 ; EVENT_BEAT_HEATHER
+	event_def $0d, %00100000 ; EVENT_BEAT_BRITTANY
+	event_def $0d, %00010000 ; EVENT_DRMASON_CONGRATULATED_PLAYER
+	event_def $0d, %00001110 ; EVENT_MASON_LAB_STATE
+	event_def $0e, %11100000 ; EVENT_CHALLENGE_CUP_1_STATE
+	event_def $0e, %00011100 ; EVENT_CHALLENGE_CUP_2_STATE
+	event_def $0f, %11100000 ; EVENT_CHALLENGE_CUP_3_STATE
+	event_def $10, %10000000 ; EVENT_CHALLENGE_CUP_STARTING
+	event_def $10, %01000000 ; EVENT_CHALLENGE_CUP_STAGE_VISITED
+	event_def $10, %00110000 ; EVENT_CHALLENGE_CUP_NUMBER
+	event_def $10, %00001100 ; EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
+	event_def $10, %00000010 ; EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
+	event_def $10, %00000001 ; EVENT_CHALLENGE_CUP_IN_MENU
+	event_def $11, %11100000 ; EVENT_CHALLENGE_CUP_1_RESULT
+	event_def $11, %00011100 ; EVENT_CHALLENGE_CUP_2_RESULT
+	event_def $12, %11100000 ; EVENT_CHALLENGE_CUP_3_RESULT
+	event_def $13, %10000000 ; EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
+	event_def $13, %01100000 ; EVENT_RONALD_FIRST_DUEL_STATE
+	event_def $13, %00011000 ; EVENT_RONALD_SECOND_DUEL_STATE
+	event_def $13, %00000100 ; EVENT_RONALD_TALKED
+	event_def $13, %00000010 ; EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER
+	event_def $14, %10000000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_1
+	event_def $14, %01000000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
+	event_def $14, %00100000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_3
+	event_def $14, %00010000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_4
+	event_def $14, %00001000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_5
+	event_def $14, %00000100 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
+	event_def $14, %00000010 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_7
+	event_def $14, %00000001 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_8
+	event_def $15, %11110000 ; EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
+	event_def $15, %00001000 ; EVENT_PLAYER_ENTERED_CHALLENGE_CUP
+	event_def $16, %10000000 ; EVENT_FIGHTING_DECK_MACHINE_ACTIVE
+	event_def $16, %01000000 ; EVENT_ROCK_DECK_MACHINE_ACTIVE
+	event_def $16, %00100000 ; EVENT_WATER_DECK_MACHINE_ACTIVE
+	event_def $16, %00010000 ; EVENT_LIGHTNING_DECK_MACHINE_ACTIVE
+	event_def $16, %00001000 ; EVENT_GRASS_DECK_MACHINE_ACTIVE
+	event_def $16, %00000100 ; EVENT_PSYCHIC_DECK_MACHINE_ACTIVE
+	event_def $16, %00000010 ; EVENT_SCIENCE_DECK_MACHINE_ACTIVE
+	event_def $16, %00000001 ; EVENT_FIRE_DECK_MACHINE_ACTIVE
+	event_def $16, %11111111 ; EVENT_ALL_DECK_MACHINE_FLAGS
+	event_def $17, %10000000 ; EVENT_HALL_OF_HONOR_DOORS_OPEN
+	event_def $17, %01000000 ; EVENT_CHALLENGED_GRAND_MASTERS
+	event_def $17, %00110000 ; EVENT_POKEMON_DOME_STATE
+	event_def $17, %00001000 ; EVENT_POKEMON_DOME_IN_MENU
+	event_def $17, %00000100 ; EVENT_CHALLENGED_RONALD
+	event_def $18, %11000000 ; EVENT_COURTNEY_STATE
+	event_def $18, %00110000 ; EVENT_STEVE_STATE
+	event_def $18, %00001100 ; EVENT_JACK_STATE
+	event_def $18, %00000011 ; EVENT_ROD_STATE
+	event_def $19, %11000000 ; EVENT_RONALD_POKEMON_DOME_STATE
+	event_def $19, %00100000 ; EVENT_RECEIVED_ZAPDOS
+	event_def $19, %00010000 ; EVENT_RECEIVED_MOLTRES
+	event_def $19, %00001000 ; EVENT_RECEIVED_ARTICUNO
+	event_def $19, %00000100 ; EVENT_RECEIVED_DRAGONITE
+	event_def $19, %00111100 ; EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
+	event_def $1a, %11111100 ; EVENT_GIFT_CENTER_MENU_CHOICE
+	event_def $1a, %00000011 ; EVENT_AARON_BOOSTER_REWARD
+	event_def $1b, %11111111 ; EVENT_CONSOLE
+	event_def $1c, %11110000 ; EVENT_SAM_MENU_CHOICE
+	event_def $1c, %00001111 ; EVENT_AARON_DECK_MENU_CHOICE
 
 ; Used for basic level objects that just print text and quit
 PrintInteractableObjectText: ; cc25 (3:4c25)
@@ -2064,13 +2064,13 @@ ScriptCommand_AskQuestionJump: ; cce9 (3:4ce9)
 ; args - prize cards, deck id, duel theme index
 ; sets a duel up, doesn't start until we break out of the script system.
 ScriptCommand_StartDuel: ; cd01 (3:4d01)
-	call Func_cd66
+	call SetNPCDuelParams
 	ld a, [wScriptNPC]
 	ld l, LOADED_NPC_ID
 	call GetItemInLoadedNPCIndex
 	ld a, [hl]
-	farcall Func_118d3
-	ld a, [wcc19]
+	farcall SetNPCMatchStartTheme
+	ld a, [wNPCDuelDeckID]
 	cp $ff
 	jr nz, .not_aaron_duel
 	ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst]
@@ -2079,20 +2079,20 @@ ScriptCommand_StartDuel: ; cd01 (3:4d01)
 	ld hl, AaronDeckIDs
 	add hl, bc
 	ld a, [hl]
-	ld [wcc19], a
+	ld [wNPCDuelDeckID], a
 .not_aaron_duel
 	ld a, [wScriptNPC]
 	ld l, LOADED_NPC_ID
 	call GetItemInLoadedNPCIndex
 	ld a, [hl]
 .start_duel
-	ld [wd0c4], a
-	ld [wcc14], a
+	ld [wNPCDuelist], a
+	ld [wNPCDuelistCopy], a
 	push af
 	farcall Func_1c557
 	ld [wd0c5], a
 	pop af
-	farcall Func_118a7
+	farcall SetNPCOpponentNameAndPortrait
 	ld a, GAME_EVENT_DUEL
 	ld [wGameEvent], a
 	ld hl, wd0b4
@@ -2100,12 +2100,12 @@ ScriptCommand_StartDuel: ; cd01 (3:4d01)
 	jp IncreaseScriptPointerBy4
 
 ScriptCommand_StartChallengeHallDuel: ; cd4f (3:4d4f)
-	call Func_cd66
-	ld a, [wd696]
-	farcall Func_118bf
+	call SetNPCDuelParams
+	ld a, [wChallengeHallNPC]
+	farcall SetNPCDeckIDAndDuelTheme
 	ld a, MUSIC_MATCH_START_2
 	ld [wMatchStartTheme], a
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 	jr ScriptCommand_StartDuel.start_duel
 
 AaronDeckIDs: ; cd63 (3:4d63)
@@ -2113,11 +2113,11 @@ AaronDeckIDs: ; cd63 (3:4d63)
 	db WATER_AND_FIGHTING_DECK_ID
 	db GRASS_AND_PSYCHIC_DECK_ID
 
-Func_cd66: ; cd66 (3:4d66)
+SetNPCDuelParams: ; cd66 (3:4d66)
 	ld a, c
-	ld [wcc18], a
+	ld [wNPCDuelPrizes], a
 	ld a, b
-	ld [wcc19], a
+	ld [wNPCDuelDeckID], a
 	call GetScriptArgs3AfterPointer
 	ld a, c
 	ld [wDuelTheme], a
@@ -2143,7 +2143,7 @@ ScriptCommand_PrintVariableNPCText: ; cd83 (3:4d83)
 	jp IncreaseScriptPointerBy5
 
 ScriptCommand_PrintTextForChallengeCup: ; cd94 (3:4d94)
-	get_flag_value EVENT_CHALLENGE_CUP_NUMBER
+	get_event_value EVENT_CHALLENGE_CUP_NUMBER
 	dec a
 	and %11
 	add a
@@ -2189,7 +2189,7 @@ ScriptCommand_UnloadChallengeHallNPC: ; cdd8 (3:4dd8)
 	push af
 	ld a, [wTempNPC]
 	push af
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	call Func_cdd1
@@ -2204,7 +2204,7 @@ ScriptCommand_SetChallengeHallNPCCoords: ; cdf5 (3:4df5)
 	push af
 	ld a, [wTempNPC]
 	push af
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 	ld [wTempNPC], a
 	ld a, c
 	ld [wLoadNPCXPos], a
@@ -2262,7 +2262,7 @@ ScriptCommand_MoveChallengeHallNPC: ; ce52 (3:4e52)
 	push af
 	ld a, [wTempNPC]
 	push af
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 ;	fallthrough
 
 ; Executes movement on an arbitrary NPC using values in a and on the stack
@@ -2298,32 +2298,32 @@ ScriptCommand_CloseTextBox: ; ce84 (3:4e84)
 ; args: booster pack index, booster pack index, booster pack index
 ScriptCommand_GiveBoosterPacks: ; ce8a (3:4e8a)
 	xor a
-	ld [wd117], a
+	ld [wAnotherBoosterPack], a
 	push bc
 	call Func_c2a3
 	pop bc
 	push bc
 	ld a, c
-	farcall BoosterPack_1031b
-	ld a, 1
-	ld [wd117], a
+	farcall GiveBoosterPack
+	ld a, TRUE
+	ld [wAnotherBoosterPack], a
 	pop bc
 	ld a, b
 	cp NO_BOOSTER
 	jr z, .done
-	farcall BoosterPack_1031b
+	farcall GiveBoosterPack
 	call GetScriptArgs3AfterPointer
 	ld a, c
 	cp NO_BOOSTER
 	jr z, .done
-	farcall BoosterPack_1031b
+	farcall GiveBoosterPack
 .done
 	call Func_c2d4
 	jp IncreaseScriptPointerBy4
 
 ScriptCommand_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
 	xor a
-	ld [wd117], a
+	ld [wAnotherBoosterPack], a
 	call Func_c2a3
 	ld hl, .booster_type_table
 .loop
@@ -2331,9 +2331,9 @@ ScriptCommand_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
 	cp NO_BOOSTER
 	jr z, .done
 	push hl
-	farcall BoosterPack_1031b
-	ld a, $1
-	ld [wd117], a
+	farcall GiveBoosterPack
+	ld a, TRUE
+	ld [wAnotherBoosterPack], a
 	pop hl
 	inc hl
 	jr .loop
@@ -2357,7 +2357,7 @@ ScriptCommand_ShowCardReceivedScreen: ; cee2 (3:4ee2)
 	jr z, .legendary_card
 	or a
 	jr nz, .show_card
-	ld a, [wd697]
+	ld a, [wCardReceived]
 
 .show_card
 	push af
@@ -2415,12 +2415,12 @@ ScriptCommand_JumpIfEnoughCardsOwned: ; cf2d (3:4f2d)
 	jr nc, ScriptCommand_JumpIfCardInCollection.pass_try_jump
 	jr ScriptCommand_JumpIfCardInCollection.fail
 
-; Gives the first arg as a card. If that's 0 pulls from wd697
+; Gives the first arg as a card. If that's 0 pulls from wCardReceived
 ScriptCommand_GiveCard: ; cf3f (3:4f3f)
 	ld a, c
 	or a
 	jr nz, .give_card
-	ld a, [wd697]
+	ld a, [wCardReceived]
 
 .give_card
 	call AddCardToCollection
@@ -2484,19 +2484,19 @@ ScriptCommand_RemoveAllEnergyCardsFromCollection: ; cf7b (3:4f7b)
 
 ScriptCommand_JumpBasedOnFightingClubPupilStatus: ; cf96 (3:4f96)
 	ld c, 0
-	get_flag_value EVENT_PUPIL_MICHAEL_STATE
+	get_event_value EVENT_PUPIL_MICHAEL_STATE
 	or a ; cp PUPIL_INACTIVE
 	jr z, .first_interaction
 	cp PUPIL_DEFEATED
 	jr c, .pupil1_not_defeated
 	inc c
 .pupil1_not_defeated
-	get_flag_value EVENT_PUPIL_CHRIS_STATE
+	get_event_value EVENT_PUPIL_CHRIS_STATE
 	cp PUPIL_DEFEATED
 	jr c, .pupil2_not_defeated
 	inc c
 .pupil2_not_defeated
-	get_flag_value EVENT_PUPIL_JESSICA_STATE
+	get_event_value EVENT_PUPIL_JESSICA_STATE
 	cp PUPIL_DEFEATED
 	jr c, .pupil3_not_defeated
 	inc c
@@ -2519,7 +2519,7 @@ ScriptCommand_SetActiveNPCDirection: ; cfc6 (3:4fc6)
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_PickNextMan1RequestedCard: ; cfd4 (3:4fd4)
-	get_flag_value EVENT_MAN1_GIFTED_CARD_FLAGS
+	get_event_value EVENT_MAN1_GIFTED_CARD_FLAGS
 	ld b, a
 .choose_again
 	ld a, Man1RequestedCardsList.end - Man1RequestedCardsList
@@ -2542,13 +2542,13 @@ ScriptCommand_PickNextMan1RequestedCard: ; cfd4 (3:4fd4)
 	or b
 	push bc
 	ld c, a
-	set_flag_value EVENT_MAN1_GIFTED_CARD_FLAGS
+	set_event_value EVENT_MAN1_GIFTED_CARD_FLAGS
 	pop bc
 	ld b, 0
 	ld hl, Man1RequestedCardsList
 	add hl, bc
 	ld c, [hl]
-	set_flag_value EVENT_MAN1_REQUESTED_CARD_ID
+	set_event_value EVENT_MAN1_REQUESTED_CARD_ID
 	jp IncreaseScriptPointerBy1
 
 Man1RequestedCardsList: ; d006 (3:5006)
@@ -2565,7 +2565,7 @@ ScriptCommand_LoadMan1RequestedCardIntoTxRamSlot: ; d00b (3:500b)
 	ld hl, wTxRam2
 	add hl, bc
 	push hl
-	get_flag_value EVENT_MAN1_REQUESTED_CARD_ID
+	get_event_value EVENT_MAN1_REQUESTED_CARD_ID
 	ld e, a
 	ld d, 0
 	call GetCardName
@@ -2576,19 +2576,19 @@ ScriptCommand_LoadMan1RequestedCardIntoTxRamSlot: ; d00b (3:500b)
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_JumpIfMan1RequestedCardOwned: ; d025 (3:5025)
-	get_flag_value EVENT_MAN1_REQUESTED_CARD_ID
+	get_event_value EVENT_MAN1_REQUESTED_CARD_ID
 	call GetCardCountInCollectionAndDecks
 	jp c, ScriptCommand_JumpIfAnyEnergyCardsInCollection.fail
 	jp ScriptCommand_JumpIfAnyEnergyCardsInCollection.pass_try_jump
 
 ScriptCommand_JumpIfMan1RequestedCardInCollection: ; d032 (3:5032)
-	get_flag_value EVENT_MAN1_REQUESTED_CARD_ID
+	get_event_value EVENT_MAN1_REQUESTED_CARD_ID
 	call GetCardCountInCollection
 	jp c, ScriptCommand_JumpIfAnyEnergyCardsInCollection.fail
 	jp ScriptCommand_JumpIfAnyEnergyCardsInCollection.pass_try_jump
 
 ScriptCommand_RemoveMan1RequestedCardFromCollection: ; d03f (3:503f)
-	get_flag_value EVENT_MAN1_REQUESTED_CARD_ID
+	get_event_value EVENT_MAN1_REQUESTED_CARD_ID
 	call RemoveCardFromCollection
 	jp IncreaseScriptPointerBy1
 
@@ -2684,20 +2684,20 @@ ScriptCommand_JumpIfActiveNPCCoordsMatch: ; d0d9 (3:50d9)
 	farcall Func_1c477
 	ld a, e
 	cp c
-	jp nz, ScriptCommand_JumpIfFlagEqual.fail
+	jp nz, ScriptCommand_JumpIfEventEqual.fail
 	ld a, d
 	cp b
-	jp nz, ScriptCommand_JumpIfFlagEqual.fail
-	jp ScriptCommand_JumpIfFlagEqual.pass_try_jump
+	jp nz, ScriptCommand_JumpIfEventEqual.fail
+	jp ScriptCommand_JumpIfEventEqual.pass_try_jump
 
 ScriptCommand_JumpIfPlayerCoordsMatch: ; d0f2 (3:50f2)
 	ld a, [wPlayerXCoord]
 	cp c
-	jp nz, ScriptCommand_JumpIfFlagEqual.fail
+	jp nz, ScriptCommand_JumpIfEventEqual.fail
 	ld a, [wPlayerYCoord]
 	cp b
-	jp nz, ScriptCommand_JumpIfFlagEqual.fail
-	jp ScriptCommand_JumpIfFlagEqual.pass_try_jump
+	jp nz, ScriptCommand_JumpIfEventEqual.fail
+	jp ScriptCommand_JumpIfEventEqual.pass_try_jump
 
 ScriptCommand_JumpIfNPCLoaded: ; d103 (3:5103)
 	ld a, [wLoadedNPCTempIndex]
@@ -2708,11 +2708,11 @@ ScriptCommand_JumpIfNPCLoaded: ; d103 (3:5103)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	jr c, .not_loaded
-	call ScriptCommand_JumpIfFlagNonzero2.pass_try_jump
+	call ScriptCommand_JumpIfEventTrue.pass_try_jump
 	jr .done
 
 .not_loaded
-	call ScriptCommand_JumpIfFlagZero2.fail
+	call ScriptCommand_JumpIfEventFalse.fail
 
 .done
 	pop af
@@ -2736,7 +2736,7 @@ ScriptCommand_LoadCurrentMapNameIntoTxRamSlot: ; d135 (3:5135)
 	ld hl, wTxRam2
 	add hl, bc
 	push hl
-	ld a, [wd32e]
+	ld a, [wOverworldMapSelection]
 	rlca
 	ld c, a
 	ld b, 0
@@ -2776,7 +2776,7 @@ ScriptCommand_LoadChallengeHallNPCIntoTxRamSlot: ; d16b (3:516b)
 	ld hl, wTxRam2
 	add hl, bc
 	push hl
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 	farcall SetNPCDialogName
 	pop hl
 	ld a, [wCurrentNPCNameTx]
@@ -2793,10 +2793,10 @@ ScriptCommand_LoadChallengeHallNPCIntoTxRamSlot: ; d16b (3:516b)
 ScriptCommand_PickChallengeHallOpponent: ; d195 (3:5195)
 	ld a, [wTempNPC]
 	push af
-	get_flag_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
+	get_event_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
 	inc a
 	ld c, a
-	set_flag_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
+	set_event_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
 	call Func_f580
 	pop af
 	ld [wTempNPC], a
@@ -2807,7 +2807,7 @@ ScriptCommand_OpenMenu: ; d1ad (3:51ad)
 	jp IncreaseScriptPointerBy1
 
 ScriptCommand_PickChallengeCupPrizeCard: ; d1b3 (3:51b3)
-	get_flag_value EVENT_CHALLENGE_CUP_NUMBER
+	get_event_value EVENT_CHALLENGE_CUP_NUMBER
 	dec a
 	cp 2
 	jr c, .first_or_second_cup
@@ -2824,7 +2824,7 @@ ScriptCommand_PickChallengeCupPrizeCard: ; d1b3 (3:51b3)
 	ld d, 0
 	add hl, de
 	ld a, [hli]
-	ld [wd697], a
+	ld [wCardReceived], a
 	ld a, [hli]
 	ld [wTxRam2], a
 	ld a, [hl]
@@ -2879,7 +2879,7 @@ ChallengeCupPrizeCards: ; d1dc (3:51dc)
 .end
 
 ScriptCommand_PickLegendaryCard: ; d209 (3:5209)
-	get_flag_value EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
+	get_event_value EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
 	ld e, a
 .new_random
 	call UpdateRNGSources
@@ -2898,10 +2898,10 @@ ScriptCommand_PickLegendaryCard: ; d209 (3:5209)
 	jr nz, .new_random
 	push bc
 	ld b, 0
-	ld hl, Flags_d240
+	ld hl, LegendaryCardEvents
 	add hl, bc
 	ld a, [hl]
-	call MaxOutEventFlag ; also modifies EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
+	call MaxOutEventValue ; also modifies EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS
 	pop bc
 	ld hl, LegendaryCards
 	ld a, c
@@ -2920,7 +2920,7 @@ LegendaryCards: ; d234 (3:5234)
 	db DRAGONITE1
 	tx DragoniteLegendaryCardName
 
-Flags_d240: ; d240 (3:5240)
+LegendaryCardEvents: ; d240 (3:5240)
 	db EVENT_RECEIVED_ZAPDOS
 	db EVENT_RECEIVED_MOLTRES
 	db EVENT_RECEIVED_ARTICUNO
@@ -2937,7 +2937,7 @@ ScriptCommand_ChooseDeckToDuelAgainstMultichoice: ; d24c (3:524c)
 	call ShowMultichoiceTextbox
 	ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst]
 	ld c, a
-	set_flag_value EVENT_AARON_DECK_MENU_CHOICE
+	set_event_value EVENT_AARON_DECK_MENU_CHOICE
 	jp IncreaseScriptPointerBy1
 
 .multichoice_menu_args ; d25e
@@ -2966,7 +2966,7 @@ ScriptCommand_ChooseStarterDeckMultichoice: ; d271 (3:5271)
 	tx SelectDeckToTakeText ; text for textbox under menu
 	dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ; location of table configuration in bank 4
 	db $00 ; the value to return when b is pressed
-	dw wd693 ; ram location to return result into
+	dw wStarterDeckChoice ; ram location to return result into
 	dw .text_entries ; location of table containing text entries
 
 .text_entries
@@ -3063,7 +3063,7 @@ ScriptCommand_ShowSamNormalMultichoice: ; d2f6 (3:52f6)
 	call ShowMultichoiceTextbox
 	ld a, [wMultichoiceTextboxResult_Sam]
 	ld c, a
-	set_flag_value EVENT_SAM_MENU_CHOICE
+	set_event_value EVENT_SAM_MENU_CHOICE
 	xor a
 	ld [wMultichoiceTextboxResult_Sam], a
 	jp IncreaseScriptPointerBy1
@@ -3082,7 +3082,7 @@ ScriptCommand_ShowSamRulesMultichoice: ; d317 (3:5317)
 	call ShowMultichoiceTextbox
 	ld a, [wMultichoiceTextboxResult_Sam]
 	ld c, a
-	set_flag_value EVENT_SAM_MENU_CHOICE
+	set_event_value EVENT_SAM_MENU_CHOICE
 	jp IncreaseScriptPointerBy1
 
 .multichoice_menu_args ; d32b (3:532b)
@@ -3145,7 +3145,7 @@ ScriptCommand_FlashScreen: ; d38f (3:538f)
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_SaveGame: ; d396 (3:5396)
-	farcall Func_1157c
+	farcall _SaveGame
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_GiftCenter: ; d39d (3:539d)
@@ -3155,7 +3155,7 @@ ScriptCommand_GiftCenter: ; d39d (3:539d)
 	; show menu
 	farcall Func_10dba
 	ld c, a
-	set_flag_value EVENT_GIFT_CENTER_MENU_CHOICE
+	set_event_value EVENT_GIFT_CENTER_MENU_CHOICE
 	jr .done
 
 .load_gift_center
@@ -3183,7 +3183,7 @@ ScriptCommand_nop: ; d3d1 (3:53d1)
 	jp IncreaseScriptPointerBy1
 
 ScriptCommand_GiveStarterDeck: ; d3d4 (3:53d4)
-	ld a, [wd693]
+	ld a, [wStarterDeckChoice]
 	bank1call Func_7576
 	jp IncreaseScriptPointerBy1
 
@@ -3191,16 +3191,16 @@ Unknown_d3dd: ; d3dd (3:53dd)
 	db $03, $05, $07
 
 ScriptCommand_WalkPlayerToMasonLaboratory: ; d3e0 (3:53e0)
-	ld a, $1
-	ld [wd32e], a
-	farcall Func_11024
+	ld a, OWMAP_MASON_LABORATORY
+	ld [wOverworldMapSelection], a
+	farcall OverworldMap_BeginPlayerMovement
 .asm_d3e9
 	call DoFrameIfLCDEnabled
-	farcall Func_11060
-	ld a, [wd33e]
+	farcall OverworldMap_UpdatePlayerWalkingAnimation
+	ld a, [wOverworldMapPlayerAnimationState]
 	cp $2
 	jr nz, .asm_d3e9
-	farcall Func_10f2e
+	farcall OverworldMap_PrintMapName
 	jp IncreaseScriptPointerBy1
 
 ScriptCommand_OverrideSong: ; d3fe (3:53fe)
@@ -3211,7 +3211,7 @@ ScriptCommand_OverrideSong: ; d3fe (3:53fe)
 
 ScriptCommand_SetDefaultSong: ; d408 (3:5408)
 	ld a, c
-	ld [wd111], a
+	ld [wDefaultSong], a
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_PlaySong: ; d40f (3:540f)
@@ -3225,7 +3225,7 @@ ScriptCommand_PlaySFX: ; d416 (3:5416)
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_PlayDefaultSong: ; d41d (3:541d)
-	call Func_39fc
+	call PlayDefaultSong
 	jp IncreaseScriptPointerBy1
 
 ScriptCommand_PauseSong: ; d423 (3:5423)
@@ -3252,26 +3252,26 @@ ScriptCommand_ChallengeMachine: ; d43d (3:543d)
 	set 6, [hl]
 	jp IncreaseScriptPointerBy1
 
-; sets the event flag in arg 1 to the value in arg 2
-ScriptCommand_SetFlagValue: ; d44a (3:544a)
+; sets the event var in arg 1 to the value in arg 2
+ScriptCommand_SetEventValue: ; d44a (3:544a)
 	ld a, c
 	ld c, b
-	call SetEventFlagValue
+	call SetEventValue
 	jp IncreaseScriptPointerBy3
 
-ScriptCommand_IncrementFlagValue: ; d452 (3:5452)
+ScriptCommand_IncrementEventValue: ; d452 (3:5452)
 	ld a, c
 	push af
-	call GetEventFlagValue
+	call GetEventValue
 	inc a
 	ld c, a
 	pop af
-	call SetEventFlagValue
+	call SetEventValue
 	jp IncreaseScriptPointerBy2
 
-ScriptCommand_JumpIfFlagZero1: ; d460 (3:5460)
+ScriptCommand_JumpIfEventZero: ; d460 (3:5460)
 	ld a, c
-	call GetEventFlagValue
+	call GetEventValue
 	or a
 	jr z, .pass_try_jump
 
@@ -3288,16 +3288,16 @@ ScriptCommand_JumpIfFlagZero1: ; d460 (3:5460)
 .no_jump
 	jp IncreaseScriptPointerBy4
 
-ScriptCommand_JumpIfFlagNonzero1: ; d47b (3:547b)
+ScriptCommand_JumpIfEventNonzero: ; d47b (3:547b)
 	ld a, c
-	call GetEventFlagValue
+	call GetEventValue
 	or a
-	jr nz, ScriptCommand_JumpIfFlagZero1.pass_try_jump
-	jr ScriptCommand_JumpIfFlagZero1.fail
+	jr nz, ScriptCommand_JumpIfEventZero.pass_try_jump
+	jr ScriptCommand_JumpIfEventZero.fail
 
-; args - event flag, value, jump address
-ScriptCommand_JumpIfFlagEqual: ; d484 (3:5484)
-	call GetEventFlagValueBC
+; args - event var, value, jump address
+ScriptCommand_JumpIfEventEqual: ; d484 (3:5484)
+	call GetEventValueBC
 	cp c
 	jr z, .pass_try_jump
 
@@ -3314,47 +3314,47 @@ ScriptCommand_JumpIfFlagEqual: ; d484 (3:5484)
 .no_jump
 	jp IncreaseScriptPointerBy5
 
-ScriptCommand_JumpIfFlagNotEqual: ; d49e (3:549e)
-	call GetEventFlagValueBC
+ScriptCommand_JumpIfEventNotEqual: ; d49e (3:549e)
+	call GetEventValueBC
 	cp c
-	jr nz, ScriptCommand_JumpIfFlagEqual.pass_try_jump
-	jr ScriptCommand_JumpIfFlagEqual.fail
+	jr nz, ScriptCommand_JumpIfEventEqual.pass_try_jump
+	jr ScriptCommand_JumpIfEventEqual.fail
 
-ScriptCommand_JumpIfFlagNotLessThan: ; d4a6 (3:54a6)
-	call GetEventFlagValueBC
+ScriptCommand_JumpIfEventGreaterOrEqual: ; d4a6 (3:54a6)
+	call GetEventValueBC
 	cp c
-	jr nc, ScriptCommand_JumpIfFlagEqual.pass_try_jump
-	jr ScriptCommand_JumpIfFlagEqual.fail
+	jr nc, ScriptCommand_JumpIfEventEqual.pass_try_jump
+	jr ScriptCommand_JumpIfEventEqual.fail
 
-ScriptCommand_JumpIfFlagLessThan: ; d4ae (3:54ae)
-	call GetEventFlagValueBC
+ScriptCommand_JumpIfEventLessThan: ; d4ae (3:54ae)
+	call GetEventValueBC
 	cp c
-	jr c, ScriptCommand_JumpIfFlagEqual.pass_try_jump
-	jr ScriptCommand_JumpIfFlagEqual.fail
+	jr c, ScriptCommand_JumpIfEventEqual.pass_try_jump
+	jr ScriptCommand_JumpIfEventEqual.fail
 
-; Gets event flag at c (Script defaults)
+; Gets event value at c (Script defaults)
 ; c takes on the value of b as a side effect
-GetEventFlagValueBC: ; d4b6 (3:54b6)
+GetEventValueBC: ; d4b6 (3:54b6)
 	ld a, c
 	ld c, b
-	call GetEventFlagValue
+	call GetEventValue
 	ret
 
-ScriptCommand_MaxOutFlagValue: ; d4bc (3:54bc)
+ScriptCommand_MaxOutEventValue: ; d4bc (3:54bc)
 	ld a, c
-	call MaxOutEventFlag
+	call MaxOutEventValue
 	jp IncreaseScriptPointerBy2
 
-ScriptCommand_ZeroOutFlagValue: ; d4c3 (3:54c3)
+ScriptCommand_ZeroOutEventValue: ; d4c3 (3:54c3)
 	ld a, c
-	call ZeroOutEventFlag
+	call ZeroOutEventValue
 	jp IncreaseScriptPointerBy2
 
-ScriptCommand_JumpIfFlagNonzero2: ; d4ca (3:54ca)
+ScriptCommand_JumpIfEventTrue: ; d4ca (3:54ca)
 	ld a, c
-	call GetEventFlagValue
+	call GetEventValue
 	or a
-	jr z, ScriptCommand_JumpIfFlagZero2.fail
+	jr z, ScriptCommand_JumpIfEventFalse.fail
 
 .pass_try_jump
 	call SetScriptControlBytePass
@@ -3365,11 +3365,11 @@ ScriptCommand_JumpIfFlagNonzero2: ; d4ca (3:54ca)
 .no_jump
 	jp IncreaseScriptPointerBy4
 
-ScriptCommand_JumpIfFlagZero2: ; d4df (3:54df)
+ScriptCommand_JumpIfEventFalse: ; d4df (3:54df)
 	ld a, c
-	call GetEventFlagValue
+	call GetEventValue
 	or a
-	jr z, ScriptCommand_JumpIfFlagNonzero2.pass_try_jump
+	jr z, ScriptCommand_JumpIfEventTrue.pass_try_jump
 
 .fail
 	call SetScriptControlByteFail
@@ -3377,35 +3377,35 @@ ScriptCommand_JumpIfFlagZero2: ; d4df (3:54df)
 
 LoadOverworld: ; d4ec (3:54ec)
 	call Func_d4fb
-	get_flag_value EVENT_MASON_LAB_STATE
+	get_event_value EVENT_MASON_LAB_STATE
 	or a
 	ret nz
 	ld bc, Script_BeginGame
 	jp SetNextScript
 
 Func_d4fb: ; d4fb (3:54fb)
-	zero_flag_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
+	set_event_false EVENT_PLAYER_ENTERED_CHALLENGE_CUP
 	call Func_f602
-	get_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	get_event_value EVENT_CHALLENGE_CUP_1_STATE
 	cp CHALLENGE_CUP_WON
 	jr z, .close_challenge_cup_one
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	cp CHALLENGE_CUP_WON
 	jr z, .close_challenge_cup_two
-	get_flag_value EVENT_CHALLENGE_CUP_3_STATE
+	get_event_value EVENT_CHALLENGE_CUP_3_STATE
 	cp CHALLENGE_CUP_WON
 	jr z, .close_challenge_cup_three
 	ret
 
 .close_challenge_cup_three
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_3_STATE
+	set_event_value EVENT_CHALLENGE_CUP_3_STATE
 .close_challenge_cup_two
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	set_event_value EVENT_CHALLENGE_CUP_2_STATE
 .close_challenge_cup_one
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_value EVENT_CHALLENGE_CUP_1_STATE
 	ret
 
 Script_BeginGame: ; d52e (3:552e)
@@ -3429,7 +3429,7 @@ MasonLaboratoryAfterDuel: ; d53b (3:553b)
 	db $00
 
 MasonLabLoadMap: ; d549 (3:5549)
-	get_flag_value EVENT_MASON_LAB_STATE
+	get_event_value EVENT_MASON_LAB_STATE
 	cp MASON_LAB_RECEIVED_STARTER_DECK
 	ret nc
 	ld a, NPC_DRMASON
@@ -3445,7 +3445,7 @@ MasonLabCloseTextBox: ; d55e (3:555e)
 
 ; Lets you access the Challenge Machine if available
 MasonLabPressedA: ; d565 (3:5565)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	ret z
 	ld hl, ChallengeMachineObjectTable
@@ -3480,7 +3480,7 @@ Script_Tech1: ; d583 (3:5583)
 	jr c, .low_on_energies
 
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Tech1MasterMedalExplanationText, Tech1AutoDeckMachineExplanationText
 	quit_script_fully
 
@@ -3519,24 +3519,24 @@ EnergyCardList: ; d5c4 (3:55c4)
 
 Script_Tech2: ; d5ca (3:55ca)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Tech2LegendaryCardsExplanationText, Tech2LegendaryCardsCongratsText
 	quit_script_fully
 
 Script_Tech3: ; d5d5 (3:55d5)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Tech3BoosterPackExplanationText, Tech3LegendaryCardsCongratsText
 	quit_script_fully
 
 Script_Tech4: ; d5e0 (3:55e0)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Tech4ClubsExplanationText, Tech4DefeatedTheGrandMastersText
 	quit_script_fully
 
 Preload_Tech5: ; d5eb (3:55eb)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	jr z, .skip
 	ld hl, wLoadNPCXPos
@@ -3548,12 +3548,12 @@ Preload_Tech5: ; d5eb (3:55eb)
 
 Script_Tech5: ; d5f9 (3:55f9)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Tech5DiaryAndEmailExplanationText, Tech5ChallengeMachineExplanationText
 	quit_script_fully
 
 Preload_Sam: ; d604 (3:5604)
-	get_flag_value EVENT_MASON_LAB_STATE
+	get_event_value EVENT_MASON_LAB_STATE
 	cp MASON_LAB_IN_PRACTICE_DUEL
 	jr nc, .sam_at_table
 	ld a, $0a
@@ -3570,9 +3570,9 @@ Script_Sam: ; d61d (3:561d)
 	start_script
 	show_sam_normal_multichoice
 	close_text_box
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NORMAL_DUEL, .ows_d63b
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RULES, Script_LostToSam.ows_d6b0
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING, .ows_d637
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NORMAL_DUEL, .ows_d63b
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RULES, Script_LostToSam.ows_d6b0
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING, .ows_d637
 ; SAM_MENU_PRACTICE_DUEL
 	print_npc_text Text05cb
 	ask_question_jump Text05cc, .ows_d647
@@ -3609,7 +3609,7 @@ Script_Sam: ; d61d (3:561d)
 	move_player SOUTH, 1
 	set_player_direction WEST
 	move_active_npc NPCMovement_d889
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NORMAL_DUEL, .ows_d685
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NORMAL_DUEL, .ows_d685
 	start_duel PRIZES_2, SAMS_PRACTICE_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully
 
@@ -3619,16 +3619,16 @@ Script_Sam: ; d61d (3:561d)
 
 Script_BeatSam: ; d68a (3:568a)
 	start_script
-	jump_if_flag_equal EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL, Script_EnterLabFirstTime.ows_d82d
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_PRACTICE_DUEL, Script_LostToSam.ows_d6ad
+	jump_if_event_equal EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL, Script_EnterLabFirstTime.ows_d82d
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_PRACTICE_DUEL, Script_LostToSam.ows_d6ad
 	print_npc_text Text05d1
 	give_booster_packs BOOSTER_ENERGY_RANDOM, NO_BOOSTER, NO_BOOSTER
 	print_text_quit_fully Text05d2
 
 Script_LostToSam: ; d69f (3:569f)
 	start_script
-	jump_if_flag_equal EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL, Script_EnterLabFirstTime.ows_d82d
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_PRACTICE_DUEL, .ows_d6ad
+	jump_if_event_equal EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL, Script_EnterLabFirstTime.ows_d82d
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_PRACTICE_DUEL, .ows_d6ad
 	print_text_quit_fully Text05d3
 
 .ows_d6ad
@@ -3640,13 +3640,13 @@ Script_LostToSam: ; d69f (3:569f)
 	close_text_box
 	show_sam_rules_multichoice
 	close_text_box
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING_TO_ASK, Script_Sam.ows_d637
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ATTACKING, .ows_d6df
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RETREATING, .ows_d6e5
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_EVOLVING, .ows_d6eb
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_POKEMON_POWER, .ows_d6f1
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ENDING_YOUR_TURN, .ows_d6f7
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_WIN_OR_LOSS, .ows_d6fd
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING_TO_ASK, Script_Sam.ows_d637
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ATTACKING, .ows_d6df
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RETREATING, .ows_d6e5
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_EVOLVING, .ows_d6eb
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_POKEMON_POWER, .ows_d6f1
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ENDING_YOUR_TURN, .ows_d6f7
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_WIN_OR_LOSS, .ows_d6fd
 ; SAM_MENU_ENERGY
 	print_npc_text Text05d6
 	script_jump .ows_d6b3
@@ -3676,7 +3676,7 @@ Script_LostToSam: ; d69f (3:569f)
 	script_jump .ows_d6b3
 
 Func_d703: ; d703 (3:5703)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	ret z
 	ld a, $0a
@@ -3685,7 +3685,7 @@ Func_d703: ; d703 (3:5703)
 
 Preload_DrMason: ; d710 (3:5710)
 	call Func_d703
-	get_flag_value EVENT_MASON_LAB_STATE
+	get_event_value EVENT_MASON_LAB_STATE
 	cp MASON_LAB_IN_PRACTICE_DUEL
 	jr nz, .not_practice_duel
 	ld a, $06
@@ -3698,25 +3698,25 @@ Preload_DrMason: ; d710 (3:5710)
 
 Script_DrMason: ; d727 (3:5727)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER, .ows_d72f
+	jump_if_event_true EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER, .ows_d72f
 	print_text_quit_fully Text05dd
 
 .ows_d72f
 	try_give_medal_pc_packs
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 2, .ows_d738
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 2, .ows_d738
 	print_text_quit_fully Text05de
 
 .ows_d738
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 7, .ows_d740
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 7, .ows_d740
 	print_text_quit_fully Text05df
 
 .ows_d740
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_d747
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_d747
 	print_text_quit_fully Text05e0
 
 .ows_d747
-	jump_if_flag_nonzero_2 EVENT_DRMASON_CONGRATULATED_PLAYER, .ows_d750
-	max_out_flag_value EVENT_DRMASON_CONGRATULATED_PLAYER
+	jump_if_event_true EVENT_DRMASON_CONGRATULATED_PLAYER, .ows_d750
+	max_out_event_value EVENT_DRMASON_CONGRATULATED_PLAYER
 	print_text_quit_fully Text05e1
 
 .ows_d750
@@ -3775,13 +3775,13 @@ Script_EnterLabFirstTime: ; d753 (3:5753)
 	close_text_box
 	show_sam_rules_multichoice
 	close_text_box
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING_TO_ASK, .ows_d80c
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ATTACKING, .ows_d7e8
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RETREATING, .ows_d7ee
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_EVOLVING, .ows_d7f4
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_POKEMON_POWER, .ows_d7fa
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ENDING_YOUR_TURN, .ows_d800
-	jump_if_flag_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_WIN_OR_LOSS, .ows_d806
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_NOTHING_TO_ASK, .ows_d80c
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ATTACKING, .ows_d7e8
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_RETREATING, .ows_d7ee
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_EVOLVING, .ows_d7f4
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_POKEMON_POWER, .ows_d7fa
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_ENDING_YOUR_TURN, .ows_d800
+	jump_if_event_equal EVENT_SAM_MENU_CHOICE, SAM_MENU_WIN_OR_LOSS, .ows_d806
 ; SAM_MENU_ENERGY
 	print_npc_text Text05d6
 	script_jump .ows_d7bc
@@ -3819,7 +3819,7 @@ Script_EnterLabFirstTime: ; d753 (3:5753)
 	set_dialog_npc NPC_DRMASON
 	print_npc_text Text05ea
 	script_nop
-	script_set_flag_value EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL
+	set_event EVENT_MASON_LAB_STATE, MASON_LAB_IN_PRACTICE_DUEL
 	close_advanced_text_box
 	set_next_npc_and_script NPC_SAM, .ows_d827
 	end_script
@@ -3870,7 +3870,7 @@ Script_AfterPracticeDuel: ; d834 (3:5834)
 	wait_for_song_to_finish
 	resume_song
 	close_text_box
-	script_set_flag_value EVENT_MASON_LAB_STATE, MASON_LAB_RECEIVED_STARTER_DECK
+	set_event EVENT_MASON_LAB_STATE, MASON_LAB_RECEIVED_STARTER_DECK
 	give_stater_deck
 	print_npc_text Text05f6
 	save_game 0
@@ -3943,19 +3943,19 @@ DeckMachineRoomCloseTextBox: ; d8ad (3:58ad)
 
 Script_Tech6: ; d8bb (3:58bb)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text05f7, Text05f8
 	quit_script_fully
 
 Script_Tech7: ; d8c6 (3:58c6)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text05f9, Text05fa
 	quit_script_fully
 
 Script_Tech8: ; d8d1 (3:58d1)
 	start_script
-	jump_if_flag_not_equal EVENT_ALL_DECK_MACHINE_FLAGS, $ff, NULL
+	test_if_event_not_equal EVENT_ALL_DECK_MACHINE_FLAGS, $ff
 	print_variable_npc_text Text05fb, Text05fc
 	quit_script_fully
 
@@ -3970,7 +3970,7 @@ Script_Aaron: ; d8dd (3:58dd)
 	print_npc_text Text0600
 	choose_deck_to_duel_against
 	close_text_box
-	jump_if_flag_equal EVENT_AARON_DECK_MENU_CHOICE, AARON_DECK_MENU_CANCEL, .ows_d8e6
+	jump_if_event_equal EVENT_AARON_DECK_MENU_CHOICE, AARON_DECK_MENU_CANCEL, .ows_d8e6
 	ask_question_jump Text0601, .ows_d8fb
 	script_jump .ows_d8e6
 
@@ -3982,12 +3982,12 @@ Script_Aaron: ; d8dd (3:58dd)
 Script_BeatAaron: ; d903 (3:5903)
 	ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst]
 	ld c, a
-	set_flag_value EVENT_AARON_BOOSTER_REWARD
+	set_event_value EVENT_AARON_BOOSTER_REWARD
 
 	start_script
 	print_npc_text Text0603
-	jump_if_flag_equal EVENT_AARON_BOOSTER_REWARD, 1, .ows_d920
-	jump_if_flag_equal EVENT_AARON_BOOSTER_REWARD, 2, .ows_d927
+	jump_if_event_equal EVENT_AARON_BOOSTER_REWARD, 1, .ows_d920
+	jump_if_event_equal EVENT_AARON_BOOSTER_REWARD, 2, .ows_d927
 	give_booster_packs BOOSTER_ENERGY_RANDOM, NO_BOOSTER, NO_BOOSTER
 	script_jump Script_LostToAaron.ows_d92f
 
@@ -4020,9 +4020,9 @@ Script_d93f: ; d93f (3:593f)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_FIGHTING_DECK_MACHINE_ACTIVE, .ows_d963
+	jump_if_event_true EVENT_FIGHTING_DECK_MACHINE_ACTIVE, .ows_d963
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_MITCH, .ows_d954
+	jump_if_event_true EVENT_BEAT_MITCH, .ows_d954
 	quit_script_fully
 
 .ows_d954
@@ -4031,7 +4031,7 @@ Script_d93f: ; d93f (3:593f)
 
 .ows_d95a
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_FIGHTING_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_FIGHTING_DECK_MACHINE_ACTIVE
 	replace_map_blocks $02
 	print_text Text060a
 .ows_d963
@@ -4073,9 +4073,9 @@ Script_d995: ; d995 (3:5995)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_ROCK_DECK_MACHINE_ACTIVE, .ows_d9b9
+	jump_if_event_true EVENT_ROCK_DECK_MACHINE_ACTIVE, .ows_d9b9
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_GENE, .ows_d9aa
+	jump_if_event_true EVENT_BEAT_GENE, .ows_d9aa
 	quit_script_fully
 
 .ows_d9aa
@@ -4084,7 +4084,7 @@ Script_d995: ; d995 (3:5995)
 
 .ows_d9b0
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_ROCK_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_ROCK_DECK_MACHINE_ACTIVE
 	replace_map_blocks $03
 	print_text Text060a
 .ows_d9b9
@@ -4101,9 +4101,9 @@ Script_d9c2: ; d9c2 (3:59c2)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_WATER_DECK_MACHINE_ACTIVE, .ows_d9e6
+	jump_if_event_true EVENT_WATER_DECK_MACHINE_ACTIVE, .ows_d9e6
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_AMY, .ows_d9d7
+	jump_if_event_true EVENT_BEAT_AMY, .ows_d9d7
 	quit_script_fully
 
 .ows_d9d7
@@ -4112,7 +4112,7 @@ Script_d9c2: ; d9c2 (3:59c2)
 
 .ows_d9dd
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_WATER_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_WATER_DECK_MACHINE_ACTIVE
 	replace_map_blocks $04
 	print_text Text060a
 .ows_d9e6
@@ -4129,9 +4129,9 @@ Script_d9ef: ; d9ef (3:59ef)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_LIGHTNING_DECK_MACHINE_ACTIVE, .ows_da13
+	jump_if_event_true EVENT_LIGHTNING_DECK_MACHINE_ACTIVE, .ows_da13
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_ISAAC, .ows_da04
+	jump_if_event_true EVENT_BEAT_ISAAC, .ows_da04
 	quit_script_fully
 
 .ows_da04
@@ -4140,7 +4140,7 @@ Script_d9ef: ; d9ef (3:59ef)
 
 .ows_da0a
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_LIGHTNING_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_LIGHTNING_DECK_MACHINE_ACTIVE
 	replace_map_blocks $05
 	print_text Text060a
 .ows_da13
@@ -4157,9 +4157,9 @@ Script_da1c: ; da1c (3:5a1c)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_GRASS_DECK_MACHINE_ACTIVE, .ows_da40
+	jump_if_event_true EVENT_GRASS_DECK_MACHINE_ACTIVE, .ows_da40
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_NIKKI, .ows_da31
+	jump_if_event_true EVENT_BEAT_NIKKI, .ows_da31
 	quit_script_fully
 
 .ows_da31
@@ -4168,7 +4168,7 @@ Script_da1c: ; da1c (3:5a1c)
 
 .ows_da37
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_GRASS_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_GRASS_DECK_MACHINE_ACTIVE
 	replace_map_blocks $06
 	print_text Text060a
 .ows_da40
@@ -4185,9 +4185,9 @@ Script_da49: ; da49 (3:5a49)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_PSYCHIC_DECK_MACHINE_ACTIVE, .ows_da6d
+	jump_if_event_true EVENT_PSYCHIC_DECK_MACHINE_ACTIVE, .ows_da6d
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_MURRAY, .ows_da5e
+	jump_if_event_true EVENT_BEAT_MURRAY, .ows_da5e
 	quit_script_fully
 
 .ows_da5e
@@ -4196,7 +4196,7 @@ Script_da49: ; da49 (3:5a49)
 
 .ows_da64
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_PSYCHIC_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_PSYCHIC_DECK_MACHINE_ACTIVE
 	replace_map_blocks $07
 	print_text Text060a
 .ows_da6d
@@ -4213,9 +4213,9 @@ Script_da76: ; da76 (3:5a76)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_SCIENCE_DECK_MACHINE_ACTIVE, .ows_da9a
+	jump_if_event_true EVENT_SCIENCE_DECK_MACHINE_ACTIVE, .ows_da9a
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_RICK, .ows_da8b
+	jump_if_event_true EVENT_BEAT_RICK, .ows_da8b
 	quit_script_fully
 
 .ows_da8b
@@ -4224,7 +4224,7 @@ Script_da76: ; da76 (3:5a76)
 
 .ows_da91
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_SCIENCE_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_SCIENCE_DECK_MACHINE_ACTIVE
 	replace_map_blocks $08
 	print_text Text060a
 .ows_da9a
@@ -4241,9 +4241,9 @@ Script_daa3: ; daa3 (3:5aa3)
 
 	start_script
 	print_text Text0607
-	jump_if_flag_nonzero_2 EVENT_FIRE_DECK_MACHINE_ACTIVE, .ows_dac7
+	jump_if_event_true EVENT_FIRE_DECK_MACHINE_ACTIVE, .ows_dac7
 	print_text Text0608
-	jump_if_flag_nonzero_2 EVENT_BEAT_KEN, .ows_dab8
+	jump_if_event_true EVENT_BEAT_KEN, .ows_dab8
 	quit_script_fully
 
 .ows_dab8
@@ -4252,7 +4252,7 @@ Script_daa3: ; daa3 (3:5aa3)
 
 .ows_dabe
 	play_sfx SFX_5A
-	max_out_flag_value EVENT_FIRE_DECK_MACHINE_ACTIVE
+	max_out_event_value EVENT_FIRE_DECK_MACHINE_ACTIVE
 	replace_map_blocks $09
 	print_text Text060a
 .ows_dac7
@@ -4274,7 +4274,7 @@ Script_dad0: ; dad0 (3:5ad0)
 	quit_script_fully
 
 Preload_NikkiInIshiharasHouse: ; dadd (3:5add)
-	get_flag_value EVENT_NIKKI_STATE
+	get_event_value EVENT_NIKKI_STATE
 	cp NIKKI_IN_ISHIHARAS_HOUSE
 	jr nz, .dont_load
 	scf
@@ -4286,7 +4286,7 @@ Preload_NikkiInIshiharasHouse: ; dadd (3:5add)
 Script_NikkiInIshiharasHouse: ; dae9 (3:5ae9)
 	start_script
 	print_npc_text Text0723
-	script_set_flag_value EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB
+	set_event EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB
 	close_text_box
 	jump_if_npc_loaded NPC_ISHIHARA, .ows_dafb
 	move_active_npc_by_direction NPCMovementTable_db24
@@ -4353,34 +4353,34 @@ NPCMovement_db39: ; db39 (3:5b39)
 	db $fe, -14
 
 Preload_IshiharaInIshiharasHouse: ; db3d (3:5b3d)
-	get_flag_value EVENT_ISHIHARA_MENTIONED
+	get_event_value EVENT_ISHIHARA_MENTIONED
 	or a
 	ret z
-	get_flag_value EVENT_ISHIHARA_TRADE_STATE
+	get_event_value EVENT_ISHIHARA_TRADE_STATE
 	cp ISHIHARA_LEFT
 	ret
 
 Script_Ishihara: ; db4a (3:5b4a)
 	start_script
-	max_out_flag_value EVENT_ISHIHARA_MET
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_INTRODUCTION, .ows_db80
-	jump_if_flag_nonzero_2 EVENT_ISHIHARA_CONGRATULATED_PLAYER, .ows_db5a
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_dc3e
+	max_out_event_value EVENT_ISHIHARA_MET
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_INTRODUCTION, .ows_db80
+	jump_if_event_true EVENT_ISHIHARA_CONGRATULATED_PLAYER, .ows_db5a
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_dc3e
 .ows_db5a
-	jump_if_flag_nonzero_2 EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_db90
-	jump_if_flag_zero_2 EVENT_ISHIHARA_WANTS_TO_TRADE, .ows_db90
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED, .ows_db93
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_OFFERED, .ows_db93
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_dbcc
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_OFFERED, .ows_dbcc
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_dc05
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_OFFERED, .ows_dc05
+	jump_if_event_true EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_db90
+	jump_if_event_false EVENT_ISHIHARA_WANTS_TO_TRADE, .ows_db90
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED, .ows_db93
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_OFFERED, .ows_db93
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_dbcc
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_OFFERED, .ows_dbcc
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_dc05
+	jump_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_OFFERED, .ows_dc05
 .ows_db80
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_ISHIHARA
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED
-	zero_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_db8d
-	max_out_flag_value EVENT_ISHIHARA_CONGRATULATED_PLAYER
+	max_out_event_value EVENT_TEMP_TRADED_WITH_ISHIHARA
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED
+	zero_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS, .ows_db8d
+	max_out_event_value EVENT_ISHIHARA_CONGRATULATED_PLAYER
 .ows_db8d
 	print_text_quit_fully Text0727
 
@@ -4388,9 +4388,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text0728
 
 .ows_db93
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED, NULL
+	test_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_RUMORED
 	print_variable_npc_text Text0729, Text072a
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_OFFERED
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_1_OFFERED
 	ask_question_jump Text072b, .check_if_clefable_owned
 	print_text_quit_fully Text072c
 
@@ -4403,9 +4403,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text072e
 
 .do_clefable_trade
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_ISHIHARA
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED
-	zero_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_ISHIHARA
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED
+	zero_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_npc_text Text072f
 	print_text Text0730
 	take_card CLEFABLE
@@ -4414,9 +4414,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text0731
 
 .ows_dbcc
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, NULL
+	test_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED
 	print_variable_npc_text Text0732, Text0733
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_OFFERED
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_OFFERED
 	ask_question_jump Text072b, .check_if_ditto_owned
 	print_text_quit_fully Text072c
 
@@ -4429,9 +4429,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text0735
 
 .do_ditto_trade
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_ISHIHARA
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED
-	zero_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_ISHIHARA
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED
+	zero_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_npc_text Text072f
 	print_text Text0736
 	take_card DITTO
@@ -4440,9 +4440,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text0737
 
 .ows_dc05
-	jump_if_flag_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, NULL
+	test_if_event_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED
 	print_variable_npc_text Text0738, Text0739
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_OFFERED
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_OFFERED
 	ask_question_jump Text072b, .check_if_chansey_owned
 	print_text_quit_fully Text072c
 
@@ -4455,9 +4455,9 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text073b
 
 .do_chansey_trade
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_ISHIHARA
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE
-	zero_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_ISHIHARA
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE
+	zero_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_npc_text Text072f
 	print_text Text073c
 	take_card CHANSEY
@@ -4466,19 +4466,19 @@ Script_Ishihara: ; db4a (3:5b4a)
 	print_text_quit_fully Text073d
 
 .ows_dc3e
-	max_out_flag_value EVENT_ISHIHARA_CONGRATULATED_PLAYER
+	max_out_event_value EVENT_ISHIHARA_CONGRATULATED_PLAYER
 	print_text_quit_fully Text073e
 
 Preload_Ronald1InIshiharasHouse: ; dc43 (3:5c43)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	cp TRUE
 	ccf
 	ret
 
 Script_Ronald: ; dc4b (3:5c4b)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_RONALD_TALKED, .ows_dc55
-	max_out_flag_value EVENT_RONALD_TALKED
+	jump_if_event_true EVENT_RONALD_TALKED, .ows_dc55
+	max_out_event_value EVENT_RONALD_TALKED
 	print_text_quit_fully Text073f
 
 .ows_dc55
@@ -4511,18 +4511,18 @@ FightingClubLobbyAfterDuel: ; dc68 (3:5c68)
 
 Script_Man1: ; dc76 (3:5c76)
 	start_script
-	jump_if_flag_equal EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE, .ows_dce8
-	jump_if_flag_nonzero_2 EVENT_TEMP_GIFTED_TO_MAN1, .ows_dce5
-	jump_if_flag_nonzero_2 EVENT_MAN1_TALKED, .ows_dc91
-	max_out_flag_value EVENT_MAN1_TALKED
+	jump_if_event_equal EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE, .ows_dce8
+	jump_if_event_true EVENT_TEMP_GIFTED_TO_MAN1, .ows_dce5
+	jump_if_event_true EVENT_MAN1_TALKED, .ows_dc91
+	max_out_event_value EVENT_MAN1_TALKED
 	pick_next_man1_requested_card
 	load_man1_requested_card_into_txram_slot 0
 	print_npc_text Text045b
-	max_out_flag_value EVENT_MAN1_WAITING_FOR_CARD
+	max_out_event_value EVENT_MAN1_WAITING_FOR_CARD
 	script_jump .ows_dca5
 
 .ows_dc91
-	jump_if_flag_zero_2 EVENT_MAN1_WAITING_FOR_CARD, .ows_dc9d
+	jump_if_event_false EVENT_MAN1_WAITING_FOR_CARD, .ows_dc9d
 	load_man1_requested_card_into_txram_slot 0
 	print_npc_text Text045c
 	script_jump .ows_dca5
@@ -4531,7 +4531,7 @@ Script_Man1: ; dc76 (3:5c76)
 	pick_next_man1_requested_card
 	load_man1_requested_card_into_txram_slot 0
 	print_npc_text Text045d
-	max_out_flag_value EVENT_MAN1_WAITING_FOR_CARD
+	max_out_event_value EVENT_MAN1_WAITING_FOR_CARD
 .ows_dca5
 	load_man1_requested_card_into_txram_slot 0
 	ask_question_jump Text045e, .ows_dcaf
@@ -4554,10 +4554,10 @@ Script_Man1: ; dc76 (3:5c76)
 	load_man1_requested_card_into_txram_slot 1
 	print_npc_text Text0462
 	remove_man1_requested_card_from_collection
-	max_out_flag_value EVENT_TEMP_GIFTED_TO_MAN1
-	zero_out_flag_value EVENT_MAN1_WAITING_FOR_CARD
-	increment_flag_value EVENT_MAN1_GIFT_SEQUENCE_STATE
-	jump_if_flag_equal EVENT_MAN1_GIFT_SEQUENCE_STATE, 5, .ows_dcd7
+	max_out_event_value EVENT_TEMP_GIFTED_TO_MAN1
+	zero_out_event_value EVENT_MAN1_WAITING_FOR_CARD
+	increment_event_value EVENT_MAN1_GIFT_SEQUENCE_STATE
+	jump_if_event_equal EVENT_MAN1_GIFT_SEQUENCE_STATE, 5, .ows_dcd7
 	quit_script_fully
 
 .ows_dcd7
@@ -4565,7 +4565,7 @@ Script_Man1: ; dc76 (3:5c76)
 	give_card PIKACHU4
 	show_card_received_screen PIKACHU4
 	print_npc_text Text0464
-	script_set_flag_value EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE
+	set_event EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE
 	quit_script_fully
 
 .ows_dce5
@@ -4575,14 +4575,14 @@ Script_Man1: ; dc76 (3:5c76)
 	print_text_quit_fully Text0466
 
 Preload_ImakuniInFightingClubLobby: ; dceb (3:5ceb)
-	get_flag_value EVENT_IMAKUNI_STATE
+	get_event_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_MENTIONED
 	jr z, .load_imakuni
 	or a ; cp IMAKUNI_NOT_MENTIONED
 	jr z, .dont_load
-	get_flag_value EVENT_TEMP_DUELED_IMAKUNI
+	get_event_value EVENT_TEMP_DUELED_IMAKUNI
 	jr nz, .dont_load
-	get_flag_value EVENT_IMAKUNI_ROOM
+	get_event_value EVENT_IMAKUNI_ROOM
 	cp IMAKUNI_FIGHTING_CLUB
 	jr z, .load_imakuni
 .dont_load
@@ -4591,16 +4591,16 @@ Preload_ImakuniInFightingClubLobby: ; dceb (3:5ceb)
 
 .load_imakuni
 	ld a, MUSIC_IMAKUNI
-	ld [wd111], a
+	ld [wDefaultSong], a
 	scf
 	ret
 
 Script_Imakuni: ; dd0d (3:5d0d)
 	start_script
-	script_set_flag_value EVENT_IMAKUNI_STATE, IMAKUNI_TALKED
-	jump_if_flag_zero_2 EVENT_TEMP_TALKED_TO_IMAKUNI, NULL
+	set_event EVENT_IMAKUNI_STATE, IMAKUNI_TALKED
+	test_if_event_false EVENT_TEMP_TALKED_TO_IMAKUNI
 	print_variable_npc_text Text0467, Text0468
-	max_out_flag_value EVENT_TEMP_TALKED_TO_IMAKUNI
+	max_out_event_value EVENT_TEMP_TALKED_TO_IMAKUNI
 	ask_question_jump Text0469, .start_duel
 	print_npc_text Text046a
 	quit_script_fully
@@ -4612,10 +4612,10 @@ Script_Imakuni: ; dd0d (3:5d0d)
 
 Script_BeatImakuni: ; dd2d (3:5d2d)
 	start_script
-	jump_if_flag_equal EVENT_IMAKUNI_WIN_COUNT, 7, .give_boosters
-	increment_flag_value EVENT_IMAKUNI_WIN_COUNT
-	jump_if_flag_equal EVENT_IMAKUNI_WIN_COUNT, 3, .three_wins
-	jump_if_flag_equal EVENT_IMAKUNI_WIN_COUNT, 6, .six_wins
+	jump_if_event_equal EVENT_IMAKUNI_WIN_COUNT, 7, .give_boosters
+	increment_event_value EVENT_IMAKUNI_WIN_COUNT
+	jump_if_event_equal EVENT_IMAKUNI_WIN_COUNT, 3, .three_wins
+	jump_if_event_equal EVENT_IMAKUNI_WIN_COUNT, 6, .six_wins
 .give_boosters
 	print_npc_text Text046c
 	give_one_of_each_trainer_booster
@@ -4649,7 +4649,7 @@ Script_LostToImakuni: ; dd5c (3:5d5c)
 .ows_dd6e
 	move_active_npc NPCMovement_dd78
 	unload_active_npc
-	max_out_flag_value EVENT_TEMP_DUELED_IMAKUNI
+	max_out_event_value EVENT_TEMP_DUELED_IMAKUNI
 	set_default_song MUSIC_OVERWORLD
 	play_default_song
 	quit_script_fully
@@ -4668,18 +4668,18 @@ NPCMovement_dd78: ; dd78 (3:5d78)
 
 Script_Specs1: ; dd82 (3:5d82)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0472, Text0473
 	quit_script_fully
 
 Script_Butch: ; dd8d (3:5d8d)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0474, Text0475
 	quit_script_fully
 
 Preload_Granny1: ; dd98 (3:5d98)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	cp TRUE
 	ret
 
@@ -4717,14 +4717,14 @@ FightingClubAfterDuel: ; dda3 (3:5da3)
 Script_Mitch: ; ddc3 (3:5dc3)
 	start_script
 	try_give_pc_pack $02
-	jump_if_flag_nonzero_2 EVENT_BEAT_MITCH, Script_Mitch_AlreadyHaveMedal
+	jump_if_event_true EVENT_BEAT_MITCH, Script_Mitch_AlreadyHaveMedal
 	fight_club_pupil_jump .first_interaction, .three_pupils_remaining, \
 		.two_pupils_remaining, .one_pupil_remaining, .all_pupils_defeated
 .first_interaction
 	print_npc_text Text0477
-	script_set_flag_value EVENT_PUPIL_MICHAEL_STATE, PUPIL_ACTIVE
-	script_set_flag_value EVENT_PUPIL_CHRIS_STATE, PUPIL_ACTIVE
-	script_set_flag_value EVENT_PUPIL_JESSICA_STATE, PUPIL_ACTIVE
+	set_event EVENT_PUPIL_MICHAEL_STATE, PUPIL_ACTIVE
+	set_event EVENT_PUPIL_CHRIS_STATE, PUPIL_ACTIVE
+	set_event EVENT_PUPIL_JESSICA_STATE, PUPIL_ACTIVE
 	quit_script_fully
 
 .three_pupils_remaining
@@ -4749,9 +4749,9 @@ Script_Mitch: ; ddc3 (3:5dc3)
 
 Script_BeatMitch: ; ddff (3:5dff)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_MITCH, Script_Mitch_GiveBoosters
+	jump_if_event_true EVENT_BEAT_MITCH, Script_Mitch_GiveBoosters
 	print_npc_text Text047f
-	max_out_flag_value EVENT_BEAT_MITCH
+	max_out_event_value EVENT_BEAT_MITCH
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_MITCH
 	record_master_win $01
@@ -4762,7 +4762,7 @@ Script_BeatMitch: ; ddff (3:5dff)
 
 Script_LostToMitch: ; de19 (3:5e19)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_MITCH, Script_Mitch_PrintTrainHarderText
+	jump_if_event_true EVENT_BEAT_MITCH, Script_Mitch_PrintTrainHarderText
 	print_text_quit_fully Text0482
 
 Script_Mitch_AlreadyHaveMedal: ; de21 (3:5e21)
@@ -4786,15 +4786,15 @@ Script_Mitch_PrintTrainHarderText: ; de40 (3:5e40)
 	print_text_quit_fully Text0488
 
 Preload_ChrisInFightingClub: ; de43 (3:5e43)
-	get_flag_value EVENT_PUPIL_CHRIS_STATE
+	get_event_value EVENT_PUPIL_CHRIS_STATE
 	cp PUPIL_DEFEATED
 	ccf
 	ret
 
 Script_de4b: ; de4b (3:5e4b)
-	jump_if_flag_equal EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED, NULL
+	test_if_event_equal EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED
 	print_variable_npc_text Text0489, Text048a
-	script_set_flag_value EVENT_PUPIL_CHRIS_STATE, PUPIL_REVISITED
+	set_event EVENT_PUPIL_CHRIS_STATE, PUPIL_REVISITED
 	ask_question_jump Text048b, .ows_de61
 	print_npc_text Text048c
 	quit_script_fully
@@ -4816,7 +4816,7 @@ Script_LostToChrisInFightingClub: ; de75 (3:5e75)
 	print_text_quit_fully Text0490
 
 Preload_MichaelInFightingClub: ; de79 (3:5e79)
-	get_flag_value EVENT_PUPIL_MICHAEL_STATE
+	get_event_value EVENT_PUPIL_MICHAEL_STATE
 	cp PUPIL_DEFEATED
 	ccf
 	ret
@@ -4844,7 +4844,7 @@ Script_LostToMichaelInFightingClub: ; dea1 (3:5ea1)
 	print_text_quit_fully Text0497
 
 Preload_JessicaInFightingClub: ; dea5 (3:5ea5)
-	get_flag_value EVENT_PUPIL_JESSICA_STATE
+	get_event_value EVENT_PUPIL_JESSICA_STATE
 	cp PUPIL_DEFEATED
 	ccf
 	ret
@@ -4893,7 +4893,7 @@ RockClubLobbyAfterDuel: ; ded5 (3:5ed5)
 	db $00
 
 Preload_ChrisInRockClubLobby: ; dee9 (3:5ee9)
-	get_flag_value EVENT_PUPIL_CHRIS_STATE
+	get_event_value EVENT_PUPIL_CHRIS_STATE
 	or a ; cp PUPIL_INACTIVE
 	ret z
 	cp PUPIL_DEFEATED
@@ -4901,7 +4901,7 @@ Preload_ChrisInRockClubLobby: ; dee9 (3:5ee9)
 
 Script_Chris: ; def2 (3:5ef2)
 	start_script
-	jump_if_flag_not_less_than EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED, Script_de4b
+	jump_if_event_greater_or_equal EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED, Script_de4b
 	print_npc_text Text077a
 	ask_question_jump Text077b, .ows_df04
 	print_npc_text Text077c
@@ -4914,7 +4914,7 @@ Script_Chris: ; def2 (3:5ef2)
 
 Script_BeatChrisInRockClubLobby: ; df0c (3:5f0c)
 	start_script
-	script_set_flag_value EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED
+	set_event EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED
 	print_npc_text Text077e
 	give_booster_packs BOOSTER_EVOLUTION_FIGHTING, BOOSTER_EVOLUTION_FIGHTING, NO_BOOSTER
 	print_npc_text Text077f
@@ -4952,15 +4952,15 @@ NPCMovement_df34: ; df34 (3:5f34)
 Script_Matthew: ; df39 (3:5f39)
 	start_script
 	try_give_pc_pack $03
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_df4c
-	jump_if_flag_zero_1 EVENT_MATTHEW_STATE, NULL
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_df4c
+	test_if_event_zero EVENT_MATTHEW_STATE
 	print_variable_npc_text Text0781, Text0782
 	script_jump .ows_df4f
 
 .ows_df4c
 	print_npc_text Text0783
 .ows_df4f
-	script_set_flag_value EVENT_MATTHEW_STATE, MATTHEW_TALKED
+	set_event EVENT_MATTHEW_STATE, MATTHEW_TALKED
 	ask_question_jump Text0784, .ows_df5b
 	print_npc_text Text0785
 	quit_script_fully
@@ -4972,8 +4972,8 @@ Script_Matthew: ; df39 (3:5f39)
 
 Script_BeatMatthew: ; df63 (3:5f63)
 	start_script
-	script_set_flag_value EVENT_MATTHEW_STATE, MATTHEW_DEFEATED
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	set_event EVENT_MATTHEW_STATE, MATTHEW_DEFEATED
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0787, Text0788
 	give_booster_packs BOOSTER_MYSTERY_FIGHTING_COLORLESS, BOOSTER_MYSTERY_FIGHTING_COLORLESS, NO_BOOSTER
 	print_npc_text Text0789
@@ -4981,50 +4981,50 @@ Script_BeatMatthew: ; df63 (3:5f63)
 
 Script_LostToMatthew: ; df78 (3:5f78)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text078a, Text078b
 	quit_script_fully
 
 Script_Woman1: ; df83 (3:5f83)
 	start_script
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_dfba
-	jump_if_flag_nonzero_2 EVENT_ISHIHARA_MET, .ows_df96
-	max_out_flag_value EVENT_ISHIHARA_MENTIONED
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_dfba
+	jump_if_event_true EVENT_ISHIHARA_MET, .ows_df96
+	max_out_event_value EVENT_ISHIHARA_MENTIONED
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text078c
 
 .ows_df96
-	jump_if_flag_nonzero_2 EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_dfb7
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_dfae
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_dfa9
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_true EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_dfb7
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_dfae
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_dfa9
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text078d
 
 .ows_dfa9
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text078e
 
 .ows_dfae
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_dfb7
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS, .ows_dfb7
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text078f
 
 .ows_dfb7
 	print_text_quit_fully Text0790
 
 .ows_dfba
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
 	print_text_quit_fully Text0791
 
 Script_Chap1: ; dfc0 (3:5fc0)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0792, Text0793
 	quit_script_fully
 
 Preload_Lass3: ; dfcb (3:5fcb)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	cp TRUE
 	ret
 
@@ -5105,7 +5105,7 @@ Script_LostToAndrew: ; e03a (3:603a)
 Script_Gene: ; e03e (3:603e)
 	start_script
 	try_give_pc_pack $03
-	jump_if_flag_nonzero_2 EVENT_BEAT_GENE, Script_LostToGene.ows_e07b
+	jump_if_event_true EVENT_BEAT_GENE, Script_LostToGene.ows_e07b
 	print_npc_text Text07a3
 	ask_question_jump Text07a4, .ows_e051
 	print_npc_text Text07a5
@@ -5118,9 +5118,9 @@ Script_Gene: ; e03e (3:603e)
 
 Script_BeatGene: ; e059 (3:6059)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_GENE, Script_LostToGene.ows_e08f
+	jump_if_event_true EVENT_BEAT_GENE, Script_LostToGene.ows_e08f
 	print_npc_text Text07a7
-	max_out_flag_value EVENT_BEAT_GENE
+	max_out_event_value EVENT_BEAT_GENE
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_GENE
 	record_master_win $02
@@ -5131,7 +5131,7 @@ Script_BeatGene: ; e059 (3:6059)
 
 Script_LostToGene: ; e073 (3:6073)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_GENE, .ows_e09a
+	jump_if_event_true EVENT_BEAT_GENE, .ows_e09a
 	print_text_quit_fully Text07aa
 
 .ows_e07b
@@ -5172,12 +5172,12 @@ WaterClubLobbyAfterDuel: ; e0a2 (3:60a2)
 	db $00
 
 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0)
-	get_flag_value EVENT_IMAKUNI_STATE
+	get_event_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_TALKED
 	jr c, .dont_load
-	get_flag_value EVENT_TEMP_DUELED_IMAKUNI
+	get_event_value EVENT_TEMP_DUELED_IMAKUNI
 	jr nz, .dont_load
-	get_flag_value EVENT_IMAKUNI_ROOM
+	get_event_value EVENT_IMAKUNI_ROOM
 	cp IMAKUNI_WATER_CLUB
 	jr z, .load_imakuni
 .dont_load
@@ -5186,16 +5186,16 @@ Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0)
 
 .load_imakuni
 	ld a, MUSIC_IMAKUNI
-	ld [wd111], a
+	ld [wDefaultSong], a
 	scf
 	ret
 
 Script_Gal1: ; e0cf (3:60cf)
 	start_script
-	jump_if_flag_equal EVENT_GAL1_TRADE_STATE, GAL1_TRADE_COMPLETED, .ows_e10e
-	jump_if_flag_equal EVENT_GAL1_TRADE_STATE, GAL1_TRADE_NOT_OFFERED, NULL
+	jump_if_event_equal EVENT_GAL1_TRADE_STATE, GAL1_TRADE_COMPLETED, .ows_e10e
+	test_if_event_equal EVENT_GAL1_TRADE_STATE, GAL1_TRADE_NOT_OFFERED
 	print_variable_npc_text Gal1WantToTrade1Text, Gal1WantToTrade2Text
-	script_set_flag_value EVENT_GAL1_TRADE_STATE, GAL1_TRADE_OFFERED
+	set_event EVENT_GAL1_TRADE_STATE, GAL1_TRADE_OFFERED
 	ask_question_jump Gal1WouldYouLikeToTradeText, .ows_e0eb
 	print_npc_text Gal1DeclinedTradeText
 	quit_script_fully
@@ -5211,7 +5211,7 @@ Script_Gal1: ; e0cf (3:60cf)
 	quit_script_fully
 
 .ows_e0fb
-	script_set_flag_value EVENT_GAL1_TRADE_STATE, GAL1_TRADE_COMPLETED
+	set_event EVENT_GAL1_TRADE_STATE, GAL1_TRADE_COMPLETED
 	print_npc_text Gal1LetsTradeText
 	print_text Gal1TradeCompleteText
 	take_card LAPRAS
@@ -5225,22 +5225,22 @@ Script_Gal1: ; e0cf (3:60cf)
 
 Script_Lass1: ; e111 (3:6111)
 	start_script
-	jump_if_flag_equal EVENT_LASS1_MENTIONED_IMAKUNI, TRUE, .ows_e121
+	jump_if_event_equal EVENT_LASS1_MENTIONED_IMAKUNI, TRUE, .ows_e121
 	print_npc_text Text0427
-	script_set_flag_value EVENT_LASS1_MENTIONED_IMAKUNI, TRUE
-	script_set_flag_value EVENT_IMAKUNI_STATE, IMAKUNI_MENTIONED
+	set_event EVENT_LASS1_MENTIONED_IMAKUNI, TRUE
+	set_event EVENT_IMAKUNI_STATE, IMAKUNI_MENTIONED
 	quit_script_fully
 
 .ows_e121
-	jump_if_flag_not_equal EVENT_IMAKUNI_ROOM, IMAKUNI_WATER_CLUB, .ows_e12d
-	jump_if_flag_nonzero_2 EVENT_TEMP_DUELED_IMAKUNI, .ows_e12d
+	jump_if_event_not_equal EVENT_IMAKUNI_ROOM, IMAKUNI_WATER_CLUB, .ows_e12d
+	jump_if_event_true EVENT_TEMP_DUELED_IMAKUNI, .ows_e12d
 	print_text_quit_fully Text0428
 
 .ows_e12d
 	print_text_quit_fully Text0429
 
 Preload_Man2: ; e130 (3:6130)
-	get_flag_value EVENT_JOSHUA_STATE
+	get_event_value EVENT_JOSHUA_STATE
 	cp JOSHUA_DEFEATED
 	ret
 
@@ -5256,7 +5256,7 @@ WaterClubMovePlayer: ; e13f (3:613f)
 	ld a, [wPlayerYCoord]
 	cp $8
 	ret nz
-	get_flag_value EVENT_JOSHUA_STATE
+	get_event_value EVENT_JOSHUA_STATE
 	cp JOSHUA_DEFEATED
 	ret nc
 	ld a, NPC_JOSHUA
@@ -5305,7 +5305,7 @@ Script_Sara: ; e177 (3:6177)
 
 Script_BeatSara: ; e18c (3:618c)
 	start_script
-	max_out_flag_value EVENT_BEAT_SARA
+	max_out_event_value EVENT_BEAT_SARA
 	print_npc_text Text0430
 	give_booster_packs BOOSTER_COLOSSEUM_WATER, BOOSTER_COLOSSEUM_WATER, NO_BOOSTER
 	print_npc_text Text0431
@@ -5329,7 +5329,7 @@ Script_Amanda: ; e19e (3:619e)
 
 Script_BeatAmanda: ; e1b3 (3:61b3)
 	start_script
-	max_out_flag_value EVENT_BEAT_AMANDA
+	max_out_event_value EVENT_BEAT_AMANDA
 	print_npc_text Text0437
 	give_booster_packs BOOSTER_MYSTERY_LIGHTNING_COLORLESS, BOOSTER_MYSTERY_LIGHTNING_COLORLESS, NO_BOOSTER
 	print_npc_text Text0438
@@ -5410,25 +5410,25 @@ NPCMovement_e219: ; e219 (3:6219)
 
 Script_Joshua: ; e21c (3:621c)
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_AMANDA, .sara_and_amanda_not_beaten
-	jump_if_flag_zero_2 EVENT_BEAT_SARA, .sara_and_amanda_not_beaten
+	jump_if_event_false EVENT_BEAT_AMANDA, .sara_and_amanda_not_beaten
+	jump_if_event_false EVENT_BEAT_SARA, .sara_and_amanda_not_beaten
 	script_jump .beat_sara_and_amanda
 
 .sara_and_amanda_not_beaten
-	script_set_flag_value EVENT_JOSHUA_STATE, JOSHUA_TALKED
+	set_event EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_npc_text Text043b
 	quit_script_fully
 
 .beat_sara_and_amanda
-	jump_if_flag_nonzero_1 EVENT_JOSHUA_STATE, .already_talked
-	script_set_flag_value EVENT_JOSHUA_STATE, JOSHUA_TALKED
+	jump_if_event_nonzero EVENT_JOSHUA_STATE, .already_talked
+	set_event EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_npc_text Text043b
 	print_npc_text Text043c
 .already_talked
-	jump_if_flag_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED, NULL
+	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_variable_npc_text Text043d, Text043e
 	ask_question_jump Text043f, .start_duel
-	jump_if_flag_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED, NULL
+	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_variable_npc_text Text0440, Text0441
 	quit_script_fully
 
@@ -5440,22 +5440,22 @@ Script_Joshua: ; e21c (3:621c)
 
 Script_LostToJoshua: ; e260 (3:6260)
 	start_script
-	jump_if_flag_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED, NULL
+	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_variable_npc_text Text0443, Text0444
 	quit_script_fully
 
 Script_BeatJoshua: ; e26c (3:626c)
 	start_script
-	jump_if_flag_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED, NULL
+	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_variable_npc_text Text0445, Text0446
 	give_booster_packs BOOSTER_MYSTERY_WATER_COLORLESS, BOOSTER_MYSTERY_WATER_COLORLESS, NO_BOOSTER
-	jump_if_flag_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED, NULL
+	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
 	print_variable_npc_text Text0447, Text0448
-	jump_if_flag_not_equal EVENT_JOSHUA_STATE, JOSHUA_DEFEATED, .first_joshua_win
+	jump_if_event_not_equal EVENT_JOSHUA_STATE, JOSHUA_DEFEATED, .first_joshua_win
 	quit_script_fully
 
 .first_joshua_win
-	script_set_flag_value EVENT_JOSHUA_STATE, JOSHUA_DEFEATED
+	set_event EVENT_JOSHUA_STATE, JOSHUA_DEFEATED
 	print_npc_text Text0449
 	close_text_box
 	move_active_npc_by_direction NPCMovementTable_e2a1
@@ -5523,7 +5523,7 @@ Script_MeetAmy: ; e2d1 (3:62d1)
 
 Script_Amy: ; e304 (3:6304)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_AMY, Script_Amy_AlreadyHaveMedal
+	jump_if_event_true EVENT_BEAT_AMY, Script_Amy_AlreadyHaveMedal
 	print_npc_text Text044f
 .ask_for_duel
 	ask_question_jump Text0450, .start_duel
@@ -5540,9 +5540,9 @@ Script_Amy: ; e304 (3:6304)
 Script_BeatAmy: ; e322 (3:6322)
 	start_script
 	print_npc_text Text0453
-	jump_if_flag_nonzero_2 EVENT_BEAT_AMY, .give_booster_packs
+	jump_if_event_true EVENT_BEAT_AMY, .give_booster_packs
 	print_npc_text Text0454
-	max_out_flag_value EVENT_BEAT_AMY
+	max_out_event_value EVENT_BEAT_AMY
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_AMY
 	record_master_win $03
@@ -5591,12 +5591,12 @@ LightningClubLobbyAfterDuel: ; e36d (3:636d)
 	db $00
 
 Preload_ImakuniInLightningClubLobby: ; e37b (3:637b)
-	get_flag_value EVENT_IMAKUNI_STATE
+	get_event_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_TALKED
 	jr c, .dont_load
-	get_flag_value EVENT_TEMP_DUELED_IMAKUNI
+	get_event_value EVENT_TEMP_DUELED_IMAKUNI
 	jr nz, .dont_load
-	get_flag_value EVENT_IMAKUNI_ROOM
+	get_event_value EVENT_IMAKUNI_ROOM
 	cp IMAKUNI_LIGHTNING_CLUB
 	jr z, .load_imakuni
 .dont_load
@@ -5605,16 +5605,16 @@ Preload_ImakuniInLightningClubLobby: ; e37b (3:637b)
 
 .load_imakuni
 	ld a, MUSIC_IMAKUNI
-	ld [wd111], a
+	ld [wDefaultSong], a
 	scf
 	ret
 
 Script_Chap2: ; e39a (3:639a)
 	start_script
-	jump_if_flag_equal EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_COMPLETED, .ows_e3d6
-	jump_if_flag_equal EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_NOT_OFFERED, NULL
+	jump_if_event_equal EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_COMPLETED, .ows_e3d6
+	test_if_event_equal EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_NOT_OFFERED
 	print_variable_npc_text Text060f, Text0610
-	script_set_flag_value EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_OFFERED
+	set_event EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_OFFERED
 	ask_question_jump Text0611, .ows_e3b6
 	print_npc_text Text0612
 	quit_script_fully
@@ -5630,7 +5630,7 @@ Script_Chap2: ; e39a (3:639a)
 	quit_script_fully
 
 .ows_e3c6
-	script_set_flag_value EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_COMPLETED
+	set_event EVENT_CHAP2_TRADE_STATE, CHAP2_TRADE_COMPLETED
 	print_npc_text Text0615
 	take_card ELECTABUZZ2
 	give_card ELECTABUZZ1
@@ -5647,7 +5647,7 @@ Script_Lass4: ; e3d9 (3:63d9)
 
 Script_Hood1: ; e3dd (3:63dd)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0619, Text061a
 	quit_script_fully
 
@@ -5692,7 +5692,7 @@ Script_Jennifer: ; e408 (3:6408)
 
 Script_BeatJennifer: ; e41d (3:641d)
 	start_script
-	max_out_flag_value EVENT_BEAT_JENNIFER
+	max_out_event_value EVENT_BEAT_JENNIFER
 	print_npc_text Text061f
 	give_booster_packs BOOSTER_MYSTERY_LIGHTNING_COLORLESS, BOOSTER_MYSTERY_LIGHTNING_COLORLESS, NO_BOOSTER
 	print_npc_text Text0620
@@ -5716,7 +5716,7 @@ Script_Nicholas: ; e42f (3:642f)
 
 Script_BeatNicholas: ; e444 (3:6444)
 	start_script
-	max_out_flag_value EVENT_BEAT_NICHOLAS
+	max_out_event_value EVENT_BEAT_NICHOLAS
 	print_npc_text Text0626
 	give_booster_packs BOOSTER_COLOSSEUM_LIGHTNING, BOOSTER_COLOSSEUM_LIGHTNING, NO_BOOSTER
 	print_npc_text Text0627
@@ -5728,9 +5728,9 @@ Script_LostToNicholas: ; e452 (3:6452)
 
 Script_Brandon: ; e456 (3:6456)
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_JENNIFER, .ows_e469
-	jump_if_flag_zero_2 EVENT_BEAT_NICHOLAS, .ows_e469
-	jump_if_flag_zero_2 EVENT_BEAT_BRANDON, .ows_e469
+	jump_if_event_false EVENT_BEAT_JENNIFER, .ows_e469
+	jump_if_event_false EVENT_BEAT_NICHOLAS, .ows_e469
+	jump_if_event_false EVENT_BEAT_BRANDON, .ows_e469
 	print_npc_text Text0629
 	script_jump .ows_e46c
 
@@ -5750,7 +5750,7 @@ Script_Brandon: ; e456 (3:6456)
 Script_BeatBrandon: ; e480 (3:6480)
 	start_script
 	try_give_pc_pack $05
-	max_out_flag_value EVENT_BEAT_BRANDON
+	max_out_event_value EVENT_BEAT_BRANDON
 	print_npc_text Text062f
 	give_booster_packs BOOSTER_COLOSSEUM_LIGHTNING, BOOSTER_COLOSSEUM_LIGHTNING, NO_BOOSTER
 	print_npc_text Text0630
@@ -5761,11 +5761,11 @@ Script_LostToBrandon: ; e490 (3:6490)
 	print_text_quit_fully Text0631
 
 Preload_Isaac: ; e494 (3:6494)
-	get_flag_value EVENT_BEAT_JENNIFER
+	get_event_value EVENT_BEAT_JENNIFER
 	jr z, .asm_e4ab
-	get_flag_value EVENT_BEAT_NICHOLAS
+	get_event_value EVENT_BEAT_NICHOLAS
 	jr z, .asm_e4ab
-	get_flag_value EVENT_BEAT_BRANDON
+	get_event_value EVENT_BEAT_BRANDON
 	jr z, .asm_e4ab
 	ld a, SOUTH
 	ld [wLoadNPCDirection], a
@@ -5775,9 +5775,9 @@ Preload_Isaac: ; e494 (3:6494)
 
 Script_Isaac: ; e4ad (3:64ad)
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_JENNIFER, .ows_e4bd
-	jump_if_flag_zero_2 EVENT_BEAT_NICHOLAS, .ows_e4bd
-	jump_if_flag_zero_2 EVENT_BEAT_BRANDON, .ows_e4bd
+	jump_if_event_false EVENT_BEAT_JENNIFER, .ows_e4bd
+	jump_if_event_false EVENT_BEAT_NICHOLAS, .ows_e4bd
+	jump_if_event_false EVENT_BEAT_BRANDON, .ows_e4bd
 	script_jump .ows_e4c1
 
 .ows_e4bd
@@ -5785,10 +5785,10 @@ Script_Isaac: ; e4ad (3:64ad)
 	quit_script_fully
 
 .ows_e4c1
-	jump_if_flag_nonzero_2 EVENT_BEAT_ISAAC, Script_LostToIsaac.ows_e503
-	jump_if_flag_zero_2 EVENT_ISAAC_TALKED, NULL
+	jump_if_event_true EVENT_BEAT_ISAAC, Script_LostToIsaac.ows_e503
+	test_if_event_false EVENT_ISAAC_TALKED
 	print_variable_npc_text Text0633, Text0634
-	max_out_flag_value EVENT_ISAAC_TALKED
+	max_out_event_value EVENT_ISAAC_TALKED
 	ask_question_jump Text0635, .ows_e4d9
 	print_npc_text Text0636
 	quit_script_fully
@@ -5800,9 +5800,9 @@ Script_Isaac: ; e4ad (3:64ad)
 
 Script_BeatIsaac: ; e4e1 (3:64e1)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_ISAAC, Script_LostToIsaac.ows_e517
+	jump_if_event_true EVENT_BEAT_ISAAC, Script_LostToIsaac.ows_e517
 	print_npc_text Text0638
-	max_out_flag_value EVENT_BEAT_ISAAC
+	max_out_event_value EVENT_BEAT_ISAAC
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_ISAAC
 	record_master_win $04
@@ -5813,7 +5813,7 @@ Script_BeatIsaac: ; e4e1 (3:64e1)
 
 Script_LostToIsaac: ; e4fb (3:64fb)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_ISAAC, .ows_e522
+	jump_if_event_true EVENT_BEAT_ISAAC, .ows_e522
 	print_text_quit_fully Text063b
 
 .ows_e503
@@ -5849,7 +5849,7 @@ FindEndOfDuelScript: ; e52c (3:652c)
 	ld c, 2
 
 .player_won
-	ld a, [wd0c4]
+	ld a, [wNPCDuelist]
 	ld b, a
 	ld de, 5
 .check_enemy_byte_loop
@@ -5893,7 +5893,7 @@ Script_Clerk5: ; e566 (3:6566)
 	print_text_quit_fully Text06d7
 
 Preload_MichaelInGrassClubEntrance: ; e56a (3:656a)
-	get_flag_value EVENT_PUPIL_MICHAEL_STATE
+	get_event_value EVENT_PUPIL_MICHAEL_STATE
 	or a ; cp PUPIL_INACTIVE
 	ret z
 	cp PUPIL_DEFEATED
@@ -5901,10 +5901,10 @@ Preload_MichaelInGrassClubEntrance: ; e56a (3:656a)
 
 Script_Michael: ; e573 (3:6573)
 	start_script
-	jump_if_flag_not_less_than EVENT_PUPIL_MICHAEL_STATE, PUPIL_DEFEATED,  Script_MichaelRematch
-	jump_if_flag_equal EVENT_PUPIL_MICHAEL_STATE, PUPIL_ACTIVE, NULL
+	jump_if_event_greater_or_equal EVENT_PUPIL_MICHAEL_STATE, PUPIL_DEFEATED,  Script_MichaelRematch
+	test_if_event_equal EVENT_PUPIL_MICHAEL_STATE, PUPIL_ACTIVE
 	print_variable_npc_text Text06d8, Text06d9
-	script_set_flag_value EVENT_PUPIL_MICHAEL_STATE, PUPIL_TALKED
+	set_event EVENT_PUPIL_MICHAEL_STATE, PUPIL_TALKED
 	ask_question_jump Text06da, .ows_e58f
 	print_npc_text Text06db
 	quit_script_fully
@@ -5916,7 +5916,7 @@ Script_Michael: ; e573 (3:6573)
 
 Script_BeatMichaelInGrassClubEntrance: ; e597 (3:6597)
 	start_script
-	script_set_flag_value EVENT_PUPIL_MICHAEL_STATE, PUPIL_DEFEATED
+	set_event EVENT_PUPIL_MICHAEL_STATE, PUPIL_DEFEATED
 	print_npc_text Text06dd
 	give_booster_packs BOOSTER_COLOSSEUM_FIGHTING, BOOSTER_COLOSSEUM_FIGHTING, NO_BOOSTER
 	print_npc_text Text06de
@@ -5965,7 +5965,7 @@ GrassClubLobbyAfterDuel: ; e5c4 (3:65c4)
 
 Script_Brittany: ; e5d2 (3:65d2)
 	start_script
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
 	print_variable_npc_text Text06e0, Text06e1
 	ask_question_jump Text06e2, .start_duel
 	print_npc_text Text06e3
@@ -5980,14 +5980,14 @@ Script_BeatBrittany: ; e5ee (3:65ee)
 	start_script
 	print_npc_text Text06e5
 	give_booster_packs BOOSTER_MYSTERY_GRASS_COLORLESS, BOOSTER_MYSTERY_GRASS_COLORLESS, NO_BOOSTER
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB
 	print_variable_npc_text Text06e6, Text06e7
-	max_out_flag_value EVENT_BEAT_BRITTANY
-	jump_if_flag_not_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .quit
-	jump_if_flag_zero_2 EVENT_BEAT_KRISTIN, .quit
-	jump_if_flag_zero_2 EVENT_BEAT_HEATHER, .quit
-	script_set_flag_value EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_BEAT_BRITTANY
+	jump_if_event_greater_or_equal EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .quit
+	jump_if_event_false EVENT_BEAT_KRISTIN, .quit
+	jump_if_event_false EVENT_BEAT_HEATHER, .quit
+	set_event EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
 	print_npc_text Text06e8
 .quit
 	quit_script_fully
@@ -6001,13 +6001,13 @@ Script_e61c: ; e61c (3:661c)
 
 Script_Lass2: ; e61f (3:661f)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_TEMP_TRADED_WITH_LASS2, Script_e61c
-	jump_if_flag_not_less_than EVENT_LASS2_TRADE_STATE, LASS2_TRADES_COMPLETE, Script_e61c
-	jump_if_flag_not_less_than EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE, .ows_e6a1
-	jump_if_flag_not_less_than EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE, .ows_e66a
-	jump_if_flag_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_1_AVAILABLE, NULL
+	jump_if_event_true EVENT_TEMP_TRADED_WITH_LASS2, Script_e61c
+	jump_if_event_greater_or_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADES_COMPLETE, Script_e61c
+	jump_if_event_greater_or_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE, .ows_e6a1
+	jump_if_event_greater_or_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE, .ows_e66a
+	test_if_event_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_1_AVAILABLE
 	print_variable_npc_text Text06eb, Text06ec
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADE_1_OFFERED
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADE_1_OFFERED
 	ask_question_jump Text06ed, .ows_e648
 	print_text_quit_fully Text06ee
 
@@ -6020,8 +6020,8 @@ Script_Lass2: ; e61f (3:661f)
 	print_text_quit_fully Text06f0
 
 .ows_e656
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_LASS2
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_LASS2
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE
 	print_npc_text Text06f1
 	print_text Text06f2
 	take_card ODDISH
@@ -6030,9 +6030,9 @@ Script_Lass2: ; e61f (3:661f)
 	print_text_quit_fully Text06f3
 
 .ows_e66a
-	jump_if_flag_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE, NULL
+	test_if_event_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_AVAILABLE
 	print_variable_npc_text Text06f4, Text06f5
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_OFFERED
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADE_2_OFFERED
 	ask_question_jump Text06ed, .ows_e67f
 	print_text_quit_fully Text06f6
 
@@ -6045,8 +6045,8 @@ Script_Lass2: ; e61f (3:661f)
 	print_text_quit_fully Text06f8
 
 .ows_e68d
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_LASS2
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_LASS2
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE
 	print_npc_text Text06f9
 	print_text Text06fa
 	take_card CLEFAIRY
@@ -6055,9 +6055,9 @@ Script_Lass2: ; e61f (3:661f)
 	print_text_quit_fully Text06f3
 
 .ows_e6a1
-	jump_if_flag_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE, NULL
+	test_if_event_equal EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_AVAILABLE
 	print_variable_npc_text Text06fb, Text06fc
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_OFFERED
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADE_3_OFFERED
 	ask_question_jump Text06ed, .ows_e6b6
 	print_text_quit_fully Text06fd
 
@@ -6070,8 +6070,8 @@ Script_Lass2: ; e61f (3:661f)
 	print_text_quit_fully Text06ff
 
 .ows_e6c4
-	max_out_flag_value EVENT_TEMP_TRADED_WITH_LASS2
-	script_set_flag_value EVENT_LASS2_TRADE_STATE, LASS2_TRADES_COMPLETE
+	max_out_event_value EVENT_TEMP_TRADED_WITH_LASS2
+	set_event EVENT_LASS2_TRADE_STATE, LASS2_TRADES_COMPLETE
 	print_npc_text Text0700
 	print_text Text0701
 	take_card CHARIZARD
@@ -6084,7 +6084,7 @@ Script_Granny2: ; e6d8 (3:66d8)
 	print_text_quit_fully Text0702
 
 Preload_Gal2: ; e6dc (3:66dc)
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	cp TRUE
 	ret
 
@@ -6116,7 +6116,7 @@ GrassClubAfterDuel: ; e6e7 (3:66e7)
 
 Script_Kristin: ; e701 (3:6701)
 	start_script
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
 	print_variable_npc_text Text0704, Text0705
 	ask_question_jump Text0706, .ows_e714
 	print_text_quit_fully Text0707
@@ -6132,12 +6132,12 @@ Script_BeatKristin: ; e71c (3:671c)
 	print_npc_text Text0709
 	give_booster_packs BOOSTER_EVOLUTION_GRASS, BOOSTER_EVOLUTION_GRASS, NO_BOOSTER
 	print_npc_text Text070a
-	max_out_flag_value EVENT_BEAT_KRISTIN
-	jump_if_flag_not_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .ows_e740
-	jump_if_flag_zero_2 EVENT_BEAT_BRITTANY, .ows_e740
-	jump_if_flag_zero_2 EVENT_BEAT_HEATHER, .ows_e740
-	script_set_flag_value EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_BEAT_KRISTIN
+	jump_if_event_greater_or_equal EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .ows_e740
+	jump_if_event_false EVENT_BEAT_BRITTANY, .ows_e740
+	jump_if_event_false EVENT_BEAT_HEATHER, .ows_e740
+	set_event EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
 	print_npc_text Text070b
 .ows_e740
 	quit_script_fully
@@ -6148,7 +6148,7 @@ Script_LostToKristin: ; e741 (3:6741)
 
 Script_Heather: ; e745 (3:6745)
 	start_script
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
 	print_variable_npc_text Text070d, Text070e
 	ask_question_jump Text070f, .ows_e758
 	print_text_quit_fully Text0710
@@ -6160,28 +6160,28 @@ Script_Heather: ; e745 (3:6745)
 
 Script_BeatHeather: ; e760 (3:6760)
 	start_script
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB
 	print_variable_npc_text Text0712, Text0713
 	give_booster_packs BOOSTER_COLOSSEUM_GRASS, BOOSTER_COLOSSEUM_GRASS, NO_BOOSTER
 	print_npc_text Text0714
-	max_out_flag_value EVENT_BEAT_HEATHER
-	jump_if_flag_not_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .ows_e789
-	jump_if_flag_zero_2 EVENT_BEAT_BRITTANY, .ows_e789
-	jump_if_flag_zero_2 EVENT_BEAT_KRISTIN, .ows_e789
-	script_set_flag_value EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_BEAT_HEATHER
+	jump_if_event_greater_or_equal EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, .ows_e789
+	jump_if_event_false EVENT_BEAT_BRITTANY, .ows_e789
+	jump_if_event_false EVENT_BEAT_KRISTIN, .ows_e789
+	set_event EVENT_NIKKI_STATE, NIKKI_IN_ISHIHARAS_HOUSE
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
 	print_npc_text Text0715
 .ows_e789
 	quit_script_fully
 
 Script_LostToHeather: ; e78a (3:678a)
 	start_script
-	jump_if_flag_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB, NULL
+	test_if_event_less_than EVENT_NIKKI_STATE, NIKKI_IN_GRASS_CLUB
 	print_variable_npc_text Text0716, Text0717
 	quit_script_fully
 
 Preload_NikkiInGrassClub: ; e796 (3:6796)
-	get_flag_value EVENT_NIKKI_STATE
+	get_event_value EVENT_NIKKI_STATE
 	cp NIKKI_IN_GRASS_CLUB
 	ccf
 	ret
@@ -6192,15 +6192,15 @@ Script_Nikki: ; e79e (3:679e)
 	jp z, Script_NikkiInIshiharasHouse
 
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_NIKKI, NULL
+	test_if_event_false EVENT_BEAT_NIKKI
 	print_variable_npc_text Text0718, Text0719
 	ask_question_jump Text071a, .ows_e7bf
-	jump_if_flag_zero_2 EVENT_BEAT_NIKKI, NULL
+	test_if_event_false EVENT_BEAT_NIKKI
 	print_variable_npc_text Text071b, Text071c
 	quit_script_fully
 
 .ows_e7bf
-	jump_if_flag_nonzero_2 EVENT_BEAT_NIKKI, .ows_e7cb
+	jump_if_event_true EVENT_BEAT_NIKKI, .ows_e7cb
 	print_npc_text Text071d
 	start_duel PRIZES_6, FLOWER_POWER_DECK_ID, MUSIC_DUEL_THEME_2
 	quit_script_fully
@@ -6212,10 +6212,10 @@ Script_Nikki: ; e79e (3:679e)
 
 Script_BeatNikki: ; e7d3 (3:67d3)
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_NIKKI, NULL
+	test_if_event_false EVENT_BEAT_NIKKI
 	print_variable_npc_text Text071f, Text0720
-	jump_if_flag_nonzero_2 EVENT_BEAT_NIKKI, .ows_e7eb
-	max_out_flag_value EVENT_BEAT_NIKKI
+	jump_if_event_true EVENT_BEAT_NIKKI, .ows_e7eb
+	max_out_event_value EVENT_BEAT_NIKKI
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_NIKKI
 	record_master_win $05
@@ -6266,7 +6266,7 @@ TryFirstRonaldDuel: ; e822 (3:6822)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ret c
-	get_flag_value EVENT_RONALD_FIRST_DUEL_STATE
+	get_event_value EVENT_RONALD_FIRST_DUEL_STATE
 	or a
 	ret nz ; already dueled
 	ld bc, Script_FirstRonaldDuel
@@ -6277,7 +6277,7 @@ TrySecondRonaldDuel: ; e837 (3:6837)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ret c
-	get_flag_value EVENT_RONALD_SECOND_DUEL_STATE
+	get_event_value EVENT_RONALD_SECOND_DUEL_STATE
 	or a
 	ret nz ; already dueled
 	ld bc, Script_SecondRonaldDuel
@@ -6289,18 +6289,18 @@ Script_Clerk6: ; e84c (3:684c)
 
 Script_Lad3: ; e850 (3:6850)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0643, Text0644
 	quit_script_fully
 
 Preload_Ronald1InClubEntrance: ; e85b (3:685b)
-	get_flag_value EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
+	get_event_value EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
 	cp TRUE
 	ret
 
 Script_FirstRonaldEncounter: ; e862 (3:6862)
 	start_script
-	max_out_flag_value EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
+	max_out_event_value EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER
 	move_active_npc NPCMovement_e894
 	load_current_map_name_into_txram_slot 0
 	print_npc_text Text0645
@@ -6333,7 +6333,7 @@ NPCMovement_e894: ; e894 (3:6894)
 	db $ff
 
 Preload_Ronald2InClubEntrance: ; e89a (3:689a)
-	get_flag_value EVENT_RONALD_FIRST_DUEL_STATE
+	get_event_value EVENT_RONALD_FIRST_DUEL_STATE
 	ld e, 2 ; medal requirement for ronald duel
 Func_e8a0: ; e8a0 (3:68a0)
 	cp RONALD_DUEL_WON
@@ -6341,7 +6341,7 @@ Func_e8a0: ; e8a0 (3:68a0)
 	cp RONALD_DUEL_LOST
 	jr nc, .asm_e8b2
 	call TryGiveMedalPCPacks
-	get_flag_value EVENT_MEDAL_COUNT
+	get_event_value EVENT_MEDAL_COUNT
 	cp e
 	jr z, .asm_e8be
 .asm_e8b2
@@ -6371,7 +6371,7 @@ Script_FirstRonaldDuel: ; e8c0 (3:68c0)
 	move_player SOUTH, 1
 	move_player SOUTH, 1
 	print_npc_text Text064b
-	script_set_flag_value EVENT_RONALD_FIRST_DUEL_STATE, RONALD_DUEL_WON
+	set_event EVENT_RONALD_FIRST_DUEL_STATE, RONALD_DUEL_WON
 	start_duel PRIZES_6, IM_RONALD_DECK_ID, MUSIC_RONALD
 	quit_script_fully
 
@@ -6387,7 +6387,7 @@ Script_LostToFirstRonaldDuel: ; e8f7 (3:68f7)
 	start_script
 	print_npc_text Text064e
 .ows_e8fb
-	script_set_flag_value EVENT_RONALD_FIRST_DUEL_STATE, RONALD_DUEL_LOST
+	set_event EVENT_RONALD_FIRST_DUEL_STATE, RONALD_DUEL_LOST
 	close_text_box
 	move_active_npc NPCMovement_e90f
 	unload_active_npc
@@ -6417,7 +6417,7 @@ NPCMovement_e90f: ; e90f (3:690f)
 	db $ff
 
 Preload_Ronald3InClubEntrance: ; e915 (3:6915)
-	get_flag_value EVENT_RONALD_SECOND_DUEL_STATE
+	get_event_value EVENT_RONALD_SECOND_DUEL_STATE
 	ld e, 5 ; medal requirement for ronald duel
 	jp Func_e8a0
 
@@ -6435,7 +6435,7 @@ Script_SecondRonaldDuel: ; e91e (3:691e)
 	move_player SOUTH, 1
 	move_player SOUTH, 1
 	print_npc_text Text0650
-	script_set_flag_value EVENT_RONALD_SECOND_DUEL_STATE, RONALD_DUEL_WON
+	set_event EVENT_RONALD_SECOND_DUEL_STATE, RONALD_DUEL_WON
 	start_duel PRIZES_6, POWERFUL_RONALD_DECK_ID, MUSIC_RONALD
 	quit_script_fully
 
@@ -6451,7 +6451,7 @@ Script_LostToSecondRonaldDuel: ; e955 (3:6955)
 	start_script
 	print_npc_text Text0653
 .ows_e959
-	script_set_flag_value EVENT_RONALD_SECOND_DUEL_STATE, RONALD_DUEL_LOST
+	set_event EVENT_RONALD_SECOND_DUEL_STATE, RONALD_DUEL_LOST
 	close_text_box
 	move_active_npc NPCMovement_e90f
 	unload_active_npc
@@ -6503,27 +6503,27 @@ Script_LostToRobert: ; e9a1 (3:69a1)
 
 Script_Pappy1: ; e9a5 (3:69a5)
 	start_script
-	jump_if_flag_equal EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_COMPLETE, .ows_e9de
-	jump_if_flag_nonzero_2 EVENT_BEAT_MURRAY, .ows_e9cb
-	jump_if_flag_equal EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_ACCEPTED, .ows_e9c8
-	script_set_flag_value EVENT_PAPPY1_STATE, PAPPY1_TALKED
+	jump_if_event_equal EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_COMPLETE, .ows_e9de
+	jump_if_event_true EVENT_BEAT_MURRAY, .ows_e9cb
+	jump_if_event_equal EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_ACCEPTED, .ows_e9c8
+	set_event EVENT_PAPPY1_STATE, PAPPY1_TALKED
 	print_npc_text Text065b
 	ask_question_jump_default_yes Text065c, .ows_e9c2
 	print_text_quit_fully Text065d
 
 .ows_e9c2
-	script_set_flag_value EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_ACCEPTED
+	set_event EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_ACCEPTED
 	print_text_quit_fully Text065e
 
 .ows_e9c8
 	print_text_quit_fully Text065f
 
 .ows_e9cb
-	jump_if_flag_zero_1 EVENT_PAPPY1_STATE, NULL
+	test_if_event_zero EVENT_PAPPY1_STATE
 	print_variable_npc_text Text0660, Text0661
 	give_card MEWTWO3
 	show_card_received_screen MEWTWO3
-	script_set_flag_value EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_COMPLETE
+	set_event EVENT_PAPPY1_STATE, PAPPY1_CHALLENGE_COMPLETE
 	print_text_quit_fully Text0662
 
 .ows_e9de
@@ -6531,10 +6531,10 @@ Script_Pappy1: ; e9a5 (3:69a5)
 
 _Preload_Ronald1InPsychicClubLobby: ; e9e1 (3:69e1)
 	call TryGiveMedalPCPacks
-	get_flag_value EVENT_MEDAL_COUNT
+	get_event_value EVENT_MEDAL_COUNT
 	cp 4
 	jr nz, .dont_load
-	get_flag_value EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
+	get_event_value EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
 	or a
 	jr nz, .dont_load
 	scf
@@ -6553,7 +6553,7 @@ Preload_Ronald1InPsychicClubLobby: ; e9f7 (3:69f7)
 Script_ea02: ; ea02 (3:6a02)
 	start_script
 	move_active_npc_by_direction NPCMovementTable_ea1a
-	max_out_flag_value EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
+	max_out_event_value EVENT_RONALD_PSYCHIC_CLUB_LOBBY_ENCOUNTER
 	print_npc_text Text0664
 	close_text_box
 	set_player_direction SOUTH
@@ -6587,13 +6587,13 @@ NPCMovement_ea2c: ; ea2c (3:6a2c)
 
 Script_Gal3: ; ea30 (3:6a30)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0665, Text0666
 	quit_script_fully
 
 Script_Chap4: ; ea3b (3:6a3b)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0667, Text0668
 	quit_script_fully
 
@@ -6622,12 +6622,12 @@ PsychicClubAfterDuel: ; ea46 (3:6a46)
 Script_Daniel: ; ea60 (3:6a60)
 	start_script
 	try_give_medal_pc_packs
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 4, .ows_ea7e
-	jump_if_flag_nonzero_2 EVENT_DANIEL_TALKED, .ows_ea70
-	max_out_flag_value EVENT_DANIEL_TALKED
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 4, .ows_ea7e
+	jump_if_event_true EVENT_DANIEL_TALKED, .ows_ea70
+	max_out_event_value EVENT_DANIEL_TALKED
 	print_npc_text Text0669
 .ows_ea70
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 1, .ows_ea78
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 1, .ows_ea78
 	print_text_quit_fully Text066a
 
 .ows_ea78
@@ -6660,7 +6660,7 @@ Script_LostToDaniel: ; ea9e (3:6a9e)
 Script_Stephanie: ; eaa2 (3:6aa2)
 	start_script
 	try_give_medal_pc_packs
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 2, .ows_eaac
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 2, .ows_eaac
 	print_text_quit_fully Text0673
 
 .ows_eaac
@@ -6687,7 +6687,7 @@ Script_LostToStephanie: ; eacc (3:6acc)
 
 Preload_Murray2: ; ead0 (3:6ad0)
 	call TryGiveMedalPCPacks
-	get_flag_value EVENT_MEDAL_COUNT
+	get_event_value EVENT_MEDAL_COUNT
 	cp 4
 	ret
 
@@ -6700,16 +6700,16 @@ Script_Murray: ; eadf (3:6adf)
 	start_script
 	try_give_pc_pack $07
 	try_give_medal_pc_packs
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 4, .ows_eaef
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 4, .ows_eaef
 	print_npc_text Text067b
 	print_text Text067c
 	quit_script_fully
 
 .ows_eaef
-	jump_if_flag_nonzero_2 EVENT_BEAT_MURRAY, Script_LostToMurray.ows_eb31
-	jump_if_flag_zero_2 EVENT_MURRAY_TALKED, NULL
+	jump_if_event_true EVENT_BEAT_MURRAY, Script_LostToMurray.ows_eb31
+	test_if_event_false EVENT_MURRAY_TALKED
 	print_variable_npc_text Text067d, Text067e
-	max_out_flag_value EVENT_MURRAY_TALKED
+	max_out_event_value EVENT_MURRAY_TALKED
 	ask_question_jump Text067f, .ows_eb07
 	print_npc_text Text0680
 	quit_script_fully
@@ -6721,9 +6721,9 @@ Script_Murray: ; eadf (3:6adf)
 
 Script_BeatMurray: ; eb0f (3:6b0f)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_MURRAY, Script_LostToMurray.ows_eb45
+	jump_if_event_true EVENT_BEAT_MURRAY, Script_LostToMurray.ows_eb45
 	print_npc_text Text0682
-	max_out_flag_value EVENT_BEAT_MURRAY
+	max_out_event_value EVENT_BEAT_MURRAY
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_MURRAY
 	record_master_win $06
@@ -6734,7 +6734,7 @@ Script_BeatMurray: ; eb0f (3:6b0f)
 
 Script_LostToMurray: ; eb29 (3:6b29)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_MURRAY, .ows_eb50
+	jump_if_event_true EVENT_BEAT_MURRAY, .ows_eb50
 	print_text_quit_fully Text0685
 
 .ows_eb31
@@ -6774,12 +6774,12 @@ ScienceClubLobbyAfterDuel:; eb57 (3:6b57)
 	db $00
 
 Preload_ImakuniInScienceClubLobby: ; eb65 (3:6b65)
-	get_flag_value EVENT_IMAKUNI_STATE
+	get_event_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_TALKED
 	jr c, .dont_load
-	get_flag_value EVENT_TEMP_DUELED_IMAKUNI
+	get_event_value EVENT_TEMP_DUELED_IMAKUNI
 	jr nz, .dont_load
-	get_flag_value EVENT_IMAKUNI_ROOM
+	get_event_value EVENT_IMAKUNI_ROOM
 	cp IMAKUNI_SCIENCE_CLUB
 	jr z, .load_imakuni
 .dont_load
@@ -6788,40 +6788,40 @@ Preload_ImakuniInScienceClubLobby: ; eb65 (3:6b65)
 
 .load_imakuni
 	ld a, MUSIC_IMAKUNI
-	ld [wd111], a
+	ld [wDefaultSong], a
 	scf
 	ret
 
 Script_Lad1: ; eb84 (3:6b84)
 	start_script
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_ebbb
-	jump_if_flag_nonzero_2 EVENT_ISHIHARA_MET, .ows_eb97
-	max_out_flag_value EVENT_ISHIHARA_MENTIONED
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_ebbb
+	jump_if_event_true EVENT_ISHIHARA_MET, .ows_eb97
+	max_out_event_value EVENT_ISHIHARA_MENTIONED
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0745
 
 .ows_eb97
-	jump_if_flag_nonzero_2 EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_ebb8
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_ebaf
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_ebaa
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_true EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_ebb8
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_ebaf
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_ebaa
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0746
 
 .ows_ebaa
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0747
 
 .ows_ebaf
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_ebb8
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS, .ows_ebb8
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0748
 
 .ows_ebb8
 	print_text_quit_fully Text0749
 
 .ows_ebbb
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
 	print_text_quit_fully Text074a
 
 Script_Man3: ; ebc1 (3:6bc1)
@@ -6891,9 +6891,9 @@ ScienceClubAfterDuel: ; ebf1 (3:6bf1)
 
 Script_David: ; ec11 (3:6c11)
 	start_script
-	jump_if_flag_zero_1 EVENT_DAVID_STATE, NULL
+	test_if_event_zero EVENT_DAVID_STATE
 	print_variable_npc_text Text074f, Text0750
-	script_set_flag_value EVENT_DAVID_STATE, DAVID_TALKED
+	set_event EVENT_DAVID_STATE, DAVID_TALKED
 	ask_question_jump Text0751, .ows_ec27
 	print_npc_text Text0752
 	quit_script_fully
@@ -6905,7 +6905,7 @@ Script_David: ; ec11 (3:6c11)
 
 Script_BeatDavid: ; ec2f (3:6c2f)
 	start_script
-	script_set_flag_value EVENT_DAVID_STATE, DAVID_DEFEATED
+	set_event EVENT_DAVID_STATE, DAVID_DEFEATED
 	print_npc_text Text0754
 	give_booster_packs BOOSTER_MYSTERY_GRASS_COLORLESS, BOOSTER_MYSTERY_GRASS_COLORLESS, NO_BOOSTER
 	print_npc_text Text0755
@@ -6940,7 +6940,7 @@ Script_LostToErik: ; ec63 (3:6c63)
 
 Script_Rick: ; ec67 (3:6c67)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_RICK, Script_LostToRick.ows_eca2
+	jump_if_event_true EVENT_BEAT_RICK, Script_LostToRick.ows_eca2
 	print_npc_text Text075e
 	ask_question_jump Text075f, .ows_ec78
 	print_npc_text Text0760
@@ -6953,9 +6953,9 @@ Script_Rick: ; ec67 (3:6c67)
 
 Script_BeatRick: ; ec80 (3:6c80)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_RICK, Script_LostToRick.ows_ecb6
+	jump_if_event_true EVENT_BEAT_RICK, Script_LostToRick.ows_ecb6
 	print_npc_text Text0762
-	max_out_flag_value EVENT_BEAT_RICK
+	max_out_event_value EVENT_BEAT_RICK
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_RICK
 	record_master_win $07
@@ -6966,7 +6966,7 @@ Script_BeatRick: ; ec80 (3:6c80)
 
 Script_LostToRick: ; ec9a (3:6c9a)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_RICK, .ows_ecc1
+	jump_if_event_true EVENT_BEAT_RICK, .ows_ecc1
 	print_text_quit_fully Text0765
 
 .ows_eca2
@@ -6991,7 +6991,7 @@ Script_LostToRick: ; ec9a (3:6c9a)
 
 Preload_Joseph: ; ecc4 (3:6cc4)
 	ld a, EVENT_BEAT_JOSEPH
-	call GetEventFlagValue
+	call GetEventValue
 	or a
 	jr z, .not_defeated
 	; move joseph to unblock the science master's room
@@ -7007,7 +7007,7 @@ Preload_Joseph: ; ecc4 (3:6cc4)
 Script_Joseph: ; ecdb (3:6cdb)
 	start_script
 	try_give_pc_pack $08
-	jump_if_flag_nonzero_2 EVENT_BEAT_JOSEPH, Script_LostToJoseph.ows_ed24
+	jump_if_event_true EVENT_BEAT_JOSEPH, Script_LostToJoseph.ows_ed24
 	print_npc_text Text076c
 	ask_question_jump Text076d, .ows_ecee
 	print_npc_text Text076e
@@ -7020,12 +7020,12 @@ Script_Joseph: ; ecdb (3:6cdb)
 
 Script_BeatJoseph: ; ecf6 (3:6cf6)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_JOSEPH, Script_LostToJoseph.ows_ed37
+	jump_if_event_true EVENT_BEAT_JOSEPH, Script_LostToJoseph.ows_ed37
 	print_npc_text Text0770
 	close_text_box
 	move_active_npc_by_direction NPCMovementTable_ed11
 	set_active_npc_direction WEST
-	max_out_flag_value EVENT_BEAT_JOSEPH
+	max_out_event_value EVENT_BEAT_JOSEPH
 	print_npc_text Text0771
 	give_booster_packs BOOSTER_LABORATORY_GRASS, BOOSTER_LABORATORY_GRASS, NO_BOOSTER
 	print_npc_text Text0772
@@ -7044,7 +7044,7 @@ NPCMovement_ed19: ; ed19 (3:6d19)
 
 Script_LostToJoseph: ; ed1c (3:6d1c)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_BEAT_JOSEPH, .ows_ed42
+	jump_if_event_true EVENT_BEAT_JOSEPH, .ows_ed42
 	print_text_quit_fully Text0773
 
 .ows_ed24
@@ -7128,7 +7128,7 @@ FindExtraInteractableObjects: ; ed64 (3:6d64)
 	ret
 
 Preload_JessicaInFireClubLobby: ; ed8d (3:6d8d)
-	get_flag_value EVENT_PUPIL_JESSICA_STATE
+	get_event_value EVENT_PUPIL_JESSICA_STATE
 	or a ; cp PUPIL_INACTIVE
 	ret z
 	cp PUPIL_DEFEATED
@@ -7136,10 +7136,10 @@ Preload_JessicaInFireClubLobby: ; ed8d (3:6d8d)
 
 Script_Jessica: ; ed96 (3:6d96)
 	start_script
-	jump_if_flag_not_less_than EVENT_PUPIL_JESSICA_STATE, PUPIL_DEFEATED, Script_dead
-	jump_if_flag_equal EVENT_PUPIL_JESSICA_STATE, PUPIL_ACTIVE, NULL
+	jump_if_event_greater_or_equal EVENT_PUPIL_JESSICA_STATE, PUPIL_DEFEATED, Script_dead
+	test_if_event_equal EVENT_PUPIL_JESSICA_STATE, PUPIL_ACTIVE
 	print_variable_npc_text Text068d, Text068e
-	script_set_flag_value EVENT_PUPIL_JESSICA_STATE, PUPIL_TALKED
+	set_event EVENT_PUPIL_JESSICA_STATE, PUPIL_TALKED
 	ask_question_jump Text068f, .ows_edb2
 	print_npc_text Text0690
 	quit_script_fully
@@ -7151,7 +7151,7 @@ Script_Jessica: ; ed96 (3:6d96)
 
 Script_BeatJessicaInFireClubLobby: ; edba (3:6dba)
 	start_script
-	script_set_flag_value EVENT_PUPIL_JESSICA_STATE, PUPIL_DEFEATED
+	set_event EVENT_PUPIL_JESSICA_STATE, PUPIL_DEFEATED
 	print_npc_text Text0692
 	give_booster_packs BOOSTER_COLOSSEUM_FIGHTING, BOOSTER_COLOSSEUM_FIGHTING, NO_BOOSTER
 	print_npc_text Text0693
@@ -7189,52 +7189,52 @@ NPCMovement_ede4: ; ede4 (3:6de4)
 
 Script_Chap3: ; ede8 (3:6de8)
 	start_script
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_ee1f
-	jump_if_flag_nonzero_2 EVENT_ISHIHARA_MET, .ows_edfb
-	max_out_flag_value EVENT_ISHIHARA_MENTIONED
-	max_out_flag_value EVENT_ISHIHARAS_HOUSE_MENTIONED
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADES_COMPLETE, .ows_ee1f
+	jump_if_event_true EVENT_ISHIHARA_MET, .ows_edfb
+	max_out_event_value EVENT_ISHIHARA_MENTIONED
+	max_out_event_value EVENT_ISHIHARAS_HOUSE_MENTIONED
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0695
 
 .ows_edfb
-	jump_if_flag_nonzero_2 EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_ee1c
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_ee13
-	jump_if_flag_not_less_than EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_ee0e
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_true EVENT_TEMP_TRADED_WITH_ISHIHARA, .ows_ee1c
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_3_RUMORED, .ows_ee13
+	jump_if_event_greater_or_equal EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_TRADE_2_RUMORED, .ows_ee0e
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0696
 
 .ows_ee0e
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0697
 
 .ows_ee13
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_ee1c
-	max_out_flag_value EVENT_ISHIHARA_WANTS_TO_TRADE
+	jump_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS, .ows_ee1c
+	max_out_event_value EVENT_ISHIHARA_WANTS_TO_TRADE
 	print_text_quit_fully Text0698
 
 .ows_ee1c
 	print_text_quit_fully Text0699
 
 .ows_ee1f
-	script_set_flag_value EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
+	set_event EVENT_ISHIHARA_TRADE_STATE, ISHIHARA_LEFT
 	print_text_quit_fully Text069a
 
 Preload_Lad2: ; ee25 (3:6e25)
-	get_flag_value EVENT_LAD2_STATE
+	get_event_value EVENT_LAD2_STATE
 	cp LAD2_SLOWPOKE_AVAILABLE
 	ret
 
 Script_Lad2: ; ee2c (3:6e2c)
 	start_script
 	try_give_medal_pc_packs
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 3, .ows_ee36
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 3, .ows_ee36
 	print_text_quit_fully Text069b
 
 .ows_ee36
 	print_npc_text Text069c
 	ask_question_jump Text069d, .ows_ee4a
 	print_npc_text Text069e
-	script_set_flag_value EVENT_LAD2_STATE, LAD2_SLOWPOKE_GONE
+	set_event EVENT_LAD2_STATE, LAD2_SLOWPOKE_GONE
 	close_text_box
 	move_active_npc_by_direction NPCMovementTable_ee61
 	unload_active_npc
@@ -7249,7 +7249,7 @@ Script_Lad2: ; ee2c (3:6e2c)
 	remove_all_energy_cards_from_collection
 	print_text Text06a0
 	print_npc_text Text06a1
-	script_set_flag_value EVENT_LAD2_STATE, LAD2_SLOWPOKE_AVAILABLE
+	set_event EVENT_LAD2_STATE, LAD2_SLOWPOKE_AVAILABLE
 	close_text_box
 	move_active_npc_by_direction NPCMovementTable_ee61
 	unload_active_npc
@@ -7279,11 +7279,11 @@ NPCMovement_ee72: ; ee72 (3:6e72)
 
 Script_ee76: ; ee76 (3:6e76)
 	start_script
-	jump_if_flag_equal EVENT_LAD2_STATE, LAD2_SLOWPOKE_AVAILABLE, .ows_ee7d
+	jump_if_event_equal EVENT_LAD2_STATE, LAD2_SLOWPOKE_AVAILABLE, .ows_ee7d
 	quit_script_fully
 
 .ows_ee7d
-	script_set_flag_value EVENT_LAD2_STATE, LAD2_SLOWPOKE_GONE
+	set_event EVENT_LAD2_STATE, LAD2_SLOWPOKE_GONE
 	print_text FoundLv9SlowpokeText
 	give_card SLOWPOKE1
 	show_card_received_screen SLOWPOKE1
@@ -7291,7 +7291,7 @@ Script_ee76: ; ee76 (3:6e76)
 
 Script_Mania: ; ee88 (3:6e88)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text06a3, Text06a4
 	quit_script_fully
 
@@ -7394,19 +7394,19 @@ Script_LostToJonathan: ; ef1e (3:6f1e)
 Script_Ken: ; ef22 (3:6f22)
 	start_script
 	try_give_pc_pack $09
-	jump_if_flag_nonzero_2 EVENT_KEN_HAD_ENOUGH_CARDS, .have_300_cards
+	jump_if_event_true EVENT_KEN_HAD_ENOUGH_CARDS, .have_300_cards
 	jump_if_enough_cards_owned 300, .have_300_cards
-	jump_if_flag_zero_1 EVENT_KEN_TALKED, NULL
+	test_if_event_zero EVENT_KEN_TALKED
 	print_variable_npc_text Text06ba, Text06bb
-	script_set_flag_value EVENT_KEN_TALKED, TRUE
+	set_event EVENT_KEN_TALKED, TRUE
 	quit_script_fully
 
 .have_300_cards
-	max_out_flag_value EVENT_KEN_HAD_ENOUGH_CARDS
-	jump_if_flag_nonzero_2 EVENT_BEAT_KEN, Script_Ken_AlreadyHaveMedal
-	jump_if_flag_zero_1 EVENT_KEN_TALKED, NULL
+	max_out_event_value EVENT_KEN_HAD_ENOUGH_CARDS
+	jump_if_event_true EVENT_BEAT_KEN, Script_Ken_AlreadyHaveMedal
+	test_if_event_zero EVENT_KEN_TALKED
 	print_variable_npc_text Text06bc, Text06bd
-	script_set_flag_value EVENT_KEN_TALKED, TRUE
+	set_event EVENT_KEN_TALKED, TRUE
 	ask_question_jump Text06be, .start_duel
 	print_npc_text Text06bf
 	quit_script_fully
@@ -7419,8 +7419,8 @@ Script_Ken: ; ef22 (3:6f22)
 Script_BeatKen: ; ef5e (3:6f5e)
 	start_script
 	print_npc_text Text06c1
-	jump_if_flag_nonzero_2 EVENT_BEAT_KEN, .give_booster_packs
-	max_out_flag_value EVENT_BEAT_KEN
+	jump_if_event_true EVENT_BEAT_KEN, .give_booster_packs
+	max_out_event_value EVENT_BEAT_KEN
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_KEN
 	record_master_win $08
@@ -7432,7 +7432,7 @@ Script_BeatKen: ; ef5e (3:6f5e)
 
 Script_LostToKen: ; ef78 (3:6f78)
 	start_script
-	jump_if_flag_zero_2 EVENT_BEAT_KEN, NULL
+	test_if_event_false EVENT_BEAT_KEN
 	print_variable_npc_text Text06c4, Text06c5
 	quit_script_fully
 
@@ -7448,11 +7448,11 @@ Script_Ken_AlreadyHaveMedal: ; ef83 (3:6f83)
 
 Preload_Clerk9: ; ef96 (3:6f96)
 	call TryGiveMedalPCPacks
-	get_flag_value EVENT_MEDAL_COUNT
+	get_event_value EVENT_MEDAL_COUNT
 	ld hl, .jump_table
 	cp 9
 	jp c, JumpToFunctionInTable
-	debug_ret
+	debug_nop
 	jr .less_than_three_medals
 
 .jump_table
@@ -7467,30 +7467,30 @@ Preload_Clerk9: ; ef96 (3:6f96)
 	dw .more_than_five_medals
 
 .three_medals
-	get_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	get_event_value EVENT_CHALLENGE_CUP_1_STATE
 	or a ; cp CHALLENGE_CUP_NOT_STARTED
 	jr nz, .less_than_three_medals
 	ld c, CHALLENGE_CUP_READY_TO_START
-	set_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_value EVENT_CHALLENGE_CUP_1_STATE
 	jr .less_than_three_medals
 
 .five_medals
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	or a ; cp CHALLENGE_CUP_NOT_STARTED
 	jr nz, .four_medals
 	ld c, CHALLENGE_CUP_READY_TO_START
-	set_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	set_event_value EVENT_CHALLENGE_CUP_2_STATE
 	jr .four_medals
 
 .more_than_five_medals
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	set_event_value EVENT_CHALLENGE_CUP_2_STATE
 .four_medals
 	ld c, CHALLENGE_CUP_OVER
-	set_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_value EVENT_CHALLENGE_CUP_1_STATE
 .less_than_three_medals
-	zero_flag_value EVENT_CHALLENGE_CUP_STARTING
-	get_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	set_event_false EVENT_CHALLENGE_CUP_STARTING
+	get_event_value EVENT_CHALLENGE_CUP_1_STATE
 	cp CHALLENGE_CUP_NOT_STARTED
 	jr z, .check_challenge_cup_two
 	cp CHALLENGE_CUP_OVER
@@ -7499,7 +7499,7 @@ Preload_Clerk9: ; ef96 (3:6f96)
 	jr .start_challenge_cup
 
 .check_challenge_cup_two
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	cp CHALLENGE_CUP_NOT_STARTED
 	jr z, .check_challenge_cup_three
 	cp CHALLENGE_CUP_OVER
@@ -7508,36 +7508,36 @@ Preload_Clerk9: ; ef96 (3:6f96)
 	jr .start_challenge_cup
 
 .check_challenge_cup_three
-	get_flag_value EVENT_CHALLENGE_CUP_3_STATE
+	get_event_value EVENT_CHALLENGE_CUP_3_STATE
 	cp CHALLENGE_CUP_NOT_STARTED
 	jr z, .no_challenge_cup
 	cp CHALLENGE_CUP_OVER
 	jr z, .no_challenge_cup
 	ld c, 3
 .start_challenge_cup
-	set_flag_value EVENT_CHALLENGE_CUP_NUMBER
-	max_flag_value EVENT_CHALLENGE_CUP_STARTING
+	set_event_value EVENT_CHALLENGE_CUP_NUMBER
+	max_event_value EVENT_CHALLENGE_CUP_STARTING
 	ld a, MUSIC_CHALLENGE_HALL
-	ld [wd111], a
+	ld [wDefaultSong], a
 .no_challenge_cup
 	scf
 	ret
 
 Script_Clerk9: ; f025 (3:7025)
 	start_script
-	jump_if_flag_zero_1 EVENT_CHALLENGE_CUP_1_STATE, .ows_f066
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_OVER, .ows_f069
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST, .ows_f06f
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON, .ows_f072
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_OVER, .ows_f069
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST, .ows_f06f
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON, .ows_f072
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_OVER, .ows_f069
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST, .ows_f06f
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON, .ows_f072
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
+	jump_if_event_zero EVENT_CHALLENGE_CUP_1_STATE, .ows_f066
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_OVER, .ows_f069
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST, .ows_f06f
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON, .ows_f072
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_OVER, .ows_f069
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST, .ows_f06f
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON, .ows_f072
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_OVER, .ows_f069
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST, .ows_f06f
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON, .ows_f072
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
 .ows_f066
 	print_text_quit_fully Text050a
 
@@ -7559,17 +7559,17 @@ Preload_ChallengeHallNPCs2: ; f075 (3:7075)
 	ret
 
 Preload_ChallengeHallNPCs1: ; f07a (3:707a)
-	get_flag_value EVENT_CHALLENGE_CUP_STARTING
+	get_event_value EVENT_CHALLENGE_CUP_STARTING
 	or a
 	jr z, .quit
 	ld a, MUSIC_CHALLENGE_HALL
-	ld [wd111], a
+	ld [wDefaultSong], a
 	scf
 .quit
 	ret
 
 ChallengeHallLobbyLoadMap: ; f088 (3:7088)
-	get_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
+	get_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
 	or a
 	ret z
 	ld a, NPC_RONALD1
@@ -7603,20 +7603,20 @@ Script_Chap5: ; f0b0 (3:70b0)
 	print_text_quit_fully Text0514
 
 Preload_ChallengeHallLobbyRonald1: ; f0b4 (3:70b4)
-	zero_flag_value2 EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	set_event_zero EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	jr nz, .challenge_cup_2_ended
-	get_flag_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
+	get_event_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
 	or a
 	jr nz, .dont_load
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	cp CHALLENGE_CUP_NOT_STARTED
 	jr z, .check_challenge_cup_1
 	call .challenge_cup_1_ended
-	get_flag_value EVENT_CHALLENGE_CUP_2_STATE
+	get_event_value EVENT_CHALLENGE_CUP_2_STATE
 	ld e, a
-	get_flag_value EVENT_CHALLENGE_CUP_2_RESULT
+	get_event_value EVENT_CHALLENGE_CUP_2_RESULT
 	ld d, a
 	ld hl, RonaldChallengeHallLobbyCup2States
 	call SetRonaldChallengeHallLobbyState
@@ -7624,9 +7624,9 @@ Preload_ChallengeHallLobbyRonald1: ; f0b4 (3:70b4)
 	jr .load_ronald
 
 .check_challenge_cup_1
-	get_flag_value EVENT_CHALLENGE_CUP_1_STATE
+	get_event_value EVENT_CHALLENGE_CUP_1_STATE
 	ld e, a
-	get_flag_value EVENT_CHALLENGE_CUP_1_RESULT
+	get_event_value EVENT_CHALLENGE_CUP_1_RESULT
 	ld d, a
 	ld hl, RonaldChallengeHallLobbyCup1States
 	call SetRonaldChallengeHallLobbyState
@@ -7638,15 +7638,15 @@ Preload_ChallengeHallLobbyRonald1: ; f0b4 (3:70b4)
 	ret
 
 .challenge_cup_2_ended
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_5
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_7
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_8
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_5
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_7
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_8
 .challenge_cup_1_ended
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_1
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_3
-	max_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_4
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_1
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_3
+	max_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_4
 .dont_load
 	or a
 	ret
@@ -7661,14 +7661,14 @@ SetRonaldChallengeHallLobbyState: ; f121 (3:7121)
 	cp d
 	jr nz, .next
 	ld a, [hl]
-	call GetEventFlagValue
+	call GetEventValue
 	or a
 	jr nz, .next
 	ld a, [hl]
-	call MaxOutEventFlag
+	call MaxOutEventValue
 	inc hl
 	ld c, [hl]
-	set_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
+	set_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
 	scf
 	ret
 
@@ -7701,14 +7701,14 @@ RonaldChallengeHallLobbyCup2States: ; f156 (3:7156)
 Script_f166: ; f166 (3:7166)
 	start_script
 	move_active_npc NPCMovement_f232
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 1, .ows_f192
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 2, .ows_f1a5
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 3, .ows_f1b8
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 4, .ows_f1cb
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 5, .ows_f1de
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 6, .ows_f1f1
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 7, .ows_f204
-	jump_if_flag_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 8, .ows_f217
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 1, .ows_f192
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 2, .ows_f1a5
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 3, .ows_f1b8
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 4, .ows_f1cb
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 5, .ows_f1de
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 6, .ows_f1f1
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 7, .ows_f204
+	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 8, .ows_f217
 .ows_f192
 	print_npc_text Text0515
 	close_text_box
@@ -7818,7 +7818,7 @@ ChallengeHallAfterDuelTable:
 	dw Script_LostAtChallengeHall
 
 ChallengeHallLoadMap: ; f258 (3:7258)
-	get_flag_value EVENT_CHALLENGE_CUP_IN_MENU
+	get_event_value EVENT_CHALLENGE_CUP_IN_MENU
 	or a
 	ret z
 	ld a, NPC_HOST
@@ -7832,7 +7832,7 @@ Script_Clerk13: ; f26c (3:726c)
 	print_text_quit_fully Text0525
 
 Preload_Guide: ; f270 (3:7270)
-	get_flag_value EVENT_CHALLENGE_CUP_STARTING
+	get_event_value EVENT_CHALLENGE_CUP_STARTING
 	or a
 	jr z, .asm_f281
 	ld a, $1c
@@ -7845,11 +7845,11 @@ Preload_Guide: ; f270 (3:7270)
 
 Script_Guide: ; f283 (3:7283)
 	start_script
-	jump_if_flag_zero_2 EVENT_CHALLENGE_CUP_STARTING, .ows_f28b
+	jump_if_event_false EVENT_CHALLENGE_CUP_STARTING, .ows_f28b
 	print_text_quit_fully Text0526
 
 .ows_f28b
-	jump_if_flag_zero_1 EVENT_CHALLENGE_CUP_1_STATE, .ows_f292
+	jump_if_event_zero EVENT_CHALLENGE_CUP_1_STATE, .ows_f292
 	print_text_quit_fully Text0527
 
 .ows_f292
@@ -7857,14 +7857,14 @@ Script_Guide: ; f283 (3:7283)
 
 Script_Clerk12: ; f295 (3:7295)
 	start_script
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON, .ows_f2c1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON, .ows_f2c1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON, .ows_f2c1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f2cd
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f2d3
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
+	jump_if_event_equal EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON, .ows_f2c1
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
+	jump_if_event_equal EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON, .ows_f2c1
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST, .ows_f2c4
+	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON, .ows_f2c1
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f2cd
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f2d3
 	script_jump .ows_f2c7
 
 .ows_f2c1
@@ -7889,7 +7889,7 @@ Script_Clerk12: ; f295 (3:7295)
 	print_text_quit_fully Text0530
 
 .ows_f2e1
-	max_out_flag_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
+	max_out_event_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
 	print_npc_text Text0531
 	close_text_box
 	move_active_npc NPCMovement_f349
@@ -7913,8 +7913,8 @@ Script_Clerk12: ; f295 (3:7295)
 	move_player NORTH, 1
 	move_player NORTH, 1
 	move_player NORTH, 1
-	jump_if_flag_nonzero_2 EVENT_CHALLENGE_CUP_STAGE_VISITED, .ows_f33a
-	max_out_flag_value EVENT_CHALLENGE_CUP_STAGE_VISITED
+	jump_if_event_true EVENT_CHALLENGE_CUP_STAGE_VISITED, .ows_f33a
+	max_out_event_value EVENT_CHALLENGE_CUP_STAGE_VISITED
 	move_player NORTH, 1
 	move_player NORTH, 1
 	set_player_direction EAST
@@ -8012,8 +8012,8 @@ Script_LostAtChallengeHall: ; f392 (3:7392)
 	move_active_npc NPCMovement_f37d
 	do_frames 20
 	move_active_npc NPCMovement_f390
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, Script_f410
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 3, Script_f410.ows_f41a
+	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, Script_f410
+	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 3, Script_f410.ows_f41a
 	load_challenge_hall_npc_into_txram_slot 0
 	load_challenge_hall_npc_into_txram_slot 1
 	print_npc_text Text0536
@@ -8023,22 +8023,22 @@ Script_LostAtChallengeHall: ; f392 (3:7392)
 	print_npc_text Text0537
 	close_text_box
 	move_active_npc NPCMovement_f38e
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f3ce
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f3d9
-	script_set_flag_value EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST
-	script_set_flag_value EVENT_CHALLENGE_CUP_1_RESULT, CHALLENGE_CUP_LOST
-	zero_out_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f3ce
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f3d9
+	set_event EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_LOST
+	set_event EVENT_CHALLENGE_CUP_1_RESULT, CHALLENGE_CUP_LOST
+	zero_out_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_2
 	script_jump .ows_f3e2
 
 .ows_f3ce
-	script_set_flag_value EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST
-	script_set_flag_value EVENT_CHALLENGE_CUP_2_RESULT, CHALLENGE_CUP_LOST
-	zero_out_flag_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
+	set_event EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_LOST
+	set_event EVENT_CHALLENGE_CUP_2_RESULT, CHALLENGE_CUP_LOST
+	zero_out_event_value EVENT_RONALD_CHALLENGE_HALL_LOBBY_CONVO_6
 	script_jump .ows_f3e2
 
 .ows_f3d9
-	script_set_flag_value EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST
-	script_set_flag_value EVENT_CHALLENGE_CUP_3_RESULT, CHALLENGE_CUP_LOST
+	set_event EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_LOST
+	set_event EVENT_CHALLENGE_CUP_3_RESULT, CHALLENGE_CUP_LOST
 	script_jump .ows_f3e2
 
 .ows_f3e2
@@ -8081,8 +8081,8 @@ Script_f410: ; f410 (3:7410)
 .ows_f41a
 	print_npc_text Text0539
 	set_dialog_npc NPC_RONALD1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f42e
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 1, NULL
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f42e
+	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
 	print_variable_npc_text Text053a, Text053b
 .ows_f42e
 	set_dialog_npc NPC_HOST
@@ -8102,10 +8102,10 @@ Script_WonAtChallengeHall: ; f441 (3:7441)
 	move_active_npc NPCMovement_f37d
 	do_frames 20
 	move_active_npc NPCMovement_f390
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 3, Script_f4db
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f456
+	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 3, Script_f4db
+	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f456
 .ows_f456
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 1, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 1
 	print_variable_npc_text Text053c, Text053d
 	move_active_npc NPCMovement_f37f
 	load_challenge_hall_npc_into_txram_slot 0
@@ -8119,24 +8119,24 @@ Script_WonAtChallengeHall: ; f441 (3:7441)
 	set_challenge_hall_npc_coords 20, 20
 	move_challenge_hall_npc NPCMovement_f4d0
 	load_challenge_hall_npc_into_txram_slot 0
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2
 	print_variable_npc_text Text0540, Text0541
 	move_active_npc NPCMovement_f383
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f4a4
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f4a1
+	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f4a4
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f4a1
 	close_text_box
 	set_dialog_npc NPC_RONALD1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 1, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
 	print_variable_npc_text Text0542, Text0543
 	set_dialog_npc NPC_HOST
 	close_text_box
 .ows_f4a1
 	print_npc_text Text0544
 .ows_f4a4
-	zero_out_flag_value EVENT_CHALLENGE_CUP_IN_MENU
+	zero_out_event_value EVENT_CHALLENGE_CUP_IN_MENU
 	print_npc_text Text0545
 	ask_question_jump_default_yes Text0546, .ows_f4bd
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2
 	print_variable_npc_text Text0547, Text0548
 	start_challenge_hall_duel PRIZES_4, SAMS_PRACTICE_DECK_ID, MUSIC_STOP
 	quit_script_fully
@@ -8144,7 +8144,7 @@ Script_WonAtChallengeHall: ; f441 (3:7441)
 .ows_f4bd
 	print_npc_text Text0549
 	close_text_box
-	max_out_flag_value EVENT_CHALLENGE_CUP_IN_MENU
+	max_out_event_value EVENT_CHALLENGE_CUP_IN_MENU
 	open_menu
 	close_text_box
 	script_jump .ows_f4a4
@@ -8181,14 +8181,14 @@ Script_f4db: ; f4db (3:74db)
 	load_challenge_hall_npc_into_txram_slot 0
 	print_npc_text Text054b
 	close_text_box
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f513
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f513
 	set_dialog_npc NPC_RONALD1
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 1, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
 	print_variable_npc_text Text054c, Text054d
 	move_challenge_hall_npc NPCMovement_f4d8
 	do_frames 40
 	move_challenge_hall_npc NPCMovement_f34c
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 1, NULL
+	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
 	print_variable_npc_text Text054e, Text054f
 	set_dialog_npc NPC_HOST
 	close_text_box
@@ -8209,20 +8209,20 @@ Script_f4db: ; f4db (3:74db)
 	show_card_received_screen VARIABLE_CARD
 	print_npc_text Text0552
 	close_text_box
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f540
-	jump_if_flag_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f549
-	script_set_flag_value EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON
-	script_set_flag_value EVENT_CHALLENGE_CUP_1_RESULT, CHALLENGE_CUP_WON
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f540
+	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f549
+	set_event EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON
+	set_event EVENT_CHALLENGE_CUP_1_RESULT, CHALLENGE_CUP_WON
 	script_jump .ows_f552
 
 .ows_f540
-	script_set_flag_value EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON
-	script_set_flag_value EVENT_CHALLENGE_CUP_2_RESULT, CHALLENGE_CUP_WON
+	set_event EVENT_CHALLENGE_CUP_2_STATE, CHALLENGE_CUP_WON
+	set_event EVENT_CHALLENGE_CUP_2_RESULT, CHALLENGE_CUP_WON
 	script_jump .ows_f552
 
 .ows_f549
-	script_set_flag_value EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON
-	script_set_flag_value EVENT_CHALLENGE_CUP_3_RESULT, CHALLENGE_CUP_WON
+	set_event EVENT_CHALLENGE_CUP_3_STATE, CHALLENGE_CUP_WON
+	set_event EVENT_CHALLENGE_CUP_3_RESULT, CHALLENGE_CUP_WON
 	script_jump .ows_f552
 
 .ows_f552
@@ -8233,13 +8233,13 @@ Script_f4db: ; f4db (3:74db)
 
 ; Loads the NPC to fight at the challenge hall
 Preload_ChallengeHallOpponent: ; f559 (3:7559)
-	get_flag_value EVENT_CHALLENGE_CUP_STARTING
+	get_event_value EVENT_CHALLENGE_CUP_STARTING
 	or a
 	ret z
-	get_flag_value EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
+	get_event_value EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
 	or a
 	jr z, .asm_f56e
-	ld a, [wd696]
+	ld a, [wChallengeHallNPC]
 	ld [wTempNPC], a
 	scf
 	ret
@@ -8247,17 +8247,17 @@ Preload_ChallengeHallOpponent: ; f559 (3:7559)
 .asm_f56e
 	call Func_f5db
 	ld c, 1
-	set_flag_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
+	set_event_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
 	call Func_f580
-	max_flag_value EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
+	max_event_value EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
 	scf
 	ret
 
 Func_f580: ; f580 (3:7580)
-	get_flag_value EVENT_CHALLENGE_CUP_NUMBER
+	get_event_value EVENT_CHALLENGE_CUP_NUMBER
 	cp 3
 	jr z, .pick_challenger_include_ronald
-	get_flag_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
+	get_event_value EVENT_CHALLENGE_CUP_OPPONENT_NUMBER
 	cp 3
 	ld d, ChallengeHallNPCs.end - ChallengeHallNPCs - 1 ; discount Ronald
 	jr nz, .pick_challenger
@@ -8281,7 +8281,7 @@ Func_f580: ; f580 (3:7580)
 
 .force_ronald
 	ld [wTempNPC], a
-	ld [wd696], a
+	ld [wChallengeHallNPC], a
 	ret
 
 ChallengeHallNPCs: ; f5b3 (3:75b3)
@@ -8356,20 +8356,20 @@ Func_f5e9: ; f5e9 (3:75e9)
 	ret
 
 Func_f602: ; f602 (3:7602)
-	zero_flag_value EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
+	set_event_false EVENT_CHALLENGE_CUP_OPPONENT_CHOSEN
 	ret
 
 PokemonDomeEntranceLoadMap: ; f607 (3:7607)
-	zero_flag_value EVENT_HALL_OF_HONOR_DOORS_OPEN
-	zero_flag_value2 EVENT_POKEMON_DOME_STATE
-	zero_flag_value2 EVENT_COURTNEY_STATE
-	zero_flag_value2 EVENT_STEVE_STATE
-	zero_flag_value2 EVENT_JACK_STATE
-	zero_flag_value2 EVENT_ROD_STATE
-	get_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	set_event_false EVENT_HALL_OF_HONOR_DOORS_OPEN
+	set_event_zero EVENT_POKEMON_DOME_STATE
+	set_event_zero EVENT_COURTNEY_STATE
+	set_event_zero EVENT_STEVE_STATE
+	set_event_zero EVENT_JACK_STATE
+	set_event_zero EVENT_ROD_STATE
+	get_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	or a
 	ret nz
-	zero_flag_value2 EVENT_RONALD_POKEMON_DOME_STATE
+	set_event_zero EVENT_RONALD_POKEMON_DOME_STATE
 	ret
 
 PokemonDomeEntranceCloseTextBox: ; f62a (3:762a)
@@ -8387,7 +8387,7 @@ Script_f631: ; f631 (3:7631)
 
 .ows_f63c
 	call TryGiveMedalPCPacks
-	get_flag_value EVENT_MEDAL_COUNT
+	get_event_value EVENT_MEDAL_COUNT
 	ld [wTxRam3], a
 	inc a
 	ld [wTxRam3_b], a
@@ -8396,11 +8396,11 @@ Script_f631: ; f631 (3:7631)
 	ld [wTxRam3_b + 1], a
 
 	start_script
-	jump_if_flag_not_less_than EVENT_MEDAL_COUNT, 7, .ows_f69b
-	jump_if_flag_zero_2 EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER, .ows_f69b
-	jump_if_flag_nonzero_2 EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER, .ows_f69b
+	jump_if_event_greater_or_equal EVENT_MEDAL_COUNT, 7, .ows_f69b
+	jump_if_event_false EVENT_RONALD_FIRST_CLUB_ENTRANCE_ENCOUNTER, .ows_f69b
+	jump_if_event_true EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER, .ows_f69b
 	override_song MUSIC_RONALD
-	max_out_flag_value EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER
+	max_out_event_value EVENT_RONALD_POKEMON_DOME_ENTRANCE_ENCOUNTER
 	jump_if_player_coords_match 18, 2, .ows_f66e
 	move_active_npc NPCMovement_f69c
 	script_jump .ows_f671
@@ -8418,7 +8418,7 @@ Script_f631: ; f631 (3:7631)
 	script_jump .ows_f695
 
 .ows_f688
-	jump_if_flag_zero_1 EVENT_MEDAL_COUNT, .ows_f692
+	jump_if_event_zero EVENT_MEDAL_COUNT, .ows_f692
 	print_npc_text Text0556
 	script_jump .ows_f695
 
@@ -8459,7 +8459,7 @@ NPCMovement_f6a6: ; f6a6 (3:76a6)
 Script_f6af: ; f6af (3:76af)
 	start_script
 	try_give_medal_pc_packs
-	jump_if_flag_equal EVENT_MEDAL_COUNT, 8, .ows_f6b9
+	jump_if_event_equal EVENT_MEDAL_COUNT, 8, .ows_f6b9
 	print_text_quit_fully Text0558
 
 .ows_f6b9
@@ -8519,7 +8519,7 @@ PokemonDomeAfterDuel: ; f6e0 (3:76e0)
 PokemonDomeLoadMap: ; f706 (3:7706)
 	ld a, $0d
 	farcall TryGivePCPack
-	get_flag_value EVENT_POKEMON_DOME_IN_MENU
+	get_event_value EVENT_POKEMON_DOME_IN_MENU
 	or a
 	ret z
 	ld bc, Script_f80b
@@ -8532,36 +8532,36 @@ PokemonDomeCloseTextBox: ; f718 (3:7718)
 
 Script_Courtney: ; f71f (3:771f)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text055a, Text055b
 	quit_script_fully
 
 Script_Steve: ; f72a (3:772a)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text055c, Text055d
 	quit_script_fully
 
 Script_Jack: ; f735 (3:7735)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text055e, Text055f
 	quit_script_fully
 
 Script_Rod: ; f740 (3:7740)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0560, Text0561
 	quit_script_fully
 
 Preload_Courtney: ; f74b (3:774b)
-	get_flag_value EVENT_COURTNEY_STATE
+	get_event_value EVENT_COURTNEY_STATE
 	cp COURTNEY_CHALLENGED
-	jr z, Func_f76c
+	jr z, PlacePokemonDomeOpponentAtDuelTable
 	lb bc, $16, $0c
 	cp COURTNEY_DEFEATED
 	jr z, Func_f77d
-	get_flag_value EVENT_CHALLENGED_GRAND_MASTERS
+	get_event_value EVENT_CHALLENGED_GRAND_MASTERS
 	jr nz, Func_f762
 	scf
 	ret
@@ -8573,7 +8573,7 @@ Func_f762: ; f762 (3:7762)
 	scf
 	ret
 
-Func_f76c: ; f76c (3:776c)
+PlacePokemonDomeOpponentAtDuelTable: ; f76c (3:776c)
 	ld a, $12
 	ld [wLoadNPCXPos], a
 	ld a, $0e
@@ -8595,34 +8595,34 @@ Func_f782: ; f782 (3:7782)
 	ret
 
 Preload_Steve: ; f78c (3:778c)
-	get_flag_value EVENT_STEVE_STATE
+	get_event_value EVENT_STEVE_STATE
 	cp STEVE_CHALLENGED
-	jr z, Func_f76c
+	jr z, PlacePokemonDomeOpponentAtDuelTable
 	lb bc, $16, $0e
 	cp STEVE_DEFEATED
 	jr z, Func_f77d
-	get_flag_value EVENT_CHALLENGED_GRAND_MASTERS
+	get_event_value EVENT_CHALLENGED_GRAND_MASTERS
 	jr nz, Func_f762
 	scf
 	ret
 
 Preload_Jack: ; f7a3 (3:77a3)
-	get_flag_value EVENT_JACK_STATE
+	get_event_value EVENT_JACK_STATE
 	cp JACK_CHALLENGED
-	jr z, Func_f76c
+	jr z, PlacePokemonDomeOpponentAtDuelTable
 	lb bc, $14, $0a
 	cp JACK_DEFEATED
 	jr z, Func_f77d
-	get_flag_value EVENT_CHALLENGED_GRAND_MASTERS
+	get_event_value EVENT_CHALLENGED_GRAND_MASTERS
 	jr nz, Func_f762
 	scf
 	ret
 
 Preload_Rod: ; f7ba (3:77ba)
-	get_flag_value EVENT_ROD_STATE
+	get_event_value EVENT_ROD_STATE
 	cp ROD_CHALLENGED
-	jr z, Func_f76c
-	get_flag_value EVENT_POKEMON_DOME_STATE
+	jr z, PlacePokemonDomeOpponentAtDuelTable
+	get_event_value EVENT_POKEMON_DOME_STATE
 	lb bc, $10, $0a
 	cp POKEMON_DOME_DEFEATED
 	jr z, Func_f782
@@ -8633,21 +8633,21 @@ Preload_Rod: ; f7ba (3:77ba)
 	ret
 
 Preload_Ronald1InPokemonDome: ; f7d6 (3:77d6)
-	get_flag_value EVENT_RONALD_POKEMON_DOME_STATE
+	get_event_value EVENT_RONALD_POKEMON_DOME_STATE
 	cp RONALD_DEFEATED
 	ret nc
-	get_flag_value EVENT_RONALD_POKEMON_DOME_STATE
+	get_event_value EVENT_RONALD_POKEMON_DOME_STATE
 	or a
 	jr z, .not_challenged
 	ld a, MUSIC_RONALD
-	ld [wd111], a
-	jr Func_f76c
+	ld [wDefaultSong], a
+	jr PlacePokemonDomeOpponentAtDuelTable
 .not_challenged
 	scf
 	ret
 
 Script_f7ed: ; f7ed (3:77ed)
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_f7f9
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_f7f9
 	print_npc_text Text0562
 .ows_f7f4
 	close_text_box
@@ -8665,10 +8665,10 @@ Script_f7ed: ; f7ed (3:77ed)
 
 Script_f80b: ; f80b (3:780b)
 	start_script
-	jump_if_flag_equal EVENT_STEVE_STATE, STEVE_CHALLENGED, .ows_f820
-	jump_if_flag_equal EVENT_JACK_STATE, JACK_CHALLENGED, .ows_f82b
-	jump_if_flag_equal EVENT_ROD_STATE, ROD_CHALLENGED, .ows_f836
-	jump_if_flag_equal EVENT_RONALD_POKEMON_DOME_STATE, RONALD_CHALLENGED, .ows_f841
+	jump_if_event_equal EVENT_STEVE_STATE, STEVE_CHALLENGED, .ows_f820
+	jump_if_event_equal EVENT_JACK_STATE, JACK_CHALLENGED, .ows_f82b
+	jump_if_event_equal EVENT_ROD_STATE, ROD_CHALLENGED, .ows_f836
+	jump_if_event_equal EVENT_RONALD_POKEMON_DOME_STATE, RONALD_CHALLENGED, .ows_f841
 .ows_f820
 	close_advanced_text_box
 	set_next_npc_and_script NPC_STEVE, .ows_f827
@@ -8711,7 +8711,7 @@ Script_f80b: ; f80b (3:780b)
 
 Script_f84c: ; f84c (3:784c)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_HALL_OF_HONOR_DOORS_OPEN, Script_f7ed
+	jump_if_event_true EVENT_HALL_OF_HONOR_DOORS_OPEN, Script_f7ed
 	print_npc_text Text0565
 	ask_question_jump Text0566, .ows_f85f
 	print_npc_text Text0567
@@ -8739,10 +8739,10 @@ Script_f84c: ; f84c (3:784c)
 	move_player EAST, 1
 	move_player EAST, 1
 	set_player_direction NORTH
-	jump_if_flag_zero_2 EVENT_CHALLENGED_GRAND_MASTERS, NULL
+	test_if_event_false EVENT_CHALLENGED_GRAND_MASTERS
 	print_variable_npc_text Text0569, Text056a
 	move_active_npc NPCMovement_fb8c
-	jump_if_flag_nonzero_2 EVENT_CHALLENGED_GRAND_MASTERS, .ows_f8ef
+	jump_if_event_true EVENT_CHALLENGED_GRAND_MASTERS, .ows_f8ef
 	print_npc_text Text056b
 	close_advanced_text_box
 	set_next_npc_and_script NPC_COURTNEY, .ows_f8af
@@ -8791,12 +8791,12 @@ Script_f84c: ; f84c (3:784c)
 
 .ows_f8e6
 	start_script
-	max_out_flag_value EVENT_CHALLENGED_GRAND_MASTERS
+	max_out_event_value EVENT_CHALLENGED_GRAND_MASTERS
 	print_npc_text Text056e
 	script_jump .ows_f8f8
 
 .ows_f8ef
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text056f, Text0570
 .ows_f8f8
 	print_npc_text Text0571
@@ -8808,7 +8808,7 @@ Script_f84c: ; f84c (3:784c)
 	move_player SOUTH, 1
 	set_player_direction EAST
 	move_active_npc NPCMovement_fb8d
-	script_set_flag_value EVENT_POKEMON_DOME_STATE, POKEMON_DOME_CHALLENGED
+	set_event EVENT_POKEMON_DOME_STATE, POKEMON_DOME_CHALLENGED
 	close_advanced_text_box
 	set_next_npc_and_script NPC_COURTNEY, .ows_f918
 	end_script
@@ -8817,22 +8817,22 @@ Script_f84c: ; f84c (3:784c)
 .ows_f918
 	start_script
 	try_give_pc_pack $0e
-	script_set_flag_value EVENT_COURTNEY_STATE, COURTNEY_CHALLENGED
+	set_event EVENT_COURTNEY_STATE, COURTNEY_CHALLENGED
 	set_dialog_npc NPC_ROD
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0572, Text0573
 	close_text_box
 	set_dialog_npc NPC_COURTNEY
 	move_active_npc NPCMovement_fba6
 	set_active_npc_direction WEST
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0574, Text0575
 	start_duel PRIZES_6, LEGENDARY_MOLTRES_DECK_ID, MUSIC_DUEL_THEME_3
 	quit_script_fully
 
 Script_LostToCourtney: ; f93f (3:793f)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0576, Text0577
 	close_advanced_text_box
 	set_next_npc_and_script NPC_ROD, .ows_f950
@@ -8847,8 +8847,8 @@ Script_LostToCourtney: ; f93f (3:793f)
 
 Script_BeatCourtney: ; f95a (3:795a)
 	start_script
-	script_set_flag_value EVENT_COURTNEY_STATE, COURTNEY_DEFEATED
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	set_event EVENT_COURTNEY_STATE, COURTNEY_DEFEATED
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0579, Text057a
 	close_text_box
 	move_active_npc NPCMovement_fbb7
@@ -8861,18 +8861,18 @@ Script_BeatCourtney: ; f95a (3:795a)
 .ows_f974
 	start_script
 	try_give_pc_pack $0f
-	script_set_flag_value EVENT_STEVE_STATE, STEVE_CHALLENGED
+	set_event EVENT_STEVE_STATE, STEVE_CHALLENGED
 	set_dialog_npc NPC_ROD
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text057b, Text057c
 	close_text_box
 	set_dialog_npc NPC_STEVE
 	move_active_npc NPCMovement_fba4
 	set_active_npc_direction WEST
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text057d, Text057e
 .ows_f996
-	zero_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	zero_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	set_dialog_npc NPC_ROD
 	print_npc_text Text057f
 	ask_question_jump_default_yes Text0580, .ows_f9af
@@ -8884,14 +8884,14 @@ Script_BeatCourtney: ; f95a (3:795a)
 
 .ows_f9af
 	close_text_box
-	max_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	max_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	open_menu
 	close_text_box
 	script_jump .ows_f996
 
 Script_LostToSteve: ; f9b7 (3:79b7)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0583, Text0584
 	close_advanced_text_box
 	set_next_npc_and_script NPC_ROD, Script_LostToCourtney.ows_f950
@@ -8900,8 +8900,8 @@ Script_LostToSteve: ; f9b7 (3:79b7)
 
 Script_BeatSteve: ; f9c8 (3:79c8)
 	start_script
-	script_set_flag_value EVENT_STEVE_STATE, STEVE_DEFEATED
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	set_event EVENT_STEVE_STATE, STEVE_DEFEATED
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0585, Text0586
 	close_text_box
 	move_active_npc NPCMovement_fbb8
@@ -8913,18 +8913,18 @@ Script_BeatSteve: ; f9c8 (3:79c8)
 
 .ows_f9e2
 	start_script
-	script_set_flag_value EVENT_JACK_STATE, JACK_CHALLENGED
+	set_event EVENT_JACK_STATE, JACK_CHALLENGED
 	set_dialog_npc NPC_ROD
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0587, Text0588
 	close_text_box
 	set_dialog_npc NPC_JACK
 	move_active_npc NPCMovement_fbbc
 	set_active_npc_direction WEST
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0589, Text058a
 .ows_fa02
-	zero_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	zero_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	set_dialog_npc NPC_ROD
 	print_npc_text Text058b
 	ask_question_jump_default_yes Text058c, .ows_fa1b
@@ -8936,14 +8936,14 @@ Script_BeatSteve: ; f9c8 (3:79c8)
 
 .ows_fa1b
 	close_text_box
-	max_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	max_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	open_menu
 	close_text_box
 	script_jump .ows_fa02
 
 Script_LostToJack: ; fa23 (3:7a23)
 	start_script
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text058f, Text0590
 	close_advanced_text_box
 	set_next_npc_and_script NPC_ROD, Script_LostToCourtney.ows_f950
@@ -8952,8 +8952,8 @@ Script_LostToJack: ; fa23 (3:7a23)
 
 Script_BeatJack: ; fa34 (3:7a34)
 	start_script
-	script_set_flag_value EVENT_JACK_STATE, JACK_DEFEATED
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	set_event EVENT_JACK_STATE, JACK_DEFEATED
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0591, Text0592
 	close_text_box
 	move_active_npc NPCMovement_fbc2
@@ -8966,31 +8966,31 @@ Script_BeatJack: ; fa34 (3:7a34)
 
 .ows_fa52
 	start_script
-	script_set_flag_value EVENT_ROD_STATE, ROD_CHALLENGED
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	set_event EVENT_ROD_STATE, ROD_CHALLENGED
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text0593, Text0594
 	close_text_box
 	move_active_npc NPCMovement_fbaf
 	set_active_npc_direction WEST
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fa75
-	jump_if_flag_zero_2 EVENT_CHALLENGED_RONALD, NULL
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fa75
+	test_if_event_false EVENT_CHALLENGED_RONALD
 	print_variable_npc_text Text0595, Text0596
 	script_jump .ows_fa78
 
 .ows_fa75
 	print_npc_text Text0597
 .ows_fa78
-	zero_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	zero_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	print_npc_text Text0598
 	ask_question_jump_default_yes Text0599, .ows_fa90
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text059a, Text059b
 	start_duel PRIZES_6, LEGENDARY_DRAGONITE_DECK_ID, MUSIC_DUEL_THEME_3
 	quit_script_fully
 
 .ows_fa90
 	close_text_box
-	max_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	max_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	open_menu
 	close_text_box
 	script_jump .ows_fa78
@@ -9001,20 +9001,20 @@ Script_LostToRod: ; fa98 (3:7a98)
 	close_text_box
 	move_active_npc NPCMovement_fb9d
 	set_active_npc_direction SOUTH
-	jump_if_flag_zero_2 EVENT_RECEIVED_LEGENDARY_CARDS, NULL
+	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
 	print_variable_npc_text Text059d, Text059e
 	script_jump Script_f7ed.ows_f804
 
 Script_BeatRod: ; faae (3:7aae)
 	start_script
-	script_set_flag_value EVENT_ROD_STATE, ROD_DEFEATED
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fad5
-	jump_if_flag_zero_2 EVENT_CHALLENGED_RONALD, NULL
+	set_event EVENT_ROD_STATE, ROD_DEFEATED
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fad5
+	test_if_event_false EVENT_CHALLENGED_RONALD
 	print_variable_npc_text Text059f, Text05a0
 	close_text_box
 	move_active_npc NPCMovement_fb90
 	set_active_npc_direction SOUTH
-	jump_if_flag_zero_2 EVENT_CHALLENGED_RONALD, NULL
+	test_if_event_false EVENT_CHALLENGED_RONALD
 	print_variable_npc_text Text05a1, Text05a2
 	close_advanced_text_box
 	set_next_npc_and_script NPC_RONALD1, .ows_fae9
@@ -9027,20 +9027,20 @@ Script_BeatRod: ; faae (3:7aae)
 	set_active_npc_direction SOUTH
 	play_sfx SFX_0F
 	replace_map_blocks $01
-	script_set_flag_value EVENT_POKEMON_DOME_STATE, POKEMON_DOME_DEFEATED
-	max_out_flag_value EVENT_HALL_OF_HONOR_DOORS_OPEN
+	set_event EVENT_POKEMON_DOME_STATE, POKEMON_DOME_DEFEATED
+	max_out_event_value EVENT_HALL_OF_HONOR_DOORS_OPEN
 	print_text_quit_fully Text05a4
 
 .ows_fae9
 	start_script
 	override_song MUSIC_STOP
-	script_set_flag_value EVENT_RONALD_POKEMON_DOME_STATE, RONALD_CHALLENGED
+	set_event EVENT_RONALD_POKEMON_DOME_STATE, RONALD_CHALLENGED
 	play_sfx SFX_0F
 	replace_map_blocks $01
 	move_active_npc NPCMovement_fbd2
 	set_default_song MUSIC_RONALD
 	play_default_song
-	jump_if_flag_nonzero_2 EVENT_CHALLENGED_RONALD, .ows_fb15
+	jump_if_event_true EVENT_CHALLENGED_RONALD, .ows_fb15
 	print_npc_text Text05a5
 	set_dialog_npc NPC_ROD
 	move_npc NPC_ROD, NPCMovement_fb9b
@@ -9056,9 +9056,9 @@ Script_BeatRod: ; faae (3:7aae)
 	close_text_box
 	move_active_npc NPCMovement_fba8
 	set_active_npc_direction WEST
-	max_out_flag_value EVENT_CHALLENGED_RONALD
+	max_out_event_value EVENT_CHALLENGED_RONALD
 .ows_fb20
-	zero_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	zero_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	set_dialog_npc NPC_ROD
 	print_npc_text Text05a9
 	ask_question_jump_default_yes Text05aa, .ows_fb40
@@ -9073,7 +9073,7 @@ Script_BeatRod: ; faae (3:7aae)
 
 .ows_fb40
 	close_text_box
-	max_out_flag_value EVENT_POKEMON_DOME_IN_MENU
+	max_out_event_value EVENT_POKEMON_DOME_IN_MENU
 	open_menu
 	close_text_box
 	script_jump .ows_fb20
@@ -9088,7 +9088,7 @@ Script_LostToRonald1InPokemonDome: ; fb48 (3:7b48)
 
 Script_BeatRonald1InPokemonDome: ; fb53 (3:7b53)
 	start_script
-	script_set_flag_value EVENT_RONALD_POKEMON_DOME_STATE, RONALD_DEFEATED
+	set_event EVENT_RONALD_POKEMON_DOME_STATE, RONALD_DEFEATED
 	print_npc_text Text05af
 	set_dialog_npc NPC_ROD
 	print_npc_text Text05b0
@@ -9111,8 +9111,8 @@ Script_BeatRonald1InPokemonDome: ; fb53 (3:7b53)
 	set_player_direction NORTH
 	print_npc_text Text05b3
 	move_active_npc NPCMovement_fbb2
-	script_set_flag_value EVENT_POKEMON_DOME_STATE, POKEMON_DOME_DEFEATED
-	max_out_flag_value EVENT_HALL_OF_HONOR_DOORS_OPEN
+	set_event EVENT_POKEMON_DOME_STATE, POKEMON_DOME_DEFEATED
+	max_out_event_value EVENT_HALL_OF_HONOR_DOORS_OPEN
 	record_master_win $0a
 	print_text_quit_fully Text05b4
 
@@ -9243,8 +9243,8 @@ Script_fbe1: ; fbe1 (3:7be1)
 
 Script_fbf1: ; fbf1 (3:7bf1)
 	start_script
-	jump_if_flag_nonzero_2 EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fc10
-	max_out_flag_value EVENT_RECEIVED_LEGENDARY_CARDS
+	jump_if_event_true EVENT_RECEIVED_LEGENDARY_CARDS, .ows_fc10
+	max_out_event_value EVENT_RECEIVED_LEGENDARY_CARDS
 	print_text Text05b8
 	give_card ZAPDOS3
 	give_card MOLTRES2
@@ -9261,7 +9261,7 @@ Script_fbf1: ; fbf1 (3:7bf1)
 	quit_script_fully
 
 .ows_fc10
-	jump_if_flag_equal EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS, %1111, .ows_fc20
+	jump_if_event_equal EVENT_LEGENDARY_CARDS_RECEIVED_FLAGS, %1111, .ows_fc20
 	pick_legendary_card
 	print_text Text05ba
 	give_card VARIABLE_CARD
@@ -9336,13 +9336,13 @@ Preload_GiftCenterClerk: ; fc6c (3:7c6c)
 Func_fc7a: ; fc7a (3:7c7a)
 	ld a, [wConsole]
 	ld c, a
-	set_flag_value EVENT_CONSOLE
+	set_event_value EVENT_CONSOLE
 
 	start_script
-	jump_if_flag_not_equal EVENT_CONSOLE, CONSOLE_CGB, Func_fcad.ows_fcd5
+	jump_if_event_not_equal EVENT_CONSOLE, CONSOLE_CGB, Func_fcad.ows_fcd5
 	print_npc_text Text06cd
 	gift_center 0
-	jump_if_flag_not_less_than EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_EXIT, .ows_fcaa
+	jump_if_event_greater_or_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_EXIT, .ows_fcaa
 	print_npc_text Text06ce
 	ask_question_jump_default_yes Text06cf, .ows_fca0
 	print_npc_text Text06d0
@@ -9361,14 +9361,14 @@ Func_fc7a: ; fc7a (3:7c7a)
 Func_fcad: ; fcad (3:7cad)
 	ld a, [wd10e]
 	ld c, a
-	set_flag_value EVENT_GIFT_CENTER_MENU_CHOICE
+	set_event_value EVENT_GIFT_CENTER_MENU_CHOICE
 
 	start_script
 	play_sfx SFX_56
 	save_game 0
-	jump_if_flag_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_CARD, .ows_fccc
-	jump_if_flag_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_DECK, .ows_fccf
-	jump_if_flag_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_RECEIVE_DECK, .ows_fcd2
+	jump_if_event_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_CARD, .ows_fccc
+	jump_if_event_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_SEND_DECK, .ows_fccf
+	jump_if_event_equal EVENT_GIFT_CENTER_MENU_CHOICE, GIFT_CENTER_MENU_RECEIVE_DECK, .ows_fcd2
 ; GIFT_CENTER_MENU_RECEIVE_CARD
 	script_jump Func_fc7a.ows_fcaa
 
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index c8625fc..b22581f 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -114,7 +114,7 @@ MasterMedalNames: ; 1030b (4:430b)
 	tx RockClubMapNameText
 	tx FightingClubMapNameText
 
-BoosterPack_1031b: ; 1031b (4:431b)
+GiveBoosterPack: ; 1031b (4:431b)
 	ld c, a
 	ld a, [wd291]
 	push af
@@ -125,20 +125,20 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	ld [wTextBoxFrameType], a
 	pop bc
 	push bc
-	ld b, $0
-	ld hl, Unknown_103a5
+	ld b, 0
+	ld hl, BoosterTypes
 	add hl, bc
 	ld a, [hl]
 	ld c, a
 	add a
 	add a
 	ld c, a
-	ld hl, Unknown_103c2
+	ld hl, BoosterScenesAndNameTexts
 	add hl, bc
 	ld a, [hli]
 	push hl
-	ld bc, $0600
-	call Func_130ca
+	lb bc, 6, 0
+	call LoadBoosterGfx
 	pop hl
 	ld a, [hli]
 	ld [wTxRam3], a
@@ -156,11 +156,11 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	ld a, c
 	farcall GenerateBoosterPack
 	ldtx hl, ReceivedBoosterPackText
-	ld a, [wd117]
-	cp $1
-	jr nz, .asm_10373
+	ld a, [wAnotherBoosterPack]
+	cp TRUE
+	jr nz, .first_booster
 	ldtx hl, AndAnotherBoosterPackText
-.asm_10373
+.first_booster
 	call PrintScrollableText_NoTextBoxLabel
 	call WaitForSongToFinish
 	call ResumeSong
@@ -173,18 +173,56 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	ld [wVBlankOAMCopyToggle], a
 	ld a, $4
 	ld [wTextBoxFrameType], a
-	farcall Func_7599
+	farcall OpenBoosterPack
 	farcall WhiteOutDMGPals
 	call DoFrameIfLCDEnabled
 	pop af
 	ld [wd291], a
 	ret
 
-Unknown_103a5: ; 103a5 (4:43a5)
-	INCROM $103a5, $103c2
-
-Unknown_103c2: ; 103c2 (4:43c2)
-	INCROM $103c2, $103d2
+BoosterTypes: ; 103a5 (4:43a5)
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_NEUTRAL
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_GRASS
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_FIRE
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_WATER
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_LIGHTNING
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_FIGHTING
+	db BOOSTER_COLOSSEUM  ; BOOSTER_COLOSSEUM_TRAINER
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_NEUTRAL
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_GRASS
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_FIRE
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_WATER
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_FIGHTING
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_PSYCHIC
+	db BOOSTER_EVOLUTION  ; BOOSTER_EVOLUTION_TRAINER
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_NEUTRAL
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_GRASS_COLORLESS
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_WATER_COLORLESS
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_LIGHTNING_COLORLESS
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_FIGHTING_COLORLESS
+	db BOOSTER_MYSTERY    ; BOOSTER_MYSTERY_TRAINER_COLORLESS
+	db BOOSTER_LABORATORY ; BOOSTER_LABORATORY_NEUTRAL
+	db BOOSTER_LABORATORY ; BOOSTER_LABORATORY_GRASS
+	db BOOSTER_LABORATORY ; BOOSTER_LABORATORY_WATER
+	db BOOSTER_LABORATORY ; BOOSTER_LABORATORY_PSYCHIC
+	db BOOSTER_LABORATORY ; BOOSTER_LABORATORY_TRAINER
+	db BOOSTER_COLOSSEUM  ; BOOSTER_ENERGY_LIGHTNING_FIRE
+	db BOOSTER_COLOSSEUM  ; BOOSTER_ENERGY_WATER_FIGHTING
+	db BOOSTER_COLOSSEUM  ; BOOSTER_ENERGY_GRASS_PSYCHIC
+	db BOOSTER_COLOSSEUM  ; BOOSTER_ENERGY_RANDOM
+
+BoosterScenesAndNameTexts: ; 103c2 (4:43c2)
+	db SCENE_COLOSSEUM_BOOSTER, SCENE_COLOSSEUM_BOOSTER
+	tx ColosseumBoosterText
+
+	db SCENE_EVOLUTION_BOOSTER, SCENE_EVOLUTION_BOOSTER
+	tx EvolutionBoosterText
+
+	db SCENE_MYSTERY_BOOSTER, SCENE_MYSTERY_BOOSTER
+	tx MysteryBoosterText
+
+	db SCENE_LABORATORY_BOOSTER, SCENE_LABORATORY_BOOSTER
+	tx LaboratoryBoosterText
 
 Func_103d2: ; 103d2 (4:43d2)
 	INCROM $103d2, $103d3
@@ -199,7 +237,7 @@ Duel_Init: ; 103d3 (4:43d3)
 	lb de, 0, 12
 	lb bc, 20, 6
 	call DrawRegularTextBox
-	ld a, [wcc19]
+	ld a, [wNPCDuelDeckID]
 	add a
 	add a
 	ld c, a
@@ -291,7 +329,7 @@ TryGivePCPack: ; 10a70 (4:4a70)
 	inc hl
 	dec c
 	jr nz, .findFreeSlotLoop
-	debug_ret
+	debug_nop
 	jr .quit
 
 .foundFreeSlot
@@ -384,81 +422,210 @@ Unknown_10df0: ; 10df0 (4:4df0)
 Unknown_10e17: ; 10e17 (4:4e17)
 	INCROM $10e17, $10e28
 
-Func_10e28: ; 10e28 (4:4e28)
-	INCROM $10e28, $10e55
+; refresh the cursor's position based on the currently selected map
+; and refresh the player's position based on the starting map
+; but only if the player is not being animated across the overworld
+OverworldMap_UpdatePlayerAndCursorSprites: ; 10e28 (4:4e28)
+	push hl
+	push bc
+	push de
+	ld a, [wOverworldMapCursorSprite]
+	ld [wWhichSprite], a
+	ld a, [wOverworldMapSelection]
+	ld d, 0
+	ld e, -12
+	call OverworldMap_SetSpritePosition
+	ld a, [wOverworldMapPlayerAnimationState]
+	or a
+	jr nz, .player_walking
+	ld a, [wPlayerSpriteIndex]
+	ld [wWhichSprite], a
+	ld a, [wOverworldMapStartingPosition]
+	ld d, 0
+	ld e, 0
+	call OverworldMap_SetSpritePosition
+.player_walking
+	pop de
+	pop bc
+	pop hl
+	ret
 
-Func_10e55: ; 10e55 (4:4e55)
+; if no selection has been made yet, call OverworldMap_HandleKeyPress
+; if the player is being animated across the screen, call OverworldMap_UpdatePlayerWalkingAnimation
+; if the player has finished walking, call OverworldMap_LoadSelectedMap
+OverworldMap_Update: ; 10e55 (4:4e55)
 	ld a, [wPlayerSpriteIndex]
 	ld [wWhichSprite], a
-	ld a, [wd33e]
+	ld a, [wOverworldMapPlayerAnimationState]
 	or a
-	jr nz, .asm_10e65
-	call Func_10e71
+	jr nz, .player_walking
+	call OverworldMap_HandleKeyPress
 	ret
-.asm_10e65
-	cp $2
-	jr z, .asm_10e6d
-	call Func_11060
+.player_walking
+	cp 2
+	jr z, .player_finished_walking
+	call OverworldMap_UpdatePlayerWalkingAnimation
 	ret
-.asm_10e6d
-	call LoadOverworldMapSelection
+.player_finished_walking
+	call OverworldMap_LoadSelectedMap
 	ret
 
-Func_10e71: ; 10e71 (4:4e71)
+; update the map selection if the DPad is pressed
+; or finalize the selection if the A button is pressed
+OverworldMap_HandleKeyPress: ; 10e71 (4:4e71)
 	ldh a, [hKeysPressed]
 	and D_PAD
-	jr z, .asm_10e83
+	jr z, .no_d_pad
 	farcall GetDirectionFromDPad
 	ld [wPlayerDirection], a
-	call Func_10e97
-	jr .asm_10e96
-.asm_10e83
+	call OverworldMap_HandleDPad
+	jr .done
+.no_d_pad
 	ldh a, [hKeysPressed]
 	and A_BUTTON
-	jr z, .asm_10e96
+	jr z, .done
 	ld a, SFX_02
 	call PlaySFX
-	call Func_11016
-	call Func_11024
-	jr .asm_10e96
-.asm_10e96
+	call OverworldMap_UpdateCursorAnimation
+	call OverworldMap_BeginPlayerMovement
+	jr .done
+.done
 	ret
 
-Func_10e97: ; 10e97 (4:4e97)
+; update wOverworldMapSelection based on the pressed direction in wPlayerDirection
+OverworldMap_HandleDPad: ; 10e97 (4:4e97)
 	push hl
 	pop hl
-	ld a, [wd32e]
+	ld a, [wOverworldMapSelection]
 	rlca
 	rlca
 	ld c, a
 	ld a, [wPlayerDirection]
 	add c
 	ld c, a
-	ld b, $0
-	ld hl, Unknown_10ebc
+	ld b, 0
+	ld hl, OverworldMap_CursorTransitions
 	add hl, bc
 	ld a, [hl]
 	or a
-	jr z, .asm_10eb9
-	ld [wd32e], a
-	call Func_10f2e
+	jr z, .no_transition
+	ld [wOverworldMapSelection], a
+	call OverworldMap_PrintMapName
 	ld a, SFX_01
 	call PlaySFX
-.asm_10eb9
+.no_transition
 	pop bc
 	pop hl
 	ret
 
-Unknown_10ebc: ; 10ebc (4:4ebc)
-	INCROM $10ebc, $10efd
+OverworldMap_CursorTransitions: ; 10ebc (4:4ebc)
+	; unused
+	db OWMAP_SCIENCE_CLUB     ; NORTH
+	db OWMAP_SCIENCE_CLUB     ; EAST
+	db OWMAP_SCIENCE_CLUB     ; SOUTH
+	db OWMAP_SCIENCE_CLUB     ; WEST
+
+	; OWMAP_MASON_LABORATORY
+	db OWMAP_LIGHTNING_CLUB   ; NORTH
+	db OWMAP_FIGHTING_CLUB    ; EAST
+	db $00                    ; SOUTH
+	db $00                    ; WEST
+
+	; OWMAP_ISHIHARAS_HOUSE
+	db $00                    ; NORTH
+	db OWMAP_CHALLENGE_HALL   ; EAST
+	db OWMAP_ROCK_CLUB        ; SOUTH
+	db $00                    ; WEST
+
+	; OWMAP_FIGHTING_CLUB
+	db OWMAP_LIGHTNING_CLUB   ; NORTH
+	db OWMAP_WATER_CLUB       ; EAST
+	db $00                    ; SOUTH
+	db OWMAP_MASON_LABORATORY ; WEST
+
+	; OWMAP_ROCK_CLUB
+	db OWMAP_ISHIHARAS_HOUSE  ; NORTH
+	db OWMAP_POKEMON_DOME     ; EAST
+	db OWMAP_LIGHTNING_CLUB   ; SOUTH
+	db $00                    ; WEST
+
+	; OWMAP_WATER_CLUB
+	db OWMAP_GRASS_CLUB       ; NORTH
+	db $00                    ; EAST
+	db $00                    ; SOUTH
+	db OWMAP_FIGHTING_CLUB    ; WEST
+
+	; OWMAP_LIGHTNING_CLUB
+	db OWMAP_ROCK_CLUB        ; NORTH
+	db OWMAP_POKEMON_DOME     ; EAST
+	db OWMAP_FIGHTING_CLUB    ; SOUTH
+	db OWMAP_MASON_LABORATORY ; WEST
+
+	; OWMAP_GRASS_CLUB
+	db OWMAP_SCIENCE_CLUB     ; NORTH
+	db $00                    ; EAST
+	db OWMAP_WATER_CLUB       ; SOUTH
+	db OWMAP_PSYCHIC_CLUB     ; WEST
+
+	; OWMAP_PSYCHIC_CLUB
+	db OWMAP_FIRE_CLUB        ; NORTH
+	db OWMAP_SCIENCE_CLUB     ; EAST
+	db OWMAP_GRASS_CLUB       ; SOUTH
+	db OWMAP_POKEMON_DOME     ; WEST
+
+	; OWMAP_SCIENCE_CLUB
+	db OWMAP_FIRE_CLUB        ; NORTH
+	db $00                    ; EAST
+	db OWMAP_GRASS_CLUB       ; SOUTH
+	db OWMAP_PSYCHIC_CLUB     ; WEST
+
+	; OWMAP_FIRE_CLUB
+	db $00                    ; NORTH
+	db OWMAP_SCIENCE_CLUB     ; EAST
+	db OWMAP_SCIENCE_CLUB     ; SOUTH
+	db OWMAP_PSYCHIC_CLUB     ; WEST
+
+	; OWMAP_CHALLENGE_HALL
+	db $00                    ; NORTH
+	db OWMAP_PSYCHIC_CLUB     ; EAST
+	db OWMAP_POKEMON_DOME     ; SOUTH
+	db OWMAP_ISHIHARAS_HOUSE  ; WEST
+
+	; OWMAP_POKEMON_DOME
+	db OWMAP_CHALLENGE_HALL   ; NORTH
+	db OWMAP_PSYCHIC_CLUB     ; EAST
+	db OWMAP_FIGHTING_CLUB    ; SOUTH
+	db OWMAP_ROCK_CLUB        ; WEST
+
+; set the active sprite (player or cursor) at the appropriate map position
+; input:
+; a = OWMAP_* value
+; d = x offset
+; e = y offset
+OverworldMap_SetSpritePosition: ; 10ef0 (4:4ef0)
+	call OverworldMap_GetMapPosition
+	ld c, SPRITE_ANIM_COORD_X
+	call GetSpriteAnimBufferProperty
+	ld a, d
+	ld [hli], a
+	ld a, e
+	ld [hl], a
+	ret
 
-Func_10efd: ; 10efd (4:4efd)
+; input:
+; a = OWMAP_* value
+; d = x offset
+; e = y offset
+; output:
+; d = x position
+; e = y position
+OverworldMap_GetMapPosition: ; 10efd (4:4efd)
 	push hl
 	push de
 	rlca
 	ld e, a
-	ld d, $0
-	ld hl, Unknown_10f14
+	ld d, 0
+	ld hl, OverworldMap_MapPositions
 	add hl, de
 	pop de
 	ld a, [hli]
@@ -472,18 +639,30 @@ Func_10efd: ; 10efd (4:4efd)
 	pop hl
 	ret
 
-Unknown_10f14: ; 10f14 (4:4f14)
-	INCROM $10f14, $10f2e
-
-Func_10f2e: ; 10f2e (4:4f2e)
+OverworldMap_MapPositions: ; 10f14 (4:4f14)
+	db $00, $00 ; unused
+	db $0C, $68 ; OWMAP_MASON_LABORATORY
+	db $04, $18 ; OWMAP_ISHIHARAS_HOUSE
+	db $34, $68 ; OWMAP_FIGHTING_CLUB
+	db $14, $38 ; OWMAP_ROCK_CLUB
+	db $6C, $64 ; OWMAP_WATER_CLUB
+	db $24, $50 ; OWMAP_LIGHTNING_CLUB
+	db $7C, $40 ; OWMAP_GRASS_CLUB
+	db $5C, $2C ; OWMAP_PSYCHIC_CLUB
+	db $7C, $20 ; OWMAP_SCIENCE_CLUB
+	db $6C, $10 ; OWMAP_FIRE_CLUB
+	db $3C, $20 ; OWMAP_CHALLENGE_HALL
+	db $44, $44 ; OWMAP_POKEMON_DOME
+
+OverworldMap_PrintMapName: ; 10f2e (4:4f2e)
 	push hl
 	push de
 	lb de, 1, 1
 	call InitTextPrinting
-	call Func_10f4a
+	call OverworldMap_GetOWMapID
 	rlca
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld hl, OverworldMapNames
 	add hl, de
 	ld a, [hli]
@@ -494,30 +673,33 @@ Func_10f2e: ; 10f2e (4:4f2e)
 	pop hl
 	ret
 
-Func_10f4a: ; 10f4a (4:4f4a)
+; returns [wOverworldMapSelection] in a
+; or OWMAP_MYSTERY_HOUSE if [wOverworldMapSelection] == OWMAP_ISHIHARAS_HOUSE
+;   and EVENT_ISHIHARAS_HOUSE_MENTIONED == FALSE
+OverworldMap_GetOWMapID: ; 10f4a (4:4f4a)
 	push bc
-	ld a, [wd32e]
-	cp $2
-	jr nz, .asm_10f5f
+	ld a, [wOverworldMapSelection]
+	cp OWMAP_ISHIHARAS_HOUSE
+	jr nz, .got_map
 	ld c, a
-	ld a, $1e
-	farcall GetEventFlagValue
+	ld a, EVENT_ISHIHARAS_HOUSE_MENTIONED
+	farcall GetEventValue
 	or a
 	ld a, c
-	jr nz, .asm_10f5f
-	ld a, $d
-.asm_10f5f
+	jr nz, .got_map
+	ld a, OWMAP_MYSTERY_HOUSE
+.got_map
 	pop bc
 	ret
 
-LoadOverworldMapSelection: ; 10f61 (4:4f61)
+OverworldMap_LoadSelectedMap: ; 10f61 (4:4f61)
 	push hl
 	push bc
-	ld a, [wd32e]
+	ld a, [wOverworldMapSelection]
 	rlca
 	rlca
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, OverworldMapIndexes
 	add hl, bc
 	ld a, [hli]
@@ -526,7 +708,7 @@ LoadOverworldMapSelection: ; 10f61 (4:4f61)
 	ld [wTempPlayerXCoord], a
 	ld a, [hli]
 	ld [wTempPlayerYCoord], a
-	ld a, $0
+	ld a, NORTH
 	ld [wTempPlayerDirection], a
 	ld hl, wd0b4
 	set 4, [hl]
@@ -536,104 +718,118 @@ LoadOverworldMapSelection: ; 10f61 (4:4f61)
 
 INCLUDE "data/overworld_indexes.asm"
 
-Func_10fbc: ; 10fbc (4:4fbc)
+OverworldMap_InitVolcanoSprite: ; 10fbc (4:4fbc)
 	ld a, SPRITE_OW_MAP_OAM
 	farcall CreateSpriteAndAnimBufferEntry
 	ld c, SPRITE_ANIM_COORD_X
 	call GetSpriteAnimBufferProperty
 	ld a, $80
-	ld [hli], a
+	ld [hli], a ; x
 	ld a, $10
-	ld [hl], a
-	ld b, $34
+	ld [hl], a ; y
+	ld b, $34 ; non-cgb volcano smoke
 	ld a, [wConsole]
 	cp CONSOLE_CGB
-	jr nz, .asm_10fd8
-	ld b, $37
-.asm_10fd8
+	jr nz, .not_cgb
+	ld b, $37 ; cgb volcano smoke
+.not_cgb
 	ld a, b
 	farcall StartNewSpriteAnimation
 	ret
 
-Func_10fde: ; 10fde (4:4fde)
-	ld a, [wd32e]
-	ld [wd33d], a
+OverworldMap_InitCursorSprite: ; 10fde (4:4fde)
+	ld a, [wOverworldMapSelection]
+	ld [wOverworldMapStartingPosition], a
 	xor a
-	ld [wd33e], a
+	ld [wOverworldMapPlayerAnimationState], a
 	ld a, SPRITE_OW_MAP_OAM
 	call CreateSpriteAndAnimBufferEntry
 	ld a, [wWhichSprite]
-	ld [wd33b], a
-	ld b, $35
+	ld [wOverworldMapCursorSprite], a
+	ld b, $35 ; non-cgb overworld map cursor
 	ld a, [wConsole]
-	cp $2
-	jr nz, .asm_10ffe
-	ld b, $38
-.asm_10ffe
+	cp CONSOLE_CGB
+	jr nz, .not_cgb
+	ld b, $38 ; cgb overworld map cursor
+.not_cgb
 	ld a, b
-	ld [wd33c], a
+	ld [wOverworldMapCursorAnimation], a
 	call StartNewSpriteAnimation
-	ld a, $3e
-	farcall GetEventFlagValue
+	ld a, EVENT_MASON_LAB_STATE
+	farcall GetEventValue
 	or a
-	jr nz, .asm_11015
+	jr nz, .visited_lab
 	ld c, SPRITE_ANIM_FLAGS
 	call GetSpriteAnimBufferProperty
-	set 7, [hl]
-.asm_11015
+	set SPRITE_ANIM_FLAG_UNSKIPPABLE, [hl]
+.visited_lab
 	ret
 
-Func_11016: ; 11016 (4:5016)
-	ld a, [wd33b]
+; play animation $36 (non-cgb) or $39 (cgb) to make the cursor blink faster
+; after a selection is made
+OverworldMap_UpdateCursorAnimation: ; 11016 (4:5016)
+	ld a, [wOverworldMapCursorSprite]
 	ld [wWhichSprite], a
-	ld a, [wd33c]
+	ld a, [wOverworldMapCursorAnimation]
 	inc a
 	call StartNewSpriteAnimation
 	ret
 
-Func_11024: ; 11024 (4:5024)
+; begin walking the player across the overworld
+; from wOverworldMapStartingPosition to wOverworldMapSelection
+OverworldMap_BeginPlayerMovement: ; 11024 (4:5024)
 	ld a, SFX_57
 	call PlaySFX
 	ld a, [wPlayerSpriteIndex]
 	ld [wWhichSprite], a
 	ld c, SPRITE_ANIM_FLAGS
 	call GetSpriteAnimBufferProperty
-	set 2, [hl]
-	ld hl, Unknown_1229f
-	ld a, [wd33d]
+	set SPRITE_ANIM_FLAG_SPEED, [hl]
+
+; get pointer table for starting map
+	ld hl, OverworldMap_PlayerMovementPaths
+	ld a, [wOverworldMapStartingPosition]
 	dec a
 	add a
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wd32e]
+
+; get path sequence for selected map
+	ld a, [wOverworldMapSelection]
 	dec a
 	add a
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	ld a, [hli]
-	ld [wd33f], a
+	ld [wOverworldMapPlayerMovementPtr], a
 	ld a, [hl]
-	ld [wd340], a
-	ld a, $1
-	ld [wd33e], a
+	ld [wOverworldMapPlayerMovementPtr + 1], a
+
+	ld a, 1
+	ld [wOverworldMapPlayerAnimationState], a
 	xor a
-	ld [wd341], a
+	ld [wOverworldMapPlayerMovementCounter], a
 	ret
 
-Func_11060: ; 11060 (4:5060)
+; update the player walking across the overworld
+; either by advancing along the current path
+; or determining the next direction to move along the path
+OverworldMap_UpdatePlayerWalkingAnimation: ; 11060 (4:5060)
 	ld a, [wPlayerSpriteIndex]
 	ld [wWhichSprite], a
-	ld a, [wd341]
+	ld a, [wOverworldMapPlayerMovementCounter]
 	or a
-	jp nz, Func_11184
-	ld a, [wd33f]
+	jp nz, OverworldMap_ContinuePlayerWalkingAnimation
+
+; get next x,y on the path
+	ld a, [wOverworldMapPlayerMovementPtr]
 	ld l, a
-	ld a, [wd340]
+	ld a, [wOverworldMapPlayerMovementPtr + 1]
 	ld h, a
 	ld a, [hli]
 	ld b, a
@@ -641,194 +837,245 @@ Func_11060: ; 11060 (4:5060)
 	ld c, a
 	and b
 	cp $ff
-	jr z, .asm_110a0
+	jr z, .player_finished_walking
 	ld a, c
 	or b
-	jr nz, .asm_11094
-	ld a, [wd33d]
+	jr nz, .next_point
+
+; point 0,0 means walk straight towards [wOverworldMapSelection]
+	ld a, [wOverworldMapStartingPosition]
 	ld e, a
-	ld a, [wd32e]
+	ld a, [wOverworldMapSelection]
 	cp e
-	jr z, .asm_110a0
-	ld de, $0000
-	call Func_10efd
+	jr z, .player_finished_walking
+	lb de, 0, 0
+	call OverworldMap_GetMapPosition
 	ld b, d
 	ld c, e
-.asm_11094
+
+.next_point
 	ld a, l
-	ld [wd33f], a
+	ld [wOverworldMapPlayerMovementPtr], a
 	ld a, h
-	ld [wd340], a
-	call Func_110a6
+	ld [wOverworldMapPlayerMovementPtr + 1], a
+	call OverworldMap_InitNextPlayerVelocity
 	ret
-.asm_110a0
-	ld a, $2
-	ld [wd33e], a
+
+.player_finished_walking
+	ld a, 2
+	ld [wOverworldMapPlayerAnimationState], a
 	ret
 
-Func_110a6: ; 110a6 (4:50a6)
+; input:
+; b = target x position
+; c = target y position
+OverworldMap_InitNextPlayerVelocity: ; 110a6 (4:50a6)
 	push hl
 	push bc
 	ld c, SPRITE_ANIM_COORD_X
 	call GetSpriteAnimBufferProperty
+
 	pop bc
 	ld a, b
-	sub [hl]
-	ld [wd343], a
-	ld a, $0
-	sbc $0
-	ld [wd344], a
+	sub [hl] ; a = target x - current x
+	ld [wOverworldMapPlayerPathHorizontalMovement], a
+	ld a, 0
+	sbc 0
+	ld [wOverworldMapPlayerPathHorizontalMovement + 1], a
+
 	inc hl
 	ld a, c
-	sub [hl]
-	ld [wd345], a
-	ld a, $0
-	sbc $0
-	ld [wd346], a
-	ld a, [wd343]
+	sub [hl] ; a = target y - current y
+	ld [wOverworldMapPlayerPathVerticalMovement], a
+	ld a, 0
+	sbc 0
+	ld [wOverworldMapPlayerPathVerticalMovement + 1], a
+
+	ld a, [wOverworldMapPlayerPathHorizontalMovement]
 	ld b, a
-	ld a, [wd344]
+	ld a, [wOverworldMapPlayerPathHorizontalMovement + 1]
 	bit 7, a
-	jr z, .asm_110d8
-	ld a, [wd343]
+	jr z, .positive
+; absolute value
+	ld a, [wOverworldMapPlayerPathHorizontalMovement]
 	cpl
 	inc a
 	ld b, a
-.asm_110d8
-	ld a, [wd345]
+
+.positive
+	ld a, [wOverworldMapPlayerPathVerticalMovement]
 	ld c, a
-	ld a, [wd346]
+	ld a, [wOverworldMapPlayerPathVerticalMovement + 1]
 	bit 7, a
-	jr z, .asm_110e9
-	ld a, [wd345]
+	jr z, .positive2
+; absolute value
+	ld a, [wOverworldMapPlayerPathVerticalMovement]
 	cpl
 	inc a
 	ld c, a
-.asm_110e9
+
+.positive2
+; if the absolute value of wOverworldMapPlayerPathVerticalMovement is larger than
+; the absolute value of wOverworldMapPlayerPathHorizontalMovement, this is dominantly
+; a north/south movement. otherswise, an east/west movement
 	ld a, b
 	cp c
-	jr c, .asm_110f2
-	call Func_11102
-	jr .asm_110f5
-.asm_110f2
-	call Func_1113e
-.asm_110f5
+	jr c, .north_south
+	call OverworldMap_InitPlayerEastWestMovement
+	jr .done
+.north_south
+	call OverworldMap_InitPlayerNorthSouthMovement
+.done
 	xor a
-	ld [wd347], a
-	ld [wd348], a
+	ld [wOverworldMapPlayerHorizontalSubPixelPosition], a
+	ld [wOverworldMapPlayerVerticalSubPixelPosition], a
 	farcall UpdatePlayerSprite
 	pop hl
 	ret
 
-Func_11102: ; 11102 (4:5102)
+; input:
+; b = absolute value of horizontal movement distance
+; c = absolute value of vertical movement distance
+OverworldMap_InitPlayerEastWestMovement: ; 11102 (4:5102)
+; use horizontal distance for counter
 	ld a, b
-	ld [wd341], a
+	ld [wOverworldMapPlayerMovementCounter], a
+
+; de = absolute horizontal distance, for later
 	ld e, a
-	ld d, $0
-	ld hl, wd343
+	ld d, 0
+
+; overwrite wOverworldMapPlayerPathHorizontalMovement with either -1.0 or +1.0
+; always move east/west by 1 pixel per frame
+	ld hl, wOverworldMapPlayerPathHorizontalMovement
 	xor a
 	ld [hli], a
 	bit 7, [hl]
-	jr z, .asm_11115
+	jr z, .east
 	dec a
-	jr .asm_11116
-.asm_11115
+	jr .west
+.east
 	inc a
-.asm_11116
+.west
 	ld [hl], a
-	ld b, c
-	ld c, $0
+
+; divide (total vertical distance * $100) by total horizontal distance
+	ld b, c ; vertical distance in high byte
+	ld c, 0
 	call DivideBCbyDE
-	ld a, [wd346]
+	ld a, [wOverworldMapPlayerPathVerticalMovement + 1]
 	bit 7, a
-	jr z, .asm_11127
-	call Func_11179
-.asm_11127
+	jr z, .positive
+; restore negative sign
+	call OverworldMap_NegateBC
+.positive
 	ld a, c
-	ld [wd345], a
+	ld [wOverworldMapPlayerPathVerticalMovement], a
 	ld a, b
-	ld [wd346], a
-	ld hl, wd344
-	ld a, $1
+	ld [wOverworldMapPlayerPathVerticalMovement + 1], a
+
+; set player direction
+	ld hl, wOverworldMapPlayerPathHorizontalMovement + 1
+	ld a, EAST
 	bit 7, [hl]
-	jr z, .asm_1113a
-	ld a, $3
-.asm_1113a
+	jr z, .east2
+	ld a, WEST
+.east2
 	ld [wPlayerDirection], a
 	ret
 
-Func_1113e: ; 1113e (4:513e)
+; input:
+; b = absolute value of horizontal movement distance
+; c = absolute value of vertical movement distance
+OverworldMap_InitPlayerNorthSouthMovement: ; 1113e (4:513e)
+; use vertical distance for counter
 	ld a, c
-	ld [wd341], a
+	ld [wOverworldMapPlayerMovementCounter], a
+
+; de = absolute vertical distance, for later
 	ld e, a
-	ld d, $0
-	ld hl, wd345
+	ld d, 0
+
+; overwrite wOverworldMapPlayerPathVerticalMovement with either -1.0 or +1.0
+; always move north/south by 1 pixel per frame
+	ld hl, wOverworldMapPlayerPathVerticalMovement
 	xor a
 	ld [hli], a
 	bit 7, [hl]
-	jr z, .asm_11151
+	jr z, .south
 	dec a
-	jr .asm_11152
-.asm_11151
+	jr .north
+.south
 	inc a
-.asm_11152
+.north
 	ld [hl], a
-	ld c, $0
+
+; divide (total horizontal distance * $100) by total vertical distance
+; horizontal distance in high byte
+	ld c, 0
 	call DivideBCbyDE
-	ld a, [wd344]
+	ld a, [wOverworldMapPlayerPathHorizontalMovement + 1]
 	bit 7, a
-	jr z, .asm_11162
-	call Func_11179
-.asm_11162
+	jr z, .positive
+; restore negative sign
+	call OverworldMap_NegateBC
+.positive
 	ld a, c
-	ld [wd343], a
+	ld [wOverworldMapPlayerPathHorizontalMovement], a
 	ld a, b
-	ld [wd344], a
-	ld hl, wd346
-	ld a, $2
+	ld [wOverworldMapPlayerPathHorizontalMovement + 1], a
+
+; set player direction
+	ld hl, wOverworldMapPlayerPathVerticalMovement + 1
+	ld a, SOUTH
 	bit 7, [hl]
-	jr z, .asm_11175
-	ld a, $0
-.asm_11175
+	jr z, .south2
+	ld a, NORTH
+.south2
 	ld [wPlayerDirection], a
 	ret
 
-Func_11179: ; 11179 (4:5179)
+; output:
+; bc = bc * -1
+OverworldMap_NegateBC: ; 11179 (4:5179)
 	ld a, c
 	cpl
-	add $1
+	add 1
 	ld c, a
 	ld a, b
 	cpl
-	adc $0
+	adc 0
 	ld b, a
 	ret
 
-Func_11184: ; 11184 (4:5184)
-	ld a, [wd347]
+; add the x/y speed to the current sprite position,
+; accounting for sub-pixel position
+; and decrement [wOverworldMapPlayerMovementCounter]
+OverworldMap_ContinuePlayerWalkingAnimation: ; 11184 (4:5184)
+	ld a, [wOverworldMapPlayerHorizontalSubPixelPosition]
 	ld d, a
-	ld a, [wd348]
+	ld a, [wOverworldMapPlayerVerticalSubPixelPosition]
 	ld e, a
 	ld c, SPRITE_ANIM_COORD_X
 	call GetSpriteAnimBufferProperty
-	ld a, [wd343]
+	ld a, [wOverworldMapPlayerPathHorizontalMovement]
 	add d
 	ld d, a
-	ld a, [wd344]
-	adc [hl]
+	ld a, [wOverworldMapPlayerPathHorizontalMovement + 1]
+	adc [hl] ; add carry from sub-pixel movement
 	ld [hl], a
 	inc hl
-	ld a, [wd345]
+	ld a, [wOverworldMapPlayerPathVerticalMovement]
 	add e
 	ld e, a
-	ld a, [wd346]
-	adc [hl]
+	ld a, [wOverworldMapPlayerPathVerticalMovement + 1]
+	adc [hl] ; add carry from sub-pixel movement
 	ld [hl], a
 	ld a, d
-	ld [wd347], a
+	ld [wOverworldMapPlayerHorizontalSubPixelPosition], a
 	ld a, e
-	ld [wd348], a
-	ld hl, wd341
+	ld [wOverworldMapPlayerVerticalSubPixelPosition], a
+	ld hl, wOverworldMapPlayerMovementCounter
 	dec [hl]
 	ret
 
@@ -973,26 +1220,29 @@ Data_1156c: ; 1156c (4:556c)
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 ; 0x1157c
 
-Func_1157c: ; 1157c (4:557c)
+; save the game
+; if c is 0, save the player at their current position
+; otherwise, save the player in Mason's lab
+_SaveGame: ; 1157c (4:557c)
 	ld a, c
 	or a
-	jr nz, .asm_11586
-	farcall Func_c228
-	jr .asm_1159f
+	jr nz, .force_mason_lab
+	farcall BackupPlayerPosition
+	jr .save
 
-.asm_11586
+.force_mason_lab
 	ld a, $2
 	ld [wTempPlayerXCoord], a
 	ld a, $4
 	ld [wTempPlayerYCoord], a
-	ld a, $2
+	ld a, SOUTH
 	ld [wTempPlayerDirection], a
-	ld a, $1
+	ld a, MASON_LABORATORY
 	ld [wTempMap], a
-	ld a, $1
-	ld [wd32e], a
+	ld a, OWMAP_MASON_LABORATORY
+	ld [wOverworldMapSelection], a
 
-.asm_1159f
+.save
 	call Func_11238
 	ret
 
@@ -1003,12 +1253,11 @@ INCLUDE "data/map_scripts.asm"
 
 ; loads a pointer into hl found on NPCHeaderPointers
 GetNPCHeaderPointer: ; 1184a (4:584a)
-	; this may have been a macro
 	rlca
 	add LOW(NPCHeaderPointers)
 	ld l, a
 	ld a, HIGH(NPCHeaderPointers)
-	adc $00
+	adc 0
 	ld h, a
 	ld a, [hli]
 	ld h, [hl]
@@ -1032,10 +1281,10 @@ LoadNPCSpriteData: ; 11857 (4:5857)
 	pop bc
 	ld a, [wConsole]
 	cp CONSOLE_CGB
-	jr nz, .asm_1187a
+	jr nz, .not_cgb
 	ld a, b
 	ld [wd3b1], a
-.asm_1187a
+.not_cgb
 	pop bc
 	pop hl
 	ret
@@ -1053,7 +1302,7 @@ GetNPCNameAndScript: ; 1187d (4:587d)
 	ld a, [hli]
 	ld [wCurrentNPCNameTx], a
 	ld a, [hli]
-	ld [wCurrentNPCNameTx+1], a
+	ld [wCurrentNPCNameTx + 1], a
 	pop hl
 	ret
 
@@ -1067,16 +1316,17 @@ SetNPCDialogName: ; 11893 (4:5893)
 	ld a, [hli]
 	ld [wCurrentNPCNameTx], a
 	ld a, [hli]
-	ld [wCurrentNPCNameTx+1], a
+	ld [wCurrentNPCNameTx + 1], a
 	pop bc
 	pop hl
 	ret
 
-Func_118a7: ; 118a7 (4:58a7)
+; set the opponent name and portrait for the NPC id in register a
+SetNPCOpponentNameAndPortrait: ; 118a7 (4:58a7)
 	push hl
 	push bc
 	call GetNPCHeaderPointer
-	ld bc, $0007
+	ld bc, NPC_DATA_NAME_TEXT
 	add hl, bc
 	ld a, [hli]
 	ld [wOpponentName], a
@@ -1088,39 +1338,41 @@ Func_118a7: ; 118a7 (4:58a7)
 	pop hl
 	ret
 
-Func_118bf: ; 118bf (4:58bf)
+; set the deck id and duel theme for the NPC id in register a
+SetNPCDeckIDAndDuelTheme: ; 118bf (4:58bf)
 	push hl
 	push bc
 	call GetNPCHeaderPointer
-	ld bc, $000a
+	ld bc, NPC_DATA_DECK_ID
 	add hl, bc
 	ld a, [hli]
-	ld [wcc19], a
+	ld [wNPCDuelDeckID], a
 	ld a, [hli]
 	ld [wDuelTheme], a
 	pop bc
 	pop hl
 	ret
 
-Func_118d3: ; 118d3 (4:58d3)
+; set the start theme for the NPC id in register a
+SetNPCMatchStartTheme: ; 118d3 (4:58d3)
 	push hl
 	push bc
 	push af
 	call GetNPCHeaderPointer
-	ld bc, $000c
+	ld bc, NPC_DATA_MATCH_START_ID
 	add hl, bc
 	ld a, [hli]
 	ld [wMatchStartTheme], a
 	pop af
-	cp $2
-	jr nz, .asm_118f2
+	cp NPC_RONALD1
+	jr nz, .not_ronald_final_duel
 	ld a, [wCurMap]
 	cp POKEMON_DOME
-	jr nz, .asm_118f2
+	jr nz, .not_ronald_final_duel
 	ld a, MUSIC_MATCH_START_3
 	ld [wMatchStartTheme], a
 
-.asm_118f2
+.not_ronald_final_duel
 	pop bc
 	pop hl
 	ret
@@ -1219,18 +1471,18 @@ OverworldScriptTable: ; 1217b (4:617b)
 	dw ScriptCommand_EndScript
 	dw ScriptCommand_EndScript
 	dw ScriptCommand_EndScript
-	dw ScriptCommand_SetFlagValue
-	dw ScriptCommand_JumpIfFlagZero1
-	dw ScriptCommand_JumpIfFlagNonzero1
-	dw ScriptCommand_JumpIfFlagEqual
-	dw ScriptCommand_JumpIfFlagNotEqual
-	dw ScriptCommand_JumpIfFlagNotLessThan
-	dw ScriptCommand_JumpIfFlagLessThan
-	dw ScriptCommand_MaxOutFlagValue
-	dw ScriptCommand_ZeroOutFlagValue
-	dw ScriptCommand_JumpIfFlagNonzero2
-	dw ScriptCommand_JumpIfFlagZero2
-	dw ScriptCommand_IncrementFlagValue
+	dw ScriptCommand_SetEventValue
+	dw ScriptCommand_JumpIfEventZero
+	dw ScriptCommand_JumpIfEventNonzero
+	dw ScriptCommand_JumpIfEventEqual
+	dw ScriptCommand_JumpIfEventNotEqual
+	dw ScriptCommand_JumpIfEventGreaterOrEqual
+	dw ScriptCommand_JumpIfEventLessThan
+	dw ScriptCommand_MaxOutEventValue
+	dw ScriptCommand_ZeroOutEventValue
+	dw ScriptCommand_JumpIfEventTrue
+	dw ScriptCommand_JumpIfEventFalse
+	dw ScriptCommand_IncrementEventValue
 	dw ScriptCommand_EndScript
 	dw ScriptCommand_EndScript
 	dw ScriptCommand_EndScript
@@ -1297,10 +1549,672 @@ SamRulesMultichoice_ConfigurationTable: ; 1228e (4:628e)
 
 	db $00, $00, $00 ; marker bytes -- end of config table
 
-
-
-Unknown_1229f: ; 1229f (4:629f)
-	INCROM $1229f, $126d1
+OverworldMap_PlayerMovementPaths: ; 1229f (4:629f)
+	dw OverworldMap_MasonLaboratoryPaths
+	dw OverworldMap_IshiharasHousePaths
+	dw OverworldMap_FightingClubPaths
+	dw OverworldMap_RockClubPaths
+	dw OverworldMap_WaterClubPaths
+	dw OverworldMap_LightningClubPaths
+	dw OverworldMap_GrassClubPaths
+	dw OverworldMap_PsychicClubPaths
+	dw OverworldMap_ScienceClubPaths
+	dw OverworldMap_FireClubPaths
+	dw OverworldMap_ChallengeHallPaths
+	dw OverworldMap_PokemonDomePaths
+
+OverworldMap_MasonLaboratoryPaths: ; 122b7 (4:62b7)
+	dw OverworldMap_NoMovement
+	dw OverworldMap_MasonLaboratoryPathToIshiharasHouse
+	dw OverworldMap_StraightPath
+	dw OverworldMap_MasonLaboratoryPathToRockClub
+	dw OverworldMap_MasonLaboratoryPathToWaterClub
+	dw OverworldMap_MasonLaboratoryPathToLightningClub
+	dw OverworldMap_MasonLaboratoryPathToGrassClub
+	dw OverworldMap_MasonLaboratoryPathToPsychicClub
+	dw OverworldMap_MasonLaboratoryPathToScienceClub
+	dw OverworldMap_MasonLaboratoryPathToFireClub
+	dw OverworldMap_MasonLaboratoryPathToChallengeHall
+	dw OverworldMap_MasonLaboratoryPathToPokemonDome
+
+OverworldMap_IshiharasHousePaths: ; 122cf (4:62cf)
+	dw OverworldMap_IshiharasHousePathToMasonLaboratory
+	dw OverworldMap_NoMovement
+	dw OverworldMap_IshiharasHousePathToFightingClub
+	dw OverworldMap_IshiharasHousePathToRockClub
+	dw OverworldMap_IshiharasHousePathToWaterClub
+	dw OverworldMap_IshiharasHousePathToLightningClub
+	dw OverworldMap_IshiharasHousePathToGrassClub
+	dw OverworldMap_IshiharasHousePathToPsychicClub
+	dw OverworldMap_IshiharasHousePathToScienceClub
+	dw OverworldMap_IshiharasHousePathToFireClub
+	dw OverworldMap_IshiharasHousePathToChallengeHall
+	dw OverworldMap_IshiharasHousePathToPokemonDome
+
+OverworldMap_FightingClubPaths: ; 122e7 (4:62e7)
+	dw OverworldMap_StraightPath
+	dw OverworldMap_FightingClubPathToIshiharasHouse
+	dw OverworldMap_NoMovement
+	dw OverworldMap_FightingClubPathToRockClub
+	dw OverworldMap_FightingClubPathToWaterClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_FightingClubPathToPsychicClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_FightingClubPathToFireClub
+	dw OverworldMap_FightingClubPathToChallengeHall
+	dw OverworldMap_StraightPath
+
+OverworldMap_RockClubPaths: ; 122ff (4:62ff)
+	dw OverworldMap_RockClubPathToMasonLaboratory
+	dw OverworldMap_RockClubPathToIshiharasHouse
+	dw OverworldMap_RockClubPathToFightingClub
+	dw OverworldMap_NoMovement
+	dw OverworldMap_RockClubPathToWaterClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_RockClubPathToGrassClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_RockClubPathToScienceClub
+	dw OverworldMap_RockClubPathToFireClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+
+OverworldMap_WaterClubPaths: ; 12317 (4:6317)
+	dw OverworldMap_WaterClubPathToMasonLaboratory
+	dw OverworldMap_WaterClubPathToIshiharasHouse
+	dw OverworldMap_WaterClubPathToFightingClub
+	dw OverworldMap_WaterClubPathToRockClub
+	dw OverworldMap_NoMovement
+	dw OverworldMap_WaterClubPathToLightningClub
+	dw OverworldMap_WaterClubPathToGrassClub
+	dw OverworldMap_WaterClubPathToPsychicClub
+	dw OverworldMap_WaterClubPathToScienceClub
+	dw OverworldMap_WaterClubPathToFireClub
+	dw OverworldMap_WaterClubPathToChallengeHall
+	dw OverworldMap_WaterClubPathToPokemonDome
+
+OverworldMap_LightningClubPaths: ; 1232f (4:632f)
+	dw OverworldMap_LightningClubPathToMasonLaboratory
+	dw OverworldMap_LightningClubPathToIshiharasHouse
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_LightningClubPathToWaterClub
+	dw OverworldMap_NoMovement
+	dw OverworldMap_StraightPath
+	dw OverworldMap_LightningClubPathToPsychicClub
+	dw OverworldMap_LightningClubPathToScienceClub
+	dw OverworldMap_LightningClubPathToFireClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+
+OverworldMap_GrassClubPaths: ; 12347 (4:6347)
+	dw OverworldMap_GrassClubPathToMasonLaboratory
+	dw OverworldMap_GrassClubPathToIshiharasHouse
+	dw OverworldMap_StraightPath
+	dw OverworldMap_GrassClubPathToRockClub
+	dw OverworldMap_GrassClubPathToWaterClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_NoMovement
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_GrassClubPathToChallengeHall
+	dw OverworldMap_StraightPath
+
+OverworldMap_PsychicClubPaths: ; 1235f (4:635f)
+	dw OverworldMap_PsychicClubPathToMasonLaboratory
+	dw OverworldMap_PsychicClubPathToIshiharasHouse
+	dw OverworldMap_PsychicClubPathToFightingClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_PsychicClubPathToWaterClub
+	dw OverworldMap_PsychicClubPathToLightningClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_NoMovement
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+
+OverworldMap_ScienceClubPaths: ; 12377 (4:6377)
+	dw OverworldMap_ScienceClubPathToMasonLaboratory
+	dw OverworldMap_ScienceClubPathToIshiharasHouse
+	dw OverworldMap_StraightPath
+	dw OverworldMap_ScienceClubPathToRockClub
+	dw OverworldMap_ScienceClubPathToWaterClub
+	dw OverworldMap_ScienceClubPathToLightningClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_NoMovement
+	dw OverworldMap_StraightPath
+	dw OverworldMap_ScienceClubPathToChallengeHall
+	dw OverworldMap_StraightPath
+
+OverworldMap_FireClubPaths: ; 1238f (4:638f)
+	dw OverworldMap_FireClubPathToMasonLaboratory
+	dw OverworldMap_FireClubPathToIshiharasHouse
+	dw OverworldMap_FireClubPathToFightingClub
+	dw OverworldMap_FireClubPathToRockClub
+	dw OverworldMap_FireClubPathToWaterClub
+	dw OverworldMap_FireClubPathToLightningClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_NoMovement
+	dw OverworldMap_FireClubPathToChallengeHall
+	dw OverworldMap_FireClubPathToPokemonDome
+
+OverworldMap_ChallengeHallPaths: ; 123a7 (4:63a7)
+	dw OverworldMap_ChallengeHallPathToMasonLaboratory
+	dw OverworldMap_ChallengeHallPathToIshiharasHouse
+	dw OverworldMap_ChallengeHallPathToFightingClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_ChallengeHallPathToWaterClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_ChallengeHallPathToGrassClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_ChallengeHallPathToScienceClub
+	dw OverworldMap_ChallengeHallPathToFireClub
+	dw OverworldMap_NoMovement
+	dw OverworldMap_StraightPath
+
+OverworldMap_PokemonDomePaths: ; 123bf (4:63bf)
+	dw OverworldMap_PokemonDomePathToMasonLaboratory
+	dw OverworldMap_PokemonDomePathToIshiharasHouse
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_PokemonDomePathToWaterClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_StraightPath
+	dw OverworldMap_PokemonDomePathToFireClub
+	dw OverworldMap_StraightPath
+	dw OverworldMap_NoMovement
+
+OverworldMap_IshiharasHousePathToRockClub: ; 123d7 (4:63d7)
+OverworldMap_RockClubPathToIshiharasHouse: ; 123d7 (4:63d7)
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToWaterClub: ; 123dd (4:63dd)
+	db $2c, $78
+	db $3c, $68
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToMasonLaboratory: ; 123eb (4:63eb)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToFireClub: ; 123f9 (4:63f9)
+	db $2c, $28
+	db $3c, $40
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToIshiharasHouse: ; 12403 (4:6403)
+	db $5c, $30
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToIshiharasHouse: ; 1240d (4:640d)
+	db $2c, $78
+	db $3c, $68
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToMasonLaboratory: ; 12419 (4:6419)
+	db $2c, $28
+	db $3c, $40
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToRockClub: ; 12425 (4:6425)
+	db $2c, $78
+	db $3c, $68
+	db $3c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToMasonLaboratory: ; 1242f (4:642f)
+	db $3c, $48
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToLightningClub: ; 12439 (4:6439)
+OverworldMap_LightningClubPathToMasonLaboratory: ; 12439 (4:6439)
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToGrassClub: ; 1243f (4:643f)
+	db $2c, $78
+	db $3c, $68
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_GrassClubPathToMasonLaboratory: ; 12449 (4:6449)
+	db $5c, $68
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToPsychicClub: ; 12453 (4:6453)
+	db $2c, $78
+	db $3c, $68
+	db $5c, $68
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_PsychicClubPathToMasonLaboratory: ; 1245f (4:645f)
+	db $5c, $48
+	db $5c, $68
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToScienceClub: ; 1246b (4:646b)
+	db $2c, $78
+	db $3c, $68
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ScienceClubPathToMasonLaboratory: ; 12475 (4:6475)
+	db $5c, $68
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToFireClub: ; 1247f (4:647f)
+	db $2c, $78
+	db $3c, $68
+	db $5c, $68
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToMasonLaboratory: ; 1248b (4:648b)
+	db $5c, $30
+	db $5c, $68
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToChallengeHall: ; 12497 (4:6497)
+	db $2c, $78
+	db $3c, $68
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ChallengeHallPathToMasonLaboratory: ; 124a1 (4:64a1)
+	db $3c, $40
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_MasonLaboratoryPathToPokemonDome: ; 124ab (4:64ab)
+	db $2c, $78
+	db $3c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_PokemonDomePathToMasonLaboratory: ; 124b3 (4:64b3)
+	db $3c, $68
+	db $2c, $78
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToFightingClub: ; 124bb (4:64bb)
+OverworldMap_FightingClubPathToIshiharasHouse: ; 124bb (4:64bb)
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToWaterClub: ; 124c1 (4:64c1)
+	db $2c, $28
+	db $3c, $48
+	db $3c, $68
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToIshiharasHouse: ; 124d1 (4:64d1)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $3c, $68
+	db $3c, $48
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToLightningClub: ; 124e1 (4:64e1)
+OverworldMap_LightningClubPathToIshiharasHouse: ; 124e1 (4:64e1)
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToGrassClub: ; 124e7 (4:64e7)
+	db $2c, $28
+	db $3c, $40
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_GrassClubPathToIshiharasHouse: ; 124f1 (4:64f1)
+	db $5c, $48
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToPsychicClub: ; 124fb (4:64fb)
+	db $2c, $28
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_PsychicClubPathToIshiharasHouse: ; 12503 (4:6503)
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToScienceClub: ; 1250b (4:650b)
+	db $2c, $28
+	db $3c, $40
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ScienceClubPathToIshiharasHouse: ; 12515 (4:6515)
+	db $5c, $48
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToChallengeHall: ; 1251f (4:651f)
+	db $2c, $28
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ChallengeHallPathToIshiharasHouse: ; 12527 (4:6527)
+	db $3c, $40
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_IshiharasHousePathToPokemonDome: ; 1252f (4:652f)
+	db $2c, $28
+	db $3c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_PokemonDomePathToIshiharasHouse: ; 12537 (4:6537)
+	db $3c, $48
+	db $2c, $28
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FightingClubPathToRockClub: ; 1253f (4:653f)
+	db $3c, $68
+	db $3c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToFightingClub: ; 12547 (4:6547)
+	db $3c, $48
+	db $3c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FightingClubPathToWaterClub: ; 1254f (4:654f)
+	db $3c, $68
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToFightingClub: ; 1255b (4:655b)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $3c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FightingClubPathToPsychicClub: ; 12567 (4:6567)
+OverworldMap_PsychicClubPathToFightingClub: ; 12567 (4:6567)
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FightingClubPathToFireClub: ; 1256d (4:656d)
+	db $5c, $68
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToFightingClub: ; 12575 (4:6575)
+	db $5c, $30
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FightingClubPathToChallengeHall: ; 1257d (4:657d)
+OverworldMap_ChallengeHallPathToFightingClub: ; 1257d (4:657d)
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToWaterClub: ; 12583 (4:6583)
+	db $3c, $48
+	db $3c, $68
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToRockClub: ; 12591 (4:6591)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $3c, $68
+	db $3c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToGrassClub: ; 1259f (4:659f)
+OverworldMap_GrassClubPathToRockClub: ; 1259f (4:659f)
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToFireClub: ; 125a5 (4:65a5)
+	db $3c, $40
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToRockClub: ; 125ad (4:65ad)
+	db $5c, $30
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToLightningClub: ; 125b5 (4:65b5)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $3c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_LightningClubPathToWaterClub: ; 125c1 (4:65c1)
+	db $3c, $68
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToGrassClub: ; 125cd (4:65cd)
+OverworldMap_WaterClubPathToPsychicClub: ; 125cd (4:65cd)
+OverworldMap_WaterClubPathToScienceClub: ; 125cd (4:65cd)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_GrassClubPathToWaterClub: ; 125d7 (4:65d7)
+OverworldMap_PsychicClubPathToWaterClub: ; 125d7 (4:65d7)
+OverworldMap_ScienceClubPathToWaterClub: ; 125d7 (4:65d7)
+	db $5c, $68
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToFireClub: ; 125e1 (4:65e1)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToWaterClub: ; 125eb (4:65eb)
+	db $5c, $30
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToChallengeHall: ; 125f5 (4:65f5)
+	db $74, $7c
+	db $5c, $7c
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ChallengeHallPathToWaterClub: ; 125ff (4:65ff)
+	db $5c, $48
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_WaterClubPathToPokemonDome: ; 12609 (4:6609)
+	db $74, $7c
+	db $5c, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_PokemonDomePathToWaterClub: ; 12611 (4:6611)
+	db $5c, $7c
+	db $74, $7c
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_LightningClubPathToPsychicClub: ; 12619 (4:6619)
+OverworldMap_PsychicClubPathToLightningClub: ; 12619 (4:6619)
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_LightningClubPathToScienceClub: ; 1261f (4:661f)
+	db $3c, $68
+	db $5c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ScienceClubPathToLightningClub: ; 12627 (4:6627)
+	db $5c, $68
+	db $3c, $68
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_LightningClubPathToFireClub: ; 1262f (4:662f)
+	db $3c, $48
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToLightningClub: ; 12637 (4:6637)
+	db $5c, $30
+	db $3c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_GrassClubPathToChallengeHall: ; 1263f (4:663f)
+OverworldMap_ScienceClubPathToChallengeHall: ; 1263f (4:663f)
+OverworldMap_ChallengeHallPathToGrassClub: ; 1263f (4:663f)
+OverworldMap_ChallengeHallPathToScienceClub: ; 1263f (4:663f)
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_FireClubPathToChallengeHall: ; 12645 (4:6645)
+OverworldMap_FireClubPathToPokemonDome: ; 12645 (4:6645)
+OverworldMap_ChallengeHallPathToFireClub: ; 12645 (4:6645)
+OverworldMap_PokemonDomePathToFireClub: ; 12645 (4:6645)
+	db $5c, $30
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_RockClubPathToScienceClub: ; 1264b (4:664b)
+	db $3c, $40
+	db $5c, $48
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_ScienceClubPathToRockClub: ; 12653 (4:6653)
+	db $5c, $48
+	db $3c, $40
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_StraightPath: ; 1265b (4:665b)
+	db $00, $00
+	db $ff, $ff
+
+OverworldMap_NoMovement: ; 1265f (4:665f)
+	db $ff, $ff
+
+	INCROM $12661, $126d1
 
 ; usually, the game doesn't loop here at all, since as soon as a main menu option
 ; is selected, there is no need to come back to the menu.
@@ -1346,9 +2260,9 @@ MainMenu_NewGame: ; 12704 (4:6704)
 	ld a, MUSIC_STOP
 	call PlaySong
 	farcall Func_70000
-	ld a, $9
-	ld [wd111], a
-	call Func_39fc
+	ld a, MUSIC_OVERWORLD
+	ld [wDefaultSong], a
+	call PlayDefaultSong
 	farcall Func_1d306
 	ld a, GAME_EVENT_OVERWORLD
 	ld [wGameEvent], a
@@ -1521,7 +2435,7 @@ CreateSpriteAndAnimBufferEntry: ; 1299f (4:699f)
 	ld [wWhichSprite], a
 	cp $10
 	jr nz, .findFirstEmptyAnimField
-	debug_ret
+	debug_nop
 	scf
 	jr .quit
 .foundEmptyAnimField
@@ -1976,7 +2890,7 @@ Func_12c05: ; 12c05 (4:6c05)
 	jr .quitSucceed
 
 .quitFail
-	debug_ret
+	debug_nop
 	xor a
 	scf
 .quitSucceed
@@ -2003,14 +2917,618 @@ Func_12c4f: ; 12c4f (4:6c4f)
 Func_12c5e: ; 12c5e (4:6c5e)
 	INCROM $12c5e, $12c7f
 
-Func_12c7f: ; 12c7f (4:6c7f)
-	INCROM $12c7f, $12fc6
+; input:
+; a = scene ID (SCENE_* constant)
+; b = base X position of scene in tiles
+; c = base Y position of scene in tiles
+_LoadScene: ; 12c7f (4:6c7f)
+	push hl
+	push bc
+	push de
+	ld e, a
+	ld a, [wCurTilemap]
+	push af
+	ld a, [wd291]
+	push af
+	ld a, e
+	push bc
+	push af
+	ld a, b
+	add a
+	add a
+	add a
+	add $08
+	ld [wSceneBaseX], a
+	ld a, c
+	add a
+	add a
+	add a
+	add $10
+	ld [wSceneBaseY], a
+	pop af
+	add a
+	ld c, a
+	ld b, 0
+	ld hl, ScenePointers
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld a, [hli]
+	ld [wSceneSGBPacketPtr], a
+	ld a, [hli]
+	ld [wSceneSGBPacketPtr + 1], a
+	ld a, [hli]
+	ld [wSceneSGBRoutinePtr], a
+	ld a, [hli]
+	ld [wSceneSGBRoutinePtr + 1], a
+	call LoadScene_LoadCompressedSGBPacket
+	ld a, %11100100
+	ld [wBGP], a
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	ld a, [hli]
+	jr nz, .not_cgb_1
+	ld a, [hl]
+.not_cgb_1
+	inc hl
+	push af ; palette
+	xor a
+	ld [wd4ca], a
+	ld a, [hli]
+	ld [wd4cb], a ; palette offset
+	ld [wd291], a ; palette offset
+	pop af ; palette
+	farcall Func_803c9 ; load palette
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	ld a, [hli]
+	jr nz, .not_cgb_2
+	ld a, [hl]
+.not_cgb_2
+	inc hl
+	ld [wCurTilemap], a
+	pop bc
+	push bc
+	farcall Func_8007e ; load tilemap
+	pop bc ; base x,y
+	call LoadScene_LoadSGBPacket
+	ld a, [hli]
+	ld [wd4ca], a ; tile offset
+	ld a, [hli]
+	ld [wd4cb], a ; vram0 or vram1
+	farcall LoadTilesetGfx
+.next_sprite
+	ld a, [hli]
+	or a
+	jr z, .done ; no sprite
+	ld [wSceneSprite], a
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	ld a, [hli]
+	jr nz, .not_cgb_3
+	ld a, [hl]
+.not_cgb_3
+	inc hl
+	push af ; sprite palette
+	xor a
+	ld [wd4ca], a
+	ld a, [hli]
+	ld [wd4cb], a ; palette offset
+	pop af ; sprite palette
+	farcall LoadPaletteData
+.next_animation
+	ld a, [hli]
+	or a
+	jr z, .next_sprite
+	dec hl
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	ld a, [hli]
+	jr nz, .not_cgb_4
+	ld a, [hl]
+.not_cgb_4
+	inc hl
+	ld [wSceneSpriteAnimation], a
+	ld a, [wSceneSprite]
+	farcall CreateSpriteAndAnimBufferEntry
+	ld a, [wWhichSprite]
+	ld [wSceneSpriteIndex], a
+	push hl
+	ld c, SPRITE_ANIM_COORD_X
+	call GetSpriteAnimBufferProperty
+	ld e, l
+	ld d, h
+	pop hl
+	ld a, [wSceneBaseX]
+	add [hl]
+	ld [de], a
+	inc hl
+	inc de
+	ld a, [wSceneBaseY]
+	add [hl]
+	ld [de], a
+	inc hl
+	ld a, [wSceneSpriteAnimation]
+	cp $ff
+	jr z, .no_animation
+	farcall StartSpriteAnimation
+.no_animation
+	jr .next_animation
+.done
+	pop af
+	ld [wd291], a
+	pop af
+	ld [wCurTilemap], a
+	pop de
+	pop bc
+	pop hl
+	ret
+
+ScenePointers: ; 12d6f (4:6d6f)
+	dw Scene_TitleScreen
+	dw Scene_ColosseumBooster
+	dw Scene_EvolutionBooster
+	dw Scene_MysteryBooster
+	dw Scene_LaboratoryBooster
+	dw Scene_CharizardIntro
+	dw Scene_ScytherIntro
+	dw Scene_AerodactylIntro
+	dw Scene_GradientBlackAndRed
+	dw Scene_GradientWhiteAndRed
+	dw Scene_GradientBlackAndGreen
+	dw Scene_GradientWhiteAndGreen
+	dw Scene_ColorWheel
+	dw Scene_ColorTest
+	dw Scene_GameBoyLinkConnecting
+	dw Scene_GameBoyLinkTransmitting
+	dw Scene_GameBoyLinkNotConnected
+	dw Scene_GameBoyPrinterTransmitting
+	dw Scene_GameBoyPrinterNotConnected
+	dw Scene_CardPop
+	dw Scene_CardPopError
+	dw Scene_JapaneseTitleScreen
+	dw Scene_Nintendo
+	dw Scene_Companies
+	dw Scene_JapaneseTitleScreen2
+	dw Scene_Copyright
+	dw Scene_JapaneseTitleScreen2
+	dw Scene_ColorPalette
+
+; format:
+; dw compressed sgb packet
+; dw custom sgb packet loading routine
+; db palette (non-cgb), palette (cgb), palette offset
+; db tilemap (non-cgb), tilemap (cgb), vram tile offset, vram0 or vram1
+; db sprite
+;
+; if sprite is non-zero:
+; db palette (non-cgb), palette (cgb), palette offset
+; db animation (non-cgb), animation (cgb), x offset, y offset
+; dw 0-terminator
+
+Scene_TitleScreen: ; 12da7 (4:6da7)
+	dw SGBData_TitleScreen
+	dw NULL
+	db PALETTE_25, PALETTE_25, $00
+	db TILEMAP_TITLE_SCREEN, TILEMAP_TITLE_SCREEN_CGB, $00, $00
+	db $00
+
+Scene_JapaneseTitleScreen: ; 12db3 (4:6db3)
+	dw SGBData_TitleScreen
+	dw NULL
+	db PALETTE_25, PALETTE_25, $00
+	db TILEMAP_JAPANESE_TITLE_SCREEN, TILEMAP_JAPANESE_TITLE_SCREEN_CGB, $80, $00
+	db $00
+
+Scene_ColosseumBooster: ; 12dbf (4:6dbf)
+	dw SGBData_ColosseumBooster
+	dw NULL
+	db PALETTE_108, PALETTE_101, $01
+	db TILEMAP_COLOSSEUM, TILEMAP_COLOSSEUM_CGB, $80, $00
+	db SPRITE_BOOSTER_PACK_OAM
+	db PALETTE_117, PALETTE_117, $00
+	db $ff, $bd, $00, $00
+	dw $00
+
+Scene_EvolutionBooster: ; 12dd4 (4:6dd4)
+	dw SGBData_EvolutionBooster
+	dw NULL
+	db PALETTE_108, PALETTE_102, $01
+	db TILEMAP_EVOLUTION, TILEMAP_EVOLUTION_CGB, $80, $00
+	db SPRITE_BOOSTER_PACK_OAM
+	db PALETTE_117, PALETTE_117, $00
+	db $ff, $bd, $00, $00
+	dw $00
+
+Scene_MysteryBooster: ; 12de9 (4:6de9)
+	dw SGBData_MysteryBooster
+	dw NULL
+	db PALETTE_108, PALETTE_103, $01
+	db TILEMAP_MYSTERY, TILEMAP_MYSTERY_CGB, $80, $00
+	db SPRITE_BOOSTER_PACK_OAM
+	db PALETTE_117, PALETTE_117, $00
+	db $ff, $bd, $00, $00
+	dw $00
+
+Scene_LaboratoryBooster: ; 12dfe (4:6dfe)
+	dw SGBData_LaboratoryBooster
+	dw NULL
+	db PALETTE_108, PALETTE_104, $01
+	db TILEMAP_LABORATORY, TILEMAP_LABORATORY_CGB, $80, $00
+	db SPRITE_BOOSTER_PACK_OAM
+	db PALETTE_117, PALETTE_117, $00
+	db $ff, $bd, $00, $00
+	dw $00
+
+Scene_CharizardIntro: ; 12e13 (4:6e13)
+	dw SGBData_CharizardIntro
+	dw NULL
+	db PALETTE_108, PALETTE_105, $01
+	db TILEMAP_CHARIZARD_INTRO, TILEMAP_CHARIZARD_INTRO_CGB, $80, $00
+	db $00
+
+Scene_ScytherIntro: ; 12e1f (4:6e1f)
+	dw SGBData_ScytherIntro
+	dw NULL
+	db PALETTE_108, PALETTE_106, $01
+	db TILEMAP_SCYTHER_INTRO, TILEMAP_SCYTHER_INTRO_CGB, $80, $00
+	db $00
+
+Scene_AerodactylIntro: ; 12e2b (4:6e2b)
+	dw SGBData_AerodactylIntro
+	dw NULL
+	db PALETTE_108, PALETTE_107, $01
+	db TILEMAP_AERODACTYL_INTRO, TILEMAP_AERODACTYL_INTRO_CGB, $80, $00
+	db $00
+
+Scene_GradientBlackAndRed: ; 12e37 (4:6e37)
+	dw NULL
+	dw NULL
+	db PALETTE_94, PALETTE_94, $00
+	db TILEMAP_SOLID_TILES_1, TILEMAP_SOLID_TILES_1, $01, $00
+	db $00
+
+Scene_GradientWhiteAndRed: ; 12e43 (4:6e43)
+	dw NULL
+	dw NULL
+	db PALETTE_95, PALETTE_95, $00
+	db TILEMAP_SOLID_TILES_1, TILEMAP_SOLID_TILES_1, $01, $00
+	db $00
+
+Scene_GradientBlackAndGreen: ; 12e4f (4:6e4f)
+	dw NULL
+	dw NULL
+	db PALETTE_96, PALETTE_96, $00
+	db TILEMAP_SOLID_TILES_1, TILEMAP_SOLID_TILES_1, $01, $00
+	db $00
+
+Scene_GradientWhiteAndGreen: ; 12e5b (4:6e5b)
+	dw NULL
+	dw NULL
+	db PALETTE_97, PALETTE_97, $00
+	db TILEMAP_SOLID_TILES_1, TILEMAP_SOLID_TILES_1, $01, $00
+	db $00
+
+Scene_ColorWheel: ; 12e67 (4:6e67)
+	dw NULL
+	dw NULL
+	db PALETTE_98, PALETTE_98, $00
+	db TILEMAP_SOLID_TILES_2, TILEMAP_SOLID_TILES_2, $01, $00
+	db $00
+
+Scene_ColorTest: ; 12e73 (4:6e73)
+	dw NULL
+	dw NULL
+	db PALETTE_99, PALETTE_99, $00
+	db TILEMAP_SOLID_TILES_3, TILEMAP_SOLID_TILES_3, $01, $00
+	db $00
+
+Scene_ColorPalette: ; 12e7f (4:6e7f)
+	dw NULL
+	dw NULL
+	db PALETTE_110, PALETTE_110, $00
+	db TILEMAP_SOLID_TILES_4, TILEMAP_SOLID_TILES_4, $fc, $01
+	db $00
+
+Scene_GameBoyLinkConnecting: ; 12e8b (4:6e8b)
+	dw SGBData_GameBoyLink
+	dw NULL
+	db PALETTE_111, PALETTE_111, $00
+	db TILEMAP_GAMEBOY_LINK_CONNECTING, TILEMAP_GAMEBOY_LINK_CONNECTING_CGB, $90, $00
+	db $00
+
+Scene_GameBoyLinkTransmitting: ; 12e97 (4:6e97)
+	dw SGBData_GameBoyLink
+	dw NULL
+	db PALETTE_111, PALETTE_111, $00
+	db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
+	db SPRITE_DUEL_52
+	db PALETTE_114, PALETTE_114, $00
+	db $b3, $b0, $50, $50
+	dw $00
+
+Scene_GameBoyLinkNotConnected: ; 12eac (4:6eac)
+	dw SGBData_GameBoyLink
+	dw NULL
+	db PALETTE_111, PALETTE_111, $00
+	db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
+	db SPRITE_DUEL_52
+	db PALETTE_114, PALETTE_114, $00
+	db $b4, $b1, $50, $50
+	dw $00
+
+Scene_GameBoyPrinterTransmitting: ; 12ec1 (4:6ec1)
+	dw SGBData_GameBoyPrinter
+	dw LoadScene_SetGameBoyPrinterAttrBlk
+	db PALETTE_112, PALETTE_112, $00
+	db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
+	db SPRITE_DUEL_53
+	db PALETTE_115, PALETTE_115, $00
+	db $b7, $b5, $50, $30
+	dw $00
+
+Scene_GameBoyPrinterNotConnected: ; 12ed6 (4:6ed6)
+	dw SGBData_GameBoyPrinter
+	dw LoadScene_SetGameBoyPrinterAttrBlk
+	db PALETTE_112, PALETTE_112, $00
+	db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
+	db SPRITE_DUEL_53
+	db PALETTE_115, PALETTE_115, $00
+	db $b8, $b6, $50, $30
+	dw $00
+
+Scene_CardPop: ; 12eeb (4:6eeb)
+	dw SGBData_CardPop
+	dw LoadScene_SetCardPopAttrBlk
+	db PALETTE_113, PALETTE_113, $00
+	db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
+	db SPRITE_DUEL_54
+	db PALETTE_116, PALETTE_116, $00
+	db $bb, $b9, $50, $40
+	dw $00
+
+Scene_CardPopError: ; 12f00 (4:6f00)
+	dw SGBData_CardPop
+	dw LoadScene_SetCardPopAttrBlk
+	db PALETTE_113, PALETTE_113, $00
+	db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
+	db SPRITE_DUEL_54
+	db PALETTE_116, PALETTE_116, $00
+	db $bc, $ba, $50, $40
+	dw $00
+
+Scene_Nintendo: ; 12f15 (4:6f15)
+	dw NULL
+	dw NULL
+	db PALETTE_27, PALETTE_27, $00
+	db TILEMAP_NINTENDO, TILEMAP_NINTENDO, $00, $00
+	db $00
+
+Scene_Companies: ; 12f21 (4:6f21)
+	dw NULL
+	dw NULL
+	db PALETTE_28, PALETTE_28, $00
+	db TILEMAP_COMPANIES, TILEMAP_COMPANIES, $00, $00
+	db $00
+
+Scene_Copyright: ; 12f2d (4:6f2d)
+	dw NULL
+	dw NULL
+	db PALETTE_26, PALETTE_26, $00
+	db TILEMAP_COPYRIGHT, TILEMAP_COPYRIGHT_CGB, $00, $00
+	db $00
+
+Scene_JapaneseTitleScreen2: ; 12f39 (4:6f39)
+	dw NULL
+	dw NULL
+	db PALETTE_109, PALETTE_100, $00
+	db TILEMAP_JAPANESE_TITLE_SCREEN_2, TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB, $01, $00
+	db $00
+
+LoadScene_LoadCompressedSGBPacket: ; 12f45 (4:6f45)
+	ld a, [wConsole]
+	cp CONSOLE_SGB
+	ret nz
+	push hl
+	ld hl, wSceneSGBPacketPtr
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	or h
+	jr z, .skip
+	farcall Func_703cb
+.skip
+	pop hl
+	ret
+
+LoadScene_LoadSGBPacket: ; 12f5b (4:6f5b)
+	ld a, [wConsole]
+	cp CONSOLE_SGB
+	ret nz
+	push hl
+	push bc
+	push de
+	ld hl, wSceneSGBPacketPtr
+	ld a, [hli]
+	or [hl]
+	jr z, .done
+	ld hl, wSceneSGBRoutinePtr + 1
+	ld a, [hld]
+	or [hl]
+	jr z, .use_default
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	call CallHL2
+	jr .done
+.use_default
+	ld l, %001010 ; outside, border, inside palette numbers
+	ld a, [wBGMapWidth]
+	ld d, a
+	ld a, [wBGMapHeight]
+	ld e, a
+	farcall Func_70498
+.done
+	pop de
+	pop bc
+	pop hl
+	ret
+
+LoadScene_SetGameBoyPrinterAttrBlk: ; 12f8c (4:6f8c)
+	push hl
+	push bc
+	push de
+	ld hl, SGBPacket_GameBoyPrinter
+	call SendSGB
+	pop de
+	pop bc
+	pop hl
+	ret
+
+SGBPacket_GameBoyPrinter: ; 12f99 (4:6f99)
+	sgb ATTR_BLK, 1
+	db 1 ; number of data sets
+	db ATTR_BLK_CTRL_OUTSIDE | ATTR_BLK_CTRL_LINE | ATTR_BLK_CTRL_INSIDE
+	db %101111 ; Color Palette Designation
+	db 11 ; x1
+	db 0  ; y1
+	db 16 ; x2
+	db 9  ; y2
+	ds 6 ; data set 2
+	ds 2 ; data set 3
+
+LoadScene_SetCardPopAttrBlk: ; 12fa9 (4:6fa9)
+	push hl
+	push bc
+	push de
+	ld hl, SGBPacket_CardPop
+	call SendSGB
+	pop de
+	pop bc
+	pop hl
+	ret
+
+SGBPacket_CardPop: ; 12fb6 (4:6fb6)
+	sgb ATTR_BLK, 1
+	db 1 ; number of data sets
+	db ATTR_BLK_CTRL_OUTSIDE | ATTR_BLK_CTRL_LINE | ATTR_BLK_CTRL_INSIDE
+	db %101111 ; Color Palette Designation
+	db 0  ; x1
+	db 0  ; y1
+	db 19 ; x2
+	db 4  ; y3
+	ds 6 ; data set 2
+	ds 2 ; data set 3
 
 Func_12fc6: ; 12fc6 (4:6fc6)
 	INCROM $12fc6, $130ca
 
-Func_130ca: ; 130ca (4:70ca)
-	INCROM $130ca, $131b3
+LoadBoosterGfx: ; 130ca (4:70ca)
+	push hl
+	push bc
+	push de
+	ld e, a
+	ld a, [wCurTilemap]
+	push af
+	push bc
+	ld a, e
+	call _LoadScene
+	call FlushAllPalettes
+	call SetBoosterLogoOAM
+	pop bc
+	pop af
+	ld [wCurTilemap], a
+	pop de
+	pop bc
+	pop hl
+	ret
+
+SetBoosterLogoOAM: ; 130e6 (4:70e6)
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	ret nz
+	push hl
+	push bc
+	push de
+	push bc
+	xor a
+	ld [wd4cb], a
+	ld [wd4ca], a
+	ld a, SPRITE_BOOSTER_PACK_OAM
+	farcall Func_8025b
+	pop bc
+	call ZeroObjectPositions
+	ld hl, BoosterLogoOAM
+	ld c, [hl]
+	inc hl
+.oam_loop
+	push bc
+	ldh a, [hSCX]
+	ld d, a
+	ldh a, [hSCY]
+	ld e, a
+	ld a, [wSceneBaseY]
+	sub e
+	add [hl]
+	ld e, a
+	inc hl
+	ld a, [wSceneBaseX]
+	sub d
+	add [hl]
+	ld d, a
+	inc hl
+	ld a, [wd61f]
+	add [hl]
+	ld c, a
+	inc hl
+	ld b, [hl]
+	inc hl
+	call SetOneObjectAttributes
+	pop bc
+	dec c
+	jr nz, .oam_loop
+	ld hl, wVBlankOAMCopyToggle
+	inc [hl]
+	pop de
+	pop bc
+	pop hl
+	ret
+
+BoosterLogoOAM: ; 13132 (4:7132)
+	db $20
+	db $00, $00, $00, $00
+	db $00, $08, $01, $00
+	db $00, $10, $02, $00
+	db $00, $18, $03, $00
+	db $00, $20, $04, $00
+	db $00, $28, $05, $00
+	db $00, $30, $06, $00
+	db $00, $38, $07, $00
+	db $08, $00, $10, $00
+	db $08, $08, $11, $00
+	db $08, $10, $12, $00
+	db $08, $18, $13, $00
+	db $08, $20, $14, $00
+	db $08, $28, $15, $00
+	db $08, $30, $16, $00
+	db $08, $38, $17, $00
+	db $10, $00, $08, $00
+	db $10, $08, $09, $00
+	db $10, $10, $0A, $00
+	db $10, $18, $0B, $00
+	db $10, $20, $0C, $00
+	db $10, $28, $0D, $00
+	db $10, $30, $0E, $00
+	db $10, $38, $0F, $00
+	db $18, $00, $18, $00
+	db $18, $08, $19, $00
+	db $18, $10, $1A, $00
+	db $18, $18, $1B, $00
+	db $18, $20, $1C, $00
+	db $18, $28, $1D, $00
+	db $18, $30, $1E, $00
+	db $18, $38, $1F, $00
 
 Func_131b3: ; 131b3 (4:71b3)
 	INCROM $131b3, $131d3
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index f756533..1413aed 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -1626,8 +1626,8 @@ Func_1a61f: ; 1a61f (6:661f)
 	bank1call OpenCardPage_FromHand
 	ret
 
-Func_1a68d: ; 1a68d (6:668d)
-	ld a, $c2 ; player's turn
+_OpenBoosterPack: ; 1a68d (6:668d)
+	ld a, PLAYER_TURN
 	ldh [hWhoseTurn], a
 	ld h, a
 	ld l, $00
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index ed87acc..018787e 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -51,7 +51,7 @@ Func_1c056: ; 1c056 (7:4056)
 INCLUDE "data/warps.asm"
 
 ; loads data from the map header of wCurMap
-LoadCurMapHeaderData: ; 1c33b (7:433b)
+LoadMapHeader: ; 1c33b (7:433b)
 	push hl
 	push bc
 	push de
@@ -61,7 +61,7 @@ LoadCurMapHeaderData: ; 1c33b (7:433b)
 	add a
 	add c
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, MapHeaders
 	add hl, bc
 	ld a, [hli]
@@ -75,7 +75,7 @@ LoadCurMapHeaderData: ; 1c33b (7:433b)
 	ld a, [hli]
 	ld [wd290], a
 	ld a, [hli]
-	ld [wd111], a
+	ld [wDefaultSong], a
 
 	ld a, [wConsole]
 	cp CONSOLE_CGB
@@ -152,7 +152,7 @@ Func_1c485: ; 1c485 (7:4485)
 	dec c
 	jr nz, .findEmptyIndexLoop
 	ld hl, wLoadedNPCs
-	debug_ret
+	debug_nop
 	jr .exit
 .foundEmptyIndex
 	ld a, b
@@ -478,7 +478,7 @@ Func_1c78d: ; 1c78d (7:478d)
 	inc hl
 	ld [hl], b
 	dec hl
-	call Func_39ea
+	call GetNextNPCMovementByte
 	cp $f0
 	jr nc, .asm_1c7bb
 	push af
@@ -494,7 +494,7 @@ Func_1c78d: ; 1c78d (7:478d)
 	cp $ff
 	jr z, .asm_1c7d2
 	inc bc
-	call Func_39ea
+	call GetNextNPCMovementByte
 	push hl
 	ld l, a
 	ld h, $0
@@ -545,7 +545,7 @@ Func_1c83d: ; 1c83d (7:483d)
 	inc hl
 	dec c
 	jr nz, .asm_1c845
-	debug_ret
+	debug_nop
 	jr .asm_1c855
 
 .asm_1c853
@@ -596,7 +596,7 @@ PlayLoadedDuelAnimation: ; 1c8ef (7:48ef)
 	cp HIGH(Func_3ba2)
 	jr z, .okay
 .error
-	debug_ret
+	debug_nop
 	ret
 
 .okay
@@ -1669,9 +1669,9 @@ Titlescreen_1d386: ; 1d386 (7:5386)
 	call DisableLCD
 	ld a, MUSIC_TITLESCREEN
 	call PlaySong
-	ld bc, $0000
-	ld a, $0
-	call Func_3df3
+	lb bc, 0, 0
+	ld a, SCENE_TITLE_SCREEN
+	call LoadScene
 	call Func_1d59c
 .asm_1d39f
 	call Func_3ca0
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index b94729a..8de8786 100644
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -3,8 +3,8 @@ Func_70000: ; 70000 (1c:4000)
 	cp $1
 	ret nz
 	ld b, $1
-	ld a, $22
-	farcall GetEventFlagValue
+	ld a, EVENT_RECEIVED_LEGENDARY_CARDS
+	farcall GetEventValue
 	or a
 	jr z, .asm_70013
 	ld b, $2
@@ -261,10 +261,10 @@ Func_701e9: ; 701e9 (1c:41e9)
 	ld e, l
 	ld d, h
 	ld b, HIGH(wc000)
-	call InitBGMapDecompression
+	call InitDataDecompression
 	pop bc
 	pop de
-	call DecompressBGMap
+	call DecompressData
 	ret
 
 Func_701fe: ; 701fe (1c:41fe)
@@ -292,8 +292,8 @@ Func_70214: ; 70214 (1c:4214)
 	cp $49
 	ret nz
 	ld hl, Unknown_7024a
-	ld a, $10
-	farcall GetEventFlagValue
+	ld a, EVENT_MEDAL_FLAGS
+	farcall GetEventValue
 	ld c, $8
 .asm_70227
 	push bc
@@ -388,8 +388,35 @@ SetSGB2AndSGB3MapPalette: ; 7036a (1c:436a)
 	dw $7328 ; MAP_SGB_PALETTE_8
 	dw $734b ; MAP_SGB_PALETTE_9
 	dw $736f ; MAP_SGB_PALETTE_10
+; 0x703cb
 
-	INCROM $703cb, $70403
+Func_703cb: ; 703cb (1c:43cb)
+	ld a, [wConsole]
+	cp CONSOLE_SGB
+	ret nz
+	push hl
+	push bc
+	push de
+	call Func_70403
+	ld hl, wDecompressionBuffer
+	ld de, wTempSGBPacket + $1
+	ld bc, $8 ; palette 2, color 0-3
+	call CopyDataHLtoDE
+	ld hl, wDecompressionBuffer + $22
+	ld de, wTempSGBPacket + $9
+	ld bc, $6 ; palette 3, color 1-3
+	call CopyDataHLtoDE
+	xor a
+	ld [wTempSGBPacket + $f], a
+	ld hl, wTempSGBPacket
+	ld a, PAL23 << 3 + 1
+	ld [hl], a
+	call Func_704c7
+	call SendSGB
+	pop de
+	pop bc
+	pop hl
+	ret
 
 DecompressSGBPalette: ; 70403 (1c:4403)
 	push hl
@@ -403,30 +430,120 @@ DecompressSGBPalette: ; 70403 (1c:4403)
 	ld e, l
 	ld d, h
 	ld b, HIGH(wc000)
-	call InitBGMapDecompression
+	call InitDataDecompression
 	pop bc
-	ld de, wBGMapBuffer
-	call DecompressBGMap
+	ld de, wDecompressionBuffer
+	call DecompressData
 	pop de
 	pop bc
 	pop hl
 	ret
 ; 0x7041d
 
-	INCROM $7041d, $704c7
+	INCROM $7041d, $70498
 
-; load some values to wTempSGBPacket
+; send an ATTR_BLK SGB packet
+; input:
+; b = x1 (left)
+; c = y1 (upper)
+; d = block width
+; e = block height
+; l = %00xxyyzz, palette number for: outside block, block border, inside block
+Func_70498: ; 70498 (1c:4498)
+	ld a, [wConsole]
+	cp CONSOLE_SGB
+	ret nz
+	push hl
+	push bc
+	push de
+	ld a, l
+	ld [wTempSGBPacket + 3], a ; Color Palette Designation
+	ld hl, wTempSGBPacket
+	push hl
+	ld a, ATTR_BLK << 3 + 1
+	ld [hli], a ; packet command and length
+	ld a, 1
+	ld [hli], a ; 1 data set
+	ld a, ATTR_BLK_CTRL_INSIDE
+	ld [hli], a ; control code
+	inc hl
+	ld a, b
+	ld [hli], a ; x1
+	ld a, c
+	ld [hli], a ; y1
+	ld a, d
+	dec a
+	add b
+	ld [hli], a ; x2
+	ld a, e
+	dec a
+	add c
+	ld [hli], a ; y2
+	pop hl
+	call SendSGB
+	pop de
+	pop bc
+	pop hl
+	ret
+
+; set color 0 to default white rgb(28, 28, 24)
+; input:
+; hl = pointer to start of SGB packet
 Func_704c7: ; 704c7 (1c:44c7)
 	push af
 	push hl
 	inc hl
-	ld a, $9c
+	ld a, LOW(24 << 10 | 28 << 5 | 28)
 	ld [hli], a
-	ld a, $63
+	ld a, HIGH(24 << 10 | 28 << 5 | 28)
 	ld [hl], a
 	pop hl
 	pop af
 	ret
 ; 0x704d3
 
-	INCROM $704d3, $74000
+	INCROM $704d3, $73393
+
+SGBData_CharizardIntro: ; 73393 (1c:7393)
+	dw $20 ; width
+	INCROM $73395, $733b8
+
+SGBData_ScytherIntro: ; 733b8 (1c:73b8)
+	dw $20 ; width
+	INCROM $733ba, $733dd
+
+SGBData_AerodactylIntro: ; 733dd (1c:73dd)
+	dw $20 ; width
+	INCROM $733df, $73402
+
+SGBData_ColosseumBooster: ; 73402 (1c:7402)
+	dw $20 ; width
+	INCROM $73404, $73427
+
+SGBData_EvolutionBooster: ; 73427 (1c:7427)
+	dw $20 ; width
+	INCROM $73429, $7344c
+
+SGBData_MysteryBooster: ; 7344c (1c:744c)
+	dw $20 ; width
+	INCROM $7344e, $73471
+
+SGBData_LaboratoryBooster: ; 73471 (1c:7471)
+	dw $20 ; width
+	INCROM $73473, $73aa8
+
+SGBData_GameBoyLink: ; 73aa8 (1c:7aa8)
+	dw $40 ; width
+	INCROM $73aaa, $73ad8
+
+SGBData_CardPop: ; 73ad8 (1c:7ad8)
+	dw $40 ; width
+	INCROM $73ada, $73b05
+
+SGBData_GameBoyPrinter: ; 73b05 (1c:7b05)
+	dw $40 ; width
+	INCROM $73b07, $73b33
+
+SGBData_TitleScreen: ; 73b33 (1c:7b33)
+	dw $40 ; width
+	INCROM $73b35, $74000
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 639f31a..dee6699 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -26,7 +26,7 @@ Func_80028: ; 80028 (20:4028)
 ; 0x8003d
 
 Func_8003d: ; 8003d (20:403d)
-	farcall LoadCurMapHeaderData
+	farcall LoadMapHeader
 	farcall SetSGB2AndSGB3MapPalette
 	ld bc, $0
 	call Func_80077
@@ -56,6 +56,7 @@ Func_80077: ; 80077 (20:4077)
 	ld [wWriteBGMapToSRAM], a
 	jr Func_80082
 
+Func_8007e: ; 8007e (20:407e)
 	xor a
 	ld [wWriteBGMapToSRAM], a
 ;	fallthrough
@@ -76,7 +77,7 @@ Func_80082: ; 80082 (20:4082)
 	ld [wd23d], a
 
 ; store header data
-	ld de, wBGMapBuffer
+	ld de, wDecompressionBuffer
 	ld bc, $0006 ; header + 1st instruction
 	call CopyBankedDataToDE
 	ld l, e
@@ -109,7 +110,7 @@ Func_800bd: ; 800bd (20:40bd)
 	adc $00
 	ld d, a
 	ld b, HIGH(wc000)
-	call InitBGMapDecompression
+	call InitDataDecompression
 	ld a, [wVRAMPointer]
 	ld e, a
 	ld a, [wVRAMPointer + 1]
@@ -133,7 +134,7 @@ Func_800e0: ; 800e0 (20:40e0)
 .asm_800f0
 
 	ld c, $40
-	ld hl, wBGMapBuffer
+	ld hl, wDecompressionBuffer
 	xor a
 .loop_clear
 	ld [hli], a
@@ -149,14 +150,14 @@ Func_800e0: ; 800e0 (20:40e0)
 	ld b, $00
 	ld a, [wd28e]
 	ld c, a
-	ld de, wBGMapBuffer
-	call DecompressBGMapFromBank
+	ld de, wDecompressionBuffer
+	call DecompressDataFromBank
 
 	ld a, [wBGMapWidth]
 	ld b, a
 	pop de
 	push de
-	ld hl, wBGMapBuffer
+	ld hl, wDecompressionBuffer
 	call CopyBGDataToVRAMOrSRAM
 	ld a, [wConsole]
 	cp CONSOLE_CGB
@@ -167,7 +168,7 @@ Func_800e0: ; 800e0 (20:40e0)
 	ld a, [wBGMapWidth]
 	ld c, a
 	ld b, $00
-	ld hl, wBGMapBuffer
+	ld hl, wDecompressionBuffer
 	add hl, bc
 	pop de
 	push de
@@ -718,7 +719,7 @@ LoadPaletteDataFromHL: ; 803ec (20:43ec)
 	jr .success_return
 
 .fail_return
-	debug_ret
+	debug_nop
 
 .success_return
 	pop de
@@ -1343,8 +1344,8 @@ Tilemaps: ; 80e67 (20:4e67)
 	tilemap Unused8Tilemap,                  TILESET_POKEMON_DOME          ; TILEMAP_UNUSED_8
 	tilemap HallOfHonorTilemap,              TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR
 	tilemap HallOfHonorCGBTilemap,           TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR_CGB
-	tilemap CardPop1Tilemap,                 TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1
-	tilemap CardPop1CGBTilemap,              TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1_CGB
+	tilemap CardPopCGBTilemap,               TILESET_CARD_POP              ; TILEMAP_CARD_POP_CGB
+	tilemap CardPopTilemap,                  TILESET_CARD_POP              ; TILEMAP_CARD_POP
 	tilemap GrassMedalTilemap,               TILESET_MEDAL                 ; TILEMAP_GRASS_MEDAL
 	tilemap ScienceMedalTilemap,             TILESET_MEDAL                 ; TILEMAP_SCIENCE_MEDAL
 	tilemap FireMedalTilemap,                TILESET_MEDAL                 ; TILEMAP_FIRE_MEDAL
@@ -1353,12 +1354,12 @@ Tilemaps: ; 80e67 (20:4e67)
 	tilemap FightingMedalTilemap,            TILESET_MEDAL                 ; TILEMAP_FIGHTING_MEDAL
 	tilemap RockMedalTilemap,                TILESET_MEDAL                 ; TILEMAP_ROCK_MEDAL
 	tilemap PsychicMedalTilemap,             TILESET_MEDAL                 ; TILEMAP_PSYCHIC_MEDAL
-	tilemap CardPop2Tilemap,                 TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2
-	tilemap CardPop2CGBTilemap,              TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_CGB
-	tilemap CardPop2Unknown1Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_1
-	tilemap CardPop2Unknown2Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_2
-	tilemap CardPop3Tilemap,                 TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3
-	tilemap CardPop3CGBTilemap,              TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3_CGB
+	tilemap GameBoyLinkCGBTilemap,           TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CGB
+	tilemap GameBoyLinkTilemap,              TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK
+	tilemap GameBoyLinkConnectingCGBTilemap, TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CONNECTING_CGB
+	tilemap GameBoyLinkConnectingTilemap,    TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CONNECTING
+	tilemap GameBoyPrinterCGBTilemap,        TILESET_GAMEBOY_PRINTER       ; TILEMAP_GAMEBOY_PRINTER_CGB
+	tilemap GameBoyPrinterTilemap,           TILESET_GAMEBOY_PRINTER       ; TILEMAP_GAMEBOY_PRINTER
 	tilemap ColosseumTilemap,                TILESET_COLOSSEUM_1           ; TILEMAP_COLOSSEUM
 	tilemap ColosseumCGBTilemap,             TILESET_COLOSSEUM_2           ; TILEMAP_COLOSSEUM_CGB
 	tilemap EvolutionTilemap,                TILESET_EVOLUTION_1           ; TILEMAP_EVOLUTION
@@ -1373,18 +1374,18 @@ Tilemaps: ; 80e67 (20:4e67)
 	tilemap ScytherIntroCGBTilemap,          TILESET_SCYTHER_INTRO_2       ; TILEMAP_SCYTHER_INTRO_CGB
 	tilemap AerodactylIntroTilemap,          TILESET_AERODACTYL_INTRO_1    ; TILEMAP_AERODACTYL_INTRO
 	tilemap AerodactylIntroCGBTilemap,       TILESET_AERODACTYL_INTRO_2    ; TILEMAP_AERODACTYL_INTRO_CGB
-	tilemap TitleScreen1Tilemap,             TILESET_TITLE_SCREEN_1        ; TILEMAP_TITLE_SCREEN_1
-	tilemap TitleScreen2Tilemap,             TILESET_TITLE_SCREEN_2        ; TILEMAP_TITLE_SCREEN_2
+	tilemap TitleScreen1Tilemap,             TILESET_TITLE_SCREEN_1        ; TILEMAP_JAPANESE_TITLE_SCREEN
+	tilemap TitleScreen2Tilemap,             TILESET_TITLE_SCREEN_2        ; TILEMAP_JAPANESE_TITLE_SCREEN_CGB
 	tilemap SolidTiles1Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_1
 	tilemap SolidTiles2Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_2
 	tilemap SolidTiles3Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_3
-	tilemap TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_TITLE_SCREEN_3
-	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_TITLE_SCREEN_4
+	tilemap TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_JAPANESE_TITLE_SCREEN_2
+	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB
 	tilemap SolidTiles4Tilemap,              TILESET_SOLID_TILES_2         ; TILEMAP_SOLID_TILES_4
 	tilemap PlayerTilemap,                   TILESET_PLAYER                ; TILEMAP_PLAYER
 	tilemap OpponentTilemap,                 TILESET_RONALD                ; TILEMAP_OPPONENT
-	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN_5
-	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_6
+	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN
+	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_CGB
 	tilemap CopyrightTilemap,                TILESET_COPYRIGHT             ; TILEMAP_COPYRIGHT
 	tilemap CopyrightCGBTilemap,             TILESET_COPYRIGHT             ; TILEMAP_COPYRIGHT_CGB
 	tilemap NintendoTilemap,                 TILESET_NINTENDO              ; TILEMAP_NINTENDO
@@ -1415,10 +1416,10 @@ Tilesets: ; 8100f (20:500f)
 	tileset PokemonDomeEntranceTilesetGfx,  78 ; TILESET_POKEMON_DOME_ENTRANCE
 	tileset PokemonDomeTilesetGfx,         207 ; TILESET_POKEMON_DOME
 	tileset HallOfHonorTilesetGfx,         121 ; TILESET_HALL_OF_HONOR
-	tileset CardPop1Gfx,                   189 ; TILESET_CARD_POP_1
+	tileset CardPopGfx,                    189 ; TILESET_CARD_POP
 	tileset MedalGfx,                       72 ; TILESET_MEDAL
-	tileset CardPop2Gfx,                   109 ; TILESET_CARD_POP_2
-	tileset CardPop3Gfx,                    93 ; TILESET_CARD_POP_3
+	tileset GameBoyLinkGfx,                109 ; TILESET_GAMEBOY_LINK
+	tileset GameBoyPrinterGfx,              93 ; TILESET_GAMEBOY_PRINTER
 	tileset Colosseum1Gfx,                  96 ; TILESET_COLOSSEUM_1
 	tileset Colosseum2Gfx,                  86 ; TILESET_COLOSSEUM_2
 	tileset Evolution1Gfx,                  96 ; TILESET_EVOLUTION_1
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 25acec1..af207de 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -48,7 +48,7 @@ GenerateBoosterNonEnergies: ; 1e1df (7:61df)
 	or a
 	ret
 .no_valid_cards
-	debug_ret
+	debug_nop
 	scf
 	ret
 
@@ -281,7 +281,7 @@ DetermineBoosterCard: ; 1e31d (7:631d)
 	or a
 	ret
 .no_valid_card_found
-	debug_ret
+	debug_nop
 	scf
 	ret
 
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index daaf402..f102910 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -7333,7 +7333,7 @@ Gigashock_AISelectEffect: ; 2e6c3 (b:66c3)
 	ret
 
 .start_selection
-; has more than 3 Bench cards,proceed to sort them
+; has more than 3 Bench cards, proceed to sort them
 ; by lowest remaining HP to highest, and pick first 3.
 	call SwapTurn
 	dec a
diff --git a/src/engine/home.asm b/src/engine/home.asm
index b91dbae..f12f24d 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1520,12 +1520,12 @@ UpdateRNGSources: ; 089b (0:089b)
 	ret
 
 ; initilizes variables used to decompress
-; BG Map data in DecompressBGMap
+; data in DecompressData
 ; de points to the source of compressed data
 ; b is used as the HIGH byte of the
 ; WRAM address to write to ($100 bytes of buffer space)
 ; also clears this $100 byte space
-InitBGMapDecompression: ; 08bf (0:08bf)
+InitDataDecompression: ; 08bf (0:08bf)
 	ld hl, wcad6
 	ld [hl], e
 	inc hl
@@ -1553,13 +1553,13 @@ InitBGMapDecompression: ; 08bf (0:08bf)
 	jr nz, .loop
 	ret
 
-; decompresses BG Map data
-; uses values initialized by InitBGMapDecompression
+; decompresses data
+; uses values initialized by InitDataDecompression
 ; wcad6 holds the pointer for compressed source
 ; input:
-; bc = map width
+; bc = row width
 ; de = buffer to place decompressed data
-DecompressBGMap: ; 08de (0:08de)
+DecompressData: ; 08de (0:08de)
 	push hl
 	push de
 .loop
@@ -3023,7 +3023,7 @@ CopyDeckData: ; 1072 (0:1072)
 	ld a, [hl]
 	or a
 	ret nz
-	debug_ret
+	debug_nop
 	scf
 	ret
 
@@ -10563,7 +10563,7 @@ Func_37c5: ; 37c5 (0:37c5)
 	jr nz, .asm_37c7
 	ret
 
-Func_380e: ; 380e (0:380e)
+OverworldDoFrameFunction: ; 380e (0:380e)
 	ld a, [wd0c1]
 	bit 7, a
 	ret nz
@@ -10677,18 +10677,18 @@ GameEvent_Duel: ; 38c0 (0:38c0)
 	ret
 
 GameEvent_ChallengeMachine: ; 38db (0:38db)
-	ld a, $6
-	ld [wd111], a
-	call Func_39fc
+	ld a, MUSIC_PC_MAIN_MENU
+	ld [wDefaultSong], a
+	call PlayDefaultSong
 	call EnableSRAM
 	xor a
 	ld [sba44], a
 	call DisableSRAM
 .asm_38ed
 	farcall Func_131d3
-	ld a, $9
-	ld [wd111], a
-	call Func_39fc
+	ld a, MUSIC_OVERWORLD
+	ld [wDefaultSong], a
+	call PlayDefaultSong
 	scf
 	ret
 
@@ -10711,7 +10711,7 @@ GameEvent_Credits: ; 3911 (0:3911)
 
 Func_3917: ; 3917 (0:3917)
 	ld a, EVENT_RECEIVED_LEGENDARY_CARDS
-	farcall GetEventFlagValue
+	farcall GetEventValue
 	call EnableSRAM
 	ld [s0a00a], a
 	call DisableSRAM
@@ -10831,7 +10831,7 @@ GetItemInLoadedNPCIndex: ; 39ad (0:39ad)
 	push bc
 	cp LOADED_NPC_MAX
 	jr c, .asm_39b4
-	debug_ret
+	debug_nop
 	xor a
 .asm_39b4
 	add a
@@ -10880,11 +10880,11 @@ FindLoadedNPC: ; 39c3 (0:39c3)
 	pop hl
 	ret
 
-Func_39ea: ; 39ea (0:39ea)
+GetNextNPCMovementByte: ; 39ea (0:39ea)
 	push bc
 	ldh a, [hBankROM]
 	push af
-	ld a, $03
+	ld a, BANK(ExecuteNPCMovement)
 	call BankswitchROM
 	ld a, [bc]
 	ld c, a
@@ -10894,13 +10894,13 @@ Func_39ea: ; 39ea (0:39ea)
 	pop bc
 	ret
 
-Func_39fc: ; 39fc (0:39fc)
+PlayDefaultSong: ; 39fc (0:39fc)
 	push hl
 	push bc
 	call AssertSongFinished
 	or a
 	push af
-	call Func_3a1f
+	call GetDefaultSong
 	ld c, a
 	pop af
 	jr z, .asm_3a11
@@ -10910,7 +10910,7 @@ Func_39fc: ; 39fc (0:39fc)
 	jr z, .asm_3a1c
 .asm_3a11
 	ld a, c
-	cp $1f
+	cp NUM_SONGS
 	jr nc, .asm_3a1c
 	ld [wd112], a
 	call PlaySong
@@ -10919,21 +10919,22 @@ Func_39fc: ; 39fc (0:39fc)
 	pop hl
 	ret
 
-Func_3a1f: ; 3a1f (0:3a1f)
+; returns [wDefaultSong] or MUSIC_RONALD in a
+GetDefaultSong: ; 3a1f (0:3a1f)
 	ld a, [wd3b8]
 	or a
-	jr z, .asm_3a37
-	ld a, [wd32e]
-	cp $2
-	jr z, .asm_3a37
-	cp $b
-	jr z, .asm_3a37
-	cp $c
-	jr z, .asm_3a37
+	jr z, .default_song
+	ld a, [wOverworldMapSelection]
+	cp OWMAP_ISHIHARAS_HOUSE
+	jr z, .default_song
+	cp OWMAP_CHALLENGE_HALL
+	jr z, .default_song
+	cp OWMAP_POKEMON_DOME
+	jr z, .default_song
 	ld a, MUSIC_RONALD
 	ret
-.asm_3a37
-	ld a, [wd111]
+.default_song
+	ld a, [wDefaultSong]
 	ret
 
 Func_3a3b: ; 3a3b (0:3a3b)
@@ -10952,13 +10953,13 @@ Func_3a4a: ; 3a4a (0:3a4a)
 	farcall Func_115a3
 	ret
 
-Func_3a4f: ; 3a4f (0:3a4f)
+SaveGame: ; 3a4f (0:3a4f)
 	push af
 	push bc
 	push de
 	push hl
 	ld c, $00
-	farcall Func_1157c
+	farcall _SaveGame
 	pop hl
 	pop de
 	pop bc
@@ -11233,17 +11234,17 @@ ResetDoFrameFunction: ; 3bdb (0:3bdb)
 	pop hl
 	ret
 
-; decompresses BG Map data from a given bank
-; uses values initialized by InitBGMapDecompression
+; decompresses data from a given bank
+; uses values initialized by InitDataDecompression
 ; input:
-; bc = map width
+; bc = row width
 ; de = buffer to place decompressed data
-DecompressBGMapFromBank: ; 3be4 (0:3be4)
+DecompressDataFromBank: ; 3be4 (0:3be4)
 	ldh a, [hBankROM]
 	push af
 	ld a, [wTempPointerBank]
 	call BankswitchROM
-	call DecompressBGMap
+	call DecompressData
 	pop af
 	call BankswitchROM
 	ret
@@ -11606,7 +11607,7 @@ GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
 GetSpriteAnimBufferProperty_SpriteInA: ; 3dc2 (0:3dc2)
 	cp SPRITE_ANIM_BUFFER_CAPACITY
 	jr c, .got_sprite
-	debug_ret
+	debug_nop
 	ld a, SPRITE_ANIM_BUFFER_CAPACITY - 1 ; default to last sprite
 .got_sprite
 	push bc
@@ -11643,29 +11644,29 @@ Func_3de7: ; 3de7 (0:3de7)
 	pop hl
 	ret
 
-Func_3df3: ; 3df3 (0:3df3)
+LoadScene: ; 3df3 (0:3df3)
 	push af
 	ldh a, [hBankROM]
 	push af
 	push hl
-	ld a, BANK(Func_12c7f)
+	ld a, BANK(_LoadScene)
 	call BankswitchROM
 	ld hl, sp+$5
 	ld a, [hl]
-	call Func_12c7f
+	call _LoadScene
 	call FlushAllPalettes
 	pop hl
 	pop af
 	call BankswitchROM
 	pop af
-	ld a, [wd61b]
+	ld a, [wSceneSpriteIndex]
 	ret
 
 ; draws player's portrait at b,c
 Func_3e10: ; 3e10 (0:3e10)
 	ld a, $1
 	ld [wd61e], a
-	ld a, $62
+	ld a, TILEMAP_PLAYER
 ;	fallthrough
 
 Func_3e17: ; 3e17 (0:3e17)
@@ -11682,7 +11683,7 @@ Func_3e17: ; 3e17 (0:3e17)
 ; draws opponent's portrait given in a at b,c
 Func_3e2a: ; 3e2a (0:3e2a)
 	ld [wd61e], a
-	ld a, $63
+	ld a, TILEMAP_OPPONENT
 	jr Func_3e17
 
 Func_3e31: ; 3e31 (0:3e31)
diff --git a/src/gfx.asm b/src/gfx.asm
index e27c140..32548ce 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -207,7 +207,7 @@ HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
 
 	INCBIN "data/maps/map59.bin"
 
-CardPop1Tilemap:: ; 85f7c (21:5f7c)
+CardPopCGBTilemap:: ; 85f7c (21:5f7c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -215,7 +215,7 @@ CardPop1Tilemap:: ; 85f7c (21:5f7c)
 
 	INCBIN "data/maps/map60.bin"
 
-CardPop1CGBTilemap:: ; 8607f (21:607f)
+CardPopTilemap:: ; 8607f (21:607f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -279,7 +279,7 @@ PsychicMedalTilemap:: ; 86201 (21:6201)
 
 	INCBIN "data/maps/map69.bin"
 
-CardPop2Tilemap:: ; 86217 (21:6217)
+GameBoyLinkCGBTilemap:: ; 86217 (21:6217)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -287,7 +287,7 @@ CardPop2Tilemap:: ; 86217 (21:6217)
 
 	INCBIN "data/maps/map70.bin"
 
-CardPop2CGBTilemap:: ; 862da (21:62da)
+GameBoyLinkTilemap:: ; 862da (21:62da)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -295,7 +295,7 @@ CardPop2CGBTilemap:: ; 862da (21:62da)
 
 	INCBIN "data/maps/map71.bin"
 
-CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
+GameBoyLinkConnectingCGBTilemap:: ; 86364 (21:6364)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -303,7 +303,7 @@ CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
 
 	INCBIN "data/maps/map72.bin"
 
-CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
+GameBoyLinkConnectingTilemap:: ; 86443 (21:6443)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -311,7 +311,7 @@ CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
 
 	INCBIN "data/maps/map73.bin"
 
-CardPop3Tilemap:: ; 864df (21:64df)
+GameBoyPrinterCGBTilemap:: ; 864df (21:64df)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -319,7 +319,7 @@ CardPop3Tilemap:: ; 864df (21:64df)
 
 	INCBIN "data/maps/map74.bin"
 
-CardPop3CGBTilemap:: ; 865b5 (21:65b5)
+GameBoyPrinterTilemap:: ; 865b5 (21:65b5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -733,17 +733,17 @@ AnimData11:: ; 8fff5 (23:7ff5)
 
 SECTION "Gfx 6", ROMX
 
-CardPop1Gfx:: ; 90000 (24:4000)
+CardPopGfx:: ; 90000 (24:4000)
 	dw 189
-	INCBIN "gfx/cardpop/cardpop1.2bpp"
+	INCBIN "gfx/link/cardpop.2bpp"
 
-CardPop2Gfx:: ; 90bd2 (24:4bd2)
+GameBoyLinkGfx:: ; 90bd2 (24:4bd2)
 	dw 109
-	INCBIN "gfx/cardpop/cardpop2.2bpp"
+	INCBIN "gfx/link/gameboylink.2bpp"
 
-CardPop3Gfx:: ; 912a4 (24:52a4)
+GameBoyPrinterGfx:: ; 912a4 (24:52a4)
 	dw 93
-	INCBIN "gfx/cardpop/cardpop3.2bpp"
+	INCBIN "gfx/link/gameboyprinter.2bpp"
 
 Colosseum1Gfx:: ; 91876 (24:5876)
 	dw 96
diff --git a/src/gfx/cardpop/cardpop1.png b/src/gfx/link/cardpop.png
index c607d8d..c607d8d 100644
--- a/src/gfx/cardpop/cardpop1.png
+++ b/src/gfx/link/cardpop.png
diff --git a/src/gfx/cardpop/cardpop2.png b/src/gfx/link/gameboylink.png
index 75e5149..75e5149 100644
--- a/src/gfx/cardpop/cardpop2.png
+++ b/src/gfx/link/gameboylink.png
diff --git a/src/gfx/cardpop/cardpop3.png b/src/gfx/link/gameboyprinter.png
index 48bd233..48bd233 100644
--- a/src/gfx/cardpop/cardpop3.png
+++ b/src/gfx/link/gameboyprinter.png
diff --git a/src/macros/code.asm b/src/macros/code.asm
index 8921a04..c71e9e6 100644
--- a/src/macros/code.asm
+++ b/src/macros/code.asm
@@ -26,39 +26,41 @@ else
 endc
 ENDM
 
-; runs SetEventFlagValue with the next value as the flag, c as the new value
-set_flag_value: MACRO
-	call SetStackFlagValue
+; runs SetEventValue with the next byte as the event, c as the new value
+set_event_value: MACRO
+	call SetStackEventValue
 	db \1
 ENDM
 
-; runs ZeroOutEventFlag with the next value as the flag
-zero_flag_value: MACRO
-	call ZeroStackFlagValue
+; runs ZeroOutEventValue with the next byte as the event
+; functionally identical to set_event_zero but intended for single-bit events
+set_event_false: MACRO
+	call SetStackEventFalse
 	db \1
 ENDM
 
-; a second version of the above with no real differences
-zero_flag_value2: MACRO
-	call ZeroStackFlagValue2
+; runs ZeroOutEventValue with the next byte as the event
+; functionally identical to set_event_false but intended for multi-bit events
+set_event_zero: MACRO
+	call SetStackEventZero
 	db \1
 ENDM
 
-; runs MaxOutEventFlag with the next value as the flag
-max_flag_value: MACRO
-	call MaxStackFlagValue
+; runs MaxOutEventValue with the next byte as the event
+max_event_value: MACRO
+	call MaxStackEventValue
 	db \1
 ENDM
 
-; runs GetEventFlagValue with the next value as the flag. returns value in a
-get_flag_value: MACRO
-	call GetStackFlagValue
+; runs GetEventValue with the next byte as the event. returns value in a
+get_event_value: MACRO
+	call GetStackEventValue
 	db \1
 ENDM
 
 ; the rst $38 handler is a single ret instruction
 ; probably used for testing purposes during development
-debug_ret EQUS "rst $38"
+debug_nop EQUS "rst $38"
 
 ; Returns to the pointer in bc instead of where the stack was.
 retbc: MACRO
diff --git a/src/macros/constants.asm b/src/macros/constants.asm
index 264e3ed..4387841 100644
--- a/src/macros/constants.asm
+++ b/src/macros/constants.asm
@@ -11,7 +11,7 @@ const: MACRO
 const_value = const_value + 1
 ENDM
 
-flag_def: MACRO
+event_def: MACRO
 	db \1
 	db \2
 ENDM
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index 192fe93..bd500a2 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -93,18 +93,18 @@ ENDM
 	const ScriptCommand_EndScript4_index                                     ; $55
 	const ScriptCommand_EndScript5_index                                     ; $56
 	const ScriptCommand_EndScript6_index                                     ; $57
-	const ScriptCommand_SetFlagValue_index                                   ; $58
-	const ScriptCommand_JumpIfFlagZero1_index                                ; $59
-	const ScriptCommand_JumpIfFlagNonzero1_index                             ; $5a
-	const ScriptCommand_JumpIfFlagEqual_index                                ; $5b
-	const ScriptCommand_JumpIfFlagNotEqual_index                             ; $5c
-	const ScriptCommand_JumpIfFlagNotLessThan_index                          ; $5d
-	const ScriptCommand_JumpIfFlagLessThan_index                             ; $5e
-	const ScriptCommand_MaxOutFlagValue_index                                ; $5f
-	const ScriptCommand_ZeroOutFlagValue_index                               ; $60
-	const ScriptCommand_JumpIfFlagNonzero2_index                             ; $61
-	const ScriptCommand_JumpIfFlagZero2_index                                ; $62
-	const ScriptCommand_IncrementFlagValue_index                             ; $63
+	const ScriptCommand_SetEventValue_index                                  ; $58
+	const ScriptCommand_JumpIfEventZero_index                                ; $59
+	const ScriptCommand_JumpIfEventNonzero_index                             ; $5a
+	const ScriptCommand_JumpIfEventEqual_index                               ; $5b
+	const ScriptCommand_JumpIfEventNotEqual_index                            ; $5c
+	const ScriptCommand_JumpIfEventGreaterOrEqual_index                      ; $5d
+	const ScriptCommand_JumpIfEventLessThan_index                            ; $5e
+	const ScriptCommand_MaxOutEventValue_index                               ; $5f
+	const ScriptCommand_ZeroOutEventValue_index                              ; $60
+	const ScriptCommand_JumpIfEventTrue_index                                ; $61
+	const ScriptCommand_JumpIfEventFalse_index                               ; $62
+	const ScriptCommand_IncrementEventValue_index                            ; $63
 	const ScriptCommand_EndScript7_index                                     ; $64
 	const ScriptCommand_EndScript8_index                                     ; $65
 	const ScriptCommand_EndScript9_index                                     ; $66
@@ -633,87 +633,125 @@ challenge_machine: MACRO
 	run_command ScriptCommand_ChallengeMachine
 ENDM
 
-; Sets a flag's value
-script_set_flag_value: MACRO
-	run_command ScriptCommand_SetFlagValue
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Sets an event's value
+set_event: MACRO
+	run_command ScriptCommand_SetEventValue
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	db \2 ; new value
 ENDM
 
-; Jumps to a script position if a given flag is zero
-jump_if_flag_zero_1: MACRO
-	run_command ScriptCommand_JumpIfFlagZero1
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Jumps to a script position if a given event is zero
+jump_if_event_zero: MACRO
+	run_command ScriptCommand_JumpIfEventZero
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	dw \2 ; Script Label
 ENDM
 
-; Jumps to a script position if a given flag is nonzero
-jump_if_flag_nonzero_1: MACRO
-	run_command ScriptCommand_JumpIfFlagNonzero1
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Tests if a given event is zero
+test_if_event_zero: MACRO
+	run_command ScriptCommand_JumpIfEventZero
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
+	dw NULL
+ENDM
+
+; Jumps to a script position if a given event is nonzero
+jump_if_event_nonzero: MACRO
+	run_command ScriptCommand_JumpIfEventNonzero
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	dw \2 ; Script Label
 ENDM
 
-; Jumps to a script position if a flag matches given value
-jump_if_flag_equal: MACRO
-	run_command ScriptCommand_JumpIfFlagEqual
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Jumps to a script position if an event matches given value
+jump_if_event_equal: MACRO
+	run_command ScriptCommand_JumpIfEventEqual
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	db \2 ; value
 	dw \3 ; Script Label
 ENDM
 
-; Jumps to a script position if a flag does not match a given value
-jump_if_flag_not_equal: MACRO
-	run_command ScriptCommand_JumpIfFlagNotEqual
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Tests if an event matches given value
+test_if_event_equal: MACRO
+	run_command ScriptCommand_JumpIfEventEqual
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
+	db \2 ; value
+	dw NULL
+ENDM
+
+; Jumps to a script position if an event does not match a given value
+jump_if_event_not_equal: MACRO
+	run_command ScriptCommand_JumpIfEventNotEqual
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	db \2 ; value
 	dw \3 ; Script Label
 ENDM
 
-; Jumps to a script position if a flag is not less than a given value
-jump_if_flag_not_less_than: MACRO
-	run_command ScriptCommand_JumpIfFlagNotLessThan
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Tests if an event does not match a given value
+test_if_event_not_equal: MACRO
+	run_command ScriptCommand_JumpIfEventNotEqual
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
+	db \2 ; value
+	dw NULL
+ENDM
+
+; Jumps to a script position if an event is greater than or equal to a given value
+jump_if_event_greater_or_equal: MACRO
+	run_command ScriptCommand_JumpIfEventGreaterOrEqual
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	db \2 ; value
 	dw \3 ; Script Label
 ENDM
 
-; Jumps to a script position if a flag is less than a given value
-jump_if_flag_less_than: MACRO
-	run_command ScriptCommand_JumpIfFlagLessThan
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Jumps to a script position if an event is less than a given value
+jump_if_event_less_than: MACRO
+	run_command ScriptCommand_JumpIfEventLessThan
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 	db \2 ; value
 	dw \3 ; Script Label
 ENDM
 
-; Sets a flag to its maximum possible value
-max_out_flag_value: MACRO
-	run_command ScriptCommand_MaxOutFlagValue
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Tests if an event is less than a given value
+test_if_event_less_than: MACRO
+	run_command ScriptCommand_JumpIfEventLessThan
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
+	db \2 ; value
+	dw NULL
+ENDM
+
+; Sets an event to its maximum possible value
+max_out_event_value: MACRO
+	run_command ScriptCommand_MaxOutEventValue
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 ENDM
 
-; Sets a flags value to zero
-zero_out_flag_value: MACRO
-	run_command ScriptCommand_ZeroOutFlagValue
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Sets an event's value to zero
+zero_out_event_value: MACRO
+	run_command ScriptCommand_ZeroOutEventValue
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 ENDM
 
-; Jumps to a script position if a flag is nonzero
-jump_if_flag_nonzero_2: MACRO
-	run_command ScriptCommand_JumpIfFlagNonzero2
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Jumps to a script position if an event is true
+jump_if_event_true: MACRO
+	run_command ScriptCommand_JumpIfEventTrue
+	db \1 ; event (ex EVENT_RECEIVED_LEGENDARY_CARDS)
 	dw \2 ; Script Label
 ENDM
 
-; Jumps to a script position if a flag is zero
-jump_if_flag_zero_2: MACRO
-	run_command ScriptCommand_JumpIfFlagZero2
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Jumps to a script position if an event is false
+jump_if_event_false: MACRO
+	run_command ScriptCommand_JumpIfEventFalse
+	db \1 ; event (ex EVENT_RECEIVED_LEGENDARY_CARDS)
 	dw \2 ; Script Label
 ENDM
 
-; Increments given flags value (truncates the new value)
-increment_flag_value: MACRO
-	run_command ScriptCommand_IncrementFlagValue
-	db \1 ; flag (ex EVENT_IMAKUNI_WIN_COUNT)
+; Tests if an event is false
+test_if_event_false: MACRO
+	run_command ScriptCommand_JumpIfEventFalse
+	db \1 ; event (ex EVENT_RECEIVED_LEGENDARY_CARDS)
+	dw NULL
+ENDM
+
+; Increments given event's value (truncates the new value)
+increment_event_value: MACRO
+	run_command ScriptCommand_IncrementEventValue
+	db \1 ; event (ex EVENT_IMAKUNI_WIN_COUNT)
 ENDM
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 7699e08..a05ca19 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1604,19 +1604,19 @@ Text03a6: ; 3f631 (f:7631)
 Text03a7: ; 3f643 (f:7643)
 	done
 
-Text03a8: ; 3f644 (f:7644)
+ColosseumBoosterText: ; 3f644 (f:7644)
 	text "COLOSSEUM"
 	done
 
-Text03a9: ; 3f64f (f:764f)
+EvolutionBoosterText: ; 3f64f (f:764f)
 	text "EVOLUTION"
 	done
 
-Text03aa: ; 3f65a (f:765a)
+MysteryBoosterText: ; 3f65a (f:765a)
 	text "MYSTERY"
 	done
 
-Text03ab: ; 3f663 (f:7663)
+LaboratoryBoosterText: ; 3f663 (f:7663)
 	text "LABORATORY"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index ff757fe..3f1d87d 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -937,10 +937,10 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text03a5                                           ; 0x03a5
 	textpointer Text03a6                                           ; 0x03a6
 	textpointer Text03a7                                           ; 0x03a7
-	textpointer Text03a8                                           ; 0x03a8
-	textpointer Text03a9                                           ; 0x03a9
-	textpointer Text03aa                                           ; 0x03aa
-	textpointer Text03ab                                           ; 0x03ab
+	textpointer ColosseumBoosterText                               ; 0x03a8
+	textpointer EvolutionBoosterText                               ; 0x03a9
+	textpointer MysteryBoosterText                                 ; 0x03aa
+	textpointer LaboratoryBoosterText                              ; 0x03ab
 	textpointer DrMasonNPCName                                     ; 0x03ac
 	textpointer RonaldNPCName                                      ; 0x03ad
 	textpointer IshiharaNPCName                                    ; 0x03ae
diff --git a/src/wram.asm b/src/wram.asm
index 074b9c2..85c839b 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -913,7 +913,7 @@ wPlayerAttackingCardID:: ; cc12
 wIsPracticeDuel:: ; cc13
 	ds $1
 
-wcc14:: ; cc14
+wNPCDuelistCopy:: ; cc14
 	ds $1
 
 wOpponentPortrait:: ; cc15
@@ -924,11 +924,11 @@ wOpponentName:: ; cc16
 	ds $2
 
 ; an overworld script starting a duel sets this address to the value to be written into wDuelInitialPrizes
-wcc18:: ; cc18
+wNPCDuelPrizes:: ; cc18
 	ds $1
 
 ; an overworld script starting a duel sets this address to the value to be written into wOpponentDeckID
-wcc19:: ; cc19
+wNPCDuelDeckID:: ; cc19
 	ds $1
 
 ; song played during a duel
@@ -2002,7 +2002,7 @@ wd0c2:: ; d0c2
 wDuelResult:: ; d0c3
 	ds $1
 
-wd0c4:: ; d0c4
+wNPCDuelist:: ; d0c4
 	ds $1
 
 wd0c5:: ; d0c5
@@ -2036,7 +2036,7 @@ wd10f:: ; d10f
 wd110:: ; d110
 	ds $1
 
-wd111:: ; d111
+wDefaultSong:: ; d111
 	ds $1
 
 wd112:: ; d112
@@ -2054,7 +2054,10 @@ wd115:: ; d115
 wd116:: ; d116
 	ds $1
 
-wd117:: ; d117
+; if FALSE, first booster being given
+; if TRUE, additional booster being given
+; used to control the text that is displayed when booster is opened
+wAnotherBoosterPack:: ; d117
 	ds $1
 
 	ds $3
@@ -2147,8 +2150,8 @@ wLoadedPalData:: ; d23e
 
 NEXTU
 
-; where BG map data is decompressed
-wBGMapBuffer:: ; d23e
+; where BG map data or other compressed data is decompressed
+wDecompressionBuffer:: ; d23e
 	ds $40
 
 ENDU
@@ -2206,7 +2209,8 @@ wumLoadedFramesetSubgroups:: ; d322
 wd323:: ; d323
 	ds $b
 
-wd32e:: ; d32e
+; the OWMAP_* value for the current overworld map selection
+wOverworldMapSelection:: ; d32e
 	ds $1
 
 wCurMap:: ; d32f
@@ -2218,10 +2222,10 @@ wPlayerXCoord:: ; d330
 wPlayerYCoord:: ; d331
 	ds $1
 
-wd332:: ; d332
+wPlayerXCoordPixels:: ; d332
 	ds $1
 
-wd333:: ; d333
+wPlayerYCoordPixels:: ; d333
 	ds $1
 
 wPlayerDirection:: ; d334
@@ -2246,45 +2250,47 @@ wd339:: ; d339
 wd33a:: ; d33a
 	ds $1
 
-wd33b:: ; d33b
+wOverworldMapCursorSprite:: ; d33b
 	ds $1
 
-wd33c:: ; d33c
+wOverworldMapCursorAnimation:: ; d33c
 	ds $1
 
-wd33d:: ; d33d
+wOverworldMapStartingPosition:: ; d33d
 	ds $1
 
-wd33e:: ; d33e
+; 0: selection not made, controlling cursor
+; 1: selection made, animating player across map
+; 2: player arrived at new map
+wOverworldMapPlayerAnimationState:: ; d33e
 	ds $1
 
-wd33f:: ; d33f
-	ds $1
-
-wd340:: ; d340
-	ds $1
-
-wd341:: ; d341
-	ds $1
-
-	ds $1
+wOverworldMapPlayerMovementPtr:: ; d33f
+	ds $2
 
-wd343:: ; d343
+wOverworldMapPlayerMovementCounter:: ; d341
 	ds $1
 
-wd344:: ; d344
 	ds $1
 
-wd345:: ; d345
-	ds $1
+; during setup, this holds a signed 16-bit integer
+; representing the total horizontal distance between
+; the current point and the next point
+; afterward, this holds a signed fixed-point fractional number
+; where the high byte represents the number of pixels
+; to travel per frame and the low byte represents the
+; fraction of a pixel to travel per frame
+wOverworldMapPlayerPathHorizontalMovement:: ; d343
+	ds $2
 
-wd346:: ; d346
-	ds $1
+; works the same as above, but for vertical distance
+wOverworldMapPlayerPathVerticalMovement:: ; d345
+	ds $2
 
-wd347:: ; d347
+wOverworldMapPlayerHorizontalSubPixelPosition:: ; d347
 	ds $1
 
-wd348:: ; d348
+wOverworldMapPlayerVerticalSubPixelPosition:: ; d348
 	ds $1
 
 wd349:: ; d349
@@ -2359,11 +2365,11 @@ wd3cc:: ; d3cc
 wd3d0:: ; d3d0
 	ds $1
 
-; the bits relevant to the currently worked on flag, obtained from EventFlagMods
-wLoadedFlagBits:: ; d3d1
+; the bits relevant to the currently worked on event, obtained from EventVarMasks
+wLoadedEventBits:: ; d3d1
 	ds $1
 
-wEventFlags:: ; d3d2
+wEventVars:: ; d3d2
 	ds $40
 
 ; 0 keeps looping, other values break the loop in RST20
@@ -2373,7 +2379,7 @@ wBreakScriptLoop:: ; d412
 wScriptPointer:: ; d413
 	ds $2
 
-; generally set to ff when a flag check passes, 0 otherwise
+; generally set to ff when an event check passes, 0 otherwise
 wScriptControlByte:: ; d415
 	ds $1
 
@@ -2605,17 +2611,34 @@ wSpriteVRAMBuffer:: ; d5d8
 wSpriteVRAMBufferSize:: ; d618
 	ds $1
 
-	ds $2
+wSceneSprite:: ; d619
+	ds $1
 
-wd61b:: ; d61b
+wSceneSpriteAnimation:: ; d61a
 	ds $1
 
-	ds $2
+wSceneSpriteIndex:: ; d61b
+	ds $1
+
+; base X position in pixels of loaded scene
+wSceneBaseX:: ; d61c
+	ds $1
+
+; base Y position in pixels of loaded scene
+wSceneBaseY:: ; d61d
+	ds $1
 
 wd61e:: ; d61e
 	ds $1
 
-	ds $5
+wd61f:: ; d61f
+	ds $1
+
+wSceneSGBPacketPtr:: ; d620
+	ds $2
+
+wSceneSGBRoutinePtr:: ; d622
+	ds $2
 
 wd624:: ; d624
 	ds $1
@@ -2737,7 +2760,7 @@ wBoosterData_TypeChances:: ; d689
 
 	ds $1
 
-wd693:: ; d693
+wStarterDeckChoice:: ; d693
 	ds $1
 
 wMultichoiceTextboxResult_Sam:: ; d694
@@ -2746,10 +2769,10 @@ wMultichoiceTextboxResult_Sam:: ; d694
 wMultichoiceTextboxResult_ChooseDeckToDuelAgainst:: ; d695
 	ds $1
 
-wd696:: ; d696
+wChallengeHallNPC:: ; d696
 	ds $1
 
-wd697:: ; d697
+wCardReceived:: ; d697
 	ds $1
 
 wd698:: ; d698
author	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-16 15:57:28 +0000
committer	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-16 16:07:19 +0000
commit	d7c76675f7424803928526449bf51f0cc8d62cee (patch)
tree	1da9468d6a751a3666b1c7f9bff256edbc2c0a16 /src
parent	220422a25c5b7463ccf50e5ae44228dd3418de57 (diff)
parent	95f2f3f87df689671384c251f3527b06d6a78f8a (diff)