summaryrefslogtreecommitdiff
path: root/macros/scripts
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:20:41 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-10-05 21:20:41 -0400
commit0fdefbc9602f0e6f14f723c89d42673e974181e3 (patch)
tree21f39edfd76ee08ff00a22a6337ffd48c6eff47f /macros/scripts
parentb398c245a27e9d0a1b9a2961bc664a93bf2c6dd2 (diff)
`warp_event` warp IDs start at 1, like in pokegold/pokecrystal
Diffstat (limited to 'macros/scripts')
-rw-r--r--macros/scripts/maps.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 6c895f9a..12bc3c77 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -41,9 +41,9 @@ ENDM
;\1 x position
;\2 y position
;\3 destination map (-1 = wLastMap)
-;\4 destination warp id
+;\4 destination warp id; starts at 1 (internally at 0)
warp_event: MACRO
- db \2, \1, \4, \3
+ db \2, \1, \4 - 1, \3
_WARP_{d:{_NUM_WARP_EVENTS}}_X = \1
_WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2
{_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1