3 files changed, 18 insertions, 2 deletions
diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm
index d8637d6..8aaa09d 100644
--- a/src/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
@@ -34,6 +34,20 @@
 	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
 
 ; 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/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