Sync with pokecrystal up to 8873506b1

constants/battle_anim_constants.asm

@@ -713,6 +713,9 @@ DEF NUM_BATTLEANIMFRAMESETS EQU const_value
 	const BATTLEANIMOAMSET_D7
 DEF NUM_BATTLEANIMOAMSETS EQU const_value
 
+assert NUM_BATTLEANIMOAMSETS <= FIRST_OAM_CMD, \
+	"BATTLEANIMOAMSET_* constants overlap oam*_command constants"
+
 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
 	const_def 1
 	const ANIM_BG_FLASH_INVERTED

constants/battle_constants.asm

@@ -90,7 +90,7 @@ DEF SPDSPCDV_SHINY EQU $AA
 	const BATTLETYPE_FISH
 	const BATTLETYPE_ROAMING
 	const BATTLETYPE_CONTEST
-	const BATTLETYPE_SHINY
+	const BATTLETYPE_FORCESHINY
 	const BATTLETYPE_TREE
 	const BATTLETYPE_TRAP
 	const BATTLETYPE_FORCEITEM

constants/map_object_constants.asm

@@ -97,6 +97,7 @@ DEF RELATIVE_ATTRIBUTES EQU 1 << RELATIVE_ATTRIBUTES_F
 DEF ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
 
 ; map_object struct members (see macros/ram.asm)
+; struct initialized by object_event macro (see macros/scripts/maps.asm)
 rsreset
 DEF MAPOBJECT_OBJECT_STRUCT_ID rb ; 0
 DEF MAPOBJECT_SPRITE           rb ; 1

constants/script_constants.asm

@@ -109,7 +109,8 @@ DEF CALLBACK_SIZE     EQU  3 ; callback
 DEF WARP_EVENT_SIZE   EQU  5 ; warp_event
 DEF COORD_EVENT_SIZE  EQU  8 ; coord_event
 DEF BG_EVENT_SIZE     EQU  5 ; bg_event
-DEF OBJECT_EVENT_SIZE EQU 13 ; object_event
+; An object_event is a map_object without its initial MAPOBJECT_OBJECT_STRUCT_ID or final padding
+DEF OBJECT_EVENT_SIZE EQU MAPOBJECT_LENGTH - 3 ; 13
 
 ; A coord_event for scene -1 will always activate,
 ; regardless of the map's scene variable value.

constants/sprite_anim_constants.asm

@@ -370,3 +370,6 @@ DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
 	const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_1 ; 9a
 	const SPRITE_ANIM_OAMSET_LEVEL_SELECTION_MENU_FEMALE_RIGHT_2 ; 9b
 DEF NUM_SPRITE_ANIM_OAMSETS EQU const_value
+
+assert NUM_SPRITE_ANIM_OAMSETS <= FIRST_OAM_CMD, \
+	"SPRITE_ANIM_OAMSET_* constants overlap oam*_command constants"