Replaced GROUP_, MAP_ references with the map macro

Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme

3 files changed, 29 insertions, 32 deletions

diff --git a/macros/event.asm b/macros/event.asm
index 678648a04..f2ab6fae5 100644
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -120,16 +120,14 @@ ptcallasm: macro
 	enum checkmaptriggers_command
 checkmaptriggers: macro
 	db checkmaptriggers_command
-	db \1 ; map_group
-	db \2 ; map_id
+	map \1 ; map
 	endm
 
 	enum domaptrigger_command
 domaptrigger: macro
 	db domaptrigger_command
-	db \1 ; map_group
-	db \2 ; map_id
-	db \3 ; trigger_id
+	map \1 ; map
+	db \2 ; trigger_id
 	endm
 
 	enum checktriggers_command
@@ -385,24 +383,21 @@ xycompare: macro
 warpmod: macro
 	db warpmod_command
 	db \1 ; warp_id
-	db \2 ; map_group
-	db \3 ; map_id
+	map \2 ; map
 	endm
 
 	enum blackoutmod_command
 blackoutmod: macro
 	db blackoutmod_command
-	db \1 ; map_group
-	db \2 ; map_id
+	map \1 ; map
 	endm
 
 	enum warp_command
 warp: macro
 	db warp_command
-	db \1 ; map_group
-	db \2 ; map_id
-	db \3 ; x
-	db \4 ; y
+	map \1 ; map
+	db \2 ; x
+	db \3 ; y
 	endm
 
 	enum readmoney_command
@@ -997,8 +992,7 @@ verbosegiveitem2: macro
 loadwilddata: macro
 	db loadwilddata_command
 	db \1 ; flag
-	db \2 ; map_group
-	db \3 ; map_id
+	map \2 ; map
 	endm
 
 	enum halloffame_command
@@ -1015,10 +1009,9 @@ credits: macro
 warpfacing: macro
 	db warpfacing_command
 	db \1 ; facing
-	db \2 ; map_group
-	db \3 ; map_id
-	db \4 ; x
-	db \5 ; y
+	map \2 ; map
+	db \3 ; x
+	db \4 ; y
 	endm
 
 	enum storetext_command
diff --git a/macros/map.asm b/macros/map.asm
index 17b1f5a65..30609e7ed 100644
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -61,8 +61,7 @@ warp_def: macro
 	db \1 ; y
 	db \2 ; x
 	db \3 ; warp_to
-	db \4 ; map group
-	db \5 ; map number
+	map \4 ; map
 	endm
 
 
@@ -177,3 +176,8 @@ newgroup: MACRO
 const_value = const_value + 1
 	enum_start 1
 ENDM
+
+elevfloor: MACRO
+	db \1, \2
+	map \3
+ENDM
diff --git a/macros/trainer.asm b/macros/trainer.asm
index b7c8ad803..2e6c61884 100644
--- a/macros/trainer.asm
+++ b/macros/trainer.asm
@@ -1,11 +1,11 @@
-trainerclass: MACRO

-	enum \1

-const_value = 1

-ENDM

-

-trainer: MACRO

-	; flag, group, id, seen text, win text, lost text, talk-again text

-	dw \1

-	db \2, \3

-	dw \4, \5, \6, \7

-ENDM

+trainerclass: MACRO
+	enum \1
+const_value = 1
+ENDM
+
+trainer: MACRO
+	; flag, group, id, seen text, win text, lost text, talk-again text
+	dw \1
+	db \2, \3
+	dw \4, \5, \6, \7
+ENDM