summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/map_setup_constants.asm59
-rw-r--r--constants/trainer_constants.asm12
2 files changed, 61 insertions, 10 deletions
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index ac4741ed6..e3088496f 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,8 +1,8 @@
- const_def
+const_value SET $f0
const MAPSETUP_00
- const MAPSETUP_01
+ const MAPSETUP_WARP
const MAPSETUP_02
- const MAPSETUP_03
+ const MAPSETUP_RELOADMAP
const MAPSETUP_04
const MAPSETUP_05
const MAPSETUP_06
@@ -10,4 +10,55 @@
const MAPSETUP_08
const MAPSETUP_09
const MAPSETUP_10
- const MAPSETUP_11
+ 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
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index be46783e5..e53c201b2 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -1,11 +1,11 @@
; trainer groups
enum_start
- trainerclass PHONE ; 0
- const MOM_PHONE
- const OAK_PHONE
- const BILL_PHONE
- const ELM_PHONE
- const BUENA_PHONE
+ trainerclass TRAINER_NONE ; 0
+ const PHONECONTACT_MOM
+ const PHONECONTACT_BIKESHOP
+ const PHONECONTACT_BILL
+ const PHONECONTACT_ELM
+ const PHONECONTACT_BUENA
trainerclass FALKNER ; 1