Add background decorations to MermaidHut1 room

mdsteele · Jun 22, 2024 · 41c034b · 41c034b
1 parent 377d1ae
commit 41c034b
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 100 deletions.
diff --git a/src/rooms/mermaid_hut1.bg b/src/rooms/mermaid_hut1.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
 
               COCP
@@ -10,9 +10,9 @@
     COCMCNCMCLCLCLCLCNCMCNCP
   COCMCLCLCLCLCLCLCLCLCLCLCNCP
 COCMCLCLCLCLCLCLCLCLCLCLCLCLCNCP
-CD                            CA
-CB                            CC
-CD                            CA
+CD    AH    AH    AH    AH    CA
+CB    BL    AI    AI    BL    CC
+CD    AI                AI    CA
 CB  AP                    AP  CC
 CB            AK              CA
 CDBPBPBPBPBPBPAMBPBPCHCGCGCGCGCA

diff --git a/src/rooms/mermaid_hut2.bg b/src/rooms/mermaid_hut2.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
 
               COCP

diff --git a/src/rooms/mermaid_hut3.bg b/src/rooms/mermaid_hut3.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
 
 

diff --git a/src/rooms/mermaid_hut4.bg b/src/rooms/mermaid_hut4.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
                   COCKCP
                 COCMCLCNCP

diff --git a/src/rooms/mermaid_hut5.bg b/src/rooms/mermaid_hut5.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
 
 

diff --git a/src/rooms/mermaid_hut6.bg b/src/rooms/mermaid_hut6.bg
@@ -1,7 +1,7 @@
 @BG 0 0 0 16x15
 >hut_0
 >hut_1
->hut_4
+>hut_2
 
 
               COCP

diff --git a/src/tiles/terrain_hut1.ahi b/src/tiles/terrain_hut1.ahi
@@ -92,56 +92,56 @@ ahi1 f0 p1 i16 w8 h8
 00000000
 00000000
 
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+00000002
+00000220
+00022000
+02222222
+00221222
+00212222
+00221222
+00212222
 
-00000000
-00000000
-00000000
-00000000
-00000000
+22000000
+20220000
+00002200
+22222222
+22221220
+22222120
+22221220
+22222120
+
+00221222
+00212212
+00221212
+00212212
+00221211
+00212222
+00221222
+00212222
+
+12221220
+12122120
+12121220
+12122120
+11121220
+12222120
+12221220
+12222120
+
+00221222
+00212222
+00221222
+00212220
+00220000
+00000000
+00000000
+00000000
+
+22221220
+22222120
+22221220
+00222120
+00000220
 00000000
 00000000
 00000000
diff --git a/src/tiles/terrain_hut2.ahi b/src/tiles/terrain_hut2.ahi
@@ -92,41 +92,41 @@ ahi1 f0 p1 i16 w8 h8
 00000000
 00000000
 
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+00221222
+00212222
+00221222
+00212222
+00221221
+00212221
+00221222
+00212222
 
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+22221220
+22222120
+22221220
+22222120
+12221220
+12222120
+12121220
+11222120
 
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+00221221
+00212222
+00221222
+00212221
+00221221
+00212221
+00221222
+00212222
 
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+21221220
+21122120
+11221220
+12222120
+22221220
+22122120
+11221220
+22222120
 
 00000000
 00000000

diff --git a/src/tileset.asm b/src/tileset.asm
@@ -197,7 +197,7 @@
     d_addr UpperRight_u8_arr_ptr, DataA_Terrain_HutUpperRight_u8_arr
     d_addr LowerRight_u8_arr_ptr, DataA_Terrain_HutLowerRight_u8_arr
     d_byte Chr08Bank_u8, <.bank(Ppu_ChrBgHut)
-    d_byte FirstSolidTerrainType_u8, $40
+    d_byte FirstSolidTerrainType_u8, $20
     D_END
 .ENDPROC
 

diff --git a/src/tilesets/hut.bg b/src/tilesets/hut.bg
@@ -1,18 +1,14 @@
-@BG 0 0 0 32x10
+@BG 0 0 0 32x6
 >terrain_hut0
 >terrain_hut1
 >terrain_hut2
 >terrain_hut3
 >terrain_shared_0
 >water_anim0
 
-    EMEN        CCCD  CJ            AIAJ        FEFFACADFEFFAEAF
-    EOEPCACBCBCHCECFCGCGCGCI        AIAJAEAFAAABAIAJACADAGAHAGAH
-BIBJBJBJ  DADB      DEDCDCDCDCDA      DHDMDN      BIBABA    FAFA
-          DCDCDADB  DGDDDDDDDDDFDKDLDIDJDODP            BCBD
-
-
-
-
+    EMEN        CCCD  CJ    BKBLBOBPAIAJ        FEFFACADFEFFAEAF
+    EOEPCACBCBCHCECFCGCGCGCIBMBN    AIAJAEAFAAABAIAJACADAGAHAGAH
+BIBJBJBJ  DADB      DEDCDCDCDCDA      DHDMDNCKCL  BIBABA    FAFA
+          DCDCDADB  DGDDDDDDDDDFDKDLDIDJDODPCMCN        BCBD
 AM    ANAK    ALAK    ALBABABBBABA      BEBFBHBGBEBGBHBF
 AK    ALAM    AN            AK          BGBHBGBHBGBHBGBH  BEBF