diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm index 881db9a..b0fab19 100644 --- a/dungeon_map/dungeon_switch.asm +++ b/dungeon_map/dungeon_switch.asm @@ -110,3 +110,32 @@ RestoreDungeonMapFloorIndex: LDA.b $0A ; the rest of what we wrote over AND.b #$08 RTL + +DrawDungeonLabel: + LDY.b #$00 + LDA.w DungeonID + ASL A + TAX + LDA.b NMISTRIPES + BEQ + + LDY.b #$20 ++ + + REP #$20 + LDA.w #$E660 + STA.w GFXStripes+$02, Y + LDA.w #$0300 + STA.w GFXStripes+$04, Y + + LDA.l DungeonLabels+0, X + STA.w GFXStripes+$06, Y + LDA.l DungeonLabels+2, X + STA.w GFXStripes+$08, Y + SEP #$20 + LDA.b #$FF + STA.w GFXStripes+$0A, Y + LDA.b #$01 + STA.b NMISTRIPES + + INC.w $020D ; what we wrote over + RTL diff --git a/dungeon_map/hooks.asm b/dungeon_map/hooks.asm index f114bcf..ff36c39 100644 --- a/dungeon_map/hooks.asm +++ b/dungeon_map/hooks.asm @@ -73,6 +73,10 @@ org $8AEFC5 JSL RestoreCurrentDungeon NOP +org $8AE1EC + PLB + JML DrawDungeonLabel + ;================================================================================ ; Show indicators of what is left in each room ;-------------------------------------------------------------------------------- diff --git a/dungeon_map/settings.asm b/dungeon_map/settings.asm index 2df5ca9..8bffdc5 100644 --- a/dungeon_map/settings.asm +++ b/dungeon_map/settings.asm @@ -108,7 +108,25 @@ padbyte $FF pad $B9F700 ; $B9F700 +DungeonLabels: +dw $2561, $256F ; Sewers +dw $2564, $255F ; Hyrule Castle +dw $2561, $256C ; Eastern Palace +dw $2560, $256C ; Desert Palace +dw $255D, $2570 ; Agahnim's Tower +dw $256F, $256C ; Swamp Palace +dw $256C, $2560 ; Palace of Darkness +dw $2569, $2569 ; Misery Mire +dw $256F, $2573 ; Skull Woods +dw $2565, $256C ; Ice Palace +dw $2570, $2564 ; Tower of Hera +dw $2570, $2570 ; Thieves' Town +dw $2570, $256E ; Turtle Rock +dw $2563, $2570 ; Ganon's Tower +dw $25A4, $25A4 ; Reserved +dw $25A4, $25A4 ; Reserved +; $B9F740 warnpc $B9FF00