merge with newest update

1 files changed, 64 insertions, 0 deletions

diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
new file mode 100644
index 000000000..e3088496f
--- /dev/null
+++ b/constants/map_setup_constants.asm
@@ -0,0 +1,64 @@
+const_value SET $f0
+	const MAPSETUP_00
+	const MAPSETUP_WARP
+	const MAPSETUP_02
+	const MAPSETUP_RELOADMAP
+	const MAPSETUP_04
+	const MAPSETUP_05
+	const MAPSETUP_06
+	const MAPSETUP_07
+	const MAPSETUP_08
+	const MAPSETUP_09
+	const MAPSETUP_10
+	const MAPSETUP_BADWARP
+
+; Command descriptions from Condensation water's scripting compendium.	const_def
+	const_def
+
+	const map_lcd_on
+	const map_lcd_off
+	const map_sound_off
+	const map_music
+	const map_start_music
+	const map_fade_music
+	const map_fade
+	const map_bike_music
+	const map_music_force
+	const map_max_volume
+	const map_load_blocks
+	const map_connection_blocks
+	const map_save_screen
+	const map_buffer_screen
+	const map_load_graphics
+	const map_load_tileset_header
+	const map_time_of_day
+	const map_palettes
+	const map_wildmons
+	const map_sprites
+	const map_change_callback
+	const map_start_callback
+	const map_load_objects
+	const map_load_spawn
+	const map_load_connection
+	const map_load_warp
+	const map_attributes
+	const map_attributes_2
+	const map_clear_bg_palettes
+	const map_fade_out_palettes
+	const map_fade_in_palettes
+	const map_anchor_screen
+	const map_warp_face
+	const map_face_down
+	const map_spawn_coord
+	const map_player_coord
+	const map_prolong_sprites
+	const map_delay_sprites
+	const map_update_roam
+	const map_keep_roam
+	const map_fade_out_music
+	const map_animations_on
+	const map_animations_off
+	const map_keep_palettes
+	const map_text_scroll_off
+	const map_stop_script
+map_end_setup_script EQU -1