aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutB1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
commite2c99f19103856426966e30cf1910d07995bb936 (patch)
tree513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/RocketHideoutB1F.asm
parentUse ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff)
downloadpokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.gz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.xz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.zip
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/RocketHideoutB1F.asm')
-rwxr-xr-xdata/maps/objects/RocketHideoutB1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm
index 9de04769..e4dfaafd 100755
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -1,16 +1,16 @@
RocketHideoutB1F_Object:
db $2e ; border block
- db 5 ; warps
+ def_warps
warp 23, 2, 0, ROCKET_HIDEOUT_B2F
warp 21, 2, 2, GAME_CORNER
warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
warp 21, 24, 3, ROCKET_HIDEOUT_B2F
warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
- db 0 ; signs
+ def_signs
- db 7 ; objects
+ def_objects
object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8
object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9
object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10