alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More supertile shape updates

Browse Source
This commit is contained in:
Kara Alexandra
2026-01-03 13:19:29 -06:00
parent 3489af82fa
commit 7a12032067
7 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
dungeon_map/data/supertile_shapes.asm
View File

@@ -12,7 +12,7 @@ db $58, $1F, $FF, $FF ; 0A
db $2E, $67, $2E, $1E ; 0B db $2E, $67, $2E, $1E ; 0B
db $31, $31, $14, $14 ; 0C db $31, $31, $14, $14 ; 0C
db $FF, $FF, $4F, $FF ; 0D - Aga 2 db $FF, $FF, $4F, $FF ; 0D - Aga 2
db $FF, $FF, $57, $72 ; 0E db $FF, $FF, $D9, $22 ; 0E
db $FF, $FF, $FF, $FF ; 0F - unused and should never be used, treated as non-id db $FF, $FF, $FF, $FF ; 0F - unused and should never be used, treated as non-id
db $00, $00, $10, $00 ; 10 db $00, $00, $10, $00 ; 10
db $00, $30, $00, $10 ; 11 db $00, $30, $00, $10 ; 11
@@ -23,13 +23,13 @@ db $34, $00, $01, $00 ; 15
db $75, $65, $2E, $2E ; 16 db $75, $65, $2E, $2E ; 16
db $30, $30, $00, $00 ; 17 db $30, $30, $00, $00 ; 17
db $75, $FF, $74, $FF ; 18 - useless fairy drop db $75, $FF, $74, $FF ; 18 - useless fairy drop
db $FF, $29, $FF, $2A ; 19 db $FF, $29, $FF, $1B ; 19
db $6E, $6F, $6D, $75 ; 1A db $6E, $6F, $6D, $75 ; 1A
db $2E, $67, $75, $FF ; 1B db $33, $D9, $21, $FF ; 1B
db $74, $74, $3E, $2E ; 1C db $74, $74, $3E, $2E ; 1C
db $72, $67, $FF, $FF ; 1D db $72, $67, $FF, $FF ; 1D
db $FF, $68, $57, $4B ; 1E db $FF, $F8, $D9, $26 ; 1E
db $FF, $FF, $71, $57 ; 1F db $FF, $FF, $20, $D9 ; 1F
db $FF, $FF, $4F, $FF ; 20 db $FF, $FF, $4F, $FF ; 20
db $00, $10, $00, $01 ; 21 db $00, $10, $00, $01 ; 21
db $FF, $FF, $28, $08 ; 22 db $FF, $FF, $28, $08 ; 22
@@ -38,48 +38,48 @@ db $10, $10, $01, $10 ; 24
db $FF, $FF, $FF, $FF ; 25 - unused db $FF, $FF, $FF, $FF ; 25 - unused
db $00, $3C, $14, $42 ; 26 db $00, $3C, $14, $42 ; 26
db $30, $30, $00, $00 ; 27 db $30, $30, $00, $00 ; 27
db $65, $FF, $2D, $08 ; 28 db $65, $FF, $18, $08 ; 28
db $FF, $FF, $FF, $56 ; 29 - Mothula db $FF, $FF, $FF, $56 ; 29 - Mothula
db $10, $12, $10, $5E db $10, $12, $10, $5E ; 2A
db $2A, $FF, $0D, $70 ; 2B db $2A, $FF, $0D, $CD ; 2B
db $00, $00, $10, $10 ; 2C - hookshot cave back db $00, $00, $10, $10 ; 2C - hookshot cave back
db $FF, $FF, $FF, $FF ; 2D - unused db $FF, $FF, $FF, $FF ; 2D - unused
db $FF, $4F, $FF, $FF ; 2E db $FF, $4F, $FF, $FF ; 2E
db $74, $FF, $2E, $72 ; 2F - Kakariko well db $74, $FF, $2E, $72 ; 2F - Kakariko well
db $75, $FF, $65, $FF ; 30 db $21, $FF, $DA, $FF ; 30 - inset stairs if possible
db $2E, $57, $2E, $57 ; 31 db $2E, $57, $2E, $57 ; 31
db $14, $14, $44, $44 db $14, $14, $44, $44 ; 32
db $FF, $FF, $4F, $FF ; 33 db $FF, $FF, $4F, $FF ; 33
db $00, $01, $40, $01 db $00, $01, $40, $01 ; 34
db $4D, $77, $71, $3D ; 35 db $4D, $77, $71, $3D ; 35
db $15, $15, $15, $15 db $15, $15, $15, $15 ; 36
db $77, $4D, $3D, $71 ; 37 db $77, $4D, $3D, $71 ; 37
db $6C, $FF, $77, $FF ; 38 db $6C, $FF, $77, $FF ; 38
db $FF, $FF, $72, $69 ; 39 db $FF, $FF, $72, $69 ; 39
db $64, $64, $14, $14 db $64, $64, $14, $14 ; 3A - make bespoke if feasible
db $65, $FF, $75, $FF db $65, $FF, $75, $FF ; 3B - inset stairs if feasible
db $00, $10, $00, $10 ; 3C - hookshot cave front db $00, $10, $00, $10 ; 3C - hookshot cave front
db $2E, $2E, $75, $65 ; 3D db $2E, $2E, $75, $65 ; 3D
db $FF, $74, $72, $2E ; 3E db $FF, $CF, $72, $33 ; 3E
db $FF, $FF, $57, $57 db $FF, $FF, $D9, $D9 ; 3F
db $65, $FF, $2E, $57 ; 40 db $65, $FF, $32, $D9 ; 40 - inset stairs if feasible
db $00, $30, $14, $14 db $00, $30, $14, $14 ; 41
db $58, $49, $FF, $FF ; 42 db $58, $49, $FF, $FF ; 42
db $72, $2E, $FF, $75 db $72, $2E, $FF, $75 ; 43
db $70, $3D, $70, $3D db $CD, $5F, $CD, $5F ; 44
db $6C, $74, $3D, $2E ; 45 db $6B, $CF, $24, $DB ; 45
db $14, $14, $00, $00 db $35, $35, $33, $33 ; 46
db $FF, $FF, $FF, $FF ; 47 - unused db $FF, $FF, $FF, $FF ; 47 - unused
db $FF, $FF, $FF, $FF ; 48 - unused db $FF, $FF, $FF, $FF ; 48 - unused
db $72, $2E, $72, $2E ; 49 db $72, $2E, $72, $2E ; 49
db $61, $61, $14, $14 ; 4A db $61, $61, $14, $14 ; 4A
db $75, $0E, $2E, $2E ; 4B db $21, $D1, $33, $33 ; 4B
db $FF, $65, $FF, $77 ; 4C db $FF, $65, $FF, $77 ; 4C
db $10, $30, $01, $00 db $10, $30, $01, $00 ; 4D
db $72, $57, $FF, $FF ; 4E db $22, $D9, $FF, $FF ; 4E
db $FF, $70, $56, $FF db $FF, $56, $CD, $FF ; 4F
db $FF, $77, $FF, $75 ; 50 db $FF, $77, $FF, $75 ; 50
db $14, $14, $44, $44 db $14, $14, $44, $44 ; 51
db $77, $FF, $19, $08 ; 52 db $77, $FF, $19, $08 ; 52
db $65, $75, $2E, $2E ; 53 db $65, $75, $2E, $2E ; 53
db $50, $50, $40, $00 ; 54 db $50, $50, $40, $00 ; 54
@@ -87,19 +87,19 @@ db $00, $00, $10, $00 ; 55
db $74, $74, $2D, $3D ; 56 db $74, $74, $2D, $3D ; 56
db $2E, $70, $4A, $5B ; 57 db $2E, $70, $4A, $5B ; 57
db $00, $00, $11, $10 ; 58 - split db $00, $00, $11, $10 ; 58 - split
db $10, $00, $10, $00 db $10, $00, $10, $00 ; 59
db $FF, $FF, $FF, $4F ; 5A - Helmasaur King db $FF, $FF, $FF, $4F ; 5A - Helmasaur King
db $FF, $77, $FF, $75 ; 5B db $FF, $77, $FF, $75 ; 5B
db $71, $6A, $FF, $74 ; 5C db $71, $6A, $FF, $74 ; 5C
db $2E, $67, $75, $FF ; 5D db $2E, $67, $75, $FF ; 5D
db $FF, $68, $57, $4B ; 5E db $FF, $F8, $DC, $26 ; 5E
db $FF, $FF, $7B, $FF ; 5F db $FF, $FF, $7B, $FF ; 5F
db $FF, $39, $FF, $2A ; 60 db $FF, $39, $FF, $2A ; 60
db $47, $45, $16, $16 ; 61 db $47, $45, $16, $16 ; 61
db $06, $14, $12, $00 ; 62 db $06, $14, $12, $00 ; 62
db $65, $FF, $75, $FF ; 63 db $65, $FF, $75, $FF ; 63
db $FF, $FF, $57, $71 ; 64 db $FF, $FF, $D9, $F1 ; 64
db $FF, $FF, $71, $69 ; 65 db $FF, $FF, $F1, $69 ; 65
db $00, $30, $10, $00 ; 66 db $00, $30, $10, $00 ; 66
db $00, $10, $00, $01 ; 67 db $00, $10, $00, $01 ; 67
db $00, $10, $01, $00 ; 68 db $00, $10, $01, $00 ; 68
@@ -114,36 +114,36 @@ db $7A, $FF, $FF, $FF ; 70
db $65, $FF, $2D, $70 ; 71 db $65, $FF, $2D, $70 ; 71
db $44, $44, $04, $14 ; 72 - slight cheating I guess... db $44, $44, $04, $14 ; 72 - slight cheating I guess...
db $74, $74, $2E, $4B ; 73 db $74, $74, $2E, $4B ; 73
db $00, $00, $05, $05 db $00, $00, $05, $05 ; 74
db $74, $74, $4A, $75 ; 75 db $74, $74, $4A, $75 ; 75
db $2D, $7C, $2E, $57 ; 76 db $2D, $7C, $2E, $57 ; 76
db $30, $00, $60, $60 db $30, $00, $60, $60 ; 77
db $FF, $FF, $FF, $FF ; 78 - unused db $FF, $FF, $FF, $FF ; 78 - unused
db $FF, $FF, $FF, $FF ; 79 - unused db $FF, $FF, $FF, $FF ; 79 - unused
db $FF, $FF, $FF, $FF ; 7A - unused db $FF, $FF, $FF, $FF ; 7A - unused
db $1E, $71, $4F, $4D ; 7B db $1E, $71, $4F, $4D ; 7B
db $77, $74, $77, $77 db $77, $74, $77, $77 ; 7C
db $2E, $70, $52, $51 ; 7D - warp tiles db $2E, $70, $52, $51 ; 7D - warp tiles
db $FF, $77, $53, $2D ; 7E db $FF, $77, $DC, $BA ; 7E
db $77, $FF, $55, $FF db $A2, $FF, $CE, $FF ; 7F
db $67, $70, $FF, $FF ; 80 db $67, $70, $FF, $FF ; 80
db $10, $01, $00, $01 db $10, $01, $00, $01 ; 81
db $5D, $14, $01, $00 ; 82 db $5D, $14, $01, $00 ; 82
db $74, $75, $2D, $2E ; 83 db $74, $75, $2D, $2E ; 83
db $04, $05, $14, $14 db $04, $05, $14, $14 ; 84
db $4B, $72, $2E, $72 ; 85 db $4B, $72, $2E, $72 ; 85
db $FF, $FF, $FF, $FF ; 86 - unused db $FF, $FF, $FF, $FF ; 86 - unused
db $67, $2E, $54, $74 db $67, $2E, $54, $74 ; 87
db $FF, $FF, $FF, $FF ; 88 - unused db $FF, $FF, $FF, $FF ; 88 - unused
db $70, $70, $FF, $FF db $70, $70, $FF, $FF ; 89
db $FF, $FF, $FF, $FF ; 8A - unused db $FF, $FF, $FF, $FF ; 8A - unused
db $2D, $71, $2D, $70 db $2D, $71, $2D, $70 ; 8B
db $7E, $7F, $7D, $78 ; 8C db $7E, $7F, $7D, $78 ; 8C
db $71, $2D, $70, $2D ; 8D db $71, $2D, $70, $2D ; 8D
db $FF, $4E, $FF, $FF db $FF, $4E, $FF, $FF ; 8E
db $FF, $FF, $FF, $FF ; 8F - unused db $FF, $FF, $FF, $FF ; 8F - unused
db $FF, $FF, $4F, $FF ; 90 db $FF, $FF, $4F, $FF ; 90
db $FF, $65, $FF, $77 db $FF, $65, $FF, $77 ; 91
db $00, $00, $01, $01 ; 92 - should it be split? idk db $00, $00, $01, $01 ; 92 - should it be split? idk
db $2C, $2C, $77, $74 ; 93 db $2C, $2C, $77, $74 ; 93
db $FF, $FF, $FF, $FF ; 94 - unused db $FF, $FF, $FF, $FF ; 94 - unused
@@ -156,44 +156,44 @@ db $FF, $FF, $FF, $FF ; 9A - unused
db $72, $1E, $1E, $38 ; 9B db $72, $1E, $1E, $38 ; 9B
db $10, $10, $01, $01 ; 9C db $10, $10, $01, $01 ; 9C
db $1E, $72, $71, $1E ; 9D db $1E, $72, $71, $1E ; 9D
db $FF, $65, $70, $79 ; 9E db $FF, $DA, $CD, $79 ; 9E
db $FF, $FF, $5B, $FF ; 9F db $FF, $FF, $5B, $FF ; 9F
db $72, $57, $FF, $FF ; A0 db $A2, $DC, $FF, $FF ; A0
db $70, $1D, $FF, $2A ; A1 db $70, $1D, $FF, $2A ; A1
db $45, $45, $16, $06 ; A2 db $45, $45, $16, $06 ; A2 - show paths somehow
db $1A, $FF, $2A, $FF ; A3 db $1A, $FF, $2A, $FF ; A3
db $FF, $FF, $4E, $FF ; A4 db $FF, $FF, $4E, $FF ; A4
db $65, $75, $2E, $2E ; A5 db $65, $75, $2E, $2E ; A5
db $00, $30, $00, $00 ; A6 db $00, $30, $00, $00 ; A6
db $56, $FF, $FF, $FF ; A7 - ToH fairy basement room db $56, $FF, $FF, $FF ; A7 - ToH fairy basement room
db $00, $03, $00, $12 ; A8 db $DB, $76, $DB, $63 ; A8
db $17, $17, $16, $16 ; A9 db $17, $17, $16, $16 ; A9
db $03, $00, $12, $00 ; AA db $0B, $DB, $1B, $DB ; AA
db $FF, $FF, $5A, $FF ; AB db $FF, $FF, $5A, $FF ; AB
db $FF, $FF, $FF, $4F ; AC - Blind db $FF, $FF, $FF, $4F ; AC - Blind
db $FF, $FF, $FF, $FF ; AD - unused db $FF, $FF, $FF, $FF ; AD - unused
db $FF, $59, $FF, $FF ; AE db $FF, $59, $FF, $FF ; AE
db $5B, $FF, $FF, $FF ; AF db $5B, $FF, $FF, $FF ; AF
db $2E, $67, $2E, $57 ; B0 db $DB, $DC, $DB, $D9 ; B0
db $0E, $75, $0C, $2D ; B1 db $0E, $75, $0C, $2D ; B1
db $1C, $62, $72, $4B ; B2 - split this monster somehow? db $1C, $62, $22, $26 ; B2
db $4A, $FF, $4A, $FF ; B3 db $2D, $FF, $2D, $FF ; B3
db $10, $00, $44, $44 ; B4 db $10, $00, $44, $44 ; B4
db $30, $00, $10, $00 ; B5 db $30, $00, $10, $00 ; B5
db $65, $74, $75, $75 ; B6 db $65, $74, $75, $75 ; B6
db $74, $FF, $75, $FF ; B7 db $74, $FF, $75, $FF ; B7
db $FF, $4A, $FF, $74 ; B8 db $FF, $4A, $FF, $74 ; B8
db $15, $15, $14, $14 ; B9 db $2B, $2B, $14, $14 ; B9
db $73, $70, $FF, $FF ; BA db $73, $70, $FF, $FF ; BA
db $2D, $3D, $2E, $3D ; BB db $BA, $24, $32, $24 ; BB
db $7F, $2D, $73, $2D ; BC - block off entrances? db $7F, $BA, $A4, $BA ; BC - block off entrances?
db $FF, $FF, $FF, $FF ; BD - unused db $FF, $FF, $FF, $FF ; BD - unused
db $FF, $65, $FF, $4A ; BE db $FF, $DA, $FF, $A5 ; BE
db $FF, $FF, $4D, $FF ; BF db $FF, $56, $4D, $FF ; BF
db $2E, $67, $2E, $57 ; C0 db $32, $DC, $32, $D9 ; C0
db $2E, $73, $2D, $73 ; C1 db $DB, $24, $25, $24 ; C1
db $11, $13, $01, $13 ; C2 db $11, $13, $01, $13 ; C2
db $13, $00, $03, $00 ; C3 db $13, $00, $03, $00 ; C3 - show layers
db $44, $44, $00, $01 ; C4 db $44, $44, $00, $01 ; C4
db $75, $FF, $4A, $FF ; C5 db $75, $FF, $4A, $FF ; C5
db $10, $11, $10, $11 ; C6 db $10, $11, $10, $11 ; C6
@@ -204,18 +204,18 @@ db $FF, $FF, $FF, $FF ; CA - unused
db $00, $03, $14, $07 ; CB db $00, $03, $14, $07 ; CB
db $13, $10, $07, $14 ; CC db $13, $10, $07, $14 ; CC
db $FF, $FF, $FF, $FF ; CD - unused db $FF, $FF, $FF, $FF ; CD - unused
db $FF, $78, $FF, $FF db $FF, $78, $FF, $FF ; CE - Kholdstare drop
db $FF, $FF, $FF, $FF ; CF - unused db $FF, $FF, $FF, $FF ; CF - unused
db $2E, $67, $2E, $57 ; D0 db $32, $DC, $32, $D9 ; D0
db $4E, $4F, $1E, $70 ; D1 db $4E, $4F, $41, $CD ; D1
db $FF, $75, $FF, $55 db $FF, $75, $FF, $55 ; D2
db $FF, $FF, $FF, $FF ; D3 - unused db $FF, $FF, $FF, $FF ; D3 - unused
db $FF, $FF, $FF, $FF ; D4 - unused db $FF, $FF, $FF, $FF ; D4 - unused
db $75, $FF, $75, $FF ; D5 db $75, $FF, $75, $FF ; D5
db $75, $75, $74, $75 ; D6 db $75, $75, $74, $75 ; D6
db $FF, $FF, $FF, $FF ; D7 - unused db $FF, $FF, $FF, $FF ; D7 - unused
db $FF, $75, $FF, $77 ; D8 db $FF, $21, $FF, $A2 ; D8
db $FF, $FF, $71, $71 ; D9 db $FF, $FF, $20, $20 ; D9
db $FF, $FF, $5C, $FF ; DA db $FF, $FF, $5C, $FF ; DA
db $14, $06, $14, $3F ; DB db $14, $06, $14, $3F ; DB
db $06, $14, $03, $00 ; DC db $06, $14, $03, $00 ; DC

7
dungeon_map/draw_rooms.asm
View File

@@ -60,6 +60,11 @@ DrawDungeonMapRoom:
LDA.w SupertileRoomShapes+<quadrant>, Y LDA.w SupertileRoomShapes+<quadrant>, Y
AND.w #$00FF AND.w #$00FF
CMP.w #$00FF : BEQ ?.empty CMP.w #$00FF : BEQ ?.empty
BIT.w #$0080
BEQ ?+
AND.w #$007F
ORA.w #$C000
?+
CLC : ADC.w #$0340 CLC : ADC.w #$0340
PHA PHA
LDA.b $0E LDA.b $0E
@@ -97,7 +102,7 @@ DrawDungeonMapRoom:
LDA.w #$174F LDA.w #$174F
?.write ?.write
ORA.w #(3-<quadrant>)<<14 EOR.w #(3-<quadrant>)<<14
STA.l $7F0000+<writeOffset>, X STA.l $7F0000+<writeOffset>, X
?.done ?.done
endmacro endmacro

BIN
menu/map_icons.3bpp
View File

Binary file not shown.

BIN
menu/map_icons.dat Normal file
View File

Binary file not shown.

BIN
menu/map_icons.pal Normal file
View File

Binary file not shown.

BIN
menu/map_icons_1.3bppc
View File

Binary file not shown.

BIN
menu/map_icons_2.3bppc
View File

Binary file not shown.