Fix light cone not showing after torches extinguish

LTTP_RND_GeneralBugfixes.asm

@@ -179,7 +179,7 @@ incsrc toast.asm
 incsrc fastcredits.asm
 incsrc msu.asm
 incsrc menu/overworldmap.asm ; Overwrites some code in bank $8A
-incsrc bossicons.asm
+incsrc dungeonmap.asm
 incsrc hextodec.asm
 incsrc multiworld.asm
 incsrc textrenderer.asm
@@ -209,11 +209,7 @@ incsrc gloom.asm
 incsrc special_weapons.asm
 incsrc variable_ganon_vulnerability.asm
 incsrc pseudoflute.asm
-incsrc dungeon_map/main.asm
+warnpc $BA8000
-warnpc $B9F000
-
-org $B9F000
-incsrc dungeon_map/settings.asm
 
 org $A38000
 incsrc stats/credits.asm ; Statically mapped
@@ -257,7 +253,7 @@ warnpc $B1A000
 
 org $B1A000
 GFX_HUD_Items:
-incbin "menu/dr_sheet_dc.2bppc"
+incbin "menu/drsheetdc.2bppc"
 warnpc $B1A800
 
 org $B1A800
@@ -310,16 +306,6 @@ NewFontInverted:
 incbin "data/newfont_inverted.bin"
 SmallCharacters:
 incbin "data/smallchars.2bpp"
-
-DungeonMapIcons1:
-incbin "menu/map_icons_1.3bppc"
-DungeonMapIcons2:
-incbin "menu/map_icons_2.3bppc"
-DungeonMapIcons3:
-incbin "menu/map_icons_3.3bppc"
-MapSheetD4:
-incbin "menu/map_sheet_d4.3bppc"
-
 org $8CD7DF
 incsrc data/playernamecharmap.asm
 org $8CE73D

bin/src/compress.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 
 const int MAXLENGTH = 0x300;
@@ -7,11 +8,11 @@ const int MAXLENGTH = 0x300;
 struct section {
     int mode;
     int length;
-    char data[2];
+    unsigned char data[2];
     int datalength;
 };
 
-int find_duplicate(off_t loc, off_t size, char buf[], struct section *out) {
+int find_duplicate(off_t loc, off_t size, unsigned char buf[], struct section *out) {
     int i, j;
     struct section result;
     result.mode = 4;
@@ -39,7 +40,7 @@ int find_duplicate(off_t loc, off_t size, char buf[], struct section *out) {
     return 0;
 }
 
-int find_repeat_byte(off_t loc, off_t size, char buf[], struct section *out) {
+int find_repeat_byte(off_t loc, off_t size, unsigned char buf[], struct section *out) {
     int i;
     for (i = 0; i < MAXLENGTH && loc + i < size; i++) {
         if (buf[loc + i] != buf[loc]) {
@@ -58,7 +59,7 @@ int find_repeat_byte(off_t loc, off_t size, char buf[], struct section *out) {
     return -1;
 }
 
-int find_repeat_word(off_t loc, off_t size, char buf[], struct section *out) {
+int find_repeat_word(off_t loc, off_t size, unsigned char buf[], struct section *out) {
     int i;
     for (i = 0; i < MAXLENGTH && loc + i + 1 < size; i += 1) {
         if (buf[loc + i] != buf[loc + (i & 1)]) {
@@ -78,7 +79,7 @@ int find_repeat_word(off_t loc, off_t size, char buf[], struct section *out) {
     return -1;
 }
 
-int find_incrementing_byte(off_t loc, off_t size, char buf[], struct section *out) {
+int find_incrementing_byte(off_t loc, off_t size, unsigned char buf[], struct section *out) {
     int i;
     for (i = 0; i < MAXLENGTH && loc + i < size; i++) {
         if (buf[loc] + i < i) {
@@ -100,7 +101,7 @@ int find_incrementing_byte(off_t loc, off_t size, char buf[], struct section *ou
     return -1;
 }
 
-int get_section(off_t loc, off_t size, char buf[], struct section *out) {
+int get_section(off_t loc, off_t size, unsigned char buf[], struct section *out) {
     struct section best, current;
     best.length = 0;
     if (!find_repeat_byte(loc, size, buf, &current)) {
@@ -132,7 +133,7 @@ int get_section(off_t loc, off_t size, char buf[], struct section *out) {
     }
 }
 
-int write_section(struct section section, char data[], char buf[], int loc) {
+int write_section(struct section section, unsigned char data[], unsigned char buf[], int loc) {
     int nloc = loc;
     int len = section.length - 1;
     if (len > 0x1F) {
@@ -149,10 +150,15 @@ int write_section(struct section section, char data[], char buf[], int loc) {
 
 int main(int argc, char *argv[]) {
     if (argc < 3) {
-        printf("Usage: %s infile outfile\n", argv[0]);
+        printf("Usage: %s infile outfile [start [length]]\n", argv[0]);
         return 1;
     }
 
+    off_t seek = 0;
+    if (argc > 3) {
+        seek = strtol(argv[3], NULL, 0);
+    }
+
     FILE *inptr;
     if ((inptr = fopen(argv[1], "rb")) == NULL) {
         printf("%s does not exist.\n", argv[1]);
@@ -170,9 +176,14 @@ int main(int argc, char *argv[]) {
         printf("Error stating file: %s\n", argv[1]);
         return 1;
     }
-    off_t size = buf.st_size;
+    off_t size = buf.st_size - seek;
 
-    char inbuf[size];
+    if (argc > 4) {
+        size = strtol(argv[4], NULL, 0);
+    }
+    unsigned char inbuf[size];
+
+    fseek(inptr, seek, SEEK_SET);
 
     if (fread(inbuf, 1, size, inptr) < size) {
         printf("Error reading file: %s\n", argv[1]);
@@ -181,9 +192,8 @@ int main(int argc, char *argv[]) {
 
     fclose(inptr);
 
-
+    unsigned char outbuf[size * 2];
-    char outbuf[size * 2];
+    unsigned char m0data[MAXLENGTH];
-    char m0data[MAXLENGTH];
 
     int oloc = 0;
     struct section m0;
@@ -233,7 +243,7 @@ int main(int argc, char *argv[]) {
     }
 
     fclose(outptr);
-    printf("Input file: %X bytes. Compressed: %X bytes.\n", size, oloc);
+    printf("Input file: %lX bytes. Compressed: %X bytes.\n", size, oloc);
 
     return 0;
 }

bin/src/decompress.c

@@ -1,21 +1,20 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 
 struct section {
     int mode;
     int length;
-    char data[2];
+    unsigned char data[2];
     int datalength;
 };
 
-int read_section(char buf[], int loc, struct section *out) {
+int read_section(unsigned char buf[], int loc, struct section *out) {
     int nloc = loc;
-    char header = buf[nloc++];
+    unsigned char header = buf[nloc++];
 
-    printf("%x: ", header & 0xff);
+    if (header == 0xFF) {
-
-    if (header == -1) {
       return -1;
     }
 
@@ -31,8 +30,6 @@ int read_section(char buf[], int loc, struct section *out) {
       result.length = (header & 0x1F) + 1;
     }
 
-    printf("%d: %x\n", result.mode, result.length);
-
     switch (result.mode) {
       case 0:
         result.datalength = 0;
@@ -61,10 +58,15 @@ int read_section(char buf[], int loc, struct section *out) {
 
 int main(int argc, char *argv[]) {
     if (argc < 3) {
-        printf("Usage: %s infile outfile\n", argv[0]);
+        printf("Usage: %s infile outfile [start [length]]\n", argv[0]);
         return 1;
     }
 
+    off_t seek = 0;
+    if (argc > 3) {
+        seek = strtol(argv[3], NULL, 0);
+    }
+
     FILE *inptr;
     if ((inptr = fopen(argv[1], "rb")) == NULL) {
         printf("%s does not exist.\n", argv[1]);
@@ -82,9 +84,15 @@ int main(int argc, char *argv[]) {
         printf("Error stating file: %s\n", argv[1]);
         return 1;
     }
-    off_t size = buf.st_size;
 
-    char inbuf[size];
+    off_t size = buf.st_size - seek;
+
+    if (argc > 4) {
+        size = strtol(argv[4], NULL, 0);
+    }
+
+    fseek(inptr, seek, SEEK_SET);
+    unsigned char inbuf[size];
 
     if (fread(inbuf, 1, size, inptr) < size) {
         printf("Error reading file: %s\n", argv[1]);
@@ -93,7 +101,7 @@ int main(int argc, char *argv[]) {
 
     fclose(inptr);
 
-    char outbuf[size * 256];
+    unsigned char outbuf[size * 256];
 
     int oloc = 0;
     struct section section;
@@ -141,7 +149,7 @@ int main(int argc, char *argv[]) {
     }
 
     fclose(outptr);
-    printf("Input file: %X bytes. Decompressed: %X bytes.\n", size, oloc);
+    printf("Input file: %lX bytes. Decompressed: %X bytes.\n", size, oloc);
 
     return 0;
 }

dungeon_map/blink_loot.asm

@@ -1,99 +0,0 @@
-; we want the icons indicating what is left in a room to blink
-; but we don't want to redraw to BG1 every few frames
-; so we duplicate the left side of BG1 to a lower portion and just toggle vertical scroll
-
-BlinkLoot:
-	; do not show icons if we're scrolling
-	LDA.w $0210
-	BNE .hide
-
-	LDA.b FrameCounter
-	AND.b #$10
-	BEQ .show
-.hide
-	LDA.b #$01
-.show
-	STZ.b $E6
-	STA.w $E7
-	JSL $8AE96B
-	RTL
-
-StartDoubleWrite:
-	; what we wrote over
-	REP #$30
-	STZ.w GFXStripes
-
-	STZ.w $021B
-	RTL
-
-CheckDoubleWrite:
-	LDA.w $021C
-	BNE .done
-
-	LDA.b #$08
-	STA.w $021C
-	REP #$30
-	JML $8AE20B
-
-.done
-	; what we wrote over
-	REP #$10
-	LDY.w GFXStripes
-	LDA.b #$FF
-	JML $8AE2E7
-
-DrawMountain:
-	LDX.w GFXStripes
-	PHX
-	LDY.w #$0000
-.next_word
-	LDA.w $8AEFEF, Y
-	STA.w GFXStripes+2, X
-	INX : INX
-	INY : INY
-	CPY.w #$002A
-	BCC .next_word
-
-	PLY
-	LDA.w $021B
-	BEQ .done
-
-	; if second copy of mountain, adjust VRAM addresses
-	SEP #$20
-	LDA.w GFXStripes+$02, Y
-	ORA.w $021C
-	STA.w GFXStripes+$02, Y
-
-	LDA.w GFXStripes+$08, Y
-	ORA.w $021C
-	STA.w GFXStripes+$08, Y
-
-	LDA.w GFXStripes+$10, Y
-	ORA.w $021C
-	STA.w GFXStripes+$10, Y
-
-	LDA.w GFXStripes+$20, Y
-	ORA.w $021C
-	STA.w GFXStripes+$20, Y
-
-	LDA.w GFXStripes+$26, Y
-	ORA.w $021C
-	STA.w GFXStripes+$26, Y
-	REP #$20
-
-.done
-	RTL
-
-WriteBigEndianAddressX:
-	ORA.w $021B
-	XBA
-	STA.w GFXStripes+2, X
-	AND.w #$FFF7
-	RTL
-
-WriteBigEndianAddressY:
-	ORA.w $021B
-	XBA
-	STA.w GFXStripes+2, Y
-	AND.w #$FFF7
-	RTL

dungeon_map/check_loot.asm

@@ -1,382 +0,0 @@
-; A = room_id
-; out A = level of loot
-CheckLoot:
-	PHP
-	REP #$30
-	PHB : PHX : PHY
-
-	STA.b $00
-
-	LDA.b $06 : PHA
-	LDA.b $0E : PHA
-
-	STZ.b $02 ; best item class found
-
-	LDA.l ShowItems_default
-	AND.w #$00FF
-	STA.b $0E
-
-	LDA.b $00
-	ASL A
-	TAX
-
-	LDA.l SaveDataWRAM, X
-	AND.w #$000F
-	BEQ +
-	LDA.l ShowItems_visited_tile
-	AND.w #$00FF
-	CMP.b $0E
-	BCC +
-	STA.b $0E
-
-+	LDA.w DungeonID
-	TAX
-
-	LDA.l MapField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowItems_have_map
-	AND.w #$00FF
-	CMP.b $0E
-	BCC +
-	STA.b $0E
-
-+	LDA.l CompassField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowItems_have_compass
-	AND.w #$00FF
-	CMP.b $0E
-	BCC +
-	STA.b $0E
-+
-
-	LDA.l ItemSources : BIT.w #$0001 : BEQ +
-	JSR CheckChests
-+
-
-	LDA.l ItemSources : BIT.w #$0002 : BEQ +
-	JSR CheckPots
-+
-
-	LDA.l ItemSources : BIT.w #$0004 : BEQ +
-	JSR CheckEnemies
-+
-
-	LDA.l ItemSources : BIT.w #$0008 : BEQ +
-	JSR CheckBoss
-+
-
-	LDA.l ItemSources : BIT.w #$0010 : BEQ +
-	JSR CheckPrize
-+
-
-.done
-	PLA : STA.b $0E
-	PLA : STA.b $06
-	PLY : PLX : PLB
-	PLP
-	LDA.b $02
-	RTL
-
-CheckChests:
-	LDA.b $00
-	ASL A
-	TAX
-
-	LDA.w #($81<<8)
-	PHA
-	PLB : PLB
-
-	LDA.w #$0008
-	STA.b $04
-
-	LDY.w #$FFFD
-.increment_mask
-	LDA.b $04
-	ASL A
-	STA.b $04
-.next_chest
-	INY #3
-	CPY.w #$01F8
-	BCS .done
-
-	LDA.w RoomData_ChestItems, Y
-	AND.w #$7FFF
-	CMP.b $00
-	BNE .next_chest
-
-	LDA.l SaveDataWRAM, X
-	AND.b $04
-	BNE .increment_mask ; already got item
-
-	LDA.w RoomData_ChestItems+2, Y
-	AND.w #$00FF
-	JSR GetLootClass
-	BRA .increment_mask
-
-.done
-	RTS
-
-CheckBoss:
-	LDX.w #$FFFA
-.next_boss
-	INX #6
-	LDA.l MiscLocations, X
-	BPL .check
-	RTS
-
-.check
-	CMP.b $00
-	BNE .next_boss
-
-	TXY
-	CMP.b RoomIndex
-	BEQ .current_room
-
-	ASL A
-	TAX
-	LDA.l SaveDataWRAM, X
-	BRA .continue
-
-.current_room
-	LDA.w RoomItemsTaken ; if checking our current room, $0403 has fresher flags
-	ASL #4
-
-.continue
-	STA.b $04
-
-	TYX
-	LDA.l MiscLocations+2, X ; get bit of room data to check
-	AND.w #$00FF
-	ASL A
-	TAX
-	LDA.l DungeonMask, X
-
-	TYX
-	BIT.b $04
-	BNE .next_boss ; continue checking if we already got the item
-
-	LDA.l MiscLocations+4, X
-	STA.b $05
-
-	LDA.l MiscLocations+3, X
-	STA.b $04
-
-	LDA.b [$04]
-	AND.w #$00FF
-	JSR GetLootClass
-
-	BRA .next_boss
-
-CheckPrize:
-	LDX.w #$FFFD
-.next_prize
-	INX #3
-	LDA.l PrizeLocations, X
-	BPL .check
-	RTS
-
-.check
-	CMP.b $00
-	BNE .next_prize
-
-	TXY
-
-	ASL A
-	TAX
-	LDA.l SaveDataWRAM, X
-	TYX
-	BIT.w #$0800
-	BNE .next_prize
-
-	LDA.l PrizeLocations+2, X ; get which prize to look at
-	AND.w #$00FF
-	TAX
-	LDA.l DungeonPrizeReceiptID, X
-	TYX
-
-	AND.w #$00FF
-	JSR GetLootClass
-
-	BRA .next_prize
-
-CheckPots:
-	LDA.b $00
-	ASL A
-	TAX
-
-	LDA.l UWPotsPointers, X
-	STA.b $04
-	LDA.w #bank(UWPotsData)
-	STA.b $06
-
-	LDY.w #$0000
-	LDX.w #$FFFF
-.next_pot
-	LDA.b [$04], Y
-	CMP.w #$FFFF : BEQ .done
-	INX : INY : INY
-	BIT.w #$8000 : BNE .major_item ; marked as major item
-	LDA.b [$04], Y
-	AND.w #$00FF
-	CMP.w #$0008 : BEQ .small_key
-	INY
-	BRA .next_pot
-
-.small_key
-	LDA.w #$8000 : STA.b $08
-	LDA.w #$0024
-	PHA
-	PHX
-	INY
-	BRA .mask_set
-.major_item
-	LDA.b [$04], Y
-.continue
-	PHA
-	PHX
-	INY
-	TXA : ASL A
-	TAX
-	LDA.l DungeonMask, X : STA.b $08
-
-.mask_set
-	LDA.b $00 : ASL A : TAX
-if !FEATURE_FIX_BASEROM
-	LDA.l SpriteDropData, X
-else
-	LDA.l RoomPotData, X
-endif
-	PLX
-	AND.b $08
-	BEQ .not_obtained
-	PLA
-	BRA .next_pot
-
-.not_obtained
-	PLA
-	AND.w #$00FF
-	JSR GetLootClass
-	BRA .next_pot
-
-.done
-	RTS
-
-CheckEnemies:
-	LDA.b $00
-	ASL A
-	TAX
-
-	LDA.l UWSpritesPointers, X
-	INC A ; skip the layered/unlayered indicator
-	STA.b $04
-	LDA.w #bank(UWSpritesData)
-	STA.b $06
-
-	LDY.w #$0000
-	LDX.w #$FFFF
-.next_enemy
-	LDA.b [$04], Y
-	AND.w #$00FF
-	CMP.w #$00FF : BEQ .done
-	LDA.b [$04], Y
-	BIT.w #$8000 : BNE .overlord
-	INY : INY
-	LDA.b [$04], Y
-	AND.w #$00FF
-	CMP.w #$00F8 : BEQ .major ; major item
-	CMP.w #$00F9 : BEQ .major ; major item in other world
-	CMP.w #$00E4 : BEQ .vanilla_key
-	INY
-	INX
-	BRA .next_enemy
-
-.overlord
-	INY : INY : INY
-	BRA .next_enemy
-
-.vanilla_key
-	DEY : DEY
-	LDA.w #$8000 : STA.b $08
-	LDA.b [$04], Y
-	INY #3
-	AND.w #$00FF
-	CMP.w #$00FD ; big key
-	BEQ .big_key
-	CMP.w #$00FE ; small key
-	BEQ .small_key
-	; false alarm -- probably hera basement key
-	INX ; since it's an actual sprite it advances the counter
-	BRA .next_enemy
-.small_key
-	LDA.w #$0024
-	PHA : PHX
-	BRA .mask_set
-.big_key
-	LDA.w #$0032
-	PHA : PHX
-	BRA .mask_set
-
-.major
-	DEY : DEY
-	LDA.b [$04], Y
-	AND.w #$00FF
-
-.proceed
-	INY : INY : INY
-
-	PHA
-	PHX
-	TXA : ASL A
-	TAX
-	LDA.l DungeonMask, X : STA.b $08
-
-.mask_set
-	LDA.b $00 : ASL A : TAX
-	LDA.l SpriteDropData, X
-	PLX
-	AND.b $08
-	BEQ .not_obtained
-	PLA
-	BRA .next_enemy
-
-.not_obtained
-	PLA
-	AND.w #$00FF
-	JSR GetLootClass
-	JMP .next_enemy
-
-.done
-	RTS
-
-; A = item id
-; updates "best loot" value if better
-GetLootClass:
-	PHX
-	TAX
-	CMP.w #$0025 : BEQ .compass
-	AND.w #$00F0
-	CMP.w #$0080 : BNE .not_compass
-
-.compass
-	LDA.l AlwaysShowCompass : BNE .check_value
-
-.not_compass
-	LDA.b $0E
-	BEQ .done
-	CMP.w #$0001
-	BEQ .value_set
-
-.check_value
-	LDA.l LootTypeMapping, X
-	AND.w #$00FF
-
-.value_set
-	CMP.b $02
-	BCC .done
-	STA.b $02
-
-.done
-	PLX
-	RTS

dungeon_map/data/analyze.rb

@@ -1,39 +0,0 @@
-File.open("supertile_shapes.asm", "r") do |file|
-  bytes = []
-  while line = file.gets
-    m = line.match(/dw \$(\h+), \$(\h+), \$(\h+), \$(\h+)/)
-    bytes += m.captures if m
-    break if bytes.length >= 4 * 0xE0
-  end
-
-  counts = []
-  for byte in bytes do
-    value = byte.to_i(16)
-    next if value == 0xFFFF
-    value = (value & 0x03FF) - 0x340
-    if not counts[value]
-      counts[value] = 0
-    end
-    counts[value] += 1
-  end
-
-  print("  ")
-  for col in 0...16
-    printf("  x%X", col)
-  end
-  puts
-
-  for row in 0...0xC
-    printf("%Xx", row + 4)
-    for col in 0...16
-      printf("%4d", counts[row * 16 + col] || 0)
-    end
-    puts
-  end
-
-  printf("Unused:")
-  for i in 0...0x80
-    printf(" %2X", i) unless counts[i]
-  end
-  puts
-end

dungeon_map/data/entrance_tiles.asm

@@ -1,26 +0,0 @@
-dw $200C
-dw $100E
-dw $2012
-dw $1023
-dw $1024
-dw $2028
-dw $204A
-dw $4056
-dw $4057
-dw $4058
-dw $4059
-dw $1060
-dw $2061
-dw $4062
-dw $4063
-dw $2077
-dw $4083
-dw $2084
-dw $1085
-dw $4098
-dw $20C9
-dw $40D5
-dw $10D6
-dw $20DB
-dw $40E0
-dw $FFFF

dungeon_map/data/item_mapping.asm

@@ -1,261 +0,0 @@
-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 $06 ; 05 - Fire Shield
-db $06 ; 06 - Mirror Shield
-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 $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 $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 $06 ; 22 - Blue Mail
-db $06 ; 23 - Red Mail
-db $03 ; 24 - Small Key
-db $07 ; 25 - Compass
-db $05 ; 26 - Heart Container from 4/4
-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 $05 ; 2E - Potion refill (red)
-db $05 ; 2F - Potion refill (green)
-db $05 ; 30 - Potion refill (blue)
-db $02 ; 31 - 10 bombs
-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 $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
-db $02 ; 41 - 50 rupees
-db $02 ; 42 - Heart
-db $02 ; 43 - Arrow
-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 $0B ; 49 - Tossed fighter sword
-db $0B ; 4A - Active Flute
-db $0B ; 4B - Boots
-
-db $06 ; 4C - Bomb capacity (50)
-db $06 ; 4D - Arrow capacity (70)
-db $06 ; 4E - 1/2 magic
-db $06 ; 4F - 1/4 magic
-db $0B ; 50 - Safe master sword
-db $06 ; 51 - Bomb capacity (+5)
-db $06 ; 52 - Bomb capacity (+10)
-db $06 ; 53 - Arrow capacity (+5)
-db $06 ; 54 - Arrow capacity (+10)
-db $02 ; 55 - Programmable item 1
-db $02 ; 56 - Programmable item 2
-db $02 ; 57 - Programmable item 3
-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 $0B ; 5E - Progressive sword
-db $06 ; 5F - Progressive shield
-db $06 ; 60 - Progressive armor
-db $0B ; 61 - Progressive glove
-db $02 ; 62 - RNG pool item (single)
-db $02 ; 63 - RNG pool item (multi)
-db $0B ; 64 - Progressive bow
-db $0B ; 65 - Progressive bow
-db $02 ; 66 -
-db $02 ; 67 -
-db $02 ; 68 -
-db $02 ; 69 -
-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 -
-
-db $02 ; 70 - Map of Light World
-db $02 ; 71 - Map of Dark World
-db $02 ; 72 - Map of Ganon's Tower
-db $02 ; 73 - Map of Turtle Rock
-db $02 ; 74 - Map of Thieves' Town
-db $02 ; 75 - Map of Tower of Hera
-db $02 ; 76 - Map of Ice Palace
-db $02 ; 77 - Map of Skull Woods
-db $02 ; 78 - Map of Misery Mire
-db $02 ; 79 - Map of Dark Palace
-db $02 ; 7A - Map of Swamp Palace
-db $02 ; 7B - Map of Agahnim's Tower
-db $02 ; 7C - Map of Desert Palace
-db $02 ; 7D - Map of Eastern Palace
-db $02 ; 7E - Map of Hyrule Castle
-db $02 ; 7F - Map 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 $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 $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 $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 -
-db $02 ; BA -
-db $02 ; BB -
-db $02 ; BC -
-db $02 ; BD -
-db $02 ; BE -
-db $02 ; BF -
-db $02 ; C0 -
-db $02 ; C1 -
-db $02 ; C2 -
-db $02 ; C3 -
-db $02 ; C4 -
-db $02 ; C5 -
-db $02 ; C6 -
-db $02 ; C7 -
-db $02 ; C8 -
-db $02 ; C9 -
-db $02 ; CA -
-db $02 ; CB -
-db $02 ; CC -
-db $02 ; CD -
-db $02 ; CE -
-db $02 ; CF -
-db $02 ; D0 - Bee trap
-db $02 ; D1 - Apples
-db $02 ; D2 - Fairy
-db $02 ; D3 - Chicken
-db $02 ; D4 - Big Magic
-db $02 ; D5 - 5 Arrows
-db $02 ; D6 - Good Bee
-db $02 ; D7 -
-db $02 ; D8 -
-db $02 ; D9 -
-db $02 ; DA -
-db $02 ; DB -
-db $02 ; DC -
-db $02 ; DD -
-db $02 ; DE -
-db $02 ; DF -
-db $02 ; E0 -
-db $02 ; E1 -
-db $02 ; E2 -
-db $02 ; E3 -
-db $02 ; E4 -
-db $02 ; E5 -
-db $02 ; E6 -
-db $02 ; E7 -
-db $02 ; E8 -
-db $02 ; E9 -
-db $02 ; EA -
-db $02 ; EB -
-db $02 ; EC -
-db $02 ; ED -
-db $02 ; EE -
-db $02 ; EF -
-db $02 ; F0 -
-db $02 ; F1 -
-db $02 ; F2 -
-db $02 ; F3 -
-db $02 ; F4 -
-db $02 ; F5 -
-db $02 ; F6 -
-db $02 ; F7 -
-db $02 ; F8 -
-db $02 ; F9 -
-db $02 ; FA -
-db $02 ; FB -
-db $02 ; FC -
-db $02 ; FD -
-db $02 ; FE - Server request (async)
-db $02 ; FF -

dungeon_map/data/supertile_shapes.asm

@@ -1,258 +0,0 @@
-dw $FFFF, $83A5, $FFFF, $FFFF ; 00
-dw $C388, $8388, $FFFF, $FFFF ; 01
-dw $4348, $034A, $4342, $0342 ; 02
-dw $FFFF, $FFFF, $438F, $FFFF ; 03 - Houlihan
-dw $039A, $038F, $4365, $C39B ; 04
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 05 - unused
-dw $FFFF, $FFFF, $438F, $FFFF ; 06 - Arrghus
-dw $C340, $8370, $4340, $0340 ; 07 - Moldorm
-dw $FFFF, $FFFF, $43B2, $03B2 ; 08 - useless fairy entrance
-dw $C3A6, $837B, $FFFF, $FFFF ; 09
-dw $C398, $835F, $FFFF, $FFFF ; 0A
-dw $039B, $439C, $839B, $0381 ; 0B
-dw $C371, $8371, $4354, $0354 ; 0C
-dw $FFFF, $FFFF, $438F, $FFFF ; 0D - Aga 2
-dw $FFFF, $FFFF, $8399, $439B ; 0E
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 0F - unused and should never be used, treated as non-id
-dw $C340, $8340, $4350, $0340 ; 10
-dw $83B7, $C3AC, $03B7, $438A ; 11
-dw $C354, $8354, $4354, $0354 ; 12
-dw $FFFF, $83B7, $FFFF, $03B7 ; 13
-dw $C351, $8341, $4351, $0351 ; 14
-dw $C374, $8340, $4341, $0340 ; 15
-dw $0361, $039A, $C3B2, $83B2 ; 16 - gross (add middle section if feasible)
-dw $C370, $8370, $4340, $0340 ; 17
-dw $C3B5, $FFFF, $43B4, $FFFF ; 18 - useless fairy drop
-dw $FFFF, $8369, $FFFF, $035A ; 19
-dw $03E7, $03E8, $03F7, $0361 ; 1A
-dw $039B, $439C, $4361, $FFFF ; 1B
-dw $038F, $038F, $037E, $C39B ; 1C
-dw $C3B2, $83A7, $FFFF, $FFFF ; 1D
-dw $FFFF, $4391, $8399, $0366 ; 1E
-dw $FFFF, $FFFF, $4360, $C399 ; 1F
-dw $FFFF, $FFFF, $438F, $FFFF ; 20
-dw $4348, $0363, $C348, $8368 ; 21
-dw $FFFF, $FFFF, $4368, $0348 ; 22
-dw $FFFF, $FFFF, $FFFF, $039B ; 23
-dw $4365, $0365, $0364, $0365 ; 24
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 25 - unused
-dw $039B, $03E4, $4363, $0382 ; 26
-dw $C370, $8370, $4340, $0340 ; 27
-dw $C3A5, $FFFF, $4358, $0348 ; 28
-dw $FFFF, $FFFF, $FFFF, $0396 ; 29 - Mothula
-dw $C350, $8352, $4350, $03F8 ; 2A
-dw $C36A, $FFFF, $03F9, $C38D ; 2B
-dw $C340, $8340, $4350, $0350 ; 2C - hookshot cave back
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 2D - unused
-dw $FFFF, $838F, $FFFF, $FFFF ; 2E
-dw $C3B4, $FFFF, $436E, $03B2 ; 2F - Kakariko well
-dw $C361, $FFFF, $839A, $FFFF ; 30 - inset stairs if possible
-dw $43B2, $0397, $839B, $C399 ; 31
-dw $43C5, $03C5, $43D5, $03D5 ; 32
-dw $FFFF, $FFFF, $438F, $FFFF ; 33
-dw $4348, $0368, $4349, $8368 ; 34
-dw $C38D, $039B, $43B1, $037D ; 35
-dw $C355, $8355, $4355, $0355 ; 36
-dw $439B, $838D, $437D, $03B1 ; 37
-dw $C3AC, $FFFF, $43B7, $FFFF ; 38
-dw $FFFF, $FFFF, $039B, $0381 ; 39
-dw $03C2, $03C3, $43D3, $03D3 ; 3A - make bespoke if feasible
-dw $C3A5, $FFFF, $43B5, $FFFF ; 3B - inset stairs if feasible
-dw $C340, $8350, $4340, $0350 ; 3C - hookshot cave front
-dw $039B, $439B, $0361, $838E ; 3D
-dw $FFFF, $438F, $43B2, $0373 ; 3E
-dw $FFFF, $FFFF, $8399, $C399 ; 3F
-dw $C3A5, $FFFF, $4372, $C399 ; 40 - inset stairs if feasible
-dw $03C6, $03C7, $03D6, $03D7 ; 41
-dw $03E9, $03EA, $FFFF, $FFFF ; 42
-dw $C3B2, $03B2, $FFFF, $0361 ; 43
-dw $038D, $839F, $838D, $039F ; 44
-dw $C3AB, $83B4, $4364, $43B7 ; 45
-dw $C375, $8375, $4373, $0373 ; 46
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 47 - unused
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 48 - unused
-dw $839B, $8372, $039B, $0372 ; 49
-dw $03E2, $03E3, $0386, $4386 ; 4A
-dw $C361, $4391, $4373, $0373 ; 4B
-dw $FFFF, $83A5, $FFFF, $03B7 ; 4C
-dw $C350, $8370, $4341, $0340 ; 4D
-dw $839B, $439C, $FFFF, $FFFF ; 4E
-dw $FFFF, $8396, $838D, $FFFF ; 4F
-dw $FFFF, $83B7, $FFFF, $03B5 ; 50
-dw $C354, $8354, $4384, $0384 ; 51
-dw $C3B7, $FFFF, $4359, $0348 ; 52
-dw $039A, $83B5, $839B, $43B7 ; 53
-dw $C390, $8390, $4380, $0340 ; 54
-dw $C340, $8340, $4350, $0340 ; 55 - secret passage
-dw $038F, $83B4, $4365, $039F ; 56
-dw $039B, $438D, $0365, $039B ; 57
-dw $C372, $439B, $0383, $0365 ; 58 - split
-dw $838A, $8372, $03D1, $0372 ; 59
-dw $FFFF, $FFFF, $FFFF, $038F ; 5A - Helmasaur King
-dw $FFFF, $83B7, $FFFF, $03B5 ; 5B
-dw $C3B1, $83AA, $FFFF, $838F ; 5C
-dw $039B, $C399, $0361, $FFFF ; 5D
-dw $FFFF, $4391, $839C, $0366 ; 5E
-dw $FFFF, $FFFF, $43BB, $FFFF ; 5F
-dw $FFFF, $8379, $FFFF, $036A ; 60
-dw $C387, $8385, $4356, $0356 ; 61
-dw $C346, $8354, $4352, $0340 ; 62
-dw $039A, $FFFF, $0361, $FFFF ; 63
-dw $FFFF, $FFFF, $8399, $C3B1 ; 64
-dw $FFFF, $FFFF, $83B1, $0381 ; 65
-dw $038F, $039A, $0362, $83B2 ; 66
-dw $83B4, $83B5, $03B7, $039F ; 67
-dw $C340, $8350, $4341, $0340 ; 68
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 69 - unused
-dw $FFFF, $03E1, $FFFF, $03F1 ; 6A
-dw $039A, $0361, $839B, $C39B ; 6B
-dw $039A, $FFFF, $839B, $0360 ; 6C - Lanmolas 2
-dw $0361, $FFFF, $C39B, $FFFF ; 6D
-dw $FFFF, $838E, $FFFF, $FFFF ; 6E
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 6F - unused
-dw $43BA, $FFFF, $FFFF, $FFFF ; 70
-dw $039A, $FFFF, $4365, $438D ; 71
-dw $437A, $037A, $8386, $0342 ; 72 - slight cheating I guess...
-dw $038F, $038F, $839B, $0366 ; 73
-dw $43B2, $03B2, $43A8, $03A8 ; 74
-dw $038F, $83B4, $0365, $03B5 ; 75
-dw $838A, $03F4, $03B7, $C399 ; 76
-dw $C370, $8340, $43A0, $03A0 ; 77
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 78 - unused
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 79 - unused
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 7A - unused
-dw $C35E, $83B1, $438F, $4381 ; 7B
-dw $C3B7, $83B4, $43B7, $03B7 ; 7C
-dw $43B2, $835E, $034C, $0391 ; 7D 
-dw $FFFF, $83B7, $4393, $438A ; 7E
-dw $439B, $FFFF, $838E, $FFFF ; 7F
-dw $C3A7, $83B0, $FFFF, $FFFF ; 80
-dw $C350, $8341, $4340, $0341 ; 81
-dw $C39D, $8354, $4341, $0340 ; 82
-dw $038F, $83B5, $4365, $43B7 ; 83
-dw $C344, $8345, $4354, $0354 ; 84
-dw $C38B, $C39B, $03B7, $439B ; 85
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 86 - unused
-dw $8399, $439B, $4394, $838F ; 87
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 88 - unused
-dw $C3B0, $83B0, $FFFF, $FFFF ; 89
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 8A - unused
-dw $838A, $0360, $038A, $438D ; 8B
-dw $83BE, $83BF, $03BD, $0391 ; 8C
-dw $0360, $C38A, $038D, $438A ; 8D
-dw $FFFF, $838E, $FFFF, $FFFF ; 8E
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 8F - unused
-dw $FFFF, $FFFF, $438F, $FFFF ; 90
-dw $FFFF, $83A5, $FFFF, $03B7 ; 91
-dw $03D2, $C3B7, $0364, $039F ; 92
-dw $C36C, $836C, $C39B, $838F ; 93
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 94 - unused
-dw $FFFF, $83B7, $FFFF, $03B5 ; 95
-dw $C3B7, $FFFF, $03B7, $C39C ; 96
-dw $039A, $83B4, $839B, $036F ; 97
-dw $FFFF, $FFFF, $43B2, $0397 ; 98
-dw $FFFF, $038F, $434A, $0363 ; 99
-dw $FFFF, $FFFF, $FFFF, $FFFF ; 9A - unused
-dw $839B, $0381, $435E, $0378 ; 9B
-dw $C350, $8350, $4341, $0341 ; 9C
-dw $C35E, $83B2, $43B1, $035E ; 9D
-dw $FFFF, $439A, $838D, $03B9 ; 9E
-dw $FFFF, $FFFF, $439B, $FFFF ; 9F
-dw $839B, $C39C, $FFFF, $FFFF ; A0
-dw $C3B0, $835D, $FFFF, $036A ; A1
-dw $03EE, $03EF, $03FE, $03FF ; A2
-dw $C35A, $FFFF, $436A, $FFFF ; A3
-dw $FFFF, $FFFF, $438E, $FFFF ; A4
-dw $039A, $0361, $C3B2, $83B2 ; A5
-dw $C340, $8370, $4340, $0340 ; A6
-dw $C396, $FFFF, $FFFF, $FFFF ; A7 - ToH fairy basement room
-dw $039B, $03E5, $839B, $03F5 ; A8
-dw $C357, $8357, $4356, $0356 ; A9
-dw $03E6, $439B, $03F6, $C39B ; AA
-dw $FFFF, $FFFF, $439A, $FFFF ; AB
-dw $FFFF, $FFFF, $FFFF, $038F ; AC - Blind
-dw $FFFF, $FFFF, $FFFF, $FFFF ; AD - unused
-dw $FFFF, $8399, $FFFF, $FFFF ; AE
-dw $C39B, $FFFF, $FFFF, $FFFF ; AF
-dw $039B, $C399, $839B, $C399 ; B0
-dw $0391, $83B5, $434C, $438A ; B1
-dw $C35C, $83A2, $039B, $0366 ; B2
-dw $0365, $FFFF, $0365, $FFFF ; B3
-dw $03FA, $83FD, $03EC, $03ED ; B4
-dw $03EB, $83FD, $83FA, $03FD ; B5
-dw $C3A5, $83B4, $43B5, $03B5 ; B6
-dw $C3B4, $FFFF, $43B5, $FFFF ; B7
-dw $FFFF, $838A, $FFFF, $03B4 ; B8
-dw $43F3, $03F3, $4354, $0354 ; B9
-dw $0364, $438D, $FFFF, $FFFF ; BA
-dw $838A, $8364, $4372, $0364 ; BB
-dw $83BE, $C38A, $03D0, $438A ; BC
-dw $FFFF, $FFFF, $FFFF, $FFFF ; BD - unused
-dw $FFFF, $439A, $FFFF, $C365 ; BE
-dw $FFFF, $8396, $438D, $FFFF ; BF
-dw $C372, $C399, $4372, $C399 ; C0
-dw $039B, $0364, $4365, $8364 ; C1
-dw $C351, $8353, $4341, $0353 ; C2
-dw $03E0, $C369, $03F0, $4369 ; C3 - show layers
-dw $43C0, $03C0, $4340, $0341 ; C4
-dw $C3B5, $FFFF, $438A, $FFFF ; C5
-dw $03FA, $03FB, $83FA, $83FB ; C6
-dw $43FB, $83FD, $03FC, $03FD ; C7
-dw $FFFF, $FFFF, $FFFF, $038F ; C8 - Armos Knights
-dw $03F2, $43F2, $0386, $4386 ; C9
-dw $FFFF, $FFFF, $FFFF, $FFFF ; CA - unused
-dw $C340, $8343, $4354, $0347 ; CB
-dw $C353, $8350, $4347, $0354 ; CC
-dw $FFFF, $FFFF, $FFFF, $FFFF ; CD - unused
-dw $FFFF, $8391, $FFFF, $FFFF ; CE - Kholdstare drop
-dw $FFFF, $FFFF, $FFFF, $FFFF ; CF - unused
-dw $C372, $C399, $4372, $C399 ; D0
-dw $C38E, $838F, $4381, $C38D ; D1
-dw $FFFF, $83B5, $FFFF, $0395 ; D2
-dw $FFFF, $FFFF, $FFFF, $FFFF ; D3 - unused
-dw $FFFF, $FFFF, $FFFF, $FFFF ; D4 - unused
-dw $C3B5, $FFFF, $43B5, $FFFF ; D5
-dw $C3B5, $83B5, $43B4, $03B5 ; D6
-dw $FFFF, $FFFF, $FFFF, $FFFF ; D7 - unused
-dw $FFFF, $8361, $FFFF, $839B ; D8
-dw $FFFF, $FFFF, $4360, $0360 ; D9
-dw $FFFF, $FFFF, $439C, $FFFF ; DA
-dw $C354, $8346, $4354, $037F ; DB
-dw $C346, $8354, $4343, $0340 ; DC
-dw $FFFF, $FFFF, $FFFF, $FFFF ; DD - unused
-dw $FFFF, $8396, $FFFF, $FFFF ; DE - Kholdstare
-dw $FFFF, $FFFF, $43A0, $0354 ; DF - paradox top
-dw $039B, $C399, $0361, $FFFF ; E0
-
-; no more dungeon
-dw $C340, $8340, $4350, $0340 ; E1 - lost woods thieves hideout
-dw $C340, $8340, $4340, $0350 ; E2 - lumberjack cave
-dw $FFFF, $83B4, $43B2, $036E ; E3 - magic bat
-dw $C340, $8342, $4350, $0342 ; E4 - old man's house front
-dw $C342, $8340, $4356, $0354 ; E5 - old man's house back
-dw $C340, $8341, $4350, $0340 ; E6 - death mountain descent left
-dw $C341, $8340, $4340, $0350 ; E7 - death mountain descent right
-dw $C370, $8370, $4380, $0350 ; E8 - superbunny top
-dw $FFFF, $FFFF, $FFFF, $FFFF ; E9 - unused
-dw $C3A5, $FFFF, $43B5, $FFFF ; EA - spectacle top
-dw $FFFF, $83A6, $FFFF, $03B5 ; EB - bumper top
-dw $FFFF, $FFFF, $FFFF, $FFFF ; EC - unused
-dw $C370, $8370, $4340, $0350 ; ED - fairy ascension top
-dw $C340, $8390, $4340, $0350 ; EE - spiral top
-dw $FFFF, $8340, $43A0, $0354 ; EF - paradox top
-dw $C340, $8342, $4350, $0342 ; F0 - old man rescue left
-dw $C342, $8342, $4340, $0350 ; F1 - old man rescue right
-dw $FFFF, $FFFF, $FFFF, $03B2 ; F2 - Sahasrahla's Kakariko house left
-dw $FFFF, $FFFF, $43B2, $FFFF ; F3 - Sahasrahla's Kakariko house right
-dw $FFFF, $FFFF, $FFFF, $03B2 ; F4 - quarreling brothers left
-dw $FFFF, $FFFF, $43B2, $FFFF ; F5 - quarreling brothers right
-dw $FFFF, $FFFF, $FFFF, $FFFF ; F6 - unused
-dw $FFFF, $FFFF, $FFFF, $FFFF ; F7 - unused
-dw $C370, $8370, $43A0, $0354 ; F8 - superbunny bottom
-dw $C340, $8341, $4350, $0340 ; F9 - spectacle left
-dw $C374, $8340, $4350, $0340 ; FA - spectacle bottom
-dw $FFFF, $83A5, $4348, $0358 ; FB - bumper bottom
-dw $FFFF, $FFFF, $FFFF, $FFFF ; FC - unused
-dw $C370, $8370, $4354, $0354 ; FD - fairy ascension bottom
-dw $FFFF, $FFFF, $43B4, $03B5 ; FE - spiral bottom
-dw $C3B4, $83B4, $436E, $036D ; FF - paradox bottom

dungeon_map/draw_loot.asm

@@ -1,144 +0,0 @@
-RedrawLoot:
-	JSL DrawLoot
-
-	; what we wrote over
-	SEP #$20
-	STZ.w $0210
-	RTL
-
-FirstDrawLoot:
-	LDA.b #$FF
-	STA.w $0215
-	LDA.b #$80
-	STA.w $0216
-	STA.w $0218
-	LDA.l DRMode
-	BEQ +
-		LDA.w DungeonID
-		ASL A
-		TAX
-		LDA.l DungeonMapData.floor, X
-		STA.b $A4
-+
-
-	; what we wrote over
-	LDA.b #$08
-	STA.b $17
-
-DrawLoot:
-	LDA.b $07
-	STA.w $021B
-
-	REP #$30
-	PHX : PHY
-
-	STZ.b $0E
-
-	LDX.w DungeonID
-	LDA.l DungeonMapRoomPointers, X
-	STA.b $0C
-
-	SEP #$20
-	LDA.l DungeonMapFloorCountData, X
-	AND.b #$0F
-	CLC : ADC.w $020E
-	PHA
-
-	JSR DrawSingleFloorLoot
-
-	INC.b $0F
-	LDA.b #$80
-	STA.b $0E
-	PLA : DEC A
-	JSR DrawSingleFloorLoot
-
-	LDX.w GFXStripes
-	LDA.b #$FF
-	STA.w GFXStripes+2, X
-
-	LDA.b #$01
-	STA.b NMISTRIPES
-
-	PLY : PLX
-	LDA.b #$00
-	RTL
-
-DrawSingleFloorLoot:
-	REP #$20
-	AND.w #$00FF
-	ASL A
-	TAX
-
-	LDA.l DungeonMapFloorToDataOffset, X
-	TAY
-	STZ.b $06
-
-.next_row
-	REP #$20
-	LDA.w GFXStripes
-	TAX
-	CLC : ADC.w #$0030
-	STA.w GFXStripes
-
-	LDA.b $07
-	AND.w #$00FF
-	XBA
-	LSR A : LSR A
-	CLC : ADC.w #$1092
-	ADC.b $0E
-	XBA
-	STA.w GFXStripes+2, X
-	CLC : ADC.w #$2000
-	STA.w GFXStripes+$1A, X
-
-	LDA.w #$1300
-	STA.w GFXStripes+$04, X
-	STA.w GFXStripes+$1C, X
-
-.next_room
-	REP #$20
-	LDA.b ($0C), Y ; get room id
-	PHY
-
-	AND.w #$00FF
-	CMP.w #$000F ; $0F = empty room
-
-	BNE .valid_room
-	LDA.w #$0000
-	BRA +
-.valid_room
-	JSL CheckLoot
-+
-	ASL A : ASL A : ASL A
-
-	TXY
-	TAX
-
-	LDA.l LootTypeIcons+0, X
-	STA.w GFXStripes+$06, Y
-	LDA.l LootTypeIcons+2, X
-	STA.w GFXStripes+$08, Y
-	LDA.l LootTypeIcons+4, X
-	STA.w GFXStripes+$1E, Y
-	LDA.l LootTypeIcons+6, X
-	STA.w GFXStripes+$20, Y
-
-	TYX
-	PLY
-	INY : INX #4
-
-	SEP #$20
-	INC.b $06
-	LDA.b $06
-	CMP.b #$05
-	BCC .next_room
-
-	STZ.b $06
-	INC.b $07
-	LDA.b $07
-	CMP.b #$05
-	BCS .done
-	JMP .next_row
-
-.done
-	RTS

dungeon_map/draw_rooms.asm

@@ -1,247 +0,0 @@
-; $CA has room_id
-DrawDungeonMapRoom:
-	PHB : PHK : PLB ; need to keep this in same bank as data, or else specify bank
-	LDA.b $0A : PHA
-
-	LDA.l ShowRooms_default
-	AND.w #$00FF
-	STA.b $0A
-
-	PHX
-
-	LDX.w DungeonID
-	LDA.l MapField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowRooms_have_map
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	LDX.w DungeonID
-	LDA.l CompassField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowRooms_have_compass
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	LDA.b $0E
-	AND.w #$000F
-	BEQ +
-	LDA.l ShowRooms_visited_tile
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	LDA.b $0A : BNE + : LDA.w #$0F00 : BRA ++
-+	DEC A     : BNE + : LDA.w #$174F : BRA ++
-+	DEC A     : BNE + : LDA.w #$174F : BRA ++
-+	DEC A     : BNE + : LDA.w #$1400 : BRA ++
-+	DEC A     : BNE + : LDA.w #$1000 : BRA ++
-+	DEC A     : BNE + : LDA.w #$0C00 : BRA ++
-+	LDA.w #$0800
-++	STA.b $0C
-
-	PLX
-
-	LDA.b $CA
-	AND.w #$00FF
-	ASL A : ASL A : ASL A
-	TAY
-
-	macro DrawQuadrant(quadrant, writeOffset)
-		?DrawQuadrant:
-		LDA.w SupertileRoomShapes+(2*<quadrant>), Y
-		CMP.w #$FFFF : BEQ ?.empty
-		PHA
-		LDA.b $0E
-		AND.w #1<<(3-<quadrant>)
-		BNE ?.visited
-
-		?.unvisited
-		LDA.b $0A
-		CMP.w #$0003
-		BCS ?.shape
-
-		?.square
-		PLA
-		LDA.b $0C
-		EOR.w #(3-<quadrant>)<<14
-		BRA ?.write
-
-		?.shape
-		PLA
-		ORA.b $0C
-		BRA ?.write
-
-		?.visited
-		PLA
-		ORA.w #$0800
-		BRA ?.write
-
-		?.empty
-		LDA.b $0A
-		CMP.w #$0001
-		BEQ ?.full_square
-		LDA.w #$0F00
-		BRA ?.write
-
-		?.full_square
-		LDA.w #$174F
-		EOR.w #(3-<quadrant>)<<14
-
-		?.write
-		STA.l $7F0000+<writeOffset>, X
-		?.done
-	endmacro
-
-	%DrawQuadrant(0, $00)
-	%DrawQuadrant(1, $02)
-	%DrawQuadrant(2, $40)
-	%DrawQuadrant(3, $42)
-
-.done
-	PLA : STA.b $0A
-	PLB
-	RTL
-
-DrawEntrances:
-	REP #$30
-	PHX : PHY
-	LDA.b $06 : PHA
-
-	LDX.w DungeonID
-	LDA.l DungeonMapRoomPointers, X
-	STA.b $0C
-
-	SEP #$20
-	LDA.l DungeonMapFloorCountData, X
-	AND.b #$0F
-	CLC : ADC.w $020E
-	DEC A
-	REP #$20
-	AND.w #$00FF
-
-	JSR DrawBothFloorsEntrances
-
-.done
-	REP #$20
-	PLA : STA.b $06
-	PLY : PLX
-	SEP #$30
-	RTL
-
-DrawBothFloorsEntrances:
-	ASL A
-	TAX
-
-	LDA.l DungeonMapFloorToDataOffset, X
-	TAY
-	STZ.b $06
-
-.next_room
-	REP #$20
-	LDA.b ($0C), Y ; get room id
-	AND.w #$00FF
-	CMP.w #$000F ; $0F = empty room
-
-	BEQ +
-	JSR DrawSingleRoomEntrances
-+
-
-	INY
-
-	SEP #$20
-	INC.b $06
-	LDA.b $06
-	CMP.b #$05
-	BCC .next_room
-
-	STZ.b $06
--	INC.b $07
-	LDA.b $07
-	CMP.b #$0A
-	BCC .next_room
-
-.done
-	RTS
-
-macro DrawSingleEntrance(offset)
-	LDX.b $00
-	STZ.w OAMBufferAux, X ; high x-bit and size bit
-	TXA
-	ASL #2
-	TAX
-
-	LDA.b $06
-	ASL #4
-	CLC : ADC.b #$90+<offset>
-	STA.w OAMBuffer+0, X
-
-	LDA.b $07
-	ASL #4
-	CMP.b #$50
-	BCC ?+
-	CLC : ADC.b #$50
-?+	CLC : ADC.b #$87
-	CLC : ADC.w $0213
-	SEC : SBC.b $E8
-	STA.w OAMBuffer+1, X
-
-	LDA.b #$33
-	STA.w OAMBuffer+2, X
-
-	LDA.b #$23
-	STA.w OAMBuffer+3, X
-
-	INC.b $00
-endmacro
-
-DrawSingleRoomEntrances:
-	STA.b $0E
-	SEP #$10
-
-	LDX.b #$FE
-.next_entry
-	INX : INX
-	LDA.l SupertileEntrances, X
-	BPL +
-	JMP .done
-+
-
-	AND.w #$0FFF
-	CMP.b $0E
-	BNE .next_entry
-
-	SEP #$20
-	LDA.l SupertileEntrances+1, X
-	PHA : PHA
-
-	BIT.b #$40
-	BEQ +
-	%DrawSingleEntrance(0)
-+
-
-	PLA
-	BIT.b #$20
-	BEQ +
-	%DrawSingleEntrance(4)
-+
-
-	PLA
-	BIT.b #$10
-	BEQ +
-	%DrawSingleEntrance(8)
-+
-
-.done
-	REP #$30
-	RTS

dungeon_map/dungeon_switch.asm

@@ -1,187 +0,0 @@
-CheckSwitchMap:
-	SEP #$20
-	LDA.b $F6
-	AND.b #$30
-	BNE +
-
-	; what we wrote over
-	REP #$20
-	LDA.w $8AF5E9, X
-	AND.w #$000F
-	CLC : ADC.b $00
-	RTL
-
-+	PHA
-	TXA
-	ASL A
-	TAX
-	PLA
-	BIT.b #$20
-	BNE +
-	INX
-+	LDA.l DungeonMapData.prev, X
-	STA.w DungeonID
-
-	LDA.b #$04
-	STA.w $0200
-	REP #$20
-	LDA.w #$0000
-	RTL
-
-DungeonMapSwitch_Submodule:
-;	LDA.b $9B
-;	STA.l $7EC229
-
-	JSL $80893D
-	JSL $80833F
-;	LDA.l $7EC229
-;	STA.b $9B
-
-	LDA.b #$09
-	STA.b $14
-	STA.w $0710
-
-	LDA.b #$01
-	STA.w $0200
-	STA.w $020D
-	STZ.w $0213
-	STZ.w $021B
-	STZ.w $021C
-	STZ.b $06
-	STZ.b $07
-
-	LDA.w DungeonID
-	ASL A
-	TAX
-	LDA.l DungeonMapData.floor, X
-	STA.b $A4
-
-	REP #$20
-	STZ.b $E0
-	STZ.b $E2
-	STZ.b $E4
-	STZ.b $E6
-	STZ.b $E8
-	STZ.b $EA
-	JML $98BCA1
-
-SkipMapSprites:
-	STZ.b $00
-
-	LDA.l DRMode
-	BNE +
-	LDA.w $0200
-	CMP.b #$04
-	BEQ +
-	JSL DrawEntrances
-+
-
-	STZ.b $0E
-	STZ.b $0F
-
-	LDA.w $0200
-	CMP.b #$04
-	BNE +
-		JML $8AEAFC
-+
-
-	LDA.l DRMode
-	BEQ +
-		JML $8AEAEE
-+
-
-	LDA.l $7EC22A
-	CMP.w DungeonID
-	BEQ +
-		JML $8AEAF3
-+	JML $8AEADE
-
-CacheCurrentDungeon:
-	STA.l $7EC206
-	SEP #$20
-	LDA.b $A4
-	STA.l $7EC22B
-
-	LDA.w DungeonID
-	STA.l $7EC22A
-
-	LDA.l DRMode
-	BEQ +
-
-	LDA.w DungeonID
-	PHX
-	ASL A
-	TAX
-	LDA.l DungeonMapData.floor, X
-	STA.b $A4
-	PLX
-
-+
-	REP #$20
-	RTL
-
-RestoreCurrentDungeon:
-	LDA.b #$F3
-	STA.w $012C ; what we wrote over
-	LDA.l $7EC22A
-	STA.w DungeonID
-	LDA.l $7EC22B
-	STA.b $A4
-	RTL
-
-RestoreDungeonMapFloorIndex:
-	STZ.w $020F ; first part we wrote over
-
-	LDA.w $021B
-	STA.b $07
-	STZ.b $06
-
-	LDA.b $0A ; the rest of what we wrote over
-	AND.b #$08
-	RTL
-
-DrawDungeonLabel:
-	LDY.b #$00
-	LDA.w DungeonID
-	ASL A
-	TAX
-	LDA.b NMISTRIPES
-	BEQ +
-	LDY.b #$20
-+
-
-	REP #$20
-	LDA.w #$E660
-	STA.w GFXStripes+$02, Y
-	LDA.w #$0300
-	STA.w GFXStripes+$04, Y
-
-	LDA.l DungeonLabels+0, X
-	STA.w GFXStripes+$06, Y
-	LDA.l DungeonLabels+2, X
-	STA.w GFXStripes+$08, Y
-	SEP #$20
-	LDA.b #$FF
-	STA.w GFXStripes+$0A, Y
-	LDA.b #$01
-	STA.b NMISTRIPES
-
-	INC.w $020D ; what we wrote over
-	RTL
-
-CountFloors:
-	ADC.w $8AF605, Y
-	STA.b $04
-	LDY.w #$0000
-	RTL
-
-CheckIfRoomFound:
-	CPY.w #$0032
-	BCS .not_found
-	LDA.b ($04), Y
-	INY
-	CMP.b $0E
-	JML $8AE877
-
-.not_found
-	JML $8AE8CD

dungeon_map/hooks.asm

@@ -1,150 +0,0 @@
-; move aga boss icon to correct room
-org $8AEE75
-db $08
-
-; change dungeon map subsheet gfx in TR
-; org $80DDC9
-; db $57
-
-; 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
-db $61, $56, $57, $62
-
-; unused chest data
-org $81E9A5
-dw $00F0 ; freezor room, second chest (only one chest in supertile)
-
-org $81EA6E
-dw $00F0 ; mire spike room, second chest (only one chest in supertile)
-
-org $81EAF8
-dw $00F0 ; GT button/switch/bladetrap room (no chest in supertile)
-
-; Dungeon Map Palettes 2-5 left half
-org $9BE544
-dw $0000, $71E7, $7FFF, $3B5F, $0000, $0000, $7EB5, $1CE7
-
-org $9BE564
-dw $0000, $5565, $7FFF, $331C, $0000, $0000, $7E27, $0C63
-
-org $9BE584
-dw $0000, $4100, $7FFF, $2656, $4100, $0000, $4100, $4100
-
-org $9BE5A4
-dw $0000, $34E0, $7FFF, $34E0, $34E0, $0000, $34E0, $34E0
-
-; move BG1 to main screen in dungeon map screen
-org $8AE130
-LDA.b #$17 : STA.b $1C
-LDA.b #$00 : STA.b $1D
-
-; make skull icon blink opposite our loot icons
-org $8AEE2B
-	AND.b #$10
-	NOP #2
-	db $F0 ; BEQ to replace BCS
-
-;================================================================================
-; Overhaul of Dungeon Map Screen
-;--------------------------------------------------------------------------------
-org $8AE64F
-	PLX
-	JSL DrawDungeonMapRoom
-	JMP.w $8AE7F2
-
-org $8AE152
-	JSL LoadLastHUDPalette
-
-org $8AEAE8 ; vanilla checks number of sprites drawn instead of... counting...
-	LDA.b $0E
-	CMP.b #$02
-
-;================================================================================
-; Swapping Dungeon in Dungeon Map Screen (L/R)
-;--------------------------------------------------------------------------------
-org $8AE9A7
-	JSL CheckSwitchMap
-	BRA + : NOP #3 : +
-
-org $8AEF06
-	DEC.b $13
-	BNE +
-	JML DungeonMapSwitch_Submodule
-+	RTL
-warnpc $8AEF29
-
-org $8AEADA
-	JML SkipMapSprites
-
-org $8AE9C7
-	JSL RestoreDungeonMapFloorIndex
-	NOP
-
-org $98BC86
-	JSL CacheCurrentDungeon
-
-org $8AEFC5
-	JSL RestoreCurrentDungeon
-	NOP
-
-org $8AE1EC
-	PLB
-	JML DrawDungeonLabel
-
-org $8AE86A
-	JSL CountFloors
-	NOP #2
-
-org $8AE872
-	JML CheckIfRoomFound
-	NOP
-
-;================================================================================
-; Show indicators of what is left in each room
-;--------------------------------------------------------------------------------
-org $8AEABA
-	JSL RedrawLoot
-	NOP
-
-org $8AE42B
-	JSL FirstDrawLoot
-
-;================================================================================
-; Blink indicators of what is left in each room
-;--------------------------------------------------------------------------------
-org $8AE964
-	JSL BlinkLoot
-
-org $8AE235
-	JSL WriteBigEndianAddressX
-org $8AE290
-	JSL WriteBigEndianAddressY
-org $8AE350
-	JSL WriteBigEndianAddressY
-
-org $8AE206
-	JSL StartDoubleWrite
-	NOP
-
-org $8AE2E0
-	JML CheckDoubleWrite
-	NOP
-
-org $8AE21C
-	JSL DrawMountain
-	BRA + : NOP #9 : +

dungeon_map/main.asm

@@ -1,36 +0,0 @@
-pushpc
-incsrc hooks.asm
-
-macro WriteGFXSheetPointer(sheet, location)
-	pushpc
-	org $80CFC0+<sheet>
-	db <location>>>16
-
-	org $80D09F+<sheet>
-	db <location>>>8
-
-	org $80D17E+<sheet>
-	db <location>>>0
-
-	pullpc
-endmacro
-
-%WriteGFXSheetPointer($C9, DungeonMapIcons1)
-%WriteGFXSheetPointer($CA, DungeonMapIcons2)
-%WriteGFXSheetPointer($D5, DungeonMapIcons3)
-
-; %WriteGFXSheetPointer($D6, DungeonMapIcons2)
-
-; TR is such a problem child
-; %WriteGFXSheetPointer($A6, DungeonMapIcons2)
-
-%WriteGFXSheetPointer($D4, MapSheetD4)
-
-pullpc
-
-incsrc draw_rooms.asm
-incsrc map_bg3.asm
-incsrc dungeon_switch.asm
-incsrc draw_loot.asm
-incsrc check_loot.asm
-incsrc blink_loot.asm

dungeon_map/map_bg3.asm

@@ -1,96 +0,0 @@
-pushpc
-org $809383
-db BG3DungeonMapStripes>>0
-
-org $80938C
-db BG3DungeonMapStripes>>8
-
-org $809395
-db BG3DungeonMapStripes>>16
-pullpc
-
-LoadLastHUDPalette:
-	; what we wrote over
-	JSL $9BEE52
-
-	REP #$20
-	LDA.l MapHUDPalette
-	STA.l PaletteBuffer+$3A
-	LDA.l MapHUDPalette+2
-	STA.l PaletteBuffer+$3C
-	LDA.l MapHUDPalette+4
-	STA.l PaletteBuffer+$3E
-	SEP #$20
-	RTL
-
-BG3DungeonMapStripes:
-; boring stuff from vanilla
-dw $4260, $0100, $2100
-dw $4360, $0E40, $2101
-dw $4B60, $0100, $6100
-dw $6260, $2EC0, $2110
-dw $6B60, $2EC0, $6110
-dw $6263, $0100, $A100
-dw $6363, $0E40, $A101
-dw $6B63, $0100, $E100
-dw $8460, $0B00, $2102, $2103, $2104, $2105, $2106, $2107
-dw $A460, $0B00, $2112, $2113, $2114, $2115, $2116, $2117
-dw $4E60, $0100, $2100
-dw $4F60, $1A40, $2101
-dw $5D60, $0100, $6100
-dw $6E60, $2EC0, $2110
-dw $7D60, $2EC0, $6110
-dw $6E63, $0100, $A100
-dw $6F63, $1A40, $A101
-dw $7D63, $0100, $E100
-dw $0060, $7E40, $2111
-dw $8063, $3E41, $2111
-dw $0060, $3EC0, $2111
-dw $0160, $3EC0, $2111
-dw $0C60, $3EC0, $2111
-dw $0D60, $3EC0, $2111
-dw $1E60, $3EC0, $2111
-dw $1F60, $3EC0, $2111
-
-; new stuff here:
-; horizontal borders
-dw $7260, $1340, $1D11
-dw $D261, $1340, $1D11
-dw $F261, $1340, $1D11
-dw $5263, $1340, $1D11
-
-; vertical borders
-dw $7160, $2FC0, $1D11
-dw $7C60, $2FC0, $1D11
-
-macro TopOfSquares(start)
-	; silly Big Endian
-	db <start>>>8, <start>, $00, $13
-	dw $5D4C, $1D4C, $5D4C, $1D4C, $5D4C, $1D4C, $5D4C, $1D4C, $5D4C, $1D4C
-endmacro
-
-macro BottomOfSquares(start)
-	; silly Big Endian
-	db <start>>>8, <start>, $00, $13
-	dw $DD4C, $9D4C, $DD4C, $9D4C, $DD4C, $9D4C, $DD4C, $9D4C, $DD4C, $9D4C
-endmacro
-
-macro FullRow(start)
-	%TopOfSquares(<start>)
-	%BottomOfSquares(<start>+$20)
-endmacro
-
-; top grid
-%FullRow($6092)
-%FullRow($60D2)
-%FullRow($6112)
-%FullRow($6152)
-%FullRow($6192)
-
-%FullRow($6212)
-%FullRow($6252)
-%FullRow($6292)
-%FullRow($62D2)
-%FullRow($6312)
-
-db $FF

dungeon_map/settings.asm

@@ -1,189 +0,0 @@
-; $B9F000
-SupertileRoomShapes:
-incsrc data/supertile_shapes.asm
-warnpc $B9F800
-padbyte $FF
-pad $B9F800
-
-org $B9F800
-DungeonMapData:
-	db $02, $04, $00, $00 ; Sewers
-	db $1A, $00, $00, $00 ; Hyrule Castle
-	db $00, $06, $00, $00 ; Eastern Palace
-	db $04, $14, $00, $00 ; Desert Palace
-	db $14, $0C, $01, $00 ; Castle Tower
-	db $0C, $10, $00, $00 ; Swamp Palace
-	db $08, $0A, $00, $00 ; Palace of Darkness
-	db $12, $18, $00, $00 ; Misery Mire
-	db $0A, $16, $FF, $00 ; Skull Woods
-	db $16, $0E, $00, $00 ; Ice Palace
-	db $06, $08, $01, $00 ; Tower of Hera
-	db $10, $12, $00, $00 ; Thieves Town
-	db $0E, $1A, $00, $00 ; Turtle Rock
-	db $18, $02, $01, $00 ; Ganon's Tower
-	db $1A, $02, $00, $00 ; Extra
-	db $1A, $02, $00, $00 ; Extra
-
-struct DungeonMapData DungeonMapData
-	.prev: skip 1
-	.next: skip 1
-	.floor: skip 1
-	.unused: skip 1
-endstruct
-
-warnpc $B9F880
-org $B9F880
-
-LootTypeIcons:
-dw $0B00, $0B00, $0B00, $0B00 ; 00 - nothing
-dw $2F32, $6F32, $AF32, $EF32 ; 01 - unknown - dot
-dw $2B0D, $6B0D, $2B3D, $6B3D ; 02 - junk - pot
-dw $2B07, $6B07, $2B17, $2B18 ; 03 - small key
-dw $2B0B, $6B0B, $2B3B, $6B3B ; 04 - triforce piece
-dw $6B08, $2B08, $EB08, $AB08 ; 05 - safety - plus
-dw $2B0E, $6B0E, $2B3E, $6B3E ; 06 - less important item - small chest
-dw $AB3A, $EB3A, $2B3A, $6B3A ; 07 - compass
-dw $2B07, $6B07, $2B17, $2B18 ; 08 - small key
-dw $2B05, $6B05, $2B15, $2B16 ; 09 - big key
-dw $2B09, $2B0A, $2B39, $6B39 ; 0A - pendant
-dw $2B0F, $6B0F, $2B3F, $6B3F ; 0B - important inventory item - big chest
-dw $2B09, $2B0A, $2B39, $6B39 ; 0C - also pendant
-dw $6F02, $2B02, $EB02, $AF02 ; 0D - crystal
-dw $2B0B, $6B0B, $2B3B, $6B3B ; 0E - triforce piece
-dw $2B0C, $6B0C, $2B3C, $6B3C ; 0F - triforce
-
-warnpc $B9F900
-org $B9F900
-LootTypeMapping:
-incsrc data/item_mapping.asm
-
-warnpc $B9FA00
-org $B9FA00
-; Room ID mappings to bit to check for presence and address of item drop
-MiscLocations:
-dw $00C8 : db $04 : dl HeartContainer_ArmosKnights
-dw $0033 : db $04 : dl HeartContainer_Lanmolas
-dw $0007 : db $04 : dl HeartContainer_Moldorm
-
-dw $005A : db $04 : dl HeartContainer_HelmasaurKing
-dw $0006 : db $04 : dl HeartContainer_Arrghus
-dw $0029 : db $04 : dl HeartContainer_Mothula
-dw $00AC : db $04 : dl HeartContainer_Blind
-dw $00DE : db $04 : dl HeartContainer_Kholdstare
-dw $0090 : db $04 : dl HeartContainer_Vitreous
-dw $00A4 : db $04 : dl HeartContainer_Trinexx
-
-dw $0073 : db $05 : dl BonkKey_Desert ; torch
-dw $008C : db $05 : dl BonkKey_GTower ; torch
-dw $0087 : db $05 : dl StandingKey_Hera
-
-dw $FFFF : db $FF : dl $FFFFFF ; Placeholders
-dw $FFFF : db $FF : dl $FFFFFF
-dw $FFFF : db $FF : dl $FFFFFF ; Aga 1? ($0020)
-dw $FFFF : db $FF : dl $FFFFFF ; Ice Armos? ($001C)
-dw $FFFF : db $FF : dl $FFFFFF ; Lanmolas 2? ($0033)
-dw $FFFF : db $FF : dl $FFFFFF ; Moldorm 2? ($004D)
-dw $FFFF : db $FF : dl $FFFFFF ; Aga 2? ($000D)
-dw $FFFF
-
-warnpc $B9FA9A
-org $B9FA9A
-MapHUDPalette:
-	dw $0000, $3ED8, $2E54
-
-warnpc $B9FAA0
-org $B9FAA0
-PrizeLocations:
-dw $00C8 : db $02 ; Armos Knights
-dw $0033 : db $03 ; Lanmolas
-dw $0006 : db $05 ; Arrghus
-dw $005A : db $06 ; Helmasaur King
-dw $0090 : db $07 ; Vitreous
-dw $0029 : db $08 ; Mothula
-dw $00DE : db $09 ; Kholdstare
-dw $0007 : db $0A ; Moldorm
-dw $00AC : db $0B ; Blind
-dw $00A4 : db $0C ; Trinexx
-dw $FFFF
-
-warnpc $B9FAC0
-org $B9FAC0
-SupertileEntrances:
-incsrc data/entrance_tiles.asm
-warnpc $B9FB00
-padbyte $FF
-pad $B9FB00
-
-; $B9FB00
-DungeonLabels:
-dw $2550, $2579 ; Sewers
-dw $2550, $2578 ; Hyrule Castle
-dw $2561, $256C ; Eastern Palace
-dw $2560, $256C ; Desert Palace
-dw $255D, $2570 ; Agahnim's Tower
-dw $256F, $256C ; Swamp Palace
-dw $256C, $2560 ; Palace of Darkness
-dw $2569, $2569 ; Misery Mire
-dw $256F, $2573 ; Skull Woods
-dw $2565, $256C ; Ice Palace
-dw $2570, $2564 ; Tower of Hera
-dw $2570, $2570 ; Thieves' Town
-dw $2570, $256E ; Turtle Rock
-dw $2563, $2570 ; Ganon's Tower
-dw $25A4, $25A4 ; Reserved
-dw $25A4, $25A4 ; Reserved
-
-; $B9FB40
-
-warnpc $B9FF00
-
-org $B9FF00
-; $00 - do not show anything
-; $01 - show presence of supertile as dark square
-; $02 - show presence of quadrants as dark squares
-; $03 - show outline of shape with walls but no interior details (palette 5)
-; $04 - show dark with stairs but no hole/internal walls (palette 4)
-; $05 - show mostly lit with stairs and holes/internal walls (palette 3)
-; $06 - show fully lit with stairs and holes/internal walls (palette 2)
-ShowRooms:
-.default
-	db $02
-.have_map
-	db $05
-.have_compass
-	db $03
-.visited_tile
-	db $04
-.reserved
-	skip 4
-warnpc $B9FF08
-
-org $B9FF08
-; $00 - do not show anything
-; $01 - show presence of unobtained items
-; $02 - show category of item
-ShowItems:
-.default
-	db $00
-.have_map
-	db $00
-.have_compass
-	db $02
-.visited_tile
-	db $01
-.reserved
-	skip 4
-warnpc $B9FF10
-
-org $B9FF10
-; ---P bepc
-; P - dungeon prizes
-; b - bosses (and torches in GT, plus hera basement standing item)
-; e - enemy drops
-; p - pots
-; c - chests
-ItemSources:
-	db $09
-
-AlwaysShowCompass:
-	db $01

enemizer/underworld_sprites.asm

@@ -1,6 +1,10 @@
 LoadUnderworldSprites:
 	STA.b Scrap00  ; part one of what we replaced
-	LDA.w #UWSpritesData>>16 ; set the bank to 28 for now
+	if !FEATURE_FIX_BASEROM
+		LDA.w #$89
+	else
+		LDA.w #UWSpritesData>>16 ; set the bank to 28 for now
+	endif
 	STA.b Scrap02
 	LDA.w $048E
 RTL

fileselect.asm

@@ -248,7 +248,7 @@ DrawPlayerFileShared:
 
 	; Flute
 	LDA.l InventoryTrackingSRAM : AND.w #$0003 : BEQ +
-	LDA.l $7003C2 : AND.w #$00FF : CMP.w #$00FF : BNE .pseudo
+	LDA.l $7003C2 : AND.w #$00FF : BNE .pseudo
 		%fs_drawItem(7,16,FileSelectItems_flute)
 		BRA ++
 	.pseudo

hooks.asm

@@ -840,10 +840,10 @@ JSL LoadModifiedIceFloorValue_a01 : NOP
 org $83FC16 ; <- 1FC16 ($A8, $B8, $3D, $D0, $B8, $3D)
 db $B1, $C6, $F9, $C9, $C6, $F9 ; data insert - 2 chests, fat fairy room
 
-; unused item receipts - moved to pyramid fairy
+; unused item receipts
 org $81E97E
-dw $0116 : db $5E
+dw $0116 : db $08
-dw $0116 : db $64
+dw $0116 : db $25
 ;--------------------------------------------------------------------------------
 org $86B489 ; <- 33489 - sprite_smithy_bros.asm : 473 (LDA $7EF359 : CMP.b #$03 : BCS .tempered_sword_or_better)
 JML GetSmithSword : NOP #4

initsramtable.asm

@@ -115,7 +115,7 @@ InitInventoryTracking: skip 2           ; PC 0x18338C \ Need to set bits here fo
 InitBowTracking: skip 2                 ; PC 0x18338E / boomerangs, powder/mushroom, etc 
 InitItemLimitCounts: skip 16            ; PC 0x183390
 skip 34                                 ;
-InitFluteBitfield: db $FF               ;
+InitFluteBitfield: db $00               ;
 InitSpecialWeaponLevel: db $00          ;
 InitItemOnB: db $00                     ;
 InitProgressIndicator: db $02           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard

keydrop/standing_items.asm

@@ -98,18 +98,10 @@ else
 endif
 UWPotsPointers: ; 0x250 bytes for 0x128 rooms' 16-bit pointers
 
-if !FEATURE_FIX_BASEROM
+org $89DACE
-	org $01DDE7
-else
-	org $89DACE
-endif
 UWPotsData: ; variable number of bytes (max 0x11D1) for all pots data
 
-if !FEATURE_FIX_BASEROM
+org $A88000
-	org $89D92E
-else
-	org $A88000
-endif
 UWSpritesData: ; variable number of bytes (max 0x2800) for all sprites and sprite drop data
 ; First $2800 bytes of this bank (28) is reserved for the sprite tables
 

lampmantlecone.asm

@@ -34,16 +34,20 @@ RTL
 ; Output: 0 locked, 1 open
 ;--------------------------------------------------------------------------------
 CheckForZelda:
-        LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
+	LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
-                LDA.b #$01 ; pretend we have zelda anyway
+		LDA.b #$01 ; pretend we have zelda anyway
-                RTL
+		RTL
-        +
+	+
-        LDA.l FollowerIndicator
+	LDA.l FollowerIndicator
 RTL
 ;================================================================================
 SetOverlayIfLamp:
-        JSL LampCheck
+	JSL LampCheck
-        STA.b SUBDESQ ; write it directly to the overlay, this isn't a terrible idea at all
+	CMP.b #$00
+	BEQ +
+	LDA.b #$01
++
+	STA.b SUBDESQ ; write it directly to the overlay, this isn't a terrible idea at all
 RTL
 ;================================================================================
 ; Mantle Object Changes

newhud.asm

@@ -152,23 +152,14 @@ NewHUD_DrawDungeonCounters:
 
 ;================================================================================
 NewHUD_DrawPrizeIcon:
-	REP #$10
+        REP #$10
-	SEP #$20
+        SEP #$20
 	LDA.b GameMode
-	CMP.b #$12 : BEQ .no_prize
+        CMP.b #$12 : BEQ .no_prize
-	CMP.b #$0E : BNE .check_hud_flag
+        CMP.b #$0E : BEQ +
-	LDA.b GameSubMode
+        LDA.l UpdateHUDFlag : BEQ NewHUD_DrawItemCounter
-	CMP.b #$03 : BNE .check_dungeon
+	+
-	LDA.w SubModuleInterface
+        LDA.w DungeonID
-	CMP.b #$06 : BNE .check_hud_flag
-	LDA.l $7EC22A
-	BRA .know_dungeon
-
-.check_hud_flag
-	LDA.l UpdateHUDFlag : BEQ NewHUD_DrawItemCounter
-.check_dungeon
-	LDA.w DungeonID
-.know_dungeon
 	CMP.b #$1A : BCS .no_prize
 	CMP.b #$04 : BCC .no_prize
 	CMP.b #$08 : BNE .dungeon
@@ -185,19 +176,19 @@ NewHUD_DrawPrizeIcon:
 	LDA.l MapMode
 
 	REP #$30
-	BEQ .prize
+        BEQ .prize
 
 	LDA.w MapField
 	AND.l DungeonItemMasks,X
 	BEQ .no_prize
 
-	.prize
+        .prize
-	TYX
+        TYX
-	LDA.l CrystalPendantFlags_3,X : AND.w #$00FF
+        LDA.l CrystalPendantFlags_3,X : AND.w #$00FF
-	ASL : TAX
+        ASL : TAX
-	LDA.l PrizeIconTiles_Transparent,X : BEQ .no_icon
+        LDA.l PrizeIconTiles_Transparent,X : BEQ .no_icon
-	TAY
+        TAY
-	BRA .draw_prize
+        BRA .draw_prize
 
 .pendant
 	LDY.w #!PTile

newitems.asm

@@ -188,12 +188,12 @@ ItemBehavior:
         BRA .store_inventory_tracking
 
         .flute_inactive
-        LDA.b #$FF : STA.l FluteBitfield
+        LDA.b #$00 : STA.l FluteBitfield
         LDA.l InventoryTracking : ORA.b #$02
         BRA .store_inventory_tracking
 
         .flute_active
-        LDA.b #$FF : STA.l FluteBitfield
+        LDA.b #$00 : STA.l FluteBitfield
         LDA.l InventoryTracking : ORA.b #$01
         BRA .store_inventory_tracking
 

owrando.asm

@@ -320,7 +320,7 @@ OWLightWorldOrCrossed:
 
 OWFluteCancel:
 {
-    lda.l FluteBitfield : beq +
+    lda.l FluteBitfield : cmp.b #$FF : beq +
     lda.l OWFlags+1 : and.b #$01 : bne +
         jsl FluteMenu_LoadTransport : rtl
     + lda.w RandoOverworldTargetEdge : bne +
@@ -332,7 +332,7 @@ OWFluteCancel2:
     lda.b Joy1B_All : ora.b Joy1A_All : and.b #$c0 : bne +
         jml FluteMenu_HandleSelection_NoSelection
     + inc.w SubModuleInterface
-    lda.l FluteBitfield : beq .cancel
+    lda.l FluteBitfield : cmp.b #$FF : beq .cancel
     lda.l OWFlags+1 : and.b #$01 : beq +
     lda.b Joy1B_All : cmp.b #$40 : bne +
         .cancel

pseudoflute.asm

@@ -1,35 +1,37 @@
 SelectFirstFluteSpot:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BNE +
 	RTL
 +	LDA.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	INC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
+	AND.l FluteMenuNumbers_bits, X
-	BEQ .try_next
+	BNE .try_next
 RTL
 
 SelectFluteNext:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BEQ InvalidBeep
 
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	INC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
+	AND.l FluteMenuNumbers_bits, X
-	BEQ .try_next
+	BNE .try_next
 
 	LDA.b #$20
 	STA.w $012F
@@ -37,18 +39,19 @@ RTL
 
 SelectFlutePrev:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BEQ InvalidBeep
 
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	DEC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
+	AND.l FluteMenuNumbers_bits, X
-	BEQ .try_next
+	BNE .try_next
 
 	LDA.b #$20
 	STA.w $012F
@@ -62,8 +65,8 @@ RTL
 SetFluteSpotPalette:
 	XBA
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
+	AND.l FluteMenuNumbers_bits, X
-	BEQ .disabled
+	BNE .disabled
 .enabled
 	XBA
 	STA.b $0C
@@ -93,8 +96,9 @@ MaybeMarkFluteSpotVisited:
 	TXA
 	LSR A
 	TAX
-	LDA.l FluteBitfield
+	LDA.l FluteMenuNumbers_bits, X
-	ORA.l $8AB7A3, X
+	EOR.b #$FF
+	AND.l FluteBitfield
 	STA.l FluteBitfield
 
 .done
@@ -113,33 +117,9 @@ CheckTransitionOverworld:
 	STA.w $040A ; what we wrote over
 	JML MaybeMarkFluteSpotVisited
 
-DrawFluteIcon:
+CheckFlute:
-	AND.w #$00FF
-	CMP.w #$0002
-	BCC .write
 	LDA.l FluteBitfield
 	AND.w #$00FF
-	CMP.w #$00FF
-	BNE .pseudo
-.real
-	LDA.w #$0003
-	BRA .write
-.pseudo
-	LDA.w #$0002
-.write
-	STA.b $02
-	RTL
-
-CheckFluteInHUD:
-	LDA.l $7EF33F, X
-	AND.w #$00FF ; what we wrote over
-	CPX.w #$000D
-	BNE .done
-	CMP.w #$0002
-	BCC .done
-	LDA.l FluteBitfield
-	AND.w #$00FF
-	CMP.w #$00FF
 	BNE .pseudo
 .real
 	LDA.w #$0003
@@ -147,4 +127,24 @@ CheckFluteInHUD:
 .pseudo
 	LDA.w #$0002
 .done
+	RTS
+
+DrawFluteIcon:
+	AND.w #$00FF
+	CMP.w #$0002
+	BCC +
+	JSR CheckFlute
++
+	STA.b $02
+	RTL
+
+CheckFluteInHUD:
+	LDA.l EquipmentWRAM-1, X
+	AND.w #$00FF ; what we wrote over
+	CPX.w #$000D
+	BNE +
+	CMP.w #$0002
+	BCC +
+	JSR CheckFlute
++
 	RTL

ram.asm

@@ -347,7 +347,6 @@ DynamicDropGFXSlots = $7E07F1     ; Assume future use of this up to $0E bytes, t
                                   ; which item gfx is currently occupying each slot
 OAMBuffer = $7E0800               ; Main OAM buffer sent to OAM. $200 bytes.
 OAMBuffer2 = $7E0A00              ;
-OAMBufferAux = $7E0A20            ; high X-bit and size bit sent to OAM, one byte per sprite
                                   ;
 TransparencyFlag = $7E0ABD        ; Flags transparency effects e.g. in Thieves Town Hellway
                                   ;
@@ -469,6 +468,8 @@ RoomStripes = $7E1100             ; Used for room drawing.
                                   ;
 MirrorPortalPosXH = $7E1ACF       ; Mirror portal position. (High byte of X coordinate)
                                   ;
+FluteSelection = $7E1AF0          ; Currently selected flute spot (zero-indexed)
+                                  ;
 IrisPtr = $7E1B00                 ; Spotlight pointers for HDMA. $1C0 bytes (?).
                                   ;
 MessageSubModule = $7E1CD8        ;

vanillalabels.asm

@@ -274,7 +274,6 @@ GFXSheetPointers_background_bank                           = $80CFC0
 GFXSheetPointers_background_high                           = $80D09F
 GFXSheetPointers_background_low                            = $80D17E
 LayerOfDestination                                         = $81C31F
-RoomData_ChestItems                                        = $81E96C
 AnimatedTileSheets                                         = $82802E
 Module1B_SpawnSelect_spawns                                = $828481
 Overworld_ActualScreenID                                   = $82A4E3
@@ -284,15 +283,13 @@ EntranceData_song                                          = $82D592
 SpawnPointData_room_id                                     = $82D8D2
 Overworld_CheckForSpecialOverworldTrigger_Direction        = $84E879
 Sprite_ShowSolicitedMessage_Direction                      = $85E1A3
+FluteMenuNumbers_bits                                      = $8AB7A3
 WorldMap_RedXChars                                         = $8ABF70
 WorldMap_CalculateOAMCoordinates                           = $8AC3B1
 WorldMap_HandleSpriteBlink                                 = $8AC52E
 WorldMapIcon_AdjustCoordinate                              = $8AC59B
 WorldMap_DarkWorldTilemap                                  = $8AD739
 DungeonMapBossRooms                                        = $8AE817
-DungeonMapFloorCountData                                   = $8AF5E9
-DungeonMapFloorToDataOffset                                = $8AF605
-DungeonMapRoomPointers                                     = $8AF615
 DamageSubclassValue                                        = $8DB8F1
 TextCharMasks                                              = $8EB844
 Credits_ScrollScene_target_y                               = $8EC308