diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /data/wild | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'data/wild')
| -rw-r--r-- | data/wild/roammon_maps.asm | 4 | ||||
| -rw-r--r-- | data/wild/treemon_maps.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index ee213bff5..c0b552b26 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -1,7 +1,7 @@ ; Maps that roaming monsters can be on, and possible maps they can jump to. ; Notably missing are Route 40 and Route 41, which are water routes. -roam_map: macro +roam_map: MACRO ; map, # of other maps, other maps map \1 db \2 @@ -10,7 +10,7 @@ rept \2 shift endr db 0 -endm +ENDM RoamMaps: ; 2a40f roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 47491c2c9..e825930cc 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -1,7 +1,7 @@ -treemon_map: macro +treemon_map: MACRO map \1 db \2 ; treemon set -endm +ENDM TreeMonMaps: ; b825e treemon_map ROUTE_26, 4 |