Adjust platforming in MermaidEast room

mdsteele · Oct 2, 2024 · a9fb974 · a9fb974
1 parent 67de87e
commit a9fb974
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 42 deletions.
diff --git a/src/rooms/mermaid_east.asm b/src/rooms/mermaid_east.asm
@@ -92,13 +92,22 @@ _Platforms_sPlatform_arr:
     d_word Left_i16,   $0030
     d_word Top_i16,    $0134
     D_END
+    ;; Sand:
     D_STRUCT sPlatform
     d_byte Type_ePlatform, ePlatform::Solid
     d_word WidthPx_u16, $10
     d_byte HeightPx_u8, $08
     d_word Left_i16,  $0030
     d_word Top_i16,   $0078
     D_END
+    ;; Rocks:
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $08
+    d_byte HeightPx_u8, $18
+    d_word Left_i16,  $0190
+    d_word Top_i16,   $0080
+    D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
 _Actors_sActor_arr:

diff --git a/src/rooms/mermaid_east.bg b/src/rooms/mermaid_east.bg
@@ -2,30 +2,31 @@
 >mermaid_0
 >mermaid_1
 >mermaid_2
+>mermaid_3
 >mermaid_4
 >mermaid_5
 
-              DHDHDHDHDHDHDHDHDHDHDHDHDHDHDHDHDH
-          DHDI      BH                      BH  DGDHDHDHDH
-        DI          BH                      BH            DGDH
-DHDHDHDI            BH                      BH                DG
-                    BH                  DO  BH                  DM
-                    BH            DO    DP  BH                  DM
-BPBPBNBPBPDO        BH  DO        DP    DP  BH      BA          DM
-EBEBENBLCMDP  BA    BH                  DP  BH  DADBDBDC        DM
-EDEDECEEENDPEOENEPBPBIBPBPBPDO              BH  DP              DM
-EAECECEDEDECECENDP      CFCHDP  DOBPBPBPBPBPBIBPDP            DAEL
-EDEDEDEBEDEBECEFEPDMBD  DNDPDP  DP        CF  BDDP              DM
-DPDPDPDPEDECEDEDEBDPDPDPDP      DPDM  CCDNDPDPDPDP    DADC      DM
-      DNDPDPDPDPDPDP  BH          DPDPDPDP                      DM
-      DN              BH            BH        BE          DO    DM
-      DN              BH            BH      AOANAP              DM
-DHDHDHDI              BH            BH    AOANANANAP          DAEL
-                      BH            BH    AI      AL          BBDM
-                      BH            BH    AKAM  AHAJ        DADBDM
-                      BH            BH    AI    AEAJ          DM
-DPDPDPBPBPBPBPBPBPBPBPBIDOBPBPBPBPBPBIBPDDDEDEDEDEDEDFBPBPBPBPDM
-    DNCFCH    CK        DP              DGDHDHDHDHDHDI      BDDM
-    DKDKDKDLBBCO  CC                                    BBCMDJDK
-          DNDPDPDPDPDPCH  BBCEBDCHCFBOBB  BBBDCHCE  CFBODPDPDM
-                    DKDKDKDKDKDKDKDKDKDKDKDKDKDKDKDKDKDKDK
+              EHEHEHEHEHEHEHEHEHEHEHEHEHEHEHEHEH
+          EHEI      BH                      BH  EGEHEHEHEH
+        EI          BH                      BH            EGEH
+EHEHEHEI            BH                      BH                EG
+                    BH                      BH                  EM
+                    BH                  EO  BH                  EM
+BPBPBNBPBPEO        BH  EO        EO        BH      BA          EM
+FBFBFNBLCMEP  BA    BH                      BH  EAEBEBEC        EM
+FDFDFCFEFNEPFOFNFPBPBIBPBPBPEO              BH  EPDO            EM
+FAFCFCFDFDFCFCFNEP      CFCHEP  EOBPBPBPBPBPBIBPEPDL          EAFL
+FDFDFDFBFDFBFCFFFPEMBD  ENEPEP  EP        CF  BDEP              EM
+EPEPEPEPFDFCFDFDFBEPEPEPEPDL    EPEM  CCENEPEPEPEP    EAEC      EM
+      ENEPEPEPEPEPEPDLBH        DKEPEPEPEPDNDL                  EM
+      ENDNDL          BH            BH        BE          EO    EM
+      EN              BH            BH      AOANAP              EM
+EHEHEHEI              BH            BH    AOANANANAP          EAFL
+                      BH            BH    AI      AL          BBEM
+                      BH            BH    AKAM  AHAJ        EAEBEM
+                      BH            BH    AI    AEAJ          EM
+EPEPEPBPBPBPBPBPBPBPBPBIEOBPBPBPBPBPBIBPEDEEEEEEEEEEEFBPBPBPBPEM
+    ENCFCH    CK        EP              EGEHEHEHEHEHEI      BDEM
+    EKEKEKELBBCO  CC                                    BBCMEJEK
+          DKEPEPEPEPEPCH  BBCEBDCHCFBOBB  BBBDCHCE  CFBOEPEPEM
+                    EKEKEKEKEKEKEKEKEKEKEKEKEKEKEKEKEKEKEK
diff --git a/src/rooms/mermaid_elevator.bg b/src/rooms/mermaid_elevator.bg
@@ -11,7 +11,7 @@
             EI        EG
           EN            EM
           EN          DAEM
-          ENEP        EPEM
+          DKEP        EPDL
             EN        EM
             EN        EM
             EN        EM

diff --git a/src/rooms/mermaid_flower.asm b/src/rooms/mermaid_flower.asm
@@ -73,6 +73,7 @@ _Platforms_sPlatform_arr:
     d_word Left_i16,  $0050
     d_word Top_i16,   $00b4
     D_END
+    ;; Sand:
     D_STRUCT sPlatform
     d_byte Type_ePlatform, ePlatform::Solid
     d_word WidthPx_u16, $10
@@ -87,6 +88,21 @@ _Platforms_sPlatform_arr:
     d_word Left_i16,  $0080
     d_word Top_i16,   $00d8
     D_END
+    ;; Rocks:
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $08
+    d_byte HeightPx_u8, $08
+    d_word Left_i16,  $0010
+    d_word Top_i16,   $0070
+    D_END
+    D_STRUCT sPlatform
+    d_byte Type_ePlatform, ePlatform::Solid
+    d_word WidthPx_u16, $08
+    d_byte HeightPx_u8, $08
+    d_word Left_i16,  $0068
+    d_word Top_i16,   $0050
+    D_END
     .assert * - :- <= kMaxPlatforms * .sizeof(sPlatform), error
     .byte ePlatform::None
 _Actors_sActor_arr:

diff --git a/src/rooms/mermaid_flower.bg b/src/rooms/mermaid_flower.bg
@@ -2,21 +2,22 @@
 >mermaid_0
 >mermaid_1
 >mermaid_2
+>mermaid_3
 >mermaid_4
 >mermaid_5
 
-        DHDHDHDHDHDHDHDHDH
-    DHDI                  DG
-  DI                        DM
-DN          BD      BA      DM
-DN        DADBDC    DADBDC  DM
-DNBA          DP      DP    DG
-EKDBDC        DP              DM
-DN          BBDP              DM
-DN          DODPDO          DJDM
-DN                          DGDHDH
-EPBLDPBABD
-EDEFECEEENBPBPBPBPBPBPBPBPBPBPBPBP
-EBEBEAECEDENCFCM    CK
-EAEAEEEDEAEBEFENBLCHCOCFCECLCM
-ECEAEDEAECEBECEDECEDEAECEDEAECEBEB
+        EHEHEHEHEHEHEHEHEH
+    EHEI                  EG
+  EI                        EM
+EN          BD      BA      EM
+EN        EAEBEC    EAEBEC  EM
+ENBA        DKEP      EP    EG
+FKEBEC        EP              EM
+ENDL        BBEP              EM
+EN          EOEPEO          EJEM
+EN                          EGEHEH
+FPBLEPBABD
+FDFFFCFEFNBPBPBPBPBPBPBPBPBPBPBPBP
+FBFBFAFCFDFNCFCM    CK
+FAFAFEFDFAFBFFFNBLCHCOCFCECLCM
+FCFAFDFAFCFBFCFDFCFDFAFCFDFAFCFBFB
diff --git a/src/tilesets/mermaid.bg b/src/tilesets/mermaid.bg
@@ -16,8 +16,8 @@
   DL  DM    CB  EAEBEI    EIJA      BABCBCBDBDBH  CBCA  BKBL
 FAFB    BIBMIAIABIBN    AB    CAIAIAIAIA        AA    AAAB    AB
 FCFDEOEPBOBLAAAABKBP  CABCBD  CCAA    AAAA    AAAB    ABAB    AB
-HIHJ
-
+HIHJ                                      HBHA      HAHBHA
+                                                        HB
 DEDGDGDGDGDFDEDGDGDGDGDFHA      GBHBHAHBHAHBHAHBHA    HBDEDFHAHB
 HBHAHBHAHBHAHBGB      HAHBDHDHDHDHHAHBGB      HAHB    HAHBHAHBHA
 BCBDBCBDBDBCBDBCBCBDBCBD            DGGB  DGDG  BABCBDBHHABABGHB
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
                 EI        EG
               EN            EM
               EN          DAEM
-              ENEP        EPEM
+              DKEP        EPDL
                 EN        EM
                 EN        EM
                 EN        EM
@@ Expand Down @@