Lots of bugs fixes and supertile updates

dungeon_map/data/item_mapping.asm

@@ -1,65 +1,65 @@
-db $0A ; 00 - Fighter Sword and Shield
-db $0A ; 01 - Master Sword
-db $0A ; 02 - Tempered Sword
-db $0A ; 03 - Butter Sword
+db $0B ; 00 - Fighter Sword and Shield
+db $0B ; 01 - Master Sword
+db $0B ; 02 - Tempered Sword
+db $0B ; 03 - Butter Sword
 db $05 ; 04 - Fighter Shield
 db $05 ; 05 - Fire Shield
 db $05 ; 06 - Mirror Shield
-db $0A ; 07 - Fire Rod
-db $0A ; 08 - Ice Rod
-db $0A ; 09 - Hammer
-db $0A ; 0A - Hookshot
-db $0A ; 0B - Bow
-db $0A ; 0C - Boomerang
-db $0A ; 0D - Powder
+db $0B ; 07 - Fire Rod
+db $0B ; 08 - Ice Rod
+db $0B ; 09 - Hammer
+db $0B ; 0A - Hookshot
+db $0B ; 0B - Bow
+db $06 ; 0C - Boomerang
+db $0B ; 0D - Powder
 db $02 ; 0E - Bottle Refill (bee)
-db $0A ; 0F - Bombos
-db $0A ; 10 - Ether
-db $0A ; 11 - Quake
-db $0A ; 12 - Lamp
-db $0A ; 13 - Shovel
-db $0A ; 14 - Flute
-db $0A ; 15 - Somaria
-db $0A ; 16 - Bottle
+db $0B ; 0F - Bombos
+db $0B ; 10 - Ether
+db $0B ; 11 - Quake
+db $0B ; 12 - Lamp
+db $06 ; 13 - Shovel
+db $0B ; 14 - Flute
+db $0B ; 15 - Somaria
+db $0B ; 16 - Bottle
 db $05 ; 17 - Heartpiece
-db $0A ; 18 - Byrna
-db $0A ; 19 - Cape
-db $0A ; 1A - Mirror
-db $0A ; 1B - Glove
-db $0A ; 1C - Mitts
-db $0A ; 1D - Book
-db $0A ; 1E - Flippers
-db $0A ; 1F - Pearl
-db $0C ; 20 - Crystal
-db $0A ; 21 - Net
+db $06 ; 18 - Byrna
+db $0B ; 19 - Cape
+db $0B ; 1A - Mirror
+db $0B ; 1B - Glove
+db $0B ; 1C - Mitts
+db $0B ; 1D - Book
+db $0B ; 1E - Flippers
+db $0B ; 1F - Pearl
+db $0D ; 20 - Crystal
+db $06 ; 21 - Net
 db $05 ; 22 - Blue Mail
 db $05 ; 23 - Red Mail
 db $03 ; 24 - Small Key
-db $06 ; 25 - Compass
+db $07 ; 25 - Compass
 db $05 ; 26 - Heart Container from 4/4
 db $02 ; 27 - Bomb
 db $02 ; 28 - 3 bombs
-db $0A ; 29 - Mushroom
-db $0A ; 2A - Red boomerang
-db $0A ; 2B - Full bottle (red)
-db $0A ; 2C - Full bottle (green)
-db $0A ; 2D - Full bottle (blue)
+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 $05 ; 2E - Potion refill (red)
 db $05 ; 2F - Potion refill (green)
 db $05 ; 30 - Potion refill (blue)
 db $02 ; 31 - 10 bombs
-db $08 ; 32 - Big key
+db $09 ; 32 - Big key
 db $02 ; 33 - Map
 db $02 ; 34 - 1 rupee
 db $02 ; 35 - 5 rupees
 db $02 ; 36 - 20 rupees
-db $09 ; 37 - Green pendant
-db $09 ; 38 - Blue pendant
-db $09 ; 39 - Red pendant
-db $0A ; 3A - Tossed bow
-db $0A ; 3B - Silvers
-db $0A ; 3C - Full bottle (bee)
-db $0A ; 3D - Full bottle (fairy)
+db $0A ; 37 - Green pendant
+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 $05 ; 3E - Boss heart
 db $05 ; 3F - Sanc heart
 db $02 ; 40 - 100 rupees
@@ -70,16 +70,16 @@ db $02 ; 44 - 10 arrows
 db $02 ; 45 - Small magic
 db $02 ; 46 - 300 rupees
 db $02 ; 47 - 20 rupees green
-db $0A ; 48 - Full bottle (good bee)
-db $0A ; 49 - Tossed fighter sword
-db $0A ; 4A - Active Flute
-db $0A ; 4B - Boots
+db $0B ; 48 - Full bottle (good bee)
+db $0B ; 49 - Tossed fighter sword
+db $0B ; 4A - Active Flute
+db $0B ; 4B - Boots
 
 db $05 ; 4C - Bomb capacity (50)
 db $05 ; 4D - Arrow capacity (70)
-db $0A ; 4E - 1/2 magic
-db $0A ; 4F - 1/4 magic
-db $0A ; 50 - Safe master sword
+db $0B ; 4E - 1/2 magic
+db $0B ; 4F - 1/4 magic
+db $0B ; 50 - Safe master sword
 db $05 ; 51 - Bomb capacity (+5)
 db $05 ; 52 - Bomb capacity (+10)
 db $05 ; 53 - Arrow capacity (+5)
@@ -87,27 +87,27 @@ db $05 ; 54 - Arrow capacity (+10)
 db $02 ; 55 - Programmable item 1
 db $02 ; 56 - Programmable item 2
 db $02 ; 57 - Programmable item 3
-db $0A ; 58 - Upgrade-only silver arrows
+db $0B ; 58 - Upgrade-only silver arrows
 db $02 ; 59 - Rupoor
 db $02 ; 5A - Nothing
 db $02 ; 5B - Red clock
 db $02 ; 5C - Blue clock
 db $02 ; 5D - Green clock
-db $0A ; 5E - Progressive sword
+db $0B ; 5E - Progressive sword
 db $05 ; 5F - Progressive shield
 db $05 ; 60 - Progressive armor
-db $0A ; 61 - Progressive glove
+db $0B ; 61 - Progressive glove
 db $02 ; 62 - RNG pool item (single)
 db $02 ; 63 - RNG pool item (multi)
-db $0A ; 64 - Progressive bow
-db $0A ; 65 - Progressive bow
+db $0B ; 64 - Progressive bow
+db $0B ; 65 - Progressive bow
 db $02 ; 66 -
 db $02 ; 67 -
 db $02 ; 68 -
 db $02 ; 69 -
-db $0E ; 6A - Triforce
-db $0D ; 6B - Power star
-db $0D ; 6C - Triforce Piece
+db $0F ; 6A - Triforce
+db $0E ; 6B - Power star
+db $0E ; 6C - Triforce Piece
 db $02 ; 6D - Server request item
 db $02 ; 6E - Server request item (dungeon drop)
 db $02 ; 6F -
@@ -129,63 +129,63 @@ db $02 ; 7D - Map of Eastern Palace
 db $02 ; 7E - Map of Hyrule Castle
 db $02 ; 7F - Map of Sewers
 
-db $06 ; 80 - Compass of Light World
-db $06 ; 81 - Compass of Dark World
-db $06 ; 82 - Compass of Ganon's Tower
-db $06 ; 83 - Compass of Turtle Rock
-db $06 ; 84 - Compass of Thieves' Town
-db $06 ; 85 - Compass of Tower of Hera
-db $06 ; 86 - Compass of Ice Palace
-db $06 ; 87 - Compass of Skull Woods
-db $06 ; 88 - Compass of Misery Mire
-db $06 ; 89 - Compass of Dark Palace
-db $06 ; 8A - Compass of Swamp Palace
-db $06 ; 8B - Compass of Agahnim's Tower
-db $06 ; 8C - Compass of Desert Palace
-db $06 ; 8D - Compass of Eastern Palace
-db $06 ; 8E - Compass of Hyrule Castle
-db $06 ; 8F - Compass of Sewers
+db $07 ; 80 - Compass of Light World
+db $07 ; 81 - Compass of Dark World
+db $07 ; 82 - Compass of Ganon's Tower
+db $07 ; 83 - Compass of Turtle Rock
+db $07 ; 84 - Compass of Thieves' Town
+db $07 ; 85 - Compass of Tower of Hera
+db $07 ; 86 - Compass of Ice Palace
+db $07 ; 87 - Compass of Skull Woods
+db $07 ; 88 - Compass of Misery Mire
+db $07 ; 89 - Compass of Dark Palace
+db $07 ; 8A - Compass of Swamp Palace
+db $07 ; 8B - Compass of Agahnim's Tower
+db $07 ; 8C - Compass of Desert Palace
+db $07 ; 8D - Compass of Eastern Palace
+db $07 ; 8E - Compass of Hyrule Castle
+db $07 ; 8F - Compass of Sewers
 
-db $08 ; 90 - Skull key
-db $08 ; 91 - Reserved
-db $08 ; 92 - Big key of Ganon's Tower
-db $08 ; 93 - Big key of Turtle Rock
-db $08 ; 94 - Big key of Thieves' Town
-db $08 ; 95 - Big key of Tower of Hera
-db $08 ; 96 - Big key of Ice Palace
-db $08 ; 97 - Big key of Skull Woods
-db $08 ; 98 - Big key of Misery Mire
-db $08 ; 99 - Big key of Dark Palace
-db $08 ; 9A - Big key of Swamp Palace
-db $08 ; 9B - Big key of Agahnim's Tower
-db $08 ; 9C - Big key of Desert Palace
-db $08 ; 9D - Big key of Eastern Palace
-db $08 ; 9E - Big key of Hyrule Castle
-db $08 ; 9F - Big key of Sewers
+db $09 ; 90 - Skull key
+db $09 ; 91 - Reserved
+db $09 ; 92 - Big key of Ganon's Tower
+db $09 ; 93 - Big key of Turtle Rock
+db $09 ; 94 - Big key of Thieves' Town
+db $09 ; 95 - Big key of Tower of Hera
+db $09 ; 96 - Big key of Ice Palace
+db $09 ; 97 - Big key of Skull Woods
+db $09 ; 98 - Big key of Misery Mire
+db $09 ; 99 - Big key of Dark Palace
+db $09 ; 9A - Big key of Swamp Palace
+db $09 ; 9B - Big key of Agahnim's Tower
+db $09 ; 9C - Big key of Desert Palace
+db $09 ; 9D - Big key of Eastern Palace
+db $09 ; 9E - Big key of Hyrule Castle
+db $09 ; 9F - Big key of Sewers
 
-db $07 ; A0 - Small key of Sewers
-db $07 ; A1 - Small key of Hyrule Castle
-db $07 ; A2 - Small key of Eastern Palace
-db $07 ; A3 - Small key of Desert Palace
-db $07 ; A4 - Small key of Agahnim's Tower
-db $07 ; A5 - Small key of Swamp Palace
-db $07 ; A6 - Small key of Dark Palace
-db $07 ; A7 - Small key of Misery Mire
-db $07 ; A8 - Small key of Skull Woods
-db $07 ; A9 - Small key of Ice Palace
-db $07 ; AA - Small key of Tower of Hera
-db $07 ; AB - Small key of Thieves' Town
-db $07 ; AC - Small key of Turtle Rock
-db $07 ; AD - Small key of Ganon's Tower
+db $08 ; A0 - Small key of Sewers
+db $08 ; A1 - Small key of Hyrule Castle
+db $08 ; A2 - Small key of Eastern Palace
+db $08 ; A3 - Small key of Desert Palace
+db $08 ; A4 - Small key of Agahnim's Tower
+db $08 ; A5 - Small key of Swamp Palace
+db $08 ; A6 - Small key of Dark Palace
+db $08 ; A7 - Small key of Misery Mire
+db $08 ; A8 - Small key of Skull Woods
+db $08 ; A9 - Small key of Ice Palace
+db $08 ; AA - Small key of Tower of Hera
+db $08 ; AB - Small key of Thieves' Town
+db $08 ; AC - Small key of Turtle Rock
+db $08 ; AD - Small key of Ganon's Tower
 db $02 ; AE - Reserved
 db $03 ; AF - Generic small key
-db $0C ; B0 - Crystal 6
-db $0C ; B1 - Crystal 1
-db $0C ; B2 - Crystal 5
-db $0C ; B3 - Crystal 7
-db $0C ; B4 - Crystal 2
-db $0C ; B5 - Crystal 4
-db $0C ; B6 - Crystal 3
+db $0D ; B0 - Crystal 6
+db $0D ; B1 - Crystal 1
+db $0D ; B2 - Crystal 5
+db $0D ; B3 - Crystal 7
+db $0D ; B4 - Crystal 2
+db $0D ; B5 - Crystal 4
+db $0D ; B6 - Crystal 3
 db $02 ; B7 - Reserved
 db $02 ; B8 -
 db $02 ; B9 -