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/Route2TradeHouse.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route2TradeHouse.asm') diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 2a345d47..11d4c0d7 100755 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,13 +1,13 @@ Route2TradeHouse_Object: db $a ; border block - db 2 ; warps + def_warps warp 2, 7, 2, LAST_MAP warp 3, 7, 2, LAST_MAP - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; 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/Route2TradeHouse.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/Route2TradeHouse.asm') diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 11d4c0d7..c93b7c8a 100755 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -11,6 +11,4 @@ Route2TradeHouse_Object: object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person - ; warp-to - warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH + def_warps_to ROUTE_2_TRADE_HOUSE -- cgit v1.2.3