summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/map_constants.asm4
-rwxr-xr-xconstants/map_dimensions.asm7
-rw-r--r--constants/tilesets.asm4
3 files changed, 12 insertions, 3 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 4e4e314f..11deedd0 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -246,4 +246,6 @@ TRADE_CENTER EQU $F0
LORELEIS_ROOM EQU $F5
BRUNOS_ROOM EQU $F6
AGATHAS_ROOM EQU $F7
-BEACH_HOUSE EQU $F8 ; Yellow only \ No newline at end of file
+IF DEF(_OPTION_BEACH_HOUSE)
+BEACH_HOUSE EQU $F8
+ENDC
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
index 7339e153..236ccac4 100755
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -890,4 +890,9 @@ BRUNOS_ROOM_WIDTH EQU $05
; Agatha_h map_id=247
AGATHAS_ROOM_HEIGHT EQU $06
-AGATHAS_ROOM_WIDTH EQU $05 \ No newline at end of file
+AGATHAS_ROOM_WIDTH EQU $05
+
+IF DEF(_OPTION_BEACH_HOUSE)
+BEACH_HOUSE_HEIGHT EQU 4
+BEACH_HOUSE_WIDTH EQU 7
+ENDC
diff --git a/constants/tilesets.asm b/constants/tilesets.asm
index e364db76..bf15f24e 100644
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -22,4 +22,6 @@ LAB EQU 20
CLUB EQU 21
FACILITY EQU 22
PLATEAU EQU 23
-
+IF DEF(_OPTION_BEACH_HOUSE)
+BEACH_HOUSE_TILESET EQU 24
+ENDC