LTTP_RND_GeneralBugfixes.asm

@@ -203,19 +203,21 @@ incsrc menu/hudalpha.asm
 warnpc $A38000
 
 org $B98000
-incsrc crystalswitchbook.asm
+incsrc gk/crystalswitchbook.asm
-incsrc mimicdash.asm
+incsrc gk/mimicdash.asm
-incsrc gloom.asm
+incsrc gk/gloom.asm
-incsrc special_weapons.asm
+incsrc gk/special_weapons.asm
-incsrc variable_ganon_vulnerability.asm
+incsrc gk/variable_ganon_vulnerability.asm
-incsrc pseudoflute.asm
+incsrc gk/pseudoflute.asm
-incsrc dungeon_map/main.asm
+incsrc gk/dungeon_maps.asm
 print "End of B9: ", pc
 
-warnpc $B9E000 ; $E000 - EFFF reserved for custom door rando map data
+warnpc $B9EE00
+org $B9EE00
+incsrc gk_meta.asm
 
 org $B9F000
-incsrc dungeon_map/settings.asm
+incsrc gk/settings.asm
 
 org $A38000
 incsrc stats/credits.asm ; Statically mapped

bugfixes.asm

@@ -284,7 +284,7 @@ SetItemRiseTimer:
 		RTL
 
 	.not_from_chest
-	JSL.l ItemIsJunk
+	JSL ItemIsJunk
 	BEQ .default
 
 	.junk

gk/dungeon_map_hooks.asm

@@ -14,24 +14,14 @@ org $8AE12B
 LDA.b #$20
 
 ; dungeon map sheets
-org $80DD97
+org $80DDD3 ; slot $8F
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
 db $61, $56, $57, $62
 
+; always use $8F in dungeon map
+org $8AE122
+NOP #4
+LDA.b #$8F
+
 ; unused chest data
 org $81E9A5
 dw $000F ; freezor room, second chest (only one chest in supertile)

gk/dungeon_maps.asm

@@ -1,5 +1,5 @@
 pushpc
-incsrc hooks.asm
+incsrc dungeon_map_hooks.asm
 
 macro WriteGFXSheetPointer(sheet, location)
 	pushpc
@@ -26,7 +26,7 @@ endmacro
 
 pullpc
 
-incsrc current_room_map.asm
+incsrc doors_dungeon_map.asm
 incsrc draw_rooms.asm
 incsrc map_bg3.asm
 incsrc dungeon_switch.asm
@@ -38,4 +38,3 @@ incsrc data/spiral_stairs.asm
 incsrc data/fall_warps.asm
 incsrc data/split_room.asm
 incsrc data/doors_connections.asm
-

gk/settings.asm

@@ -1,4 +1,4 @@
-; $B9F000
+org $B9F000
 SupertileRoomShapes:
 incsrc data/supertile_shapes.asm
 warnpc $B9F800

gk_meta.asm

@@ -0,0 +1,21 @@
+org $B9EE00
+
+;================================================================================
+warnpc $B9EEE0
+org $B9EEE0
+;--------------------------------------------------------------------------------
+B9Source:
+; $01 = GK Baserom
+; $FF = GK Adjuster Patch
+db $01
+;--------------------------------------------------------------------------------
+GKMajorVersion:
+; $01 = Dungeon Maps
+db $01
+;--------------------------------------------------------------------------------
+GKMinorVersion:
+db $00
+;--------------------------------------------------------------------------------
+GKBuild:
+db $00
+;--------------------------------------------------------------------------------