ok

spannerisms · Mar 2, 2022 · 68a8259 · 68a8259
1 parent 569c14b
commit 68a8259
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 7 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -762,7 +762,9 @@ <h3 id="menuHUD">HUD extras</h3>
 			<dt>Screen ID</dt>
 			<dd>Current overworld screen ID, corrected screen ID (based on coordinates), and sync. Not displayed in underworld; address: $7E008A</dd>
 			<dt>Tile (UW)</dt>
-			<dd>Tile type Link is standing on (bottom right; only works in underworld); address: $7E0114</dd>
+			<dd>Tile type Link is standing on (bottom right; only works in underworld); address: $7E0114</dd>	
+			<dt>Tile index</dt>
+			<dd>WRAM address in bank 7F of the tile Link is standing on.</dd>
 			<dt>Spooky</dt>
 			<dd>Ancilla height for slot 4; address: $7E02A2</dd>
 			<dt>Arc variable</dt>

diff --git a/docs/patcher/files/sa1.bps b/docs/patcher/files/sa1.bps
diff --git a/docs/patcher/files/sa1rando.bps b/docs/patcher/files/sa1rando.bps
diff --git a/docs/updates.html b/docs/updates.html
@@ -4,7 +4,23 @@
 ---
 
 <h2>Latest update</h2>
+<h3><a href="https://github.com/spannerisms/lttphack/releases/tag/14.3.3">v14.3.3</a> <span class="releaseDate">2 March 2022</span></h3>
 
+<ul class="changes">
+	<li>HUD extras:
+		<ul>
+			<li>Added "Tile index" for plaid.</li>
+		</ul>
+	</li>
+	<li>Other:
+		<ul>
+			<li>Fixed Trinexx crystal.</li>
+			<li>Fixed line sentry 4 ancilla prop.</li>
+		</ul>
+	</li>
+</ul>
+
+<h2>Older updates</h2>
 
 <h3><a href="https://github.com/spannerisms/lttphack/releases/tag/14.3.2">v14.3.2</a> <span class="releaseDate">2 February 2022</span></h3>
 
@@ -29,9 +45,6 @@ <h3><a href="https://github.com/spannerisms/lttphack/releases/tag/14.3.2">v14.3.
 </ul>
 
 
-
-<h2>Older updates</h2>
-
 <h3><a href="https://github.com/spannerisms/lttphack/releases/tag/14.3.1">v14.3.1</a> <span class="releaseDate">2 December 2021</span></h3>
 
 <ul class="changes">

diff --git a/src/cm_gamestate.asm b/src/cm_gamestate.asm
@@ -136,7 +136,7 @@ cm_game_state_crystals_submenu:
 	%toggle_bit_long("Ice", $7EF37A, 2)
 	%toggle_bit_long("Swamp", $7EF37A, 4)
 	%toggle_bit_long("Mire", $7EF37A, 0)
-	%toggle_bit_long("Turtle Rock", $7EF37A, 4)
+	%toggle_bit_long("Turtle Rock", $7EF37A, 3)
 
 ;===================================================================================================
 cm_game_reset_dungeons_submenu:

diff --git a/src/cm_hud.asm b/src/cm_hud.asm
@@ -14,7 +14,7 @@ HUDEXTRAS_SUBMENU:
 	%list_item("Classic Gray")
 
 ;===================================================================================================
-!sentry_count = 19
+!sentry_count = 20
 %choice("Sentry 1", !config_sentry1, !sentry_count, sentry_names)
 %choice("Sentry 2", !config_sentry2, !sentry_count, sentry_names)
 %choice("Sentry 3", !config_sentry3, !sentry_count, sentry_names)
@@ -48,6 +48,7 @@ endmacro
 	%new_sentry($00A9, "Quadrant")
 	%new_sentry($008A, "Screen ID")
 	%new_sentry($0114, "Tile (UW)")
+	%new_sentry($00EC, "Tile index")
 	%new_sentry($02A2, "Spooky")
 	%new_sentry($0B08, "Arc variable")
 	%new_sentry($0690, "WEST SOMARIA")
@@ -113,7 +114,7 @@ endmacro
 %choice("Ancilla prop 1", !config_ancprop1, !ancprop_count, ancprop_names)
 %choice("Ancilla prop 2", !config_ancprop2, !ancprop_count, ancprop_names)
 %choice("Ancilla prop 3", !config_ancprop3, !ancprop_count, ancprop_names)
-%choice("Ancilla prop 4", !config_ancprop3, !ancprop_count, ancprop_names)
+%choice("Ancilla prop 4", !config_ancprop4, !ancprop_count, ancprop_names)
 
 #ancillawatch_props:
 	fillword $0C4A : fill !ancprop_count*2

diff --git a/src/hudextras.asm b/src/hudextras.asm
@@ -1219,6 +1219,7 @@ sentry_routines:
 	dw sentry_quadrant
 	dw sentry_screenid
 	dw sentry_tile
+	dw sentry_tileindex
 	dw sentry_spooky
 	dw sentry_arcvar
 	dw sentry_westsom
@@ -1526,6 +1527,43 @@ sentry_tile:
 
 ;---------------------------------------------------------------------------------------------------
 
+sentry_tileindex:
+	STA.b SA1IRAM.SCRATCH+14
+	TAY
+
+	LDA.b SA1IRAM.CopyOf_1B
+	AND.w #$00FF
+	BEQ NoDisplaySentry
+
+
+	LDA.w #char(24)|!BLUE_PAL
+	STA.w SA1RAM.HUD+6,X
+
+	TYA
+	AND.b SA1IRAM.CopyOf_20
+	AND.w #$FFF8
+	ASL
+	ASL
+	ASL
+	STA.b SA1IRAM.SCRATCH+12
+
+	LDA.b SA1IRAM.SCRATCH+14
+	AND.b SA1IRAM.CopyOf_22
+	LSR
+	LSR
+	LSR
+	AND.w #$003F
+	CLC
+	ADC.b SA1IRAM.SCRATCH+12
+	CLC
+	ADC.w #$2000
+
+	LDY.w #4
+
+	JMP DrawHex_white
+
+;---------------------------------------------------------------------------------------------------
+
 sentry_quadrant:
 	TAY