From 32e7fe5454731b05984ec2ec51be7c9d91cae038 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Thu, 15 Jan 2026 03:28:46 -0600 Subject: [PATCH] Small bugfixes --- dungeon_map/current_room_map.asm | 2 +- dungeon_map/data/item_mapping.asm | 16 ++++++++-------- dungeon_map/data/spiral_stairs.asm | 2 +- dungeon_map/data/split_room.asm | 5 ++++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dungeon_map/current_room_map.asm b/dungeon_map/current_room_map.asm index e17b1c4..ff6b39b 100644 --- a/dungeon_map/current_room_map.asm +++ b/dungeon_map/current_room_map.asm @@ -1786,7 +1786,7 @@ GetRoomDropdown: AND.w #$01FF CMP.w #$00B9 BCC .left - CMP.w #$0149 + CMP.w #$0140 BCC .middle .right diff --git a/dungeon_map/data/item_mapping.asm b/dungeon_map/data/item_mapping.asm index c9bbd05..0b42562 100644 --- a/dungeon_map/data/item_mapping.asm +++ b/dungeon_map/data/item_mapping.asm @@ -2,7 +2,7 @@ db $0B ; 00 - Fighter Sword and Shield db $0B ; 01 - Master Sword db $0B ; 02 - Tempered Sword db $0B ; 03 - Butter Sword -db $06 ; 04 - Fighter Shield +db $02 ; 04 - Fighter Shield db $06 ; 05 - Fire Shield db $06 ; 06 - Mirror Shield db $0B ; 07 - Fire Rod @@ -20,7 +20,7 @@ db $0B ; 12 - Lamp db $06 ; 13 - Shovel db $0B ; 14 - Flute db $0B ; 15 - Somaria -db $0B ; 16 - Bottle +db $06 ; 16 - Bottle db $05 ; 17 - Heartpiece db $06 ; 18 - Byrna db $06 ; 19 - Cape @@ -41,9 +41,9 @@ db $02 ; 27 - Bomb db $02 ; 28 - 3 bombs db $06 ; 29 - Mushroom db $06 ; 2A - Red boomerang -db $0B ; 2B - Full bottle (red) -db $0B ; 2C - Full bottle (green) -db $0B ; 2D - Full bottle (blue) +db $06 ; 2B - Full bottle (red) +db $06 ; 2C - Full bottle (green) +db $06 ; 2D - Full bottle (blue) db $05 ; 2E - Potion refill (red) db $05 ; 2F - Potion refill (green) db $05 ; 30 - Potion refill (blue) @@ -58,8 +58,8 @@ db $0A ; 38 - Blue pendant db $0A ; 39 - Red pendant db $0B ; 3A - Tossed bow db $0B ; 3B - Silvers -db $0B ; 3C - Full bottle (bee) -db $0B ; 3D - Full bottle (fairy) +db $06 ; 3C - Full bottle (bee) +db $06 ; 3D - Full bottle (fairy) db $05 ; 3E - Boss heart db $05 ; 3F - Sanc heart db $02 ; 40 - 100 rupees @@ -70,7 +70,7 @@ db $02 ; 44 - 10 arrows db $02 ; 45 - Small magic db $02 ; 46 - 300 rupees db $02 ; 47 - 20 rupees green -db $0B ; 48 - Full bottle (good bee) +db $06 ; 48 - Full bottle (good bee) db $0B ; 49 - Tossed fighter sword db $0B ; 4A - Active Flute db $0B ; 4B - Boots diff --git a/dungeon_map/data/spiral_stairs.asm b/dungeon_map/data/spiral_stairs.asm index fef86a8..11cc4db 100644 --- a/dungeon_map/data/spiral_stairs.asm +++ b/dungeon_map/data/spiral_stairs.asm @@ -37,7 +37,7 @@ db $01, $00, $05 ; ($3D) Ice Hamlift db $01, $00, $07 ; ($40) Aga Guards db $02, $01, $00, $00, $02 ; ($43) Pod Entrance db $01, $00, $08 ; ($48) Swamp Attic -db $03, $03, $0C, $04, $06 ; ($4B) Ice U (1st three values unused) +db $02, $03, $0C, $04, $06 ; ($4B) Ice U (1st three values unused) db $01, $00, $05 ; ($50) TT Attic Left db $02, $00, $01, $01, $0B ; ($53) Pod Rupees db $01, $00, $04 ; ($58) Ice Gators diff --git a/dungeon_map/data/split_room.asm b/dungeon_map/data/split_room.asm index 0bb4da5..6cd58f8 100644 --- a/dungeon_map/data/split_room.asm +++ b/dungeon_map/data/split_room.asm @@ -537,13 +537,16 @@ db $FF db $01 %sq($00) %d(..areas) : %d(..doors) : %d(.no_items) -%d(.no_items) : %d(.no_items) : %d(..enemies) +%d(..chests) : %d(.no_items) : %d(..enemies) ..areas db $03, $00, $80, $00, $FF db $FF ..doors db $00 db $FF +..chests +db $00 +db $FF ..enemies db $00, $01, $02 db $FF