Merge branch 'master' into audio-macros

9 files changed, 72 insertions, 58 deletions

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index d6ef40b55..c2cae8aed 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -1,4 +1,4 @@
-; EngineFlags indexes (see engine/engine_flags.asm)
+; EngineFlags indexes (see data/engine_flags.asm)
 	const_def
 ; wPokegearFlags
 	const ENGINE_RADIO_CARD
@@ -64,7 +64,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
 ; wVisitedSpawns
 	const ENGINE_FLYPOINT_PLAYERS_HOUSE
-	const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
+	const ENGINE_FLYPOINT_DEBUG
 	const ENGINE_FLYPOINT_PALLET
 	const ENGINE_FLYPOINT_VIRIDIAN
 	const ENGINE_FLYPOINT_PEWTER
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 00ddb772a..f1f81d64c 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -34,7 +34,7 @@
 	const OBJECT_1F                  ; 1f
 	const OBJECT_RANGE               ; 20
 	; 21-27 are not used
-OBJECT_STRUCT_LENGTH EQU 40
+OBJECT_LENGTH EQU 40
 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
 
 ; object_struct OBJECT_FACING values
@@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
 	const MAPOBJECT_FLAG_HI ; d
 	const MAPOBJECT_E ; unused
 	const MAPOBJECT_F ; unused
-OBJECT_LENGTH EQU const_value
+MAPOBJECT_LENGTH EQU const_value
 
 ; SpriteMovementData struct members (see data/sprites/map_objects.asm)
 	const_def
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 426cbb298..ad5ea6155 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -15,55 +15,53 @@
 	const MAPSETUP_FLY        ; fc
 
 ; MapSetupCommands indexes (see engine/overworld/map_setup.asm)
-; Names taken from Condensation water's scripting compendium
-; https://hax.iimarck.us/files/scriptingcodes_eng.htm
 	const_def
-	const map_lcd_on              ; 00
-	const map_lcd_off             ; 01
-	const map_sound_off           ; 02
-	const map_music               ; 03
-	const map_start_music         ; 04
-	const map_fade_music          ; 05
-	const map_fade                ; 06
-	const map_bike_music          ; 07
-	const map_music_force         ; 08
-	const map_max_volume          ; 09
-	const map_load_blocks         ; 0a
-	const map_connection_blocks   ; 0b
-	const map_save_screen         ; 0c
-	const map_buffer_screen       ; 0d
-	const map_load_graphics       ; 0e
-	const map_load_tileset        ; 0f
-	const map_time_of_day         ; 10
-	const map_palettes            ; 11
-	const map_wildmons            ; 12
-	const map_sprites             ; 13
-	const map_change_callback     ; 14
-	const map_start_callback      ; 15
-	const map_load_objects        ; 16
-	const map_load_spawn          ; 17
-	const map_load_connection     ; 18
-	const map_load_warp           ; 19
-	const map_load_attributes     ; 1a
-	const map_load_attributes_2   ; 1b
-	const map_clear_bg_palettes   ; 1c
-	const map_fade_out_palettes   ; 1d
-	const map_fade_in_palettes    ; 1e
-	const map_anchor_screen       ; 1f
-	const map_warp_face           ; 20
-	const map_face_down           ; 21
-	const map_spawn_coord         ; 22
-	const map_player_coord        ; 23
-	const map_prolong_sprites     ; 24
-	const map_delay_sprites       ; 25
-	const map_update_roam         ; 26
-	const map_keep_roam           ; 27
-	const map_fade_out_music      ; 28
-	const map_animations_on       ; 29
-	const map_animations_off      ; 2a
-	const map_keep_palettes       ; 2b
-	const map_text_scroll_off     ; 2c
-	const map_stop_script         ; 2d
+	const map_enable_lcd                 ; 00
+	const map_disable_lcd                ; 01
+	const map_init_sound                 ; 02
+	const map_play_music                 ; 03
+	const map_restart_music              ; 04
+	const map_fade_to_music              ; 05
+	const map_fade_music_and_palettes    ; 06
+	const map_play_music_bike            ; 07
+	const map_force_music                ; 08
+	const map_fade_in_music              ; 09
+	const map_load_block_data            ; 0a
+	const map_load_connection_block_data ; 0b
+	const map_save_screen                ; 0c
+	const map_buffer_screen              ; 0d
+	const map_load_graphics              ; 0e
+	const map_load_tileset               ; 0f
+	const map_load_time_of_day           ; 10
+	const map_load_palettes              ; 11
+	const map_load_wild_mon_data         ; 12
+	const map_refresh_sprites            ; 13
+	const map_handle_new                 ; 14
+	const map_handle_continue            ; 15
+	const map_load_objects               ; 16
+	const map_enter_spawn_point          ; 17
+	const map_enter_connection           ; 18
+	const map_enter_warp                 ; 19
+	const map_load_attributes            ; 1a
+	const map_load_attributes_no_objects ; 1b
+	const map_clear_bg_palettes          ; 1c
+	const map_fade_out_palettes          ; 1d
+	const map_fade_in_palettes           ; 1e
+	const map_get_screen_coords          ; 1f
+	const map_get_warp_dest_coords       ; 20
+	const map_spawn_in_facing_down       ; 21
+	const map_spawn_player               ; 22
+	const map_refresh_player_coords      ; 23
+	const map_reset_player_object_action ; 24
+	const map_skip_update_sprites        ; 25
+	const map_update_roam_mons           ; 26
+	const map_jump_roam_mons             ; 27
+	const map_fade_out_music             ; 28
+	const map_activate_anims             ; 29
+	const map_suspend_anims              ; 2a
+	const map_apply_palettes             ; 2b
+	const map_enable_text_acceleration   ; 2c
+	const map_init_name_sign             ; 2d
 map_end EQU -1
 
 ; callback types
diff --git a/constants/mobile_constants.asm b/constants/mobile_constants.asm
index b5894b8e9..a01c29905 100644
--- a/constants/mobile_constants.asm
+++ b/constants/mobile_constants.asm
@@ -19,3 +19,8 @@
 NUM_KANA EQU 45 ; length of SortedPokemon table (see mobile/fixed_words.asm)
 
 MOBILE_LOGIN_PASSWORD_LENGTH EQU 17
+MOBILE_PHONE_NUMBER_LENGTH EQU 20
+
+; Maximum amount of time allowed for mobile battles each day
+MOBILE_BATTLE_ALLOWED_SECONDS EQU 0
+MOBILE_BATTLE_ALLOWED_MINUTES EQU 10
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 99275efe3..cfcbfbb52 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -92,6 +92,17 @@ RETVAR_EXECUTE EQU (2 << 6)
 	const PLAYEREVENT_JOYCHANGEFACING
 NUM_PLAYER_EVENTS EQU const_value
 
+; PlayerMovement.pointers indexes (see engine/overworld/events.asm)
+	const_def
+	const PLAYERMOVEMENT_NORMAL
+	const PLAYERMOVEMENT_WARP
+	const PLAYERMOVEMENT_TURN
+	const PLAYERMOVEMENT_FORCE_TURN
+	const PLAYERMOVEMENT_FINISH
+	const PLAYERMOVEMENT_CONTINUE
+	const PLAYERMOVEMENT_EXIT_WATER
+	const PLAYERMOVEMENT_JUMP
+
 ; script data sizes (see macros/scripts/maps.asm)
 SCENE_SCRIPT_SIZE EQU 4 ; scene_script
 CALLBACK_SIZE     EQU 3 ; callback
diff --git a/constants/serial_constants.asm b/constants/serial_constants.asm
index 757292ee9..390390cc2 100644
--- a/constants/serial_constants.asm
+++ b/constants/serial_constants.asm
@@ -1,4 +1,4 @@
-; link types
+; wLinkMode
 	const_def
 	const LINK_NULL        ; 0
 	const LINK_TIMECAPSULE ; 1
diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm
index b58af59ea..113cf5f39 100644
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -150,8 +150,8 @@
 	const SFX_FANFARE_2                   ; 92
 	const SFX_REGISTER_PHONE_NUMBER       ; 93
 	const SFX_3RD_PLACE                   ; 94
-	const SFX_GET_EGG_FROM_DAY_CARE_MAN   ; 95
-	const SFX_GET_EGG_FROM_DAY_CARE_LADY  ; 96
+	const SFX_GET_EGG_UNUSED              ; 95
+	const SFX_GET_EGG                     ; 96
 	const SFX_MOVE_DELETED                ; 97
 	const SFX_2ND_PLACE                   ; 98
 	const SFX_1ST_PLACE                   ; 99
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index ee5589561..f1c3a0bf7 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -33,12 +33,12 @@ TEXTBOX_INNERY EQU TEXTBOX_Y + 2
 ; PrintNum bit flags
 	const_def 5
 	const PRINTNUM_MONEY_F        ; 5
-	const PRINTNUM_RIGHTALIGN_F   ; 6
+	const PRINTNUM_LEFTALIGN_F    ; 6
 	const PRINTNUM_LEADINGZEROS_F ; 7
 
 ; PrintNum arguments (see engine/math/print_num.asm)
 PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
-PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
+PRINTNUM_LEFTALIGN      EQU 1 << PRINTNUM_LEFTALIGN_F
 PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
 
 ; character sets (see charmap.asm)
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index e89714fee..79be4ad57 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -21,7 +21,7 @@
 	const TILESET_LIGHTHOUSE           ; 13
 	const TILESET_PLAYERS_ROOM         ; 14
 	const TILESET_POKECOM_CENTER       ; 15
-	const TILESET_BATTLE_TOWER         ; 16
+	const TILESET_BATTLE_TOWER_INSIDE  ; 16
 	const TILESET_TOWER                ; 17
 	const TILESET_CAVE                 ; 18
 	const TILESET_PARK                 ; 19