From a9fb974bfb949bf2f1e3a437fd504e5aac9ac844 Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Wed, 2 Oct 2024 08:25:39 -0400 Subject: [PATCH] Adjust platforming in MermaidEast room --- src/rooms/mermaid_east.asm | 9 +++++++ src/rooms/mermaid_east.bg | 49 ++++++++++++++++++----------------- src/rooms/mermaid_elevator.bg | 2 +- src/rooms/mermaid_flower.asm | 16 ++++++++++++ src/rooms/mermaid_flower.bg | 31 +++++++++++----------- src/tilesets/mermaid.bg | 4 +-- 6 files changed, 69 insertions(+), 42 deletions(-) diff --git a/src/rooms/mermaid_east.asm b/src/rooms/mermaid_east.asm index 5ca32e36..224ab47e 100644 --- a/src/rooms/mermaid_east.asm +++ b/src/rooms/mermaid_east.asm @@ -92,6 +92,7 @@ _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 @@ -99,6 +100,14 @@ _Platforms_sPlatform_arr: 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 index 19fb96bd..d8e6bc1a 100644 --- 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 index 6018ef0c..9e358eb6 100644 --- 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 index 90e09e17..c859a2be 100644 --- 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 index 38dcd2d5..22990d35 100644 --- 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 index 0421ebd9..d1d87723 100644 --- 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