diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/collision_constants.asm | 14 | ||||
| -rw-r--r-- | constants/script_constants.asm | 8 |
2 files changed, 21 insertions, 1 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index b693dc8f8..f9724da60 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -102,6 +102,18 @@ COLL_RIGHT_WALL EQU $b0 COLL_LEFT_WALL EQU $b1 COLL_UP_WALL EQU $b2 COLL_DOWN_WALL EQU $b3 ; unused +COLL_DOWN_RIGHT_WALL EQU $b4 ; unused +COLL_DOWN_LEFT_WALL EQU $b5 ; unused +COLL_UP_RIGHT_WALL EQU $b6 ; unused +COLL_UP_LEFT_WALL EQU $b7 ; unused +COLL_RIGHT_BUOY EQU $c0 ; unused +COLL_LEFT_BUOY EQU $c1 ; unused +COLL_UP_BUOY EQU $c2 ; unused +COLL_DOWN_BUOY EQU $c3 ; unused +COLL_DOWN_RIGHT_BUOY EQU $c4 ; unused +COLL_DOWN_LEFT_BUOY EQU $c5 ; unused +COLL_UP_RIGHT_BUOY EQU $c6 ; unused +COLL_UP_LEFT_BUOY EQU $c7 ; unused COLL_FF EQU $ff ; garbage ; collision data type nybbles @@ -114,4 +126,4 @@ HI_NYBBLE_WALK_ALT EQU $50 HI_NYBBLE_WARPS EQU $70 HI_NYBBLE_LEDGES EQU $a0 HI_NYBBLE_SIDE_WALLS EQU $b0 -HI_NYBBLE_UNUSED_C0 EQU $c0 +HI_NYBBLE_SIDE_BUOYS EQU $c0 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 34f2bc864..91a519b8d 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -86,6 +86,14 @@ RETVAR_EXECUTE EQU (2 << 6) const PLAYEREVENT_JOYCHANGEFACING NUM_PLAYER_EVENTS EQU const_value +; script data sizes (see macros/scripts/maps.asm) +SCENE_SCRIPT_SIZE EQU 4 ; scene_script +CALLBACK_SIZE EQU 3 ; callback +WARP_EVENT_SIZE EQU 5 ; warp_event +COORD_EVENT_SIZE EQU 8 ; coord_event +BG_EVENT_SIZE EQU 5 ; bg_event +OBJECT_EVENT_SIZE EQU 13 ; object_event + ; bg_event types ; TryBGEvent arguments (see engine/overworld/events.asm) const_def |