From d271d6917549074e721f3e5064b77e1ad1dbe44a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 02:31:32 -0500 Subject: Add warp, sign, and warp_to macros for data/mapObjects definitions --- macros/data_macros.asm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'macros/data_macros.asm') diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 4c6457be..9085cf76 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -118,6 +118,28 @@ object: MACRO ENDC ENDM +;\1 x position +;\2 y position +;\3 destination warp id +;\4 destination map ($ff = wLastMap) +warp: MACRO + db \2, \1, \3, \4 +ENDM + +;\1 x position +;\2 y position +;\3 sign id +sign: MACRO + db \2, \1, \3 +ENDM + +;\1 x position +;\2 y position +;\3 map width +warp_to: MACRO + EVENT_DISP \3, \2, \1 +ENDM + ;\1 (byte) = current map id ;\2 (byte) = connected map id ;\3 (byte) = x movement of connection strip -- cgit v1.2.3 From dd4f0a0064921f74fd68750848fca87ae21c4545 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:12:59 -0500 Subject: Use base 10 (note, the previous commit resolves #173) --- macros/data_macros.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros/data_macros.asm') diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 9085cf76..ee5cb8f0 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -121,7 +121,7 @@ ENDM ;\1 x position ;\2 y position ;\3 destination warp id -;\4 destination map ($ff = wLastMap) +;\4 destination map (-1 = wLastMap) warp: MACRO db \2, \1, \3, \4 ENDM -- cgit v1.2.3