From 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 13:23:44 +0100 Subject: Uppercase MACRO and EQU(S) according to the style guide --- macros/scripts/maps.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'macros/scripts/maps.asm') diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 8ef08ec49..4d3744a38 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -1,15 +1,15 @@ -map: macro +map: MACRO ;\1: map id db GROUP_\1, MAP_\1 endm -scene_script: macro +scene_script: MACRO ;\1: script pointer dw \1, 0 endm -warp_def: macro +warp_def: MACRO ;\1: y: top to bottom, starts at 0 ;\2: x: left to right, starts at 0 ;\3: warp destination: starts at 1 @@ -18,7 +18,7 @@ warp_def: macro map \4 endm -coord_event: macro +coord_event: MACRO ;\1: scene id: controlled by setscene/setmapscene ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 @@ -28,7 +28,7 @@ coord_event: macro db $0, $0 endm -bg_event: macro +bg_event: MACRO ;\1: y: top to bottom, starts at 0 ;\2: x: left to right, starts at 0 ;\3: function: a BGEVENT_* constant @@ -37,7 +37,7 @@ bg_event: macro dw \4 endm -object_event: macro +object_event: MACRO ;\1: sprite: a SPRITE_* constant ;\2: y: top to bottom, starts at 0 ;\3: x: left to right, starts at 0 @@ -68,7 +68,7 @@ object_event: macro endm -trainer: macro +trainer: MACRO ;\1: flag: an EVENT_BEAT_* constant ;\2: trainer group ;\3: trainer id @@ -81,7 +81,7 @@ trainer: macro dw \4, \5, \6, \7 endm -itemball: macro +itemball: MACRO ;\1: item: from constants/item_constants.asm ;\2: quantity: default 1 if _NARG == 2 @@ -91,7 +91,7 @@ else endc endm -elevfloor: macro +elevfloor: MACRO ;\1: floor: a FLOOR_* constant ;\2: warp destination: starts at 1 ;\3: map id @@ -99,7 +99,7 @@ elevfloor: macro map \3 ENDM -stonetable: macro +stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer -- cgit v1.2.3 From 50fc9c3389ae8130d3670683f22f3e49555c57a3 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 22:31:16 +0100 Subject: endm -> ENDM --- macros/scripts/maps.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'macros/scripts/maps.asm') diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 4d3744a38..6ab4a3f61 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -1,13 +1,13 @@ map: MACRO ;\1: map id db GROUP_\1, MAP_\1 -endm +ENDM scene_script: MACRO ;\1: script pointer dw \1, 0 -endm +ENDM warp_def: MACRO ;\1: y: top to bottom, starts at 0 @@ -16,7 +16,7 @@ warp_def: MACRO ;\4: map id: from constants/map_constants.asm db \1, \2, \3 map \4 -endm +ENDM coord_event: MACRO ;\1: scene id: controlled by setscene/setmapscene @@ -26,7 +26,7 @@ coord_event: MACRO db \1, \2, \3, $0 dw \4 db $0, $0 -endm +ENDM bg_event: MACRO ;\1: y: top to bottom, starts at 0 @@ -35,7 +35,7 @@ bg_event: MACRO ;\4: script pointer db \1, \2, \3 dw \4 -endm +ENDM object_event: MACRO ;\1: sprite: a SPRITE_* constant @@ -65,7 +65,7 @@ object_event: MACRO dw \9 shift dw \9 -endm +ENDM trainer: MACRO @@ -79,7 +79,7 @@ trainer: MACRO dw \1 db \2, \3 dw \4, \5, \6, \7 -endm +ENDM itemball: MACRO ;\1: item: from constants/item_constants.asm @@ -89,7 +89,7 @@ if _NARG == 2 else db \1, 1 endc -endm +ENDM elevfloor: MACRO ;\1: floor: a FLOOR_* constant @@ -105,4 +105,4 @@ stonetable: MACRO ;\3: script pointer db \1, \2 dw \3 -endm +ENDM -- cgit v1.2.3