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/PokemonMansion1F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/PokemonMansion1F.asm') diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 7d89e914..43d0a6e2 100755 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,7 +1,7 @@ PokemonMansion1F_Object: db $2e ; border block - db 8 ; warps + def_warps warp 4, 27, 0, LAST_MAP warp 5, 27, 0, LAST_MAP warp 6, 27, 0, LAST_MAP @@ -11,9 +11,9 @@ PokemonMansion1F_Object: warp 26, 27, 0, LAST_MAP warp 27, 27, 0, LAST_MAP - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS -- cgit v1.3.1-sl0p