Skip to content

Commit

Permalink
Add some background decorations to lava rooms
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsteele committed Mar 9, 2024
1 parent c0e36d6 commit 9c3c75e
Show file tree
Hide file tree
Showing 13 changed files with 199 additions and 152 deletions.
2 changes: 1 addition & 1 deletion src/chr.asm
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ _chr_begin:
chr_inc "steam_pipes"
chr_inc "volcanic1"
chr_inc "volcanic2"
chr_res $0a
chr_res $07
chr_inc "arch"
chr_inc "boiler"
chr_inc "terrain_boss_lava"
Expand Down
8 changes: 1 addition & 7 deletions src/machines/boiler.asm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
.IMPORT FuncA_Machine_StartWorking
.IMPORT FuncA_Objects_Draw1x1Shape
.IMPORT FuncA_Objects_GetMachineLightTileId
.IMPORT FuncA_Objects_MoveShapeDownOneTile
.IMPORT FuncA_Objects_SetShapePosToMachineTopLeft
.IMPORT FuncA_Objects_SetShapePosToPlatformTopLeft
.IMPORT Func_FindEmptyActorSlot
Expand All @@ -57,8 +56,7 @@
;;; How many frames a boiler machine spends per ACT operation.
kBoilerActCooldown = kSteamNumFrames + 16

;;; OBJ palette numbers used for boiler machines and valves.
kPaletteObjBoiler = 0
;;; The OBJ palette number used for boiler machine valves.
kPaletteObjValve = 0

;;;=========================================================================;;;
Expand Down Expand Up @@ -276,10 +274,6 @@ _Finish:
jsr FuncA_Objects_SetShapePosToMachineTopLeft
jsr FuncA_Objects_GetMachineLightTileId ; returns A (param: tile ID)
ldy #kPaletteObjMachineLight ; param: object flags
jsr FuncA_Objects_Draw1x1Shape
jsr FuncA_Objects_MoveShapeDownOneTile
ldy #bObj::FlipH | kPaletteObjBoiler ; param: object flags
lda #kTileIdObjMachineCorner ; param: tile ID
jmp FuncA_Objects_Draw1x1Shape
.ENDPROC

Expand Down
21 changes: 20 additions & 1 deletion src/rooms/boss_lava.asm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
;;;=========================================================================;;;

.INCLUDE "../actor.inc"
.INCLUDE "../actors/blood.inc"
.INCLUDE "../boss.inc"
.INCLUDE "../charmap.inc"
.INCLUDE "../device.inc"
Expand Down Expand Up @@ -50,6 +51,7 @@
.IMPORT FuncA_Machine_WriteToLever
.IMPORT FuncA_Objects_Alloc2x1Shape
.IMPORT FuncA_Objects_AnimateLavaTerrain
.IMPORT FuncA_Objects_Draw1x1Shape
.IMPORT FuncA_Objects_DrawBlasterMachineVert
.IMPORT FuncA_Objects_DrawBoilerMachine
.IMPORT FuncA_Objects_DrawBoilerValve1
Expand Down Expand Up @@ -795,7 +797,24 @@ _BossFiresprayShoot:
;;; @prereq PRGA_Objects is loaded.
.PROC FuncC_Boss_Lava_DrawRoom
jsr FuncA_Objects_AnimateLavaTerrain
jmp FuncA_Objects_DrawBoss
jsr FuncA_Objects_DrawBoss
_DrawBgRocks:
ldx #kLeftWallPlatformIndex ; param: platform index
jsr FuncA_Objects_SetShapePosToPlatformTopLeft
lda #$50 ; param: offset
jsr FuncA_Objects_MoveShapeRightByA
lda #$10 ; param: offset
jsr FuncA_Objects_MoveShapeDownByA
lda #kTileIdObjBloodFirst + 0
ldy #bObj::Pri ; param: object flags
jsr FuncA_Objects_Draw1x1Shape
lda #$48 ; param: offset
jsr FuncA_Objects_MoveShapeRightByA
lda #$20 ; param: offset
jsr FuncA_Objects_MoveShapeDownByA
lda #kTileIdObjBloodFirst + 1
ldy #bObj::Pri ; param: object flags
jmp FuncA_Objects_Draw1x1Shape
.ENDPROC

;;; Draw function for the lava boss.
Expand Down
10 changes: 5 additions & 5 deletions src/rooms/boss_lava.bg
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

ECECECECECECECECECEJEIECECECECEO
ECEJCDAFAFAFAFAFAFAFAFAFAFCCEIEO
EJBG BJEO
EJBG CN BJEO
EC EO
EC CP EO
EC EO
EC CM EO
EC EO
EC EO
EC EO
EJ BM EO
EJ CM BM CN EO
ED AC BEBO BFAC EO
ECAB EAFPEAEAEAEBGNEA ABEO
ECEA ECFHFJFDEPFCGMEC AIEO
ECEA ECFHFJFDEPFCGMEC CLAIEO
ECEJ EMEIECECFAEJEIEJ DDECEO
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBN
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBN
45 changes: 23 additions & 22 deletions src/rooms/lava_center.bg
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
@BG 0 0 0 18x24
>lava_0
>lava_1
>lava_2
>lava_3
>lava_4
>lava_5
>lava_6

DCDCDCDCDCDCDJDIDCDCDCDCDCDJDIDCDCDC
DCDCDCDJ BKBJBLBHAFAFAFAFAFAFDIDCDC
DCDJDIBL AE BL
DCDCDC DN
DCDCDJ DAAB BK DADB
BL DCDA DCDC
BEBC BFDCDC DCDC
DADLDKDBDADBDCDCDEDF DGDIDC
DCDCDCDCDIDJ BH DCDC
DCDCDJDIBKBG DN DCDC
DCDCDCDJ DADCDC
DCDCDCBK DKDL DIDCDC
DCDCDJ BL BH
DCDJ DN BF
BK BL AC DADB
BC DKDL DCDC
DADADA BLBG DIDC
DCDCDCBF DN DCDC
DCDCDCDA BK DKDCDC
DCDCDJDIAE AEBKDCDC
DCDCDCDJDK BF DADLDIDC
DCDCDCDCDC DADA DJDIDCDC
ECECECECECECEJEIECECECECECEJEIECECEC
ECECECEJ BKBJBLBHAFAFAFAFAFAFEIECEC
ECEJEIBL AE BL
ECECECCN EN
ECECEJ EAAB BK EAEB
BL ECEA ECEC
BEBC BFECEC CP ECEC
EAELEKEBEAEBECECEEEF EGEIEC
ECECECECEIEJ BH ECEC
ECECEJEIBKBG EN ECEC
ECECECEJ CN EAECEC
ECECECBK CN EKEL EIECEC
ECECEJ BL BH
ECEJ EN BF
BK BL AC EAEB
BC EKEL CM ECEC
EAEAEA BLBG EIEC
ECECECBF EN ECEC
ECECECEA CM BK EKECEC
ECECEJEIAE CP AEBKECEC
ECECECEJEK BF EAELEIEC
ECECECECEC EAEA EJEIECEC
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
45 changes: 23 additions & 22 deletions src/rooms/lava_east.bg
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
@BG 0 0 0 34x24
>lava_0
>lava_1
>lava_2
>lava_3
>lava_4
>lava_5
>lava_6

DCDCDCDCDCDCDJDIDCDCDCDCDCDCDJDIDCDCDJDIDCDCDCDCDCDJDIDCDCDCDCDCDCDC
DCDCDCDCDJBKBJBL BK BL BH BIBKBK BG BL BHBK DIDCDCDC
DCDJBH BL BGDIDC
DA BF BL
BF DCDA AB DADA BE
DADADA BE DJDI DN FGEM DGDEDADADA
DCDCDCBC BBDADBDCDC BK EBDCDEDF DJDIDC
DCDJDIDADBDADCDCDCDCDL EEENFKDPDJ DIDCDC
DCDCDCDCDJDIDJ BH BL EIDCEAFP DKDL BEDCDCDC
DCDCDJDIBK BG DA EKDPFLDJ BKBI DADCDCDC
DCDCDCDJ DIDL FFAKAL BDDJDIDCDC
DCDCDCBK BH DC BE BA DADCDCDCDC
DCDCDJ DN DI DADBDBDL DKDCDCDJDIDC
DCDJ BL DC DJDIDC BL BH
BK DKDC DKDCELEO
BC DC DCEB BF
DADADA DN DCDL DPFB DKDADA
DCDCDC BK DJ EAFA DIDC
DCDCDCDA DKDC AIFCDP DCDC
DCDCDJDIBA DC DIEKECEN AB DIDC
DCDCDCDCDLDK BF DADLDIDA BK BE DADA DIDC
DCDCDCDCDCDC DADA DCDCDCDC DADBDADADBDA DCDC DCDC
ECECECECECECEJEIECECECECECECEJEIECECEJEIECECECECECEJEIECECECECECECEC
ECECECECEJBKBJBL BK BL BH BIBKBK BG BL BHBK EIECECEC
ECEJBH BL BGEIEC
EA BF BL
BF ECEA AB EAEA BE
EAEAEA BE EJEI EN GGFM EGEEEAEAEA
ECECECBC BBEAEBECEC BK FBECEEEF EJEIEC
ECEJEIEAEBEAECECECECEL FEFNGKEPEJ EIECEC
ECECECECEJEIEJ BH BL FIECFAGP EKEL BEECECEC
ECECEJEIBK BG EA FKEPGLEJ BKBI EAECECEC
ECECECEJ EIEL GFAKAL BDEJEIECEC
ECECECBK BH EC BE BA EAECECECEC
ECECEJ EN EI EAEBEBEL EKECECEJEIEC
ECEJ BL EC EJEIEC BL BH
BK EKEC EKECFLFO
BC EC ECFB BF
EAEAEA EN ECEL EPGB EKEAEA
ECECEC BK EJ FAGA EIEC
ECECECEA EKEC CLAIGCEP ECEC
ECECEJEIBA EC EIFKFCFN AB EIEC
ECECECECELEK BF EAELEIEA BK BE EAEA EIEC
ECECECECECEC EAEA ECECECEC EAEBEAEAEBEA ECEC ECEC
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
25 changes: 13 additions & 12 deletions src/rooms/lava_flower.bg
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
@BG 0 0 0 18x15
>lava_0
>lava_1
>lava_2
>lava_3
>lava_4
>lava_5
>lava_6

DCDJDIDCDCDCDJDIDCDCDJDIDCDCDCDCDJDI
DCDCDCDJ BG BK BIBLDIDCDJDIDCDCDC
DCDJ BL AGAGAHAGDIDCDC
BG BLBI
ECEJEIECECECEJEIECECEJEIECECECECEJEI
ECECECEJ BG BK BIBLEIECEJEIECECEC
ECEJ BL AGAGAHAGEIECEC
BG CM CN BLBI
AC AB BE
DBDADG DEDFDGDADBFOFDFEDADBDA
DCDJ DIAIECDPEBDCDCDC
DJDI DN BH DIEBDJDIDC
DCDC AG BKEBDCDJDI
DCDJ DN EBDCDCDC
DJDI BK DFDEDAEBDJDIDC
DCDCDADEDF DIEBDCDCDC
DCDCDJ CP EBDCDCDC
EBEAEG EEEFEGEAEBGOGDGEEAEBEA
ECEJ CO GIAIFCEPFBECECEC
EJEICN EN BH EIFBEJEIEC
ECEC AG BKFBECEJEI
ECEJ EN FBECECEC
EJEI BK EFEEEAFBEJEIEC
ECECEAEEEF CN EIFBECECEC
ECECEJ DP FBECECEC
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
BPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBPBP
49 changes: 25 additions & 24 deletions src/rooms/lava_shaft.bg
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
@BG 0 0 0 18x24
>lava_0
>lava_1
>lava_2
>lava_3
>lava_4
>lava_5

DCDJDIDCDCDJDIDCDCDJDIDCDCDCDCDCDCDC
DCDCDCDJBK BJ BK BLBH BLDIDCDC
DCDCBJBL BLBG
DCDJ BE
DCDJ DKDBDL DKDADBDA
DCDC DADA BG BKDJDIDC
DCDCBE DCDJ DIDCDC
DCDCDA DJDI DKDL BJDCDC
DCDCDJ DIDC BK DIDJ
DCDCBL DIDJ DADA DCDC
DCDJ BHBK DIDC BEDCDC
DCDC DKDADL DIDJ DADCDC
DCDJ BL BLBI DIDCDC
DCDC DKDBDLDLDBDL BLDIDC
DCDCBA BK BJBLBL DCDC
DCDCDC DKDBDL DIDC
DCDCDC BJ BL BEDCDC
DCDCDJ DADCDC
BJ DIDCDC
BFBC DFDEDADADEDG BL
DADADBDA DCDC BB
DCDJDIDCAPAOAOAPDIDCAOAPAOAPDADBDADA
DCDCDJDIDCDCDJDIDCDCDCDJDIDCDCDCDCDC
DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC
ECEJEIECECEJEIECECEJEIECECECECECECEC
ECECECEJBK BJ BK BLBH BLEIECEC
ECECBJBL BLBG
ECEJ BE
ECEJ CN EKEBEL EKEAEBEA
ECEC EAEA BG BKEJEIEC
ECECBE ECEJ CM EIECEC
ECECEA EJEI EKEL BJECEC
ECECEJ EIECCN BK EIEJ
ECECBL EIEJ EAEA ECEC
ECEJ BHBK EIEC BEECEC
ECEC EKEAEL EIEJ EAECEC
ECEJ BL BLBI EIECEC
ECEC EKEBELELEBEL BLEIEC
ECECBA BK BJBLBL ECEC
ECECEC EKEBEL EIEC
ECECEC CM BJ BL BEECEC
ECECEJ CN CP EAECEC
BJ EIECEC
BFBC EFEEEAEAEEEG BL
EAEAEBEA ECEC BB
ECEJEIECAPAOAOAPEIECAOAPAOAPEAEBEAEA
ECECEJEIECECEJEIECECECEJEIECECECECEC
ECECECECECECECECECECECECECECECECECEC
31 changes: 16 additions & 15 deletions src/rooms/lava_station.bg
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
@BG 0 0 0 17x15
>lava_0
>lava_1
>lava_2
>lava_3
>lava_4
>lava_5

DCDCDCDCDCDCDCDJDIDCDCDJDIDJDCDCDC
DCDCDCDJBJBK BG BLBI BH DIDJDI
BLBK BLBGDI
BC DC
DBDBDADA DI
DCDCEEEO DKDL DI
DCDCEADJ BJBK BFDC
DCDCEADCBF DADC
DJDJEIDCDCEPDEDG DIDC
DCDCEADCDCEA DCDC
DCDCEADCDCEA DN DIDC
DCDCEHDPECEG AB BK DA DJDI
DCDCDCEADCDCDEDGDHDHDGDHDEDCDGDCDC
DCDCDCEHEJEDAKAL DJ DCDC
DCDCDCDCDCDC DI DCDC
ECECECECECECECEJEIECECEJEIEJECECEC
ECECECEJBJBK BG BLBI BH EIEJEI
BLBK BLBGEI
BC CO CM EC
EBEBEAEA EI
ECECFEFO EKEL EI
ECECFAEJ CN BJBK BFEC
ECECFAECBF EAEC
EJEJFIECECFPEEEG EIEC
ECECFAECECFA CMECEC
ECECFAECECFA EN EIEC
ECECFHEPFCFG AB BK EA EJEI
ECECECFAECECEEEGEHEHEGEHEEECEGECEC
ECECECFHFJFDAKAL CN EJ ECEC
ECECECECECEC EI ECEC
31 changes: 16 additions & 15 deletions src/rooms/lava_teleport.bg
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
@BG 0 0 0 19x15
>lava_0
>lava_1
>lava_2
>lava_4
>lava_5
>lava_6

CCCCCCCCCCCCCJCMCICCCCCCCJCICCCCCCCCCC
CCCCCJCICCCJCICCCCCJCICCCCCJCICJCICCCC
CCCCCCCJ BL BLBG BH BLCICCCCCC
CCCCCJBG BLCICCCC
CCCCCJ CICCCC
CCCCCC CJCICC
CCCCCC CKCA CACBCL CICCCC
CCCCCJ EIAM ANEJ BK CICCCC
CCCCCJ CKCBCJ CICL BL
CCCCCCBE BL BL BD
CCCCCCCA BEAB CACBCA
CCCCCJCI BA CACBCLBFCMCICC
CCCCCCCJCKCBCLAOAOCNAOAPCICJCICACCCCCC
CCCCDDDDDDDFCCCCCCCCCJCICCCCCJCICCCCCC
CCCCCCCCCCDACCCCCCCCCCCCCCCCCCCCCCCCCC
DCDCDCDCDCDCDJDMDIDCDCDCDJDIDCDCDCDCDC
DCDCDJDIDCDJDIDCDCDJDIDCDCDJDIDJDIDCDC
DCDCDCDJ BL BLBG BH BLDIDCDCDC
DCDCDJBG BLDIDCDC
DCDCDJ CP CN DIDCDC
DCDCDC CM DJDIDC
DCDCDC DKDA CM DADBDL DIDCDC
DCDCDJ FIAM ANFJ BK DIDCDC
DCDCDJ DKDBDJ DIDL BL
DCDCDCBE BL CN BL BD
DCDCDCDA BEAB DADBDA
DCDCDJDI BA DADBDLBFDMDIDC
DCDCDCDJDKDBDLAOAODNAOAPDIDJDIDADCDCDC
DCDCEDEDEDEFDCDCDCDCDJDIDCDCDJDIDCDCDC
DCDCDCDCDCEADCDCDCDCDCDCDCDCDCDCDCDCDC
Loading

0 comments on commit 9c3c75e

Please sign in to comment.