From 6ff2cb20e67db2054486fc5dc48eb9263298d4ad Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 3 Feb 2018 16:58:49 -0500 Subject: =?UTF-8?q?map=20=E2=86=92=20map=5Fid;=20map=5Fdef=20=E2=86=92=20m?= =?UTF-8?q?ap;=20map=5Fdata=20=E2=86=92=20map=5Fattributes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- macros/scripts/events.asm | 14 +++++++------- macros/scripts/maps.asm | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'macros/scripts') diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 593d5e6ba..6f6d1992d 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -110,13 +110,13 @@ ENDM enum checkmapscene_command ; $11 checkmapscene: MACRO db checkmapscene_command - map \1 ; map + map_id \1 ; map ENDM enum setmapscene_command ; $12 setmapscene: MACRO db setmapscene_command - map \1 ; map + map_id \1 ; map db \2 ; scene_id ENDM @@ -385,19 +385,19 @@ ENDM warpmod: MACRO db warpmod_command db \1 ; warp_id - map \2 ; map + map_id \2 ; map ENDM enum blackoutmod_command ; $3b blackoutmod: MACRO db blackoutmod_command - map \1 ; map + map_id \1 ; map ENDM enum warp_command ; $3c warp: MACRO db warp_command - map \1 ; map + map_id \1 ; map db \2 ; x db \3 ; y ENDM @@ -1002,7 +1002,7 @@ ENDM swarm: MACRO db swarm_command db \1 ; flag - map \2 ; map + map_id \2 ; map ENDM enum halloffame_command ; $a1 @@ -1019,7 +1019,7 @@ ENDM warpfacing: MACRO db warpfacing_command db \1 ; facing - map \2 ; map + map_id \2 ; map db \3 ; x db \4 ; y ENDM diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 7d06a620f..3be893a6f 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -1,4 +1,4 @@ -map: MACRO +map_id: MACRO ;\1: map id db GROUP_\1, MAP_\1 ENDM @@ -22,7 +22,7 @@ warp_event: MACRO ;\3: map id: from constants/map_constants.asm ;\4: warp destination: starts at 1 db \2, \1, \4 - map \3 + map_id \3 ENDM coord_event: MACRO @@ -110,7 +110,7 @@ elevfloor: MACRO ;\2: warp destination: starts at 1 ;\3: map id db \1, \2 - map \3 + map_id \3 ENDM conditional_event: MACRO -- cgit v1.2.3