Define relationship between map_object and object_events (#1054)

pret · Aug 14, 2023 · e07a1e7 · e07a1e7
1 parent 6926900
commit e07a1e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/constants/map_object_constants.asm b/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

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
@@ -112,7 +112,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.