From 0b27d0f477f8076b287d3860c1d191b042d2675e Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 18 Jan 2026 10:48:02 -0600
Subject: [PATCH] Big rename of gk files

---
 LTTP_RND_GeneralBugfixes.asm                  | 20 +++++++++--------
 bugfixes.asm                                  |  2 +-
 {dungeon_map => gk}/blink_loot.asm            |  0
 {dungeon_map => gk}/check_loot.asm            |  0
 .../crystalswitchbook.asm                     |  0
 {dungeon_map => gk}/data/analyze.rb           |  0
 .../data/doors_connections.asm                |  0
 {dungeon_map => gk}/data/doors_display.asm    |  0
 {dungeon_map => gk}/data/entrance_tiles.asm   |  0
 {dungeon_map => gk}/data/fall_warps.asm       |  0
 {dungeon_map => gk}/data/item_mapping.asm     |  0
 {dungeon_map => gk}/data/spiral_stairs.asm    |  0
 {dungeon_map => gk}/data/split_room.asm       |  0
 {dungeon_map => gk}/data/supertile_shapes.asm |  0
 .../doors_dungeon_map.asm                     |  0
 {dungeon_map => gk}/draw_loot.asm             |  0
 {dungeon_map => gk}/draw_rooms.asm            |  0
 .../hooks.asm => gk/dungeon_map_hooks.asm     | 22 +++++--------------
 dungeon_map/main.asm => gk/dungeon_maps.asm   |  5 ++---
 {dungeon_map => gk}/dungeon_switch.asm        |  0
 gloom.asm => gk/gloom.asm                     |  0
 {dungeon_map => gk}/map_bg3.asm               |  0
 mimicdash.asm => gk/mimicdash.asm             |  0
 pseudoflute.asm => gk/pseudoflute.asm         |  0
 {dungeon_map => gk}/settings.asm              |  2 +-
 special_weapons.asm => gk/special_weapons.asm |  0
 .../variable_ganon_vulnerability.asm          |  0
 gk_meta.asm                                   | 21 ++++++++++++++++++
 28 files changed, 42 insertions(+), 30 deletions(-)
 rename {dungeon_map => gk}/blink_loot.asm (100%)
 rename {dungeon_map => gk}/check_loot.asm (100%)
 rename crystalswitchbook.asm => gk/crystalswitchbook.asm (100%)
 rename {dungeon_map => gk}/data/analyze.rb (100%)
 rename {dungeon_map => gk}/data/doors_connections.asm (100%)
 rename {dungeon_map => gk}/data/doors_display.asm (100%)
 rename {dungeon_map => gk}/data/entrance_tiles.asm (100%)
 rename {dungeon_map => gk}/data/fall_warps.asm (100%)
 rename {dungeon_map => gk}/data/item_mapping.asm (100%)
 rename {dungeon_map => gk}/data/spiral_stairs.asm (100%)
 rename {dungeon_map => gk}/data/split_room.asm (100%)
 rename {dungeon_map => gk}/data/supertile_shapes.asm (100%)
 rename dungeon_map/current_room_map.asm => gk/doors_dungeon_map.asm (100%)
 rename {dungeon_map => gk}/draw_loot.asm (100%)
 rename {dungeon_map => gk}/draw_rooms.asm (100%)
 rename dungeon_map/hooks.asm => gk/dungeon_map_hooks.asm (91%)
 rename dungeon_map/main.asm => gk/dungeon_maps.asm (93%)
 rename {dungeon_map => gk}/dungeon_switch.asm (100%)
 rename gloom.asm => gk/gloom.asm (100%)
 rename {dungeon_map => gk}/map_bg3.asm (100%)
 rename mimicdash.asm => gk/mimicdash.asm (100%)
 rename pseudoflute.asm => gk/pseudoflute.asm (100%)
 rename {dungeon_map => gk}/settings.asm (99%)
 rename special_weapons.asm => gk/special_weapons.asm (100%)
 rename variable_ganon_vulnerability.asm => gk/variable_ganon_vulnerability.asm (100%)
 create mode 100644 gk_meta.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 60450a6..b8e23f3 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -203,19 +203,21 @@ incsrc menu/hudalpha.asm
 warnpc $A38000
 
 org $B98000
-incsrc crystalswitchbook.asm
-incsrc mimicdash.asm
-incsrc gloom.asm
-incsrc special_weapons.asm
-incsrc variable_ganon_vulnerability.asm
-incsrc pseudoflute.asm
-incsrc dungeon_map/main.asm
+incsrc gk/crystalswitchbook.asm
+incsrc gk/mimicdash.asm
+incsrc gk/gloom.asm
+incsrc gk/special_weapons.asm
+incsrc gk/variable_ganon_vulnerability.asm
+incsrc gk/pseudoflute.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
diff --git a/bugfixes.asm b/bugfixes.asm
index 0ab5bbd..82d1b39 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -284,7 +284,7 @@ SetItemRiseTimer:
 		RTL
 
 	.not_from_chest
-	JSL.l ItemIsJunk
+	JSL ItemIsJunk
 	BEQ .default
 
 	.junk
diff --git a/dungeon_map/blink_loot.asm b/gk/blink_loot.asm
similarity index 100%
rename from dungeon_map/blink_loot.asm
rename to gk/blink_loot.asm
diff --git a/dungeon_map/check_loot.asm b/gk/check_loot.asm
similarity index 100%
rename from dungeon_map/check_loot.asm
rename to gk/check_loot.asm
diff --git a/crystalswitchbook.asm b/gk/crystalswitchbook.asm
similarity index 100%
rename from crystalswitchbook.asm
rename to gk/crystalswitchbook.asm
diff --git a/dungeon_map/data/analyze.rb b/gk/data/analyze.rb
similarity index 100%
rename from dungeon_map/data/analyze.rb
rename to gk/data/analyze.rb
diff --git a/dungeon_map/data/doors_connections.asm b/gk/data/doors_connections.asm
similarity index 100%
rename from dungeon_map/data/doors_connections.asm
rename to gk/data/doors_connections.asm
diff --git a/dungeon_map/data/doors_display.asm b/gk/data/doors_display.asm
similarity index 100%
rename from dungeon_map/data/doors_display.asm
rename to gk/data/doors_display.asm
diff --git a/dungeon_map/data/entrance_tiles.asm b/gk/data/entrance_tiles.asm
similarity index 100%
rename from dungeon_map/data/entrance_tiles.asm
rename to gk/data/entrance_tiles.asm
diff --git a/dungeon_map/data/fall_warps.asm b/gk/data/fall_warps.asm
similarity index 100%
rename from dungeon_map/data/fall_warps.asm
rename to gk/data/fall_warps.asm
diff --git a/dungeon_map/data/item_mapping.asm b/gk/data/item_mapping.asm
similarity index 100%
rename from dungeon_map/data/item_mapping.asm
rename to gk/data/item_mapping.asm
diff --git a/dungeon_map/data/spiral_stairs.asm b/gk/data/spiral_stairs.asm
similarity index 100%
rename from dungeon_map/data/spiral_stairs.asm
rename to gk/data/spiral_stairs.asm
diff --git a/dungeon_map/data/split_room.asm b/gk/data/split_room.asm
similarity index 100%
rename from dungeon_map/data/split_room.asm
rename to gk/data/split_room.asm
diff --git a/dungeon_map/data/supertile_shapes.asm b/gk/data/supertile_shapes.asm
similarity index 100%
rename from dungeon_map/data/supertile_shapes.asm
rename to gk/data/supertile_shapes.asm
diff --git a/dungeon_map/current_room_map.asm b/gk/doors_dungeon_map.asm
similarity index 100%
rename from dungeon_map/current_room_map.asm
rename to gk/doors_dungeon_map.asm
diff --git a/dungeon_map/draw_loot.asm b/gk/draw_loot.asm
similarity index 100%
rename from dungeon_map/draw_loot.asm
rename to gk/draw_loot.asm
diff --git a/dungeon_map/draw_rooms.asm b/gk/draw_rooms.asm
similarity index 100%
rename from dungeon_map/draw_rooms.asm
rename to gk/draw_rooms.asm
diff --git a/dungeon_map/hooks.asm b/gk/dungeon_map_hooks.asm
similarity index 91%
rename from dungeon_map/hooks.asm
rename to gk/dungeon_map_hooks.asm
index 2a0c90f..79e47da 100644
--- a/dungeon_map/hooks.asm
+++ b/gk/dungeon_map_hooks.asm
@@ -14,24 +14,14 @@ org $8AE12B
 LDA.b #$20
 
 ; dungeon map sheets
-org $80DD97
-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
+org $80DDD3 ; slot $8F
 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)
diff --git a/dungeon_map/main.asm b/gk/dungeon_maps.asm
similarity index 93%
rename from dungeon_map/main.asm
rename to gk/dungeon_maps.asm
index 8c2c58a..ed636aa 100644
--- a/dungeon_map/main.asm
+++ b/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
-
diff --git a/dungeon_map/dungeon_switch.asm b/gk/dungeon_switch.asm
similarity index 100%
rename from dungeon_map/dungeon_switch.asm
rename to gk/dungeon_switch.asm
diff --git a/gloom.asm b/gk/gloom.asm
similarity index 100%
rename from gloom.asm
rename to gk/gloom.asm
diff --git a/dungeon_map/map_bg3.asm b/gk/map_bg3.asm
similarity index 100%
rename from dungeon_map/map_bg3.asm
rename to gk/map_bg3.asm
diff --git a/mimicdash.asm b/gk/mimicdash.asm
similarity index 100%
rename from mimicdash.asm
rename to gk/mimicdash.asm
diff --git a/pseudoflute.asm b/gk/pseudoflute.asm
similarity index 100%
rename from pseudoflute.asm
rename to gk/pseudoflute.asm
diff --git a/dungeon_map/settings.asm b/gk/settings.asm
similarity index 99%
rename from dungeon_map/settings.asm
rename to gk/settings.asm
index aec7d8d..b0c87d1 100644
--- a/dungeon_map/settings.asm
+++ b/gk/settings.asm
@@ -1,4 +1,4 @@
-; $B9F000
+org $B9F000
 SupertileRoomShapes:
 incsrc data/supertile_shapes.asm
 warnpc $B9F800
diff --git a/special_weapons.asm b/gk/special_weapons.asm
similarity index 100%
rename from special_weapons.asm
rename to gk/special_weapons.asm
diff --git a/variable_ganon_vulnerability.asm b/gk/variable_ganon_vulnerability.asm
similarity index 100%
rename from variable_ganon_vulnerability.asm
rename to gk/variable_ganon_vulnerability.asm
diff --git a/gk_meta.asm b/gk_meta.asm
new file mode 100644
index 0000000..b9a8197
--- /dev/null
+++ b/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
+;--------------------------------------------------------------------------------