aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianForestSouthGate.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-20 19:07:42 -0400
committerGitHub <noreply@github.com>2020-08-20 19:07:42 -0400
commit7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch)
treeddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/ViridianForestSouthGate.asm
parentUse ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff)
parentComments explain the def_warps_to macros (diff)
downloadpokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz
pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz
pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/ViridianForestSouthGate.asm')
-rwxr-xr-xdata/maps/objects/ViridianForestSouthGate.asm12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm
index 95478e37..0b98b51b 100755
--- a/data/maps/objects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -1,20 +1,16 @@
ViridianForestSouthGate_Object:
db $a ; border block
- db 4 ; warps
+ def_warps
warp 4, 0, 3, VIRIDIAN_FOREST
warp 5, 0, 4, VIRIDIAN_FOREST
warp 4, 7, 5, LAST_MAP
warp 5, 7, 5, LAST_MAP
- db 0 ; signs
+ def_signs
- db 2 ; objects
+ def_objects
object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person
object SPRITE_LITTLE_GIRL, 2, 4, WALK, UP_DOWN, 2 ; person
- ; warp-to
- warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
- warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
- warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
- warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
+ def_warps_to VIRIDIAN_FOREST_SOUTH_GATE