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/OaksLab.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/OaksLab.asm') diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 1a784f83..872b163f 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,13 +1,13 @@ OaksLab_Object: db $3 ; border block - db 2 ; warps + def_warps warp 4, 11, 2, LAST_MAP warp 5, 11, 2, LAST_MAP - db 0 ; signs + def_signs - db 11 ; objects + def_objects object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person -- 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/OaksLab.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/OaksLab.asm') diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 872b163f..55066be4 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -20,6 +20,4 @@ OaksLab_Object: object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person - ; warp-to - warp_to 4, 11, OAKS_LAB_WIDTH - warp_to 5, 11, OAKS_LAB_WIDTH + def_warps_to OAKS_LAB -- cgit v1.2.3