From fc899e1906a9a245e94dafa7c0da2ef1697b7335 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Oct 2021 21:02:42 -0400 Subject: `warp_event` warp IDs start at 1, like in pokegold/pokecrystal --- macros/scripts/maps.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'macros/scripts') 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 -- cgit v1.2.3