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

1 files changed, 105 insertions, 105 deletions

diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 1038e40f7..de8edb652 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -1,105 +1,105 @@
-const_value = 1

-	const DECO_PLANT

-	const DECO_BED

-	const DECO_CARPET

-	const DECO_POSTER

-	const DECO_DOLL

-	const DECO_BIGDOLL

-

-const_value = 1

-	const PUT_IT_AWAY

-	const MAGNAPLANT

-	const TROPICPLANT

-	const JUMBOPLANT

-	const TOWN_MAP_D

-	const FAMICOM

-	const SUPER_NES

-	const NINTENDO_64

-	const VIRTUAL_BOY

-	const GOLD_TROPHY

-	const SILVER_TROPHY

-	const SURF_PIKA_DOLL

-	const _BED

-	const _CARPET

-	const _POSTER

-	const _DOLL

-	const BIG_

-	const FEATHERY_BED

-	const PIKACHU_BED

-	const PINK_BED

-	const POLKADOT_BED

-	const RED_CARPET

-	const BLUE_CARPET

-	const YELLOW_CARPET

-	const GREEN_CARPET

-

-const_value = 1

-	const SET_UP_BED

-	const PUT_AWAY_BED

-	const SET_UP_CARPET

-	const PUT_AWAY_CARPET

-	const SET_UP_PLANT

-	const PUT_AWAY_PLANT

-	const SET_UP_POSTER

-	const PUT_AWAY_POSTER

-	const SET_UP_CONSOLE

-	const PUT_AWAY_CONSOLE

-	const SET_UP_BIG_DOLL

-	const PUT_AWAY_BIG_DOLL

-	const SET_UP_DOLL

-	const PUT_AWAY_DOLL

-	const SET_UP_ORNAMENT

-	const PUT_AWAY_ORNAMENT

-

-const_value = 2

-	const DECO_FEATHERY_BED ; 2

-	const DECO_PINK_BED ; 3

-	const DECO_POLKADOT_BED ; 4

-	const DECO_PIKACHU_BED ; 5

-const_value = const_value + 1

-	const DECO_RED_CARPET ; 7

-	const DECO_BLUE_CARPET ; 8

-	const DECO_YELLOW_CARPET ; 9

-	const DECO_GREEN_CARPET ; a

-const_value = const_value + 1

-	const DECO_MAGNAPLANT ; c

-	const DECO_TROPICPLANT ; d

-	const DECO_JUMBOPLANT ; e

-const_value = const_value + 1

-	const DECO_TOWN_MAP ; 10

-	const DECO_PIKACHU_POSTER ; 11

-	const DECO_CLEFAIRY_POSTER ; 12

-	const DECO_JIGGLYPUFF_POSTER ; 13

-const_value = const_value + 1

-	const DECO_FAMICOM ; 15

-	const DECO_SNES ; 16

-	const DECO_N64 ; 17

-	const DECO_VIRTUAL_BOY ; 18

-const_value = const_value + 1

-	const DECO_BIG_SNORLAX_DOLL ; 1a

-	const DECO_BIG_ONIX_DOLL ; 1b

-	const DECO_BIG_LAPRAS_DOLL ; 1c

-const_value = const_value + 1

-	const DECO_PIKACHU_DOLL ; 1e

-	const DECO_SURF_PIKACHU_DOLL ; 1f

-	const DECO_CLEFAIRY_DOLL ; 20

-	const DECO_JIGGLYPUFF_DOLL ; 21

-	const DECO_BULBASAUR_DOLL ; 22

-	const DECO_CHARMANDER_DOLL ; 23

-	const DECO_SQUIRTLE_DOLL ; 24

-	const DECO_POLIWAG_DOLL ; 25

-	const DECO_DIGLETT_DOLL ; 26

-	const DECO_STARMIE_DOLL ; 27

-	const DECO_MAGIKARP_DOLL ; 28

-	const DECO_ODDISH_DOLL ; 29

-	const DECO_GENGAR_DOLL ; 2a

-	const DECO_SHELLDER_DOLL ; 2b

-	const DECO_GRIMER_DOLL ; 2c

-	const DECO_VOLTORB_DOLL ; 2d

-	const DECO_WEEDLE_DOLL ; 2e

-	const DECO_UNOWN_DOLL ; 2f

-	const DECO_GEODUDE_DOLL ; 30

-	const DECO_MACHOP_DOLL ; 31

-	const DECO_TENTACOOL_DOLL ; 32

-	const DECO_GOLD_TROPHY_DOLL ; 33

-	const DECO_SILVER_TROPHY_DOLL ; 34

+const_value = 1
+	const DECO_PLANT
+	const DECO_BED
+	const DECO_CARPET
+	const DECO_POSTER
+	const DECO_DOLL
+	const DECO_BIGDOLL
+
+const_value = 1
+	const PUT_IT_AWAY
+	const MAGNAPLANT
+	const TROPICPLANT
+	const JUMBOPLANT
+	const TOWN_MAP_D
+	const FAMICOM
+	const SUPER_NES
+	const NINTENDO_64
+	const VIRTUAL_BOY
+	const GOLD_TROPHY
+	const SILVER_TROPHY
+	const SURF_PIKA_DOLL
+	const _BED
+	const _CARPET
+	const _POSTER
+	const _DOLL
+	const BIG_
+	const FEATHERY_BED
+	const PIKACHU_BED
+	const PINK_BED
+	const POLKADOT_BED
+	const RED_CARPET
+	const BLUE_CARPET
+	const YELLOW_CARPET
+	const GREEN_CARPET
+
+const_value = 1
+	const SET_UP_BED
+	const PUT_AWAY_BED
+	const SET_UP_CARPET
+	const PUT_AWAY_CARPET
+	const SET_UP_PLANT
+	const PUT_AWAY_PLANT
+	const SET_UP_POSTER
+	const PUT_AWAY_POSTER
+	const SET_UP_CONSOLE
+	const PUT_AWAY_CONSOLE
+	const SET_UP_BIG_DOLL
+	const PUT_AWAY_BIG_DOLL
+	const SET_UP_DOLL
+	const PUT_AWAY_DOLL
+	const SET_UP_ORNAMENT
+	const PUT_AWAY_ORNAMENT
+
+const_value = 2
+	const DECO_FEATHERY_BED ; 2
+	const DECO_PINK_BED ; 3
+	const DECO_POLKADOT_BED ; 4
+	const DECO_PIKACHU_BED ; 5
+const_value = const_value + 1
+	const DECO_RED_CARPET ; 7
+	const DECO_BLUE_CARPET ; 8
+	const DECO_YELLOW_CARPET ; 9
+	const DECO_GREEN_CARPET ; a
+const_value = const_value + 1
+	const DECO_MAGNAPLANT ; c
+	const DECO_TROPICPLANT ; d
+	const DECO_JUMBOPLANT ; e
+const_value = const_value + 1
+	const DECO_TOWN_MAP ; 10
+	const DECO_PIKACHU_POSTER ; 11
+	const DECO_CLEFAIRY_POSTER ; 12
+	const DECO_JIGGLYPUFF_POSTER ; 13
+const_value = const_value + 1
+	const DECO_FAMICOM ; 15
+	const DECO_SNES ; 16
+	const DECO_N64 ; 17
+	const DECO_VIRTUAL_BOY ; 18
+const_value = const_value + 1
+	const DECO_BIG_SNORLAX_DOLL ; 1a
+	const DECO_BIG_ONIX_DOLL ; 1b
+	const DECO_BIG_LAPRAS_DOLL ; 1c
+const_value = const_value + 1
+	const DECO_PIKACHU_DOLL ; 1e
+	const DECO_SURF_PIKACHU_DOLL ; 1f
+	const DECO_CLEFAIRY_DOLL ; 20
+	const DECO_JIGGLYPUFF_DOLL ; 21
+	const DECO_BULBASAUR_DOLL ; 22
+	const DECO_CHARMANDER_DOLL ; 23
+	const DECO_SQUIRTLE_DOLL ; 24
+	const DECO_POLIWAG_DOLL ; 25
+	const DECO_DIGLETT_DOLL ; 26
+	const DECO_STARMIE_DOLL ; 27
+	const DECO_MAGIKARP_DOLL ; 28
+	const DECO_ODDISH_DOLL ; 29
+	const DECO_GENGAR_DOLL ; 2a
+	const DECO_SHELLDER_DOLL ; 2b
+	const DECO_GRIMER_DOLL ; 2c
+	const DECO_VOLTORB_DOLL ; 2d
+	const DECO_WEEDLE_DOLL ; 2e
+	const DECO_UNOWN_DOLL ; 2f
+	const DECO_GEODUDE_DOLL ; 30
+	const DECO_MACHOP_DOLL ; 31
+	const DECO_TENTACOOL_DOLL ; 32
+	const DECO_GOLD_TROPHY_DOLL ; 33
+	const DECO_SILVER_TROPHY_DOLL ; 34