Pull in OW Fog and Grid Map (#2)

Reviewed-on: #2

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

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)

gk/doors_dungeon_map.asm

@@ -1453,8 +1453,8 @@ MoveDoorsMapCursor:
 	BRA .done
 
 .no_move
-	LDA.b #$3C
+;	LDA.b #$3C
-	STA.w $012E
+;	STA.w $012E
 
 .done
 	PLP

gk/dungeon_maps.asm

@@ -24,6 +24,8 @@ endmacro
 %WriteGFXSheetPointer($62, DungeonMapIcons5)
 %WriteGFXSheetPointer($63, DungeonMapIcons6)
 
+%WriteGFXSheetPointer($14, DRSheet14)
+
 pullpc
 
 incsrc doors_dungeon_map.asm

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
 ;--------------------------------------------------------------------------------
 
 ;================================================================================

owrando.asm

@@ -558,6 +558,7 @@ MoveLinkMapSprite:
 {
     STA.l $7EC10A ; what we overwrote
     SEP #$20
+    STZ.b ScrapBuffer72
     JSR MoveMapSprite
     REP #$20
     RTL