From feb63d641a42b16de648279ff7e41f7e75af03b2 Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Sat, 17 Feb 2024 17:05:27 -0500 Subject: [PATCH] Add graphics and dialog for town blacksmith --- src/actors/townsfolk.inc | 15 ++++--- src/chr.asm | 18 ++++---- src/dialog.inc | 1 + src/platforms/column.inc | 2 +- src/platforms/glass.inc | 2 +- src/portrait.asm | 3 ++ src/rooms/town_house3.asm | 84 +++++++++++++++++++++++++++++++++---- src/rooms/town_house3.bg | 2 +- src/rooms/town_outdoors.asm | 26 +++++++++--- src/sounds/dialog.asm | 2 + src/sounds/metal.asm | 61 +++++++++++++++++++++++++++ src/tiles/adult_smith.ahi | 53 +++++++++++++++++++++++ src/tiles/furniture.ahi | 40 +++++++++++++----- src/tilesets/house.bg | 2 +- 14 files changed, 265 insertions(+), 46 deletions(-) create mode 100644 src/sounds/metal.asm create mode 100644 src/tiles/adult_smith.ahi diff --git a/src/actors/townsfolk.inc b/src/actors/townsfolk.inc index 2f201fe3..dec2946a 100644 --- a/src/actors/townsfolk.inc +++ b/src/actors/townsfolk.inc @@ -29,6 +29,9 @@ ;;; The first tile IDs for various adults. kTileIdAdultWomanFirst = $d0 kTileIdAdultManFirst = $d6 +kTileIdAdultSmithFirst = $b8 +kTileIdAdultSmith1 = kTileIdAdultSmithFirst + 0 +kTileIdAdultSmith2 = kTileIdAdultSmithFirst + 6 ;;; The first tile IDs for various mermaids. kTileIdCorraSwimmingDownFirst = $e0 @@ -38,13 +41,13 @@ kTileIdCorraSwimmingUpFirst = $f0 kTileIdCorraSwimmingUp1 = kTileIdCorraSwimmingUpFirst + 0 kTileIdCorraSwimmingUp2 = kTileIdCorraSwimmingUpFirst + 8 kTileIdMermaidCorraFirst = $aa -kTileIdMermaidFloristFirst = $94 -kTileIdMermaidDaphneFirst = $9a +kTileIdMermaidFloristFirst = $92 +kTileIdMermaidDaphneFirst = $98 kTileIdMermaidGhostFirst = $c0 -kTileIdMermaidGuardFFirst = $a0 -kTileIdMermaidGuardMFirst = $82 -kTileIdMermaidPhoebeFirst = $88 -kTileIdMermaidFarmerFirst = $8e +kTileIdMermaidGuardFFirst = $9e +kTileIdMermaidGuardMFirst = $80 +kTileIdMermaidPhoebeFirst = $86 +kTileIdMermaidFarmerFirst = $8c kTileIdMermaidQueenFirst = $b0 ;;; Mermaid first tile IDs of this or more must be drawn 2x4 instead of 2x3. diff --git a/src/chr.asm b/src/chr.asm index 6db97666..1b963d57 100644 --- a/src/chr.asm +++ b/src/chr.asm @@ -534,7 +534,7 @@ _chr_begin: chr_res $07 chr_inc "window" chr_inc "furniture" - chr_res $14 + chr_res $12 END_CHR_BANK .ENDPROC @@ -1346,18 +1346,16 @@ _chr_begin: .EXPORT Ppu_ChrObjTemple .PROC Ppu_ChrObjTemple CHR2_BANK $80 - chr_res $04 - chr_inc "column", kTileIdObjColumnFirst - chr_res $02 + chr_inc "glass", kTileIdObjGlassFirst chr_inc "upgrade_optil", kTileIdObjUpgradeOpTilFirst chr_res $04 chr_inc "bullet", kTileIdObjBulletFirst chr_inc "upgrade_opbeep", kTileIdObjUpgradeOpBeepFirst - chr_res $02 + chr_inc "column", kTileIdObjColumnFirst chr_inc "crate", kTileIdObjCrateFirst - chr_inc "glass", kTileIdObjGlassFirst + chr_res $06 chr_inc "mermaid_guardf", kTileIdMermaidGuardFFirst - chr_res $04 + chr_res $06 chr_inc "mermaid_corra", kTileIdMermaidCorraFirst chr_inc "column_cracked", kTileIdObjColumnCrackedFirst chr_inc "toad", kTileIdObjToadFirst @@ -1400,17 +1398,17 @@ _chr_begin: .EXPORT Ppu_ChrObjVillage .PROC Ppu_ChrObjVillage CHR2_BANK $80 - chr_res $02 chr_inc "mermaid_guardm", kTileIdMermaidGuardMFirst chr_inc "mermaid_phoebe", kTileIdMermaidPhoebeFirst chr_inc "mermaid_farmer", kTileIdMermaidFarmerFirst chr_inc "mermaid_florist", kTileIdMermaidFloristFirst chr_inc "mermaid_daphne", kTileIdMermaidDaphneFirst chr_inc "mermaid_guardf", kTileIdMermaidGuardFFirst - chr_res $04 + chr_res $06 chr_inc "mermaid_corra", kTileIdMermaidCorraFirst chr_inc "mermaid_queen", kTileIdMermaidQueenFirst - chr_res $20 + chr_inc "adult_smith", kTileIdAdultSmithFirst + chr_res $14 chr_inc "child_swim", kTileIdObjChildSwimFirst chr_inc "child_stand", kTileIdObjChildStandFirst END_CHR_BANK diff --git a/src/dialog.inc b/src/dialog.inc index f088898d..cc57b40f 100644 --- a/src/dialog.inc +++ b/src/dialog.inc @@ -34,6 +34,7 @@ ;;; Animated dialog portraits for various NPCs and devices. .ENUM ePortrait AdultMan + AdultSmith AdultWoman ChildAlex ChildAlexShout diff --git a/src/platforms/column.inc b/src/platforms/column.inc index af6457cd..41f04ef2 100644 --- a/src/platforms/column.inc +++ b/src/platforms/column.inc @@ -18,7 +18,7 @@ ;;;=========================================================================;;; ;;; OBJ tile IDs for drawing column platforms. -kTileIdObjColumnFirst = $84 +kTileIdObjColumnFirst = $92 kTileIdObjColumnCrackedFirst = $b0 ;;;=========================================================================;;; diff --git a/src/platforms/glass.inc b/src/platforms/glass.inc index f85a831f..29c4fec6 100644 --- a/src/platforms/glass.inc +++ b/src/platforms/glass.inc @@ -25,6 +25,6 @@ kGlassPlatformWidthPx = $08 kGlassPlatformHeightPx = $10 ;;; OBJ tile IDs for drawing glass tank platforms. -kTileIdObjGlassFirst = $98 +kTileIdObjGlassFirst = $80 ;;;=========================================================================;;; diff --git a/src/portrait.asm b/src/portrait.asm index bec62bec..0b4de4f2 100644 --- a/src/portrait.asm +++ b/src/portrait.asm @@ -31,6 +31,7 @@ .PROC DataA_Dialog_PortraitRestBank_u8_arr D_ARRAY .enum, ePortrait d_byte AdultMan, kChrBankPortraitManRest + d_byte AdultSmith, kChrBankPortraitManRest d_byte AdultWoman, kChrBankPortraitWomanRest d_byte ChildAlex, kChrBankPortraitAlexRest d_byte ChildAlexShout, kChrBankPortraitAlexTalk @@ -63,6 +64,7 @@ .PROC DataA_Dialog_PortraitAnimBank_u8_arr D_ARRAY .enum, ePortrait d_byte AdultMan, kChrBankPortraitManTalk + d_byte AdultSmith, kChrBankPortraitManTalk d_byte AdultWoman, kChrBankPortraitWomanTalk d_byte ChildAlex, kChrBankPortraitAlexTalk d_byte ChildAlexShout, kChrBankPortraitAlexRest @@ -94,6 +96,7 @@ .PROC DataA_Dialog_PortraitFirstTileId_u8_arr D_ARRAY .enum, ePortrait d_byte AdultMan, kTileIdBgPortraitManFirst + d_byte AdultSmith, kTileIdBgPortraitManFirst d_byte AdultWoman, kTileIdBgPortraitWomanFirst d_byte ChildAlex, kTileIdBgPortraitAlexFirst d_byte ChildAlexShout, kTileIdBgPortraitAlexFirst diff --git a/src/rooms/town_house3.asm b/src/rooms/town_house3.asm index 2669e209..c86ee296 100644 --- a/src/rooms/town_house3.asm +++ b/src/rooms/town_house3.asm @@ -29,8 +29,26 @@ .IMPORT DataA_Room_House_sTileset .IMPORT Data_Empty_sPlatform_arr +.IMPORT FuncA_Room_PlaySfxMetallicDing .IMPORT Func_Noop -.IMPORT Ppu_ChrObjTown +.IMPORT Ppu_ChrObjVillage +.IMPORT Ram_ActorState1_byte_arr +.IMPORTZP Zp_AvatarPosX_i16 +.IMPORTZP Zp_RoomState + +;;;=========================================================================;;; + +;;; The actor index for the blacksmith in this room. +kSmithActorIndex = 0 + +;;;=========================================================================;;; + +;;; Defines room-specific state data for this particular room. +.STRUCT sState + ;; A timer for controlling the smith's hammering animation. + HammerTimer_u8 .byte +.ENDSTRUCT +.ASSERT .sizeof(sState) <= kRoomStateSize, error ;;;=========================================================================;;; @@ -47,7 +65,7 @@ d_addr TerrainData_ptr, _TerrainData d_byte NumMachines_u8, 0 d_addr Machines_sMachine_arr_ptr, 0 - d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjTown) + d_byte Chr18Bank_u8, <.bank(Ppu_ChrObjVillage) d_addr Ext_sRoomExt_ptr, _Ext_sRoomExt D_END _Ext_sRoomExt: @@ -57,20 +75,21 @@ _Ext_sRoomExt: d_addr Actors_sActor_arr_ptr, _Actors_sActor_arr d_addr Devices_sDevice_arr_ptr, _Devices_sDevice_arr d_addr Passages_sPassage_arr_ptr, 0 - d_addr Enter_func_ptr, Func_Noop + d_addr Enter_func_ptr, FuncC_Town_House3_EnterRoom d_addr FadeIn_func_ptr, Func_Noop - d_addr Tick_func_ptr, Func_Noop + d_addr Tick_func_ptr, FuncC_Town_House3_TickRoom d_addr Draw_func_ptr, Func_Noop D_END _TerrainData: : .incbin "out/rooms/town_house3.room" .assert * - :- = 16 * 15, error _Actors_sActor_arr: -: D_STRUCT sActor +: .assert * - :- = kSmithActorIndex * .sizeof(sActor), error + D_STRUCT sActor d_byte Type_eActor, eActor::NpcAdult d_word PosX_i16, $00a0 d_word PosY_i16, $00c8 - d_byte Param_byte, kTileIdAdultManFirst + d_byte Param_byte, kTileIdAdultSmith1 D_END .assert * - :- <= kMaxActors * .sizeof(sActor), error .byte eActor::None @@ -97,13 +116,50 @@ _Devices_sDevice_arr: .byte eDevice::None .ENDPROC +.PROC FuncC_Town_House3_EnterRoom + lda #45 + sta Zp_RoomState + sState::HammerTimer_u8 + rts +.ENDPROC + +;;; @prereq PRGA_Room is loaded. +.PROC FuncC_Town_House3_TickRoom + ;; If the player avatar is near the smith (i.e. in the right half of the + ;; room), then have the smith lower his hammer. + lda Zp_AvatarPosX_i16 + 0 + bmi @lowerHammer + ;; Otherwise, have the smith periodically strike the anvil with his hammer. + @farFromSmith: + inc Zp_RoomState + sState::HammerTimer_u8 + lda Zp_RoomState + sState::HammerTimer_u8 + cmp #70 + beq @strikeHammer + cmp #50 + bne @done + @raiseHammer: + lda #kTileIdAdultSmith2 + .assert kTileIdAdultSmith2 > 0, error + bne @setSmithState ; unconditional + @strikeHammer: + jsr FuncA_Room_PlaySfxMetallicDing + @lowerHammer: + lda #0 + sta Zp_RoomState + sState::HammerTimer_u8 + lda #kTileIdAdultSmith1 + @setSmithState: + sta Ram_ActorState1_byte_arr + kSmithActorIndex + @done: + rts +.ENDPROC + ;;;=========================================================================;;; .SEGMENT "PRGA_Dialog" .EXPORT DataA_Dialog_TownHouse3Smith_sDialog .PROC DataA_Dialog_TownHouse3Smith_sDialog - dlg_Text AdultMan, DataA_Text0_TownHouse3Smith_u8_arr + dlg_Text AdultSmith, DataA_Text0_TownHouse3Smith_Part1_u8_arr + dlg_Text AdultSmith, DataA_Text0_TownHouse3Smith_Part2_u8_arr dlg_Done .ENDPROC @@ -111,8 +167,18 @@ _Devices_sDevice_arr: .SEGMENT "PRGA_Text0" -.PROC DataA_Text0_TownHouse3Smith_u8_arr - .byte "Lorem ipsum.#" +.PROC DataA_Text0_TownHouse3Smith_Part1_u8_arr + .byte "You lookin' fer yer$" + .byte "brother? Haven't seen$" + .byte "`im. Probably pokin'$" + .byte "around somewhere.#" +.ENDPROC + +.PROC DataA_Text0_TownHouse3Smith_Part2_u8_arr + .byte "That boy's a good$" + .byte "apprentice. Good smith$" + .byte "someday. Too curious$" + .byte "fer `is own good, tho.#" .ENDPROC ;;;=========================================================================;;; diff --git a/src/rooms/town_house3.bg b/src/rooms/town_house3.bg index 029c47a8..c58e5650 100644 --- a/src/rooms/town_house3.bg +++ b/src/rooms/town_house3.bg @@ -15,5 +15,5 @@ CF CC CB AN CE CF AB CA - CD AD CC + CD AD AC CC CICGCGCGCGCGCGCGCGCJ diff --git a/src/rooms/town_outdoors.asm b/src/rooms/town_outdoors.asm index aec41b2a..1a35d729 100644 --- a/src/rooms/town_outdoors.asm +++ b/src/rooms/town_outdoors.asm @@ -35,6 +35,7 @@ .INCLUDE "../portrait.inc" .INCLUDE "../ppu.inc" .INCLUDE "../room.inc" +.INCLUDE "../scroll.inc" .IMPORT DataA_Room_Outdoors_sTileset .IMPORT Data_Empty_sPlatform_arr @@ -63,6 +64,7 @@ .IMPORTZP Zp_AvatarHarmTimer_u8 .IMPORTZP Zp_AvatarState_bAvatar .IMPORTZP Zp_Buffered_sIrq +.IMPORTZP Zp_Camera_bScroll .IMPORTZP Zp_NextIrq_int_ptr .IMPORTZP Zp_Next_eCutscene .IMPORTZP Zp_PpuScrollX_u8 @@ -346,7 +348,7 @@ _AlexStanding: .assert kTileIdBgPortraitGrontaFirst = kTileIdBgPortraitAlexFirst, error dlg_Text ChildAlex, DataA_Text0_TownOutdoorsAlex3_Explore1_u8_arr dlg_Text ChildAlex, DataA_Text0_TownOutdoorsAlex3_Explore2_u8_arr - dlg_Call _ScrollOrcsIntoView + dlg_Call DataC_Town_OutdoorsScrollOrcsIntoView dlg_Text OrcGronta, DataA_Text0_TownOutdoorsAlex3_HandleThis_u8_arr dlg_Call _TurnKidsAround dlg_Text ChildAlex, DataA_Text0_TownOutdoorsAlex3_WhaWhat_u8_arr @@ -355,10 +357,6 @@ _AlexStanding: dlg_Text ChildAlexShout, DataA_Text0_TownOutdoorsAlex3_Attack2_u8_arr dlg_Call _MakeOrcGruntsJump dlg_Done -_ScrollOrcsIntoView: - ldax #$0500 - stax Zp_ScrollGoalX_u16 - rts _TurnKidsAround: ;; Make Anna turn to face the orcs. lda #kPaletteObjAvatarNormal @@ -383,10 +381,16 @@ _MakeOrcGruntsJump: .EXPORT DataC_Town_TownOutdoorsGronta_sDialog .PROC DataC_Town_TownOutdoorsGronta_sDialog .assert kTileIdBgPortraitGrontaFirst = kTileIdBgPortraitOrcFirst, error + dlg_Call DataC_Town_OutdoorsScrollOrcsIntoView dlg_Text OrcGronta, DataA_Text0_TownOutdoorsGronta_Search1_u8_arr dlg_Text OrcGronta, DataA_Text0_TownOutdoorsGronta_Search2_u8_arr dlg_Text OrcMale, DataA_Text0_TownOutdoorsGronta_YesChief_u8_arr + dlg_Call _LockScrolling dlg_Done +_LockScrolling: + lda #bScroll::LockHorz + sta Zp_Camera_bScroll + rts .ENDPROC .EXPORT DataC_Town_TownOutdoorsIvan_sDialog @@ -409,6 +413,13 @@ _MakeOrcGruntsJump: dlg_Done .ENDPROC +;;; Sets Zp_ScrollGoalX_u16 to make Gronta (and the orcs next to her) visible. +.PROC DataC_Town_OutdoorsScrollOrcsIntoView + ldax #$0500 + stax Zp_ScrollGoalX_u16 + rts +.ENDPROC + ;;;=========================================================================;;; .SEGMENT "PRGA_Text0" @@ -609,7 +620,6 @@ _InitOrcs: act_WaitFrames 4 act_SetAvatarPose eAvatar::Sleeping act_WaitFrames 120 - ;; TODO: make Chief Gronta walk onscreen act_RunDialog eDialog::TownOutdoorsGronta act_JumpToMain Main_LoadPrisonCellAndStartCutscene _AnnaHasLanded: @@ -620,6 +630,10 @@ _SetHarmTimer: lda #kAvatarHarmHealFrames - kAvatarHarmInvincibleFrames - 1 sta Zp_AvatarHarmTimer_u8 rts +_ScrollToGronta: + lda #kAvatarHarmHealFrames - kAvatarHarmInvincibleFrames - 1 + sta Zp_AvatarHarmTimer_u8 + rts .ENDPROC ;;;=========================================================================;;; diff --git a/src/sounds/dialog.asm b/src/sounds/dialog.asm index be2fffd8..4aeecbdd 100644 --- a/src/sounds/dialog.asm +++ b/src/sounds/dialog.asm @@ -118,6 +118,7 @@ _Continue: .PROC DataA_Dialog_SfxDialogTextParam2_bSfxDialog_arr D_ARRAY .enum, ePortrait d_byte AdultMan, bSfxDialog::TypePulse14 | (6 << 3) | $2 + d_byte AdultSmith, bSfxDialog::TypePulse14 | (6 << 3) | $2 d_byte AdultWoman, bSfxDialog::TypePulse14 | (5 << 3) | $2 d_byte ChildAlex, bSfxDialog::TypePulse14 | (5 << 3) | $1 d_byte ChildAlexShout, bSfxDialog::TypePulse14 | (5 << 3) | $1 @@ -149,6 +150,7 @@ _Continue: .PROC DataA_Dialog_SfxDialogTextParam1_u8_arr D_ARRAY .enum, ePortrait d_byte AdultMan, $a0 + d_byte AdultSmith, $b0 d_byte AdultWoman, $00 d_byte ChildAlex, $60 d_byte ChildAlexShout, $60 diff --git a/src/sounds/metal.asm b/src/sounds/metal.asm new file mode 100644 index 00000000..573d1a76 --- /dev/null +++ b/src/sounds/metal.asm @@ -0,0 +1,61 @@ +;;;=========================================================================;;; +;;; Copyright 2022 Matthew D. Steele ;;; +;;; ;;; +;;; This file is part of Annalog. ;;; +;;; ;;; +;;; Annalog is free software: you can redistribute it and/or modify it ;;; +;;; under the terms of the GNU General Public License as published by the ;;; +;;; Free Software Foundation, either version 3 of the License, or (at your ;;; +;;; option) any later version. ;;; +;;; ;;; +;;; Annalog is distributed in the hope that it will be useful, but WITHOUT ;;; +;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;;; +;;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;;; +;;; for more details. ;;; +;;; ;;; +;;; You should have received a copy of the GNU General Public License along ;;; +;;; with Annalog. If not, see . ;;; +;;;=========================================================================;;; + +.INCLUDE "../apu.inc" +.INCLUDE "../audio.inc" +.INCLUDE "../macros.inc" +.INCLUDE "../sound.inc" + +.IMPORT Func_PlaySfxSequence + +;;;=========================================================================;;; + +.SEGMENT "PRG8" + +;;; SFX sequence data for the "metallic ding" sound effect. +.PROC Data_MetallicDing_sSfxSeq_arr + D_STRUCT sSfxSeq + d_byte Duration_u8, 4 + d_byte Env_bEnvelope, bEnvelope::Duty18 | bEnvelope::NoLength | 7 + d_byte Sweep_byte, pulse_sweep +0, 0 + d_word Timer_u16, $00f7 + D_END + D_STRUCT sSfxSeq + d_byte Duration_u8, 40 + d_byte Env_bEnvelope, bEnvelope::Duty14 | bEnvelope::NoLength | 9 + d_byte Sweep_byte, pulse_sweep +0, 0 + d_word Timer_u16, $00f5 + D_END + .byte 0 +.ENDPROC + +;;;=========================================================================;;; + +.SEGMENT "PRGA_Room" + +;;; Starts playing a metallic "ding" sound. +;;; @preserve T0+ +.EXPORT FuncA_Room_PlaySfxMetallicDing +.PROC FuncA_Room_PlaySfxMetallicDing + ldx #eChan::Pulse2 + ldya #Data_MetallicDing_sSfxSeq_arr + jmp Func_PlaySfxSequence ; preserves T0+ +.ENDPROC + +;;;=========================================================================;;; diff --git a/src/tiles/adult_smith.ahi b/src/tiles/adult_smith.ahi new file mode 100644 index 00000000..caf05301 --- /dev/null +++ b/src/tiles/adult_smith.ahi @@ -0,0 +1,53 @@ +ahi1 f0 p1 i2 w16 h24 + +;0;54;ECEEEC;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0 + +0000000000000000 +0000333333000000 +0003313331300000 +0003131113000000 +0031333333000000 +0003331313000000 +0031333333000000 +0003331113000000 +0000313311000000 +0000111110000000 +0031313131300000 +0331311131330000 +0111333331110100 +0331333313301310 +0311333331313331 +0333113111111333 +0033331133333131 +0011113111111313 +0033331331330000 +0033333330000000 +0033333330000000 +0033333330000000 +0001100110000000 +0003300330000000 + +0000000000000000 +0033333300000000 +0331333130001000 +0313111300013100 +3133333300133310 +0333131301333100 +3133333300131310 +0333111300010133 +0031331100000313 +0011111000000331 +3133131313133300 +3313111313133000 +1113333311000000 +3313333330000000 +3311333330000000 +0333113110000333 +0033331133333300 +0011113110000333 +0033331330000000 +0033333330000000 +0033333330000000 +0033333330000000 +0001100110000000 +0003300330000000 diff --git a/src/tiles/furniture.ahi b/src/tiles/furniture.ahi index 21b14553..a2f2cfdf 100644 --- a/src/tiles/furniture.ahi +++ b/src/tiles/furniture.ahi @@ -1,6 +1,6 @@ -ahi1 f0 p1 i12 w8 h8 +ahi1 f0 p1 i14 w8 h8 -000B;0;54;ECEEEC;FF0;FF0;982220;FF0;FF0;FF0;087C00;FF0;FF0;FF0;FF0;FF0 +0008;0;54;ECEEEC;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0;FF0 00000000 00000000 @@ -11,11 +11,11 @@ ahi1 f0 p1 i12 w8 h8 22000000 22002220 -22022222 -22022000 -22000222 -22022222 -22000000 +22122222 +22122111 +22111222 +22122222 +22111111 22222222 22000000 22000000 @@ -24,16 +24,16 @@ ahi1 f0 p1 i12 w8 h8 22222222 22222222 22222222 -00000000 +11111111 22222222 00000000 00000000 00220000 00220000 -20220000 -20220000 -00220000 +21220000 +21220000 +11220000 22220000 00220000 00220000 @@ -109,3 +109,21 @@ ahi1 f0 p1 i12 w8 h8 00220000 00220000 00220000 + +11111111 +22212222 +12212222 +01121222 +00000111 +00001122 +00012122 +00122211 + +11111000 +22212100 +22212100 +22121000 +11110000 +21100000 +21210000 +12221000 diff --git a/src/tilesets/house.bg b/src/tilesets/house.bg index bb9c105b..6fc25687 100644 --- a/src/tilesets/house.bg +++ b/src/tilesets/house.bg @@ -4,7 +4,7 @@ >window BCBDAA AH AHAGAG CCCDCACBBS BT - BABB BEBFABACACADAIAJAKALAEAF CACB CCCD + BABBAMANBEBFABACACADAIAJAKALAEAF CACB CCCD BG BJBH BLBH BJBKBK BOBP BJ