aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/force_bike_surf.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /data/maps/force_bike_surf.asm
parentMerge pull request #269 from Rangi42/master (diff)
parentDon't compare strings with ==; use STRCMP (diff)
downloadpokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz
pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/maps/force_bike_surf.asm')
-rwxr-xr-xdata/maps/force_bike_surf.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/data/maps/force_bike_surf.asm b/data/maps/force_bike_surf.asm
index fb352aa9..7f65333d 100755
--- a/data/maps/force_bike_surf.asm
+++ b/data/maps/force_bike_surf.asm
@@ -1,11 +1,15 @@
+force_bike_surf: MACRO
+ db \1, \3, \2
+ENDM
+
ForcedBikeOrSurfMaps:
-; map id, y, x
- db ROUTE_16,$0A,$11
- db ROUTE_16,$0B,$11
- db ROUTE_18,$08,$21
- db ROUTE_18,$09,$21
- db SEAFOAM_ISLANDS_B3F,$07,$12
- db SEAFOAM_ISLANDS_B3F,$07,$13
- db SEAFOAM_ISLANDS_B4F,$0E,$04
- db SEAFOAM_ISLANDS_B4F,$0E,$05
- db $FF ;end
+; map id, x, y
+ force_bike_surf ROUTE_16, 17, 10
+ force_bike_surf ROUTE_16, 17, 11
+ force_bike_surf ROUTE_18, 33, 8
+ force_bike_surf ROUTE_18, 33, 9
+ force_bike_surf SEAFOAM_ISLANDS_B3F, 18, 7
+ force_bike_surf SEAFOAM_ISLANDS_B3F, 19, 7
+ force_bike_surf SEAFOAM_ISLANDS_B4F, 4, 14
+ force_bike_surf SEAFOAM_ISLANDS_B4F, 5, 14
+ db -1 ; end