diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
| commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
| tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /macros/data_macros.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) | |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'macros/data_macros.asm')
| -rwxr-xr-x | macros/data_macros.asm | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 4c6457be..ee5cb8f0 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 (-1 = 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 |