diff --git a/drhooks.asm b/drhooks.asm index 9b60310..c99b1f7 100644 --- a/drhooks.asm +++ b/drhooks.asm @@ -62,6 +62,12 @@ nop #5 org $01b618 ; Bank01.asm : 7963 Dungeon_LoadHeader (REP #$20 : INY : LDA [$0D], Y) nop : jsl OverridePaletteHeader +org $02817e ; Bank02.asm : 414 (LDA $02811E, X) +jsl FixAnimatedTiles + +org $028a06 ; Bank02.asm : 1941 Dungeon_ResetTorchBackgroundAndPlayer +JSL FixWallmasterLamp + org $00d377 ;Bank 00 line 3185 DecompDungAnimatedTiles: org $00fda4 ;Bank 00 line 8882 diff --git a/gfx.asm b/gfx.asm index 6d72dca..d17ce07 100644 --- a/gfx.asm +++ b/gfx.asm @@ -33,6 +33,22 @@ GfxFixer: rtl } +FixAnimatedTiles: + LDA.L DRMode : cmp #$02 : bne + + PHX + LDX $A0 : LDA.l TilesetTable, x + CMP $0AA1 : beq ++ + TAX : PLA : BRA + + ++ + PLX + + LDA $02802E, X ; what we wrote over + RTL + +FixWallmasterLamp: +ORA $0458 +STY $1C : STA $1D : RTL ; what we wrote over + + CgramAuxToMain: ; ripped this from bank02 because it ended with rts { rep #$20