Pull in OW Fog and Grid Map (#2 )

Reviewed-on: #2
Remove error beep from doors map navigation
2026-01-31 14:41:47 +00:00 · 2026-01-31 08:37:20 -06:00 · 2026-01-27 21:21:23 -06:00 · 2026-01-27 00:19:56 -06:00 · 2026-01-25 21:48:20 -06:00 · 2026-01-25 21:31:39 -06:00
8 changed files with 16 additions and 4 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -334,6 +334,8 @@ DungeonMapDoorConnectors:
 incbin "menu/door_connectors.3bppc"
 MapSheetD4:
 incbin "menu/map_sheet_d4.3bppc"
+DRSheet14:
+incbin "menu/dr_sheet_14.3bppc"

 org $8CD7DF
 incsrc data/playernamecharmap.asm
--- a/gk/check_loot.asm
+++ b/gk/check_loot.asm
@@ -368,7 +368,13 @@ CheckEnemies:
 	ASL A
 	TAX

-	LDA.l UWSpritesPointers, X
+
+	; get sprite pointer table
+	LDA.l $89C298 : STA.b $04
+	LDA.w #$0089 : STA.b $06
+	TXY
+	; get sprite pointer for room
+	LDA.b [$04], Y
 	INC A ; skip the layered/unlayered indicator
 	STA.b $04
 	LDA.w #bank(UWSpritesData)
--- a/gk/doors_dungeon_map.asm
+++ b/gk/doors_dungeon_map.asm
@@ -1453,8 +1453,8 @@ MoveDoorsMapCursor:
 	BRA .done

 .no_move
-	LDA.b #$3C
-	STA.w $012E
+;	LDA.b #$3C
+;	STA.w $012E

 .done
 	PLP
--- a/gk/dungeon_maps.asm
+++ b/gk/dungeon_maps.asm
@@ -24,6 +24,8 @@ endmacro
 %WriteGFXSheetPointer($62, DungeonMapIcons5)
 %WriteGFXSheetPointer($63, DungeonMapIcons6)

+%WriteGFXSheetPointer($14, DRSheet14)
+
 pullpc

 incsrc doors_dungeon_map.asm
--- a/gk_meta.asm
+++ b/gk_meta.asm
@@ -12,7 +12,8 @@ db $01
 GKRomVersion:
 ; $01 = Dungeon Maps
 ;  .., $01 = Dark rooms don't show on map from visition
-db $01, $01, $00
+;  .., $02 = OW Fog and Grid modes
+db $01, $02, $00
 ;--------------------------------------------------------------------------------

 ;================================================================================
--- a/menu/dr_sheet_14.3bpp
+++ b/menu/dr_sheet_14.3bpp
--- a/menu/dr_sheet_14.3bppc
+++ b/menu/dr_sheet_14.3bppc
--- a/owrando.asm
+++ b/owrando.asm
@@ -558,6 +558,7 @@ MoveLinkMapSprite:
 {
    STA.l $7EC10A ; what we overwrote
    SEP #$20
+    STZ.b ScrapBuffer72
    JSR MoveMapSprite
    REP #$20
    RTL
Author	SHA1	Message	Date
karafruit	5dd62441a8	Pull in OW Fog and Grid Map (#2 ) Reviewed-on: #2	2026-01-31 14:41:47 +00:00
Kara Alexandra	ab60e3fd35	Remove error beep from doors map navigation	2026-01-31 08:37:20 -06:00
Kara Alexandra	482381fe53	Add lower-layer headers to doors/stairs in IP tile theme	2026-01-27 21:21:23 -06:00
Kara Alexandra	2b3b50fc5c	Initialize $72 before loading palette for OW map	2026-01-27 00:19:56 -06:00
Kara Alexandra	b7c32fdfb1	Bump GK Rom version	2026-01-25 21:48:20 -06:00
Kara Alexandra	ec1083a2e5	Fix reference to now-removed UWSpritesPointer	2026-01-25 21:31:39 -06:00