Show stairs, warps, and drops in doors map

2026-01-11 21:42:48 -06:00
parent e56b8a55fe
commit 970d1f5db0
9 changed files with 480 additions and 123 deletions
--- a/dungeon_map/data/doors_display.asm
+++ b/dungeon_map/data/doors_display.asm
@@ -1,34 +1,42 @@
 DoorSlotsSprites:
 ; center
-	dw $68A8
+	dw $48A8
 ; north
-	dw $4090, $40A8, $40C0
-	dw $4098, $40B8
+	dw $2090, $20A8, $20C0
+	dw $2098, $20B8
 ; west
-	dw $5080, $6880, $8080
-	dw $5880, $7880
+	dw $3080, $4880, $6080
+	dw $3880, $5880
 ; south
-	dw $9090, $90A8, $90C0
-	dw $9098, $90B8
+	dw $7090, $70A8, $70C0
+	dw $7098, $70B8
 ; east
-	dw $50D0, $68D0, $80D0
-	dw $58D0, $78D0
+	dw $30D0, $48D0, $60D0
+	dw $38D0, $58D0
+; stairs
+	dw $B080, $B098, $B0B0
+; drop/warp
+	dw $B0D0

 DoorSlotsBG1:
 ; center
-	dw $11B5
+	dw $1135
 ; north
-	dw $1112, $1115, $1118
-	dw $1113, $1117
+	dw $1092, $1095, $1098
+	dw $1093, $1097
 ; west
-	dw $1150, $11B0, $1210
-	dw $1170, $15F0
+	dw $10D0, $1130, $1190
+	dw $10F0, $1170
 ; south
-	dw $1252, $1255, $1258
-	dw $1253, $1257
+	dw $11D2, $11D5, $11D8
+	dw $11D3, $11D7
 ; east
-	dw $115A, $11BA, $121A
-	dw $117A, $11FA
+	dw $10DA, $113A, $119A
+	dw $10FA, $117A
+; stairs
+	dw $12D0, $12D3, $12D6
+; drop/warp
+	dw $12DA

 DoorSlotsBG2:
 ; center
@@ -45,6 +53,10 @@ DoorSlotsBG2:
 ; east
 	dw $FF4A, $000A, $00CA
 	dw $FF8A, $008A
+; stairs
+	dw $0336, $033C, $0342
+; drop/warp
+	dw $034A

 DoorSlotSides:
 	db $02, $0C, $16, $20
@@ -68,34 +80,40 @@ NextCursorSlot:
 	db $06, $FF, $07, $00
 	db $07, $FF, $08, $00
 ; bottom
-	db $00, $E1, $FF, $0E
-	db $00, $0E, $FF, $0F
-	db $00, $0F, $FF, $E3
-	db $00, $0B, $FF, $0C
-	db $00, $0C, $FF, $0D
+	db $00, $E1, $C4, $0E
+	db $00, $0E, $C4, $0F
+	db $00, $0F, $C4, $E3
+	db $00, $0B, $C4, $0C
+	db $00, $0C, $C4, $0D
 ; right
 	db $E0, $00, $13, $FF
 	db $13, $00, $14, $FF
 	db $14, $00, $E2, $FF
 	db $10, $00, $11, $FF
 	db $11, $00, $12, $FF
+; stairs
+	db $C2, $E1, $FF, $16
+	db $C2, $15, $FF, $17
+	db $C2, $16, $FF, $18
+; drop/warp
+	db $C2, $17, $FF, $E3

 NextCursorSpecial:
 .center
 	db $02, $04, $05, $01, $03, $FF
 	db $07, $09, $0A, $06, $08, $FF
-	db $0C, $0E, $0F, $0B, $0D, $FF
+	db $0C, $0E, $0F, $0B, $0D, $15, $16, $17, $18, $FF
 	db $11, $13, $14, $10, $12, $FF
 .center_offset
-	db $00, $06, $0C, $12
+	db $00, $06, $0C, $16
 .start_index
-	db $01, $06, $0B, $10
+	db $01, $06, $0B, $10, $15
 .start_direction
-	db $03, $02, $03, $02
+	db $03, $02, $03, $02, $03
 .end_index
-	db $03, $08, $0D, $12
+	db $03, $08, $0D, $12, $18
 .end_direction
-	db $01, $00, $01, $00
+	db $01, $00, $01, $00, $01

 SingleEdgeCurrentRoomConnectors:
 .north
@@ -233,8 +251,8 @@ EdgeConnectionIndices:
 	dw $0565, $0042
 	dw $0574, $0045
 	dw $0575, $0048
-	dw $0382, $004B
-	dw $0582, $004E
+	dw $0582, $004B
+	dw $0382, $004E
 	dw $0385, $0051
 	dw $03CC, $0054
 	dw $05CC, $0057
--- a/dungeon_map/data/fall_warps.asm
+++ b/dungeon_map/data/fall_warps.asm
@@ -0,0 +1,38 @@
+FallTable:
+db $07, $17 ; Moldorm Arena
+db $17, $27 ; Below Moldorm drop to Big Chest
+db $1E, $3E ; IP first drop
+db $27, $31 ; ToH Big Chest drop
+db $31, $77 ; Second Floor ToH
+db $39, $29 ; Mothula drop
+db $3A, $0A ; Pod front drop
+db $3D, $96 ; GT Torches drop
+db $4D, $A6 ; Moldorm 2 drop
+db $54, $34 ; Left side Swamp
+db $5E, $7E ; IP drop to tall icy room
+db $7E, $9E ; Freezors drop (to big chest)
+db $8C, $1C ; Ice Armos drop
+db $97, $D1 ; Mire Cutscene
+db $9E, $BE ; IP Big Chest tile (push blocks)
+db $CE, $DE ; Kholdstare drop
+; db $65, $AC ; TT Attic
+; db $77, $A7 ; ToH drop to fairy room (Herapot)
+; db $A9, $89 ; EP drop to fairy room
+; db $BE, $4F ; IP drop to fairy room
+db $FF
+
+WarpTable:
+db $09, $4B ; PoD Basement (start)
+db $0A, $09 ; PoD Stalfos Basement
+db $0B, $6A ; PoD Turtle Room to Boss
+db $4B, $09 ; PoD Basement (mimics)
+db $7B, $9D ; GT post-compass
+db $7D, $9B ; GT warp maze
+db $9D, $7B ; GT compass room
+db $9B, $7D ; GT warp maze
+db $B1, $B2 ; South of Fishbone warp
+db $D1, $B1 ; Mire Big Key Chest warp
+; db $89, $A9 ; EP Fairy Room
+; db $A7, $17 ; ToH Fairy Room
+; db $4F, $BE ; IP Fairy Room
+db $FF
--- a/dungeon_map/data/spiral_stairs.asm
+++ b/dungeon_map/data/spiral_stairs.asm
@@ -0,0 +1,66 @@
+SpiralPropsIndex:
+db $00, $04, $07, $00, $01, $00, $00, $0D, $00, $10, $04, $00, $15, $00, $0A, $00
+db $00, $07, $00, $00, $00, $01, $07, $1C, $00, $00, $21, $00, $26, $01, $0A, $00
+db $00, $00, $00, $00, $00, $00, $29, $30, $01, $00, $00, $00, $00, $00, $00, $00
+db $00, $35, $00, $00, $3A, $00, $00, $00, $01, $00, $04, $00, $00, $00, $00, $3D
+db $40, $07, $07, $00, $00, $01, $00, $00, $00, $00, $43, $00, $07, $07, $07, $00
+db $00, $00, $00, $01, $48, $00, $00, $00, $00, $00, $00, $00, $07, $07, $00, $4B
+db $00, $00, $00, $01, $50, $00, $07, $00, $00, $00, $53, $01, $01, $00, $58, $00
+;   0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
+db $5B, $01, $04, $00, $00, $00, $60, $67, $00, $00, $00, $00, $00, $00, $00, $6E
+db $01, $00, $00, $00, $00, $00, $00, $71, $00, $00, $00, $00, $76, $00, $04, $00
+db $00, $07, $00, $04, $00, $00, $00, $01, $7D, $0A, $00, $00, $00, $00, $04, $00
+db $01, $00, $04, $00, $00, $01, $07, $00, $00, $00, $00, $0A, $00, $00, $07, $00
+db $80, $00, $00, $00, $00, $01, $01, $00, $00, $00, $00, $00, $01, $00, $07, $00
+db $85, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $8A, $04, $8F, $00, $00, $00, $00, $00, $00, $00, $0A, $00, $00, $00, $00, $00
+db $04
+
+SpiralProps:
+db $00 ;null row
+db $01, $00, $00 ; ($01) Single Top-Left Staircase
+db $01, $00, $01 ; ($04) Single Top-Middle Staircase
+db $01, $00, $02 ; ($07) Single Top-Right Staircase
+db $01, $00, $05 ; ($0A) Single Staircase at Top of Bottom Left Quadrant
+
+db $01, $00, $04 ; ($0D) Moldorm
+db $02, $00, $00, $01, $02 ; ($10) Pod Basement
+db $03, $00, $00, $01, $01, $02, $02 ; ($15) GT Entrance
+db $02, $00, $03, $01, $04 ; ($1C) Hera Below Moldorm
+db $03, $00, $01, $01, $02 ; ($21) PoD Bridge
+db $01, $00, $08 ; ($26) GT Ice Armos
+db $03, $00, $01, $01, $02, $02, $09 ; ($29) Swamp Statue
+db $02, $00, $03, $01, $04 ; ($30) Hera Big Chest
+db $02, $00, $04, $02, $09 ; ($35) Hera Startiles (middle value unused)
+db $01, $00, $08 ; ($3A) West Swamp
+db $01, $00, $05 ; ($3D) Ice Hamlift
+db $01, $00, $07 ; ($40) Aga Guards
+db $02, $00, $00, $01, $02 ; ($43) Pod Entrance
+db $01, $00, $08 ; ($48) Swamp Attic
+db $03, $03, $05, $04, $06 ; ($4B) Ice U (1st three values unused)
+db $01, $00, $05 ; ($50) TT Attic Left
+db $02, $00, $01, $01, $02 ; ($53) Pod Rupees
+db $01, $00, $04 ; ($58) Ice Gators
+db $02, $01, $00, $02, $01 ; ($5B) HC Tiny (first value placeholder)
+db $03, $00, $01, $01, $02, $02, $09 ; ($60) Swamp Sunken
+db $03, $01, $00, $02, $08, $03, $09 ; ($67) Hera Entrance (first value unused)
+db $01, $00, $08 ; ($6E) Ice Hookshot
+db $02, $01, $00, $03, $08 ; ($71) Hera Basement (first and third values unused)
+db $03, $00, $00, $01, $02, $03, $08 ; ($76) GT Circle (third value unused)
+db $01, $00, $07 ; ($7D) Mire Entrance
+db $02, $00, $02, $02, $09 ; ($80) Tower Usains (2nd value unused)
+db $02, $00, $02, $02, $09 ; ($85) Tower Dark2 (2nd value unused)
+db $02, $00, $02, $02, $09 ; ($8A) Tower Dark1 (2nd value unused)
+db $01, $00, $09 ; ($8F) Mire2
+
+SpiralLabelOffsets:
+db 1, -8
+db 5, -8
+db 9, -8
+db -6, -1
+db 15, -1
+db 1, 0
+db 5, 0
+db 9, 0
+db -6, 7
+db 15, 7