adding new dungeon items view to menu

2017-09-05 20:16:49 -04:00
parent c2e7fdaa85
commit 122dd9e02e
4 changed files with 179 additions and 7 deletions
--- a/c2807_v3.gfx
+++ b/c2807_v3.gfx
--- a/c2e3e.gfx
+++ b/c2e3e.gfx
--- a/hooks.asm
+++ b/hooks.asm
@@ -253,13 +253,13 @@ db #$80 ; BRA
 org $0DE81A ; <- 6E81A - equipment.asm : 1597 (STA $00)
 RTS
 org $0DE7B9 ; <- 6E7B9 - equipment.asm : 1548 (LDA.w #$16D0)
-LDA.w #$1610
+LDA.w #$1590
 org $0DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8)
-LDA.w #$1608
+LDA.w #$1588
 org $0DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8)
-LDA.w #$1618
+LDA.w #$1598
 org $0DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0)
-LDA.w #$1620
+LDA.w #$15A0
 ;--------------------------------------------------------------------------------
 ;org $0DE9D8 ; <- 6E9D8 - equipment.asm : 1635 (LDA $E860, X : STA $12EA, X)
 ;BRA DrawProgressIcons_initPendantDiagram_notext
@@ -901,9 +901,9 @@ LDX.w #HUD_TileMap
 org $0DFA9C ; <- 6FA9C - headsup_display.asm : 629 (MVN $0D, $7E ; $Transfer 0x014A bytes from $6FE77 -> $7EC700)
 MVN $207E
 ;--------------------------------------------------------------------------------
-;org $0DE48E ; <- 6E48E - equipment.asm : 1233 (LDA.w #$11CE : STA $00) - HOOK HERE TO DRAW ON THE ITEM SCREEN
-;JSL.l DrawHUDSilverArrows
-;NOP
+org $0DE48E ; <- 6E48E - equipment.asm : 1233 (LDA.w #$11CE : STA $00) - HOOK HERE TO DRAW ON THE ITEM SCREEN
+JSL.l DrawHUDDungeonItems
+NOP
 ;--------------------------------------------------------------------------------
 org $0DFB1F ; 6FB1F - headsup_display.asm : 681 (LDA $7EF340 : BEQ .hastNoBow)
 JSL.l CheckHUDSilverArrows
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -139,6 +139,178 @@ ShowDungeonItems:
 	BEQ + : LDA.w #$0000 : RTL : + ; if set, send the zero onwards
 	LDA $040C : AND.w #$00FF : CMP.w #$00FF ; original logic
 RTL
+;--------------------------------------------------------------------------------
+DrawHUDDungeonItems:
+	; left side
+	;LDA.w #$2871 : STA $1604 ; dungeon row
+	LDA.w #$2810 : STA $1644 ; small keys
+	LDA.w #$2811 : STA $1684 ; big key
+	LDA.w #$2821 : STA $16C4 ; map
+	LDA.w #$2C20 : STA $1704 ; compass
+
+	; dungeon names
+	LDA.w #$2D50 : STA $1606 ; sewers
+	LDA.w #$2D51 : STA $1608 ; Eastern
+	LDA.w #$2D52 : STA $160A ; Desert
+	LDA.w #$2D53 : STA $160C ; Hera
+	LDA.w #$2D54 : STA $160E ; Agahnims Tower
+
+	LDA.w #$2D55 : STA $1612 ; PoD
+	LDA.w #$2D56 : STA $1614 ; Swamp
+	LDA.w #$2D57 : STA $1616 ; Skull Woods
+	LDA.w #$2D58 : STA $1618 ; Thieves Town
+	LDA.w #$2D59 : STA $161A ; Ice
+	LDA.w #$2D5A : STA $161C ; Mire
+	LDA.w #$2D5B : STA $161E ; Turtle Rock
+ 
+	LDA.w #$2D5C : STA $1622 ; Ganon's Tower
+
+	SEP #$20 ; set 8-bit accumulator
+	; Small Keys
+	LDA.b #$16 : !ADD $7EF37C : STA $1646 : LDA.b #$28 : ADC #$00 : sta $1646+1 ; sewers
+	LDA.b #$16 : !ADD $7EF37E : STA $1648 : LDA.b #$28 : ADC #$00 : sta $1648+1 ; Eastern
+	LDA.b #$16 : !ADD $7EF37F : STA $164A : LDA.b #$28 : ADC #$00 : sta $164A+1 ; Desert
+	LDA.b #$16 : !ADD $7EF386 : STA $164C : LDA.b #$28 : ADC #$00 : sta $164C+1 ; Hera
+	LDA.b #$16 : !ADD $7EF380 : STA $164E : LDA.b #$28 : ADC #$00 : sta $164E+1 ; Agahnims Tower
+
+	LDA.b #$16 : !ADD $7EF382 : STA $1652 : LDA.b #$28 : ADC #$00 : sta $1652+1 ; PoD
+	LDA.b #$16 : !ADD $7EF381 : STA $1654 : LDA.b #$28 : ADC #$00 : sta $1654+1 ; Swamp
+	LDA.b #$16 : !ADD $7EF384 : STA $1656 : LDA.b #$28 : ADC #$00 : sta $1656+1 ; Skull Woods
+	LDA.b #$16 : !ADD $7EF387 : STA $1658 : LDA.b #$28 : ADC #$00 : sta $1658+1 ; Thieves Town
+	LDA.b #$16 : !ADD $7EF385 : STA $165A : LDA.b #$28 : ADC #$00 : sta $165A+1 ; Ice
+	LDA.b #$16 : !ADD $7EF383 : STA $165C : LDA.b #$28 : ADC #$00 : sta $165C+1 ; Mire
+	LDA.b #$16 : !ADD $7EF388 : STA $165E : LDA.b #$28 : ADC #$00 : sta $165E+1 ; Turtle Rock
+
+	LDA.b #$16 : !ADD $7EF389 : STA $1662 : LDA.b #$28 : ADC #$00 : sta $1662+1 ; Ganon's Tower
+
+	REP #$20 ; set 16-bit accumulator
+
+	; Big Keys
+	LDA $7EF366 : AND.w #$0008 : BEQ + ; sewers
+		LDA.w #$2826 : STA $1686
+	+
+	LDA $7EF367 : AND.w #$0040 : BEQ + ; Eastern
+		LDA.w #$2826 : STA $1688
+	+
+	LDA $7EF367 : AND.w #$0010 : BEQ + ; Desert
+		LDA.w #$2826 : STA $168A
+	+
+	LDA $7EF366 : AND.w #$0020 : BEQ + ; Hera
+		LDA.w #$2826 : STA $168C
+	+
+	LDA $7EF366 : AND.w #$0004 : BEQ + ; Agahnims Tower
+		LDA.w #$2826 : STA $168E
+	+
+	LDA $7EF367 : AND.w #$0002 : BEQ + ; PoD
+		LDA.w #$2826 : STA $1692
+	+
+	LDA $7EF367 : AND.w #$0004 : BEQ + ; Swamp
+		LDA.w #$2826 : STA $1694
+	+
+	LDA $7EF366 : AND.w #$0080 : BEQ + ; Skull Woods
+		LDA.w #$2826 : STA $1696
+	+
+	LDA $7EF366 : AND.w #$0010 : BEQ + ; Thieves Town
+		LDA.w #$2826 : STA $1698
+	+
+	LDA $7EF366 : AND.w #$0040 : BEQ + ; Ice
+		LDA.w #$2826 : STA $169A
+	+
+	LDA $7EF367 : AND.w #$0001 : BEQ + ; Mire
+		LDA.w #$2826 : STA $169C
+	+
+	LDA $7EF366 : AND.w #$0008 : BEQ + ; Turtle Rock
+		LDA.w #$2826 : STA $169E
+	+
+	LDA $7EF366 : AND.w #$0004 : BEQ + ; Ganon's Tower
+		LDA.w #$2826 : STA $16A2
+	+
+
+	; Maps
+	LDA $7EF368 : AND.w #$0008 : BEQ + ; sewers
+		LDA.w #$2826 : STA $16C6
+	+
+	LDA $7EF369 : AND.w #$0040 : BEQ + ; Eastern
+		LDA.w #$2826 : STA $16C8
+	+
+	LDA $7EF369 : AND.w #$0010 : BEQ + ; Desert
+		LDA.w #$2826 : STA $16CA
+	+
+	LDA $7EF368 : AND.w #$0020 : BEQ + ; Hera
+		LDA.w #$2826 : STA $16CC
+	+
+	LDA $7EF368 : AND.w #$0004 : BEQ + ; Agahnims Tower
+		LDA.w #$2826 : STA $16CE
+	+
+	LDA $7EF369 : AND.w #$0002 : BEQ + ; PoD
+		LDA.w #$2826 : STA $16D2
+	+
+	LDA $7EF369 : AND.w #$0004 : BEQ + ; Swamp
+		LDA.w #$2826 : STA $16D4
+	+
+	LDA $7EF368 : AND.w #$0080 : BEQ + ; Skull Woods
+		LDA.w #$2826 : STA $16D6
+	+
+	LDA $7EF368 : AND.w #$0010 : BEQ + ; Thieves Town
+		LDA.w #$2826 : STA $16D8
+	+
+	LDA $7EF368 : AND.w #$0040 : BEQ + ; Ice
+		LDA.w #$2826 : STA $16DA
+	+
+	LDA $7EF369 : AND.w #$0001 : BEQ + ; Mire
+		LDA.w #$2826 : STA $16DC
+	+
+	LDA $7EF368 : AND.w #$0008 : BEQ + ; Turtle Rock
+		LDA.w #$2826 : STA $16DE
+	+
+	LDA $7EF368 : AND.w #$0004 : BEQ + ; Ganon's Tower
+		LDA.w #$2826 : STA $16E2
+	+
+
+	; Compasses
+	LDA $7EF364 : AND.w #$0008 : BEQ + ; sewers
+		LDA.w #$2C26 : STA $1706
+	+
+	LDA $7EF365 : AND.w #$0040 : BEQ + ; Eastern
+		LDA.w #$2C26 : STA $1708
+	+
+	LDA $7EF365 : AND.w #$0010 : BEQ + ; Desert
+		LDA.w #$2C26 : STA $170A
+	+
+	LDA $7EF364 : AND.w #$0020 : BEQ + ; Hera
+		LDA.w #$2C26 : STA $170C
+	+
+	LDA $7EF364 : AND.w #$0004 : BEQ + ; Agahnims Tower
+		LDA.w #$2C26 : STA $170E
+	+
+	LDA $7EF365 : AND.w #$0002 : BEQ + ; PoD
+		LDA.w #$2C26 : STA $1712
+	+
+	LDA $7EF365 : AND.w #$0004 : BEQ + ; Swamp
+		LDA.w #$2C26 : STA $1714
+	+
+	LDA $7EF364 : AND.w #$0080 : BEQ + ; Skull Woods
+		LDA.w #$2C26 : STA $1716
+	+
+	LDA $7EF364 : AND.w #$0010 : BEQ + ; Thieves Town
+		LDA.w #$2C26 : STA $1718
+	+
+	LDA $7EF364 : AND.w #$0040 : BEQ + ; Ice
+		LDA.w #$2C26 : STA $171A
+	+
+	LDA $7EF365 : AND.w #$0001 : BEQ + ; Mire
+		LDA.w #$2C26 : STA $171C
+	+
+	LDA $7EF364 : AND.w #$0008 : BEQ + ; Turtle Rock
+		LDA.w #$2C26 : STA $171E
+	+
+	LDA $7EF364 : AND.w #$0004 : BEQ + ; Ganon's Tower
+		LDA.w #$2C26 : STA $1722
+	+
+
+	LDA.w #$11CE : STA $00 ; thing we wrote over
+RTL
+;--------------------------------------------------------------------------------
 ;================================================================================
 DrawPendantCrystalDiagram:
 	PHP : PHB : PHK : PLB