aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMansion3F.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/CeladonMansion3F.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/CeladonMansion3F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMansion3F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm
index 9ff614c7..761ab5e4 100755
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -1,19 +1,19 @@
CeladonMansion3F_Object:
db $f ; border block
- db 4 ; warps
+ def_warps
warp 6, 1, 0, CELADON_MANSION_2F
warp 7, 1, 0, CELADON_MANSION_ROOF
warp 2, 1, 1, CELADON_MANSION_ROOF
warp 4, 1, 3, CELADON_MANSION_2F
- db 4 ; signs
+ def_signs
sign 1, 3, 5 ; CeladonMansion3Text5
sign 4, 3, 6 ; CeladonMansion3Text6
sign 1, 6, 7 ; CeladonMansion3Text7
sign 4, 9, 8 ; CeladonMansion3Text8
- db 4 ; objects
+ def_objects
object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person
object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person