From e2c99f19103856426966e30cf1910d07995bb936 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 17 Aug 2020 16:54:59 -0400 Subject: Use def_* macros for automatic map event counts --- data/maps/objects/CinnabarLab.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/CinnabarLab.asm') diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 9398dc1e..1a4f182d 100755 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -1,20 +1,20 @@ CinnabarLab_Object: db $17 ; border block - db 5 ; warps + def_warps warp 2, 7, 2, LAST_MAP warp 3, 7, 2, LAST_MAP warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM - db 4 ; signs + def_signs sign 3, 2, 2 ; Lab1Text2 sign 9, 4, 3 ; Lab1Text3 sign 13, 4, 4 ; Lab1Text4 sign 17, 4, 5 ; Lab1Text5 - db 1 ; objects + def_objects object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person ; warp-to -- cgit v1.2.3 From 4373aafac152f64621bf3d8c6b8d037cd9c76f7b Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 17 Aug 2020 17:47:28 -0400 Subject: Use def_warps_to macro for automatic warp_to entries --- data/maps/objects/CinnabarLab.asm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'data/maps/objects/CinnabarLab.asm') diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 1a4f182d..ac326748 100755 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -17,9 +17,4 @@ CinnabarLab_Object: def_objects object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person - ; warp-to - warp_to 2, 7, CINNABAR_LAB_WIDTH - warp_to 3, 7, CINNABAR_LAB_WIDTH - warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM - warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM - warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM + def_warps_to CINNABAR_LAB -- cgit v1.2.3