From 68a825971be4f129ab5ae9cf209bd000b4abd007 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Wed, 2 Mar 2022 10:49:16 -0500 Subject: [PATCH] ok --- docs/index.html | 4 +++- docs/patcher/files/sa1.bps | Bin 110181 -> 110228 bytes docs/patcher/files/sa1rando.bps | Bin 110500 -> 110550 bytes docs/updates.html | 19 +++++++++++++--- src/cm_gamestate.asm | 2 +- src/cm_hud.asm | 5 +++-- src/hudextras.asm | 38 ++++++++++++++++++++++++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-) diff --git a/docs/index.html b/docs/index.html index 562475d..2b9ed0f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -762,7 +762,9 @@
;kZzKH=GsFUzii*&49B?H<
zMa|J4R5GZjdHRD_m{eI~MPqHFxzXC#(|E0Mpz*PuyN`%DZwx>M98tPBOC$&~b1s0D
z<>QK?)TPiArgpiylr_a!yWi;T7eqxZkg;?0SS_qMxhgAj)tH{h%buDsHH$C*t0wyL
zK?%;JL>wmPqss|oHz$|#Uq%CCE62jvqA%3%)|cp&dZ4e->-8=A@AR~jL4w50%&a5|
zQ#;{9Y)MXPPHvKz@&XUb-F&`Ms0vGLlq*k=xKf;$MsZWK#EC!x9F9g8Wgh`kMUEM9w)(}gcC*Fig=U{5+P?M||`Cc}-X@R!6Y`o=at_I;%|N3bR{7i|3R
zPv14.3.3 2 March 2022
+
+
+
+
+
+
+
+ Older updates
v14.3.2 2 February 2022
@@ -29,9 +45,6 @@ v14.3.
-
-
Older updates
-
v14.3.1 2 December 2021
diff --git a/src/cm_gamestate.asm b/src/cm_gamestate.asm
index 198f6a0..3a8097a 100644
--- 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
index 453dda8..7a3d62f 100644
--- 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
index 71848d2..f7b17ba 100644
--- 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