alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Lots of bugs fixes and supertile updates

Browse Source
This commit is contained in:
karafruit
2026-01-04 09:03:23 -06:00
parent 7fc7c8fe0b
commit fd8852d866
12 changed files with 235 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
dungeon_map/data/supertile_shapes.asm
View File

@@ -2,7 +2,7 @@ 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 $C3A5, $83B4, $436D, $036E ; 04
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
@@ -15,28 +15,28 @@ 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 $C340, $8370, $4340, $0350 ; 11
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 $C3B5, $83A5, $436E, $036E ; 16
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 $C3AE, $83AF, $43AD, $0361 ; 1A
dw $039B, $439C, $4361, $FFFF ; 1B
dw $C3B4, $83B4, $437E, $036E ; 1C
dw $038F, $038F, $037E, $C39B ; 1C
dw $C3B2, $83A7, $FFFF, $FFFF ; 1D
dw $FFFF, $43B8, $8399, $0366 ; 1E
dw $FFFF, $FFFF, $4360, $C399 ; 1F
dw $FFFF, $FFFF, $438F, $FFFF ; 20
dw $C340, $8350, $4340, $0341 ; 21
dw $4348, $0363, $C348, $8368 ; 21
dw $FFFF, $FFFF, $4368, $0348 ; 22
dw $FFFF, $FFFF, $FFFF, $039B ; 23
dw $C350, $8350, $4341, $0350 ; 24
dw $4365, $0365, $0364, $0365 ; 24
dw $FFFF, $FFFF, $FFFF, $FFFF ; 25 - unused
dw $C340, $837C, $4354, $0382 ; 26
dw $039B, $037C, $4363, $0382 ; 26
dw $C370, $8370, $4340, $0340 ; 27
dw $C3A5, $FFFF, $4358, $0348 ; 28
dw $FFFF, $FFFF, $FFFF, $0396 ; 29 - Mothula
@@ -59,13 +59,13 @@ dw $FFFF, $FFFF, $039B, $03A9 ; 39
dw $C3A4, $83A4, $4354, $0354 ; 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 $C36E, $836E, $43B5, $03A5 ; 3D
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 $C340, $8370, $4354, $0354 ; 41
dw $C398, $8389, $FFFF, $FFFF ; 42
dw $C3B2, $836E, $FFFF, $03B5 ; 43
dw $C3B2, $03B2, $FFFF, $0361 ; 43
dw $038D, $839F, $838D, $039F ; 44
dw $C3AB, $438F, $4364, $C39B ; 45
dw $C375, $8375, $4373, $0373 ; 46
@@ -76,12 +76,12 @@ dw $0376, $0377, $0386, $4386 ; 4A
dw $C361, $4391, $4373, $0373 ; 4B
dw $FFFF, $83A5, $FFFF, $03B7 ; 4C
dw $C350, $8370, $4341, $0340 ; 4D
dw $839B, $4399, $FFFF, $FFFF ; 4E
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 $C3A5, $83B5, $436E, $036E ; 53
dw $039A, $83B5, $839B, $43B7 ; 53
dw $C390, $8390, $4380, $0340 ; 54
dw $C340, $8340, $4350, $0340 ; 55
dw $038F, $83B4, $4365, $039F ; 56
@@ -90,14 +90,14 @@ dw $C372, $439B, $0383, $0365 ; 58 - split
dw $838A, $8372, $038A, $0372 ; 59
dw $FFFF, $FFFF, $FFFF, $038F ; 5A - Helmasaur King
dw $FFFF, $83B7, $FFFF, $03B5 ; 5B
dw $C3B1, $83AA, $FFFF, $03B4 ; 5C
dw $C36E, $83A7, $43B5, $FFFF ; 5D
dw $C3B1, $83AA, $FFFF, $838F ; 5C
dw $039B, $C399, $0361, $FFFF ; 5D
dw $FFFF, $43B8, $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 $C3A5, $FFFF, $43B5, $FFFF ; 63
dw $039A, $FFFF, $0361, $FFFF ; 63
dw $FFFF, $FFFF, $8399, $C3B1 ; 64
dw $FFFF, $FFFF, $83B1, $03A9 ; 65
dw $038F, $039A, $0362, $83B2 ; 66
@@ -105,17 +105,17 @@ dw $83B4, $83B5, $03B7, $039F ; 67
dw $C340, $8350, $4341, $0340 ; 68
dw $FFFF, $FFFF, $FFFF, $FFFF ; 69 - unused
dw $FFFF, $838C, $FFFF, $034E ; 6A
dw $C3A5, $83B5, $436E, $036E ; 6B
dw $C3A5, $FFFF, $436E, $03B1 ; 6C - Lanmolas 2
dw $C3B5, $FFFF, $43B7, $FFFF ; 6D
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 $C3A5, $FFFF, $436D, $03B0 ; 71
dw $C384, $8384, $4344, $0354 ; 72 - slight cheating I guess...
dw $C3B4, $83B4, $436E, $038B ; 73
dw $C340, $8340, $4345, $0345 ; 74
dw $C3B4, $83B4, $438A, $03B5 ; 75
dw $039A, $FFFF, $4365, $438D ; 71
dw $437A, $037A, $43A1, $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 $C36D, $83BC, $436E, $0397 ; 76
dw $C370, $8340, $43A0, $03A0 ; 77
dw $FFFF, $FFFF, $FFFF, $FFFF ; 78 - unused
@@ -123,47 +123,47 @@ dw $FFFF, $FFFF, $FFFF, $FFFF ; 79 - unused
dw $FFFF, $FFFF, $FFFF, $FFFF ; 7A - unused
dw $C35E, $83B1, $438F, $038D ; 7B
dw $C3B7, $83B4, $43B7, $03B7 ; 7C
dw $C36E, $83B0, $4392, $0391 ; 7D - warp tiles
dw $FFFF, $83B7, $839C, $C37A ; 7E
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 $C3B4, $83B5, $436D, $036E ; 83
dw $038F, $83B5, $4365, $43B7 ; 83
dw $C344, $8345, $4354, $0354 ; 84
dw $C38B, $83B2, $436E, $03B2 ; 85
dw $C38B, $C39B, $03B7, $439B ; 85
dw $FFFF, $FFFF, $FFFF, $FFFF ; 86 - unused
dw $C3A7, $836E, $4394, $03B4 ; 87
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 $C36D, $83B1, $436D, $03B0 ; 8B
dw $838A, $0360, $038A, $438D ; 8B
dw $83BE, $83BF, $03BD, $03B8 ; 8C
dw $C3B1, $836D, $43B0, $036D ; 8D
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 $C340, $8340, $4341, $0341 ; 92 - should it be split? idk
dw $C36C, $836C, $43B7, $03B4 ; 93
dw $039B, $C3B7, $0364, $039F ; 92 - should it be split? idk
dw $C36C, $836C, $C39B, $838F ; 93
dw $FFFF, $FFFF, $FFFF, $FFFF ; 94 - unused
dw $FFFF, $83B7, $FFFF, $03B5 ; 95
dw $C3B7, $FFFF, $436E, $0397 ; 96
dw $C3A5, $83B4, $436E, $036F ; 97
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 $C3B2, $835E, $435E, $0378 ; 9B
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, $439C, $FFFF, $FFFF ; A0
dw $839B, $C39C, $FFFF, $FFFF ; A0
dw $C3B0, $835D, $FFFF, $036A ; A1
dw $C385, $8385, $4356, $0346 ; A2 - show paths somehow
dw $C35A, $FFFF, $436A, $FFFF ; A3
dw $FFFF, $FFFF, $438E, $FFFF ; A4
dw $C3A5, $83B5, $436E, $036E ; A5
dw $039A, $0361, $C3B2, $83B2 ; A5
dw $C340, $8370, $4340, $0340 ; A6
dw $C396, $FFFF, $FFFF, $FFFF ; A7 - ToH fairy basement room
dw $039B, $83B6, $839B, $03A3 ; A8
@@ -174,8 +174,8 @@ 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, $439C, $839B, $C399 ; B0
dw $C34E, $83B5, $434C, $036D ; B1
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 $C350, $8340, $4384, $0384 ; B4
@@ -185,12 +185,12 @@ dw $C3B4, $FFFF, $43B5, $FFFF ; B7
dw $FFFF, $838A, $FFFF, $03B4 ; B8
dw $C36B, $836B, $4354, $0354 ; B9
dw $0364, $438D, $FFFF, $FFFF ; BA
dw $037A, $8364, $4372, $0364 ; BB
dw $C3BF, $437A, $8364, $C37A ; BC - block off entrances?
dw $838A, $8364, $4372, $0364 ; BB
dw $C3BF, $C38A, $8364, $438A ; BC - block off entrances?
dw $FFFF, $FFFF, $FFFF, $FFFF ; BD - unused
dw $FFFF, $439A, $FFFF, $C365 ; BE
dw $FFFF, $8396, $438D, $FFFF ; BF
dw $C372, $439C, $4372, $C399 ; C0
dw $C372, $C399, $4372, $C399 ; C0
dw $039B, $0364, $4365, $8364 ; C1
dw $C351, $8353, $4341, $0353 ; C2
dw $C353, $8340, $4343, $0340 ; C3 - show layers
@@ -206,7 +206,7 @@ dw $C353, $8350, $4347, $0354 ; CC
dw $FFFF, $FFFF, $FFFF, $FFFF ; CD - unused
dw $FFFF, $83B8, $FFFF, $FFFF ; CE - Kholdstare drop
dw $FFFF, $FFFF, $FFFF, $FFFF ; CF - unused
dw $C372, $439C, $4372, $C399 ; D0
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
@@ -222,7 +222,7 @@ 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 $C36E, $83A7, $43B5, $FFFF ; E0
dw $039B, $C399, $0361, $FFFF ; E0
; no more dungeon
dw $C340, $8340, $4350, $0340 ; E1 - lost woods thieves hideout