6 files changed, 35 insertions, 5 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index ac9908a..e711e1d 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -12,5 +12,7 @@
 const_value = -1
 	const SPAWN_N_A
 	
+NUM_SPAWNS EQU 18
+	
 ; size of each spawn point data
 SPAWN_POINT_SIZE EQU 4
 \ No newline at end of file
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index b7daf0e..4c26c04 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -294,3 +294,6 @@ NUM_ATTACKS EQU const_value + -1
 	const BATTLEANIM_WOBBLE
 	const BATTLEANIM_SHAKE
 	const BATTLEANIM_HIT_CONFUSION
+	
+	
+MOVE_DATA_SIZE EQU 7
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 5009983..c304fbb 100755
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -14,4 +14,6 @@
 	const MUSIC_VICTORY_TRAINER ; 0B
 	const MUSIC_EVOLUTION       ; 0C
 
+MUSIC_SURF EQU $62
+	
 SE_SELECT EQU 5
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 0b00f47..e9ed0c1 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -130,3 +130,8 @@ WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
 PP_UP_MASK EQU %11000000
 PP_UP_ONE  EQU %01000000
 PP_MASK    EQU %00111111
+
+; HP
+ENEMY_HP_BAR EQU 0
+BATTLE_HP_BAR EQU 1
+POKEMON_MENU_HP_BAR EQU 2
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 3aa19b5..15a08c0 100755
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -5,11 +5,14 @@
 	const SCRIPT_ID_01   ; 01
 	const SCRIPT_ID_02   ; 02
 	const SCRIPT_ID_03   ; 03
+	const SCRIPT_ID_04   ; 04
+	const SCRIPT_ID_05   ; 05
 	
 ; Flags
-SCRIPT_FINISHED      EQU 7
+SCRIPT_FINISHED_F      EQU 7
 
 ; Masks/Return Values
-SCRIPT_FINISHED_MASK = 1 << SCRIPT_FINISHED
-SCRIPT_SUCCESS  EQU SCRIPT_FINISHED_MASK | $f
-SCRIPT_FAIL     EQU SCRIPT_FINISHED_MASK | 0
-\ No newline at end of file
+SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
+SCRIPT_SUCCESS  EQU $f
+SCRIPT_FAIL     EQU 0
+
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index a5e3044..c530a8b 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -5,4 +5,19 @@
 	const UP       ; 1
 	const LEFT     ; 2
 	const RIGHT    ; 3
-NUM_DIRECTIONS EQU const_value
-\ No newline at end of file
+NUM_DIRECTIONS EQU const_value
+
+; wMonType:: ; cb5a
+	const_def
+	const PARTYMON   ; 0
+	const OTPARTYMON ; 1
+	const BOXMON     ; 2
+	const TEMPMON    ; 3
+	const WILDMON    ; 4
+	
+; wPlayerState:: ; d95d
+PLAYER_NORMAL    EQU 0
+PLAYER_BIKE      EQU 1
+PLAYER_SKATE     EQU 2
+PLAYER_SURF      EQU 4
+PLAYER_SURF_PIKA EQU 8