From 122dd9e02e9fd1f2b087fe935e65ec6327bd4a95 Mon Sep 17 00:00:00 2001
From: sporchia <print@blindchaos.net>
Date: Tue, 5 Sep 2017 20:16:49 -0400
Subject: [PATCH] adding new dungeon items view to menu

---
 c2807_v3.gfx          | Bin 1448 -> 1452 bytes
 c2e3e.gfx             | Bin 1310 -> 1450 bytes
 hooks.asm             |  14 ++--
 pendantcrystalhud.asm | 172 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 179 insertions(+), 7 deletions(-)

diff --git a/c2807_v3.gfx b/c2807_v3.gfx
index 7bad55170f2a4c3d0b3a185740c81d3a9d905770..92c05026e3ec06e1897efda0e96855c1b538ed03 100755
GIT binary patch
delta 456
zcmWNMv1=4z5XEP|+nJM#l1>ysWQmZ{|6zAe(P%)h3R;L=uudTom+#x#y(C`1Bap%n
z8zFb+CMlGl%X(PFCRiHO;|jqPCu}7rhU57)k9m*bH}iI;-c0RxD$BrHfZW}}M>J=k
z3cRnQptNz0<%7)%<gH7b)Yv`7b7aP6%Iw+}I(1~U*|^Qp#V#`RS_|y#BA#~iUFO$#
zWivfZF0hH7Sz_uoR@r@t9y$TK$r{IxI9cIk`W&EeGrYr*2Q@?#VBim-e^jWjqyDSZ
z80+SUYo9Q%%s)8Ap$9odf-#%`WBTGD%n<)#eO5?&h()M0w^TTUI>h$?Lqb{+J*#MY
z2KtIz1vwsS5hi#zz{qk&W|h?mB6Gs-Pi$apCLG!mH-!2D4*VScQ|OjZR7XGl#^ls7
zNiK*0+t|ZWdQrJ09F(Tb>M_bR6F0|K>z_#b3}3rvo7rCnVF~?0HJ@2f<G#=&ov-Q#
xlH94r|M+?iOAPm*kA)V^VkPWD&oUjD5mR&%MLbva3pCG*{>{l-tL+uO{2!o9>$v~`

delta 452
zcmWlTv1=4j7{uSc+j&tUSc@RCM63imLG5nWNFoya0|ae@U>8(09^ZTJUZdecIwkEH
zbH+k)#b!CIuC$DJ9$Q!*vW3Vh%Q3!m^9|qpX7(5Ri=W=NHUrLM{?ap+b`q+8_OjN;
zycV;TJ*_%1i}bHnvcgIQ5zjOX*zh-JobX0OT{5`EsV?};A2t1d?H)qzLVdBN79Sl)
zG$VF6<c4Rf-6g8dZO&E42XY3RG4rrt&94!|UC#N=*4mTa*eggHwrXD`XO%DV>}k8C
z{Aj7d%kClEW9R|@ym|uDF!hY!WcEIi0o@_IP!iD@qbj?qlahMONz792!<*d<a?xCR
zK)DI&K~Fi$#@>STp?`A6p2xDMW>BM;!*<U0bGjEuMs(jH3hg=5KI9|x0XMR9TCU?%
z#Sa|t5vy!q!kovfJZ1YduHH-6kW`eO?!Gkg7OsbMZ9%q>Zoxgpa(==}4k+J@TDR*h
g-x3zgIkY)kgruOmvyd*q?Lm%^el~Kn{Tdhk16ohyH2?qr

diff --git a/c2e3e.gfx b/c2e3e.gfx
index 50119653bb9258040d4dee8c2096f3a507a5548f..5eb79170ffc6904956222592a5aae5616e844213 100644
GIT binary patch
delta 408
zcmWNN%}X0m6vf|tGqEKfWYdL3XdsD-po^@#$iiuH=^qd+n1zBxcY>e<dGkS`qU6<0
zq0LJCTFydHib%jLl(-TXF47Qi7Jf`*kZGAV$G5nL3-|mkobxljpV+*uWWm}79@wdY
zS`KeNfN+2YF4eSvKM2rO8p0RvD20qVq?P)(#$6V*ED;(La9JY{rWTLY?FD-6D$G+>
zkq37Wm{sB~oIJ)|=!X#S?9asOsF~FX5?hpm-cfGHfNT9Ay$*?E+a~7|G4XYd6vYJs
z#l$__c)zfX8+cZaUWMoWmA}>66DuSO^nSo(oOuS;#yxEMtlDJ^AMsD`;XmXujmEw`
zvLVP_nosxTP)4UxHsjnX@r)ei({Hq1fR5Qu8dedRBV?C&PJZXb(PX4PG^1J=`2oT~
zB-?mG0b{D69n21@<OY0eo$Rj0BxzGIkz)3RoY5xZeZS$TzA9Ex9%;=?42yqT!HM`n
YtYV;;KnKrJ@991|!-kn8xvMX|0KygKQ~&?~

delta 267
zcmWNLJxjw-07c(Nl-e{1qN60n3Mz^ex+!#tIJo!+ltKpw2RAnf5+#B|gf|LiEQtCS
zy4gW!M+b*g3U<(%lpv`*&Gn6EIQQH;{kC}hzFPr#b1<45B0>wUjnWt?5{!`{Mx@w8
z7t=5mz2GCUOd2F43F_3y@dw$>!dNOJt3W)^O(WT;(=xVy;SojzXKVcCi-;;an$;K4
zK;LcP6$5x%thWG&M|Ln*%2V{wRvDZ^p0Ci0dtMe6uPskW)#%7Dlkug_yct@kU|k(;
z;&2J1?I0%JD(IQG;`^En|5*(AUP0@@hw0CY9j#*(ar_gdt$|v19n=g}`j+|VQ$8U;
KXhT#dPW}Nxvz^QU

diff --git a/hooks.asm b/hooks.asm
index 902d2a4..0c20949 100644
--- 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
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index 7780496..ac4fc3d 100644
--- 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