Update supertile shapes

2026-01-02 15:01:12 -06:00
parent 1b43799e6e
commit 9b4d79247f
9 changed files with 112 additions and 110 deletions
--- a/dungeon_map/data/supertile_shapes.asm
+++ b/dungeon_map/data/supertile_shapes.asm
@@ -1,19 +1,19 @@
-db $0F, $00, $1F, $0E ; 00
-db $46, $46, $0E, $0E
-db $00, $30, $14, $14
-db $0E, $1F, $20, $0F
+db $FF, $65, $FF, $FF ; 00
+db $48, $48, $FF, $FF ; 01
+db $00, $30, $14, $14 ; 02
+db $FF, $FF, $4F, $FF ; 03 - Houlihan
 db $65, $74, $2D, $2E ; 04
 db $FF, $FF, $FF, $FF ; 05 - unused
-db $FF, $FF, $4F, $FF
-db $00, $40, $00, $00 ; 07
-db $0E, $0E, $10, $20 ; 08 - useless fairy entrance
-db $66, $66, $FF, $FF
-db $44, $44, $0E, $0E
+db $FF, $FF, $4F, $FF ; 06 - Arrghus
+db $00, $40, $00, $00 ; 07 - Moldorm
+db $FF, $FF, $72, $5F ; 08 - useless fairy entrance
+db $66, $66, $FF, $FF ; 09
+db $58, $58, $FF, $FF ; 0A
 db $2E, $67, $2E, $70 ; 0B
 db $31, $31, $24, $24 ; 0C
-db $FF, $FF, $4F, $FF ; 0D
+db $FF, $FF, $4F, $FF ; 0D - Aga 2
 db $FF, $FF, $57, $5F ; 0E
-db $FF, $FF, $FF, $FF ; 0F - unused and should never be, treated as non-id
+db $FF, $FF, $FF, $FF ; 0F - unused and should never be used, treated as non-id
 db $00, $00, $20, $00 ; 10
 db $00, $30, $00, $10
 db $14, $14, $24, $24
@@ -22,8 +22,8 @@ db $11, $01, $11, $11
 db $34, $00, $01, $00
 db $75, $65, $2E, $2E ; 16
 db $40, $40, $00, $00
-db $10, $0F, $00, $0F ; 18 - useless fairy drop
-db $0F, $03, $0F, $02
+db $75, $FF, $74, $FF ; 18 - useless fairy drop
+db $FF, $29, $FF, $1A ; 19
 db $6E, $6F, $6D, $75 ; 1A
 db $2E, $67, $75, $FF
 db $74, $74, $3E, $2E ; 1C
@@ -32,20 +32,20 @@ db $FF, $68, $57, $4B
 db $FF, $FF, $71, $57 ; 1F
 db $FF, $FF, $4F, $FF ; 20
 db $00, $10, $00, $01
-db $0E, $0E, $15, $14
+db $FF, $FF, $28, $08 ; 22
 db $FF, $FF, $FF, $6B
 db $10, $10, $01, $20 ; 24
 db $FF, $FF, $FF, $FF ; 25 - unused
 db $00, $3C, $14, $42 ; 26
 db $40, $40, $00, $00
-db $30, $1E, $24, $24 ; 28
-db $1F, $0E, $0F, $00
+db $65, $FF, $1B, $0B ; 28
+db $FF, $FF, $FF, $56 ; 29 - Mothula
 db $10, $12, $10, $5E
-db $12, $1E, $36, $00
-db $00, $00, $10, $10 ; 2C - hookshot cave fairies
+db $2A, $FF, $0D, $70 ; 2B
+db $00, $00, $10, $10 ; 2C - hookshot cave back
 db $FF, $FF, $FF, $FF ; 2D - unused
 db $FF, $4F, $FF, $FF ; 2E
-db $00, $1E, $00, $20 ; 2F - kakariko well
+db $74, $FF, $2E, $5F ; 2F - Kakariko well
 db $75, $FF, $65, $FF ; 30
 db $2E, $57, $2E, $57 ; 31
 db $14, $14, $44, $44
@@ -58,13 +58,13 @@ db $6C, $FF, $77, $FF ; 38
 db $FF, $FF, $72, $69 ; 39
 db $64, $64, $14, $14
 db $65, $FF, $75, $FF
-db $00, $10, $00, $20 ; 3C - hookshot cave
+db $00, $10, $00, $20 ; 3C - hookshot cave front
 db $2E, $2E, $75, $65 ; 3D
 db $FF, $74, $72, $2E ; 3E
 db $FF, $FF, $57, $57
 db $65, $FF, $2E, $57 ; 40
 db $00, $30, $14, $14
-db $44, $31, $0E, $0E
+db $58, $49, $FF, $FF ; 42
 db $72, $2E, $FF, $75
 db $70, $3D, $70, $3D
 db $6C, $74, $3D, $2E ; 45
@@ -77,39 +77,39 @@ db $75, $74, $2E, $2E
 db $FF, $65, $FF, $77 ; 4C
 db $10, $30, $01, $00
 db $72, $57, $FF, $FF ; 4E
-db $1E, $00, $01, $1E
+db $FF, $70, $56, $FF
 db $FF, $77, $FF, $75 ; 50
 db $14, $14, $44, $44
-db $01, $1E, $04, $14
-db $65, $75, $2E, $2E
+db $77, $FF, $19, $08 ; 52
+db $65, $75, $2E, $2E ; 53
 db $50, $50, $40, $00 ; 54
-db $00, $00, $20, $00
-db $74, $74, $2B, $3D
+db $00, $00, $20, $00 ; 55
+db $74, $74, $2B, $3D ; 56
 db $2E, $70, $63, $5B
 db $00, $00, $21, $10 ; 58 - split
 db $10, $00, $20, $00
-db $FF, $FF, $FF, $4F
+db $FF, $FF, $FF, $4F ; 5A - Helmasaur King
 db $FF, $77, $FF, $75 ; 5B
 db $71, $6A, $FF, $74 ; 5C
 db $2E, $67, $75, $FF ; 5D
 db $FF, $68, $57, $4B ; 5E
 db $FF, $FF, $7B, $FF
-db $0F, $13, $0F, $22 ; 60
+db $FF, $39, $FF, $3A ; 60
 db $47, $45, $26, $26
 db $06, $14, $22, $00
 db $65, $FF, $76, $FF ; 63
 db $FF, $FF, $57, $71
-db $FF, $FF, $71, $69
+db $FF, $FF, $71, $69 ; 65
 db $00, $30, $10, $00
-db $00, $10, $00, $01
+db $00, $10, $00, $01 ; 67
 db $00, $10, $01, $00 ; 68
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 69 - unused
 db $FF, $4C, $FF, $74 ; 6A
-db $65, $75, $2E, $2E
-db $65, $FF, $2E, $71 ; 6C
+db $65, $75, $2E, $2E ; 6B
+db $65, $FF, $2E, $71 ; 6C - Lanmolas 2
 db $75, $FF, $77, $FF ; 6D
 db $FF, $4E, $FF, $FF ; 6E
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 6F - unused
 db $7A, $FF, $FF, $FF ; 70
 db $65, $FF, $2D, $70 ; 71
 db $44, $44, $04, $14 ; 72 - slight cheating I guess...
@@ -118,9 +118,9 @@ db $00, $00, $05, $05
 db $74, $74, $4A, $75 ; 75
 db $2D, $7C, $2E, $57 ; 76
 db $30, $00, $60, $60
-db $00, $00, $00, $00 ; 78
-db $00, $00, $00, $00
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 78 - unused
+db $FF, $FF, $FF, $FF ; 79 - unused
+db $FF, $FF, $FF, $FF ; 7A - unused
 db $70, $71, $4F, $4D
 db $77, $74, $77, $77
 db $2E, $70, $77, $4F ; 7D
@@ -128,52 +128,52 @@ db $FF, $77, $53, $2D ; 7E
 db $77, $FF, $55, $FF
 db $67, $70, $FF, $FF ; 80
 db $10, $01, $00, $01
-db $5D, $14, $01, $00
+db $5D, $14, $01, $00 ; 82
 db $74, $75, $2B, $2E ; 83
 db $04, $05, $24, $24
 db $4B, $72, $2E, $5F ; 85
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 86 - unused
 db $67, $2E, $54, $74
-db $00, $00, $00, $00 ; 88
-db $00, $00, $0E, $0E
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 88 - unused
+db $70, $70, $FF, $FF
+db $FF, $FF, $FF, $FF ; 8A - unused
 db $2D, $71, $2D, $70
 db $7E, $7F, $7D, $78 ; 8C
 db $71, $2D, $70, $2D ; 8D
 db $FF, $4E, $FF, $FF
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 8F - unused
 db $FF, $FF, $4F, $FF ; 90
 db $FF, $65, $FF, $77
 db $00, $00, $01, $01 ; 92 - should it be split? idk
 db $2C, $2C, $77, $74 ; 93
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; 94 - unused
 db $FF, $77, $FF, $75 ; 95
 db $77, $FF, $2E, $57
 db $65, $74, $2E, $2F ; 97
-db $0E, $0E, $20, $40 ; 98
-db $1E, $00, $42, $14
-db $00, $00, $00, $00
+db $FF, $FF, $5F, $57 ; 98
+db $FF, $74, $0A, $18 ; 99
+db $FF, $FF, $FF, $FF ; 9A - unused
 db $72, $70, $70, $71
 db $10, $10, $01, $01
 db $70, $72, $71, $70
-db $1E, $30, $00, $52
-db $0E, $1F, $11, $0F
+db $FF, $65, $70, $79 ; 9E
+db $FF, $FF, $5B, $FF ; 9F
 db $72, $57, $FF, $FF ; A0
-db $00, $02, $1E, $12
+db $70, $1D, $FF, $2A ; A1
 db $45, $45, $16, $06
-db $02, $0F, $12, $0F
+db $1A, $FF, $2A, $FF ; A3
 db $FF, $FF, $4E, $FF ; A4
 db $65, $75, $2E, $2E
 db $00, $30, $00, $00
-db $00, $0F, $0E, $1F
+db $56, $FF, $FF, $FF ; A7 - ToH fairy basement room
 db $00, $03, $00, $12 ; A8
 db $17, $17, $16, $16
 db $03, $00, $12, $00
 db $FF, $FF, $5A, $FF
-db $FF, $FF, $FF, $4F ; AC
-db $00, $00, $00, $00
-db $0F, $34, $1F, $0E
-db $11, $0F, $0E, $1F
+db $FF, $FF, $FF, $4F ; AC - Blind
+db $FF, $FF, $FF, $FF ; AD - unused
+db $FF, $59, $FF, $FF ; AE
+db $5B, $FF, $FF, $FF ; AF
 db $2E, $67, $2E, $57 ; B0
 db $74, $75, $2E, $2D
 db $14, $05, $10, $11 ; B2 - split this monster somehow?
@@ -185,11 +185,11 @@ db $74, $FF, $75, $FF
 db $FF, $4A, $FF, $74 ; B8
 db $15, $15, $14, $14
 db $73, $70, $FF, $FF
-db $10, $01, $00, $01
+db $10, $01, $00, $01 ; BB
 db $34, $10, $11, $10
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; BD - unused
 db $FF, $65, $FF, $4A
-db $FF, $FF, $4D, $FF
+db $FF, $FF, $4D, $FF ; BF
 db $2E, $67, $2E, $57 ; C0
 db $2E, $73, $2D, $73
 db $11, $13, $01, $13
@@ -198,14 +198,14 @@ db $44, $44, $00, $01 ; C4
 db $75, $FF, $4A, $FF
 db $10, $11, $10, $11
 db $11, $00, $01, $00
-db $FF, $FF, $FF, $4F ; C8
-db $14, $14, $24, $24
-db $00, $00, $00, $00
-db $00, $03, $14, $07
+db $FF, $FF, $FF, $4F ; C8 - Armos Knights
+db $14, $14, $24, $24 ; C9
+db $FF, $FF, $FF, $FF ; CA - unused
+db $00, $03, $14, $07 ; CB
 db $13, $10, $07, $14 ; CC
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; CD - unused
 db $FF, $78, $FF, $FF
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; CF - unused
 db $2E, $67, $2E, $57 ; D0
 db $4E, $4F, $70, $70
 db $FF, $75, $FF, $55
@@ -213,44 +213,46 @@ db $FF, $FF, $FF, $FF ; D3 - unused
 db $FF, $FF, $FF, $FF ; D4 - unused
 db $75, $FF, $76, $FF
 db $75, $75, $74, $76
-db $00, $00, $00, $00
+db $FF, $FF, $FF, $FF ; D7 - unused
 db $FF, $75, $FF, $77 ; D8
 db $FF, $FF, $71, $71
 db $FF, $FF, $5C, $FF
 db $14, $06, $24, $3F
 db $06, $14, $03, $00 ; DC
-db $00, $00, $00, $00
-db $0F, $00, $1F, $0E
-db $0E, $0E, $24, $24
+db $FF, $FF, $FF, $FF ; DD - unused
+db $FF, $56, $FF, $FF ; DE - Kholdstare
+db $FF, $FF, $60, $24 ; DF - paradox top
 db $2E, $67, $76, $FF ; E0
-db $00, $00, $20, $00
-db $00, $1E, $00, $20
-db $1E, $00, $20, $00
-db $00, $02, $20, $02
-db $02, $00, $26, $24
-db $00, $01, $10, $00
-db $01, $00, $00, $20
-db $30, $30, $40, $20 ; E8 more cheating
-db $00, $00, $00, $00
-db $30, $0F, $20, $0F
-db $0F, $30, $0F, $20
-db $00, $00, $00, $00
-db $30, $30, $00, $20
-db $00, $00, $00, $20
-db $1E, $00, $60, $60
-db $00, $02, $20, $02 ; F0
-db $02, $02, $00, $20
-db $1F, $0E, $0F, $20
-db $0E, $1F, $20, $0F
-db $1F, $0E, $0F, $20
-db $0E, $1F, $20, $0F
-db $00, $00, $00, $00
-db $00, $00, $00, $00
-db $30, $30, $60, $24 ; F8
-db $00, $01, $20, $00
-db $34, $00, $20, $00
-db $1E, $30, $24, $24
-db $00, $00, $00, $00
-db $30, $30, $24, $24
-db $0F, $0F, $00, $20
-db $00, $00, $00, $20
+
+; no more dungeon
+db $00, $00, $20, $00 ; E1 - lost woods thieves hideout
+db $00, $00, $00, $20 ; E2 - lumberjack cave
+db $FF, $74, $5F, $2E ; E3 - magic bat
+db $00, $02, $20, $02 ; E4 - old man's house front
+db $02, $00, $26, $24 ; E5 - old man's house back
+db $00, $01, $10, $00 ; E6 - death mountain descent left
+db $01, $00, $00, $20 ; E7 - death mountain descent right
+db $30, $30, $40, $20 ; E8 - superbunny top
+db $FF, $FF, $FF, $FF ; E9 - unused
+db $65, $FF, $76, $FF ; EA - spectacle top
+db $FF, $66, $FF, $76 ; EB - bumper top
+db $FF, $FF, $FF, $FF ; EC - unused
+db $30, $30, $00, $20 ; ED - fairy ascension top
+db $00, $50, $00, $20 ; EE - spiral top
+db $FF, $00, $60, $24 ; EF - paradox top
+db $00, $02, $20, $02 ; F0 - old man rescue left
+db $02, $02, $00, $20 ; F1 - old man rescue right
+db $FF, $FF, $FF, $5F ; F2 - Sahasrahla's Kakariko house left
+db $FF, $FF, $5F, $FF ; F3 - Sahasrahla's Kakariko house right
+db $FF, $FF, $FF, $5F ; F4 - quarreling brothers left
+db $FF, $FF, $5F, $FF ; F5 - quarreling brothers right
+db $FF, $FF, $FF, $FF ; F6 - unused
+db $FF, $FF, $FF, $FF ; F7 - unused
+db $30, $30, $60, $24 ; F8 - superbunny bottom
+db $00, $01, $20, $00 ; F9 - spectacle left
+db $34, $00, $20, $00 ; FA - spectacle bottom
+db $FF, $65, $08, $18 ; FB - bumper bottom
+db $FF, $FF, $FF, $FF ; FC - unused
+db $30, $30, $24, $24 ; FD - fairy ascension bottom
+db $FF, $FF, $74, $76 ; FE - spiral bottom
+db $74, $74, $2E, $2B ; FF - paradox bottom
--- a/dungeon_map/draw_rooms.asm
+++ b/dungeon_map/draw_rooms.asm
@@ -40,11 +40,11 @@ DrawDungeonMapRoom:
 +

 	LDA.b $0A : BNE + : LDA.w #$0F00 : BRA ++
-+	DEC A     : BNE + : LDA.w #$0F7B : BRA ++
-+	DEC A     : BNE + : LDA.w #$0F7B : BRA ++
-+	DEC A     : BNE + : LDA.w #$0C00 : BRA ++
-+	DEC A     : BNE + : LDA.w #$1000 : 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

@@ -94,7 +94,7 @@ DrawDungeonMapRoom:
 		BRA ?.write

 		?.full_square
-		LDA.w #$0F7B
+		LDA.w #$174F

 		?.write
 		ORA.w #(3-<quadrant>)<<14
--- a/dungeon_map/hooks.asm
+++ b/dungeon_map/hooks.asm
@@ -11,13 +11,13 @@ org $9BE544
 dw $0000, $71E7, $7FFF, $3B5F, $0000, $0000, $7EB5, $1CE7

 org $9BE564
-dw $0000, $34E0, $7FFF, $34E0, $34E0, $0000, $7EB5, $1CE7
+dw $0000, $5565, $7FFF, $331C, $0000, $0000, $7EB5, $1CE7

 org $9BE584
-dw $0000, $4100, $7FFF, $2656, $4100, $0000, $7EB5, $1CE7
+dw $0000, $4100, $7FFF, $2656, $4100, $0000, $4100, $4100

 org $9BE5A4
-dw $0000, $5565, $7FFF, $2BE9, $0000, $0000, $7EB5, $1CE7
+dw $0000, $34E0, $7FFF, $34E0, $34E0, $0000, $34E0, $34E0

 ; move BG1 to main screen in dungeon map screen
 org $8AE130
--- a/dungeon_map/settings.asm
+++ b/dungeon_map/settings.asm
@@ -106,9 +106,9 @@ 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 3)
+; $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 5)
+; $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
--- a/menu/map_icons.3bpp
+++ b/menu/map_icons.3bpp
--- a/menu/map_icons_1.3bppc
+++ b/menu/map_icons_1.3bppc
--- a/menu/map_icons_2.3bppc
+++ b/menu/map_icons_2.3bppc
--- a/menu/map_sheet_d4.3bpp
+++ b/menu/map_sheet_d4.3bpp
--- a/menu/map_sheet_d4.3bppc
+++ b/menu/map_sheet_d4.3bppc