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 @@
Screen ID
Current overworld screen ID, corrected screen ID (based on coordinates), and sync. Not displayed in underworld; address: $7E008A
Tile (UW)
-
Tile type Link is standing on (bottom right; only works in underworld); address: $7E0114
+
Tile type Link is standing on (bottom right; only works in underworld); address: $7E0114
+
Tile index
+
WRAM address in bank 7F of the tile Link is standing on.
Spooky
Ancilla height for slot 4; address: $7E02A2
Arc variable
diff --git a/docs/patcher/files/sa1.bps b/docs/patcher/files/sa1.bps index 8ba94ff6445a027fb5d95bff949c7a02c920c4ad..37b3a6ba702982ebe315de6b74e36da75e79ba25 100644 GIT binary patch delta 5267 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 delta 5130 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 M=CjbBd delta 4964 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 update +

v14.3.3 2 March 2022

+
    +
  • HUD extras: +
      +
    • Added "Tile index" for plaid.
    • +
    +
  • +
  • Other: +
      +
    • Fixed Trinexx crystal.
    • +
    • Fixed line sentry 4 ancilla prop.
    • +
    +
  • +
+ +

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