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

Bugfixes!

Browse Source
This commit is contained in:
karafruit
2026-01-13 18:57:55 -06:00
parent a011bc9f4a
commit 902e14b3f4
2 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dungeon_map/current_room_map.asm
View File

@@ -138,9 +138,11 @@ DrawFullRoomTile:
LDA.b $00 : PHA LDA.b $00 : PHA
LDA.b $02 : PHA LDA.b $02 : PHA
LDA.b $06 : PHA LDA.b $06 : PHA
LDA.b $08 : PHA
LDA.b $0E : PHA LDA.b $0E : PHA
JSL DrawSingleRoomLoot JSL DrawSingleRoomLoot
PLA : STA.b $0E PLA : STA.b $0E
PLA : STA.b $08
PLA : STA.b $06 PLA : STA.b $06
PLA : STA.b $02 PLA : STA.b $02
PLA : STA.b $00 PLA : STA.b $00
@@ -577,7 +579,12 @@ DrawStairs:
STA.b $CA STA.b $CA
JSR GetSpecificRoomVisibility JSR GetSpecificRoomVisibility
BEQ .ply_skip BNE +
LDA.b $0E
AND.w #$000F
BNE +
BRA .ply_skip
+
TYX TYX
LDA.b $CA LDA.b $CA
@@ -686,32 +693,42 @@ DrawDropOrWarp:
.found_drop .found_drop
LDA.w #$0DE0 LDA.w #$0DE0
STA.l $7F0574 PHA
INC A
STA.l $7F0576
LDA.l FallTable+2, X LDA.l FallTable+2, X
BRA .draw_room BRA .draw_room
.found_warp .found_warp
LDA.w #$0DE2 LDA.w #$0DE2
STA.l $7F0574 PHA
INC A
STA.l $7F0576
LDA.l WarpTable+2, X LDA.l WarpTable+2, X
.draw_room .draw_room
PHY
LDX.w #$0030
TXY
STA.l DoorSlots, X
STA.b $CA STA.b $CA
JSR GetSpecificRoomVisibility
BNE +
LDA.b $0E
AND.w #$000F
BNE +
PLA
BRA .done
+
PLA
STA.l $7F0574
INC A
STA.l $7F0576
LDX.w #$0030
LDA.b $CA
STA.l DoorSlots, X
LDA.w DoorSlotsBG2, X LDA.w DoorSlotsBG2, X
CLC : ADC.w #!CenterTile CLC : ADC.w #!CenterTile
TAX TAX
JSL DrawFullRoomTile JSL DrawFullRoomTile
PLY
.done .done
PLX PLX

34
dungeon_map/data/fall_warps.asm
View File

@@ -1,25 +1,25 @@
FallTable: FallTable:
db $1007, $1017 ; Moldorm Arena dw $1007, $1017 ; Moldorm Arena
db $1017, $1027 ; Below Moldorm drop to Big Chest dw $1017, $1027 ; Below Moldorm drop to Big Chest
db $101E, $103E ; IP first drop dw $101E, $103E ; IP first drop
db $1027, $1031 ; ToH Big Chest drop dw $1027, $1031 ; ToH Big Chest drop
db $1031, $1077 ; Second Floor ToH dw $1031, $1077 ; Second Floor ToH
db $1039, $1029 ; Mothula drop dw $1039, $1029 ; Mothula drop
db $103A, $100A ; Pod front drop dw $103A, $100A ; Pod front drop
db $103D, $1096 ; GT Torches drop dw $103D, $1096 ; GT Torches drop
db $104D, $10A6 ; Moldorm 2 drop dw $104D, $10A6 ; Moldorm 2 drop
db $1054, $1034 ; Left side Swamp dw $1054, $1034 ; Left side Swamp
db $105E, $107E ; IP drop to tall icy room dw $105E, $107E ; IP drop to tall icy room
db $107E, $109E ; Freezors drop (to big chest) dw $107E, $109E ; Freezors drop (to big chest)
db $208C, $101C ; Ice Armos drop dw $208C, $101C ; Ice Armos drop
db $1097, $10D1 ; Mire Cutscene dw $1097, $10D1 ; Mire Cutscene
db $109E, $10BE ; IP Big Chest tile (push blocks) dw $109E, $10BE ; IP Big Chest tile (push blocks)
db $10CE, $10DE ; Kholdstare drop dw $10CE, $10DE ; Kholdstare drop
; db $65, $AC ; TT Attic ; db $65, $AC ; TT Attic
; db $77, $A7 ; ToH drop to fairy room (Herapot) ; db $77, $A7 ; ToH drop to fairy room (Herapot)
; db $A9, $89 ; EP drop to fairy room ; db $A9, $89 ; EP drop to fairy room
; db $BE, $4F ; IP drop to fairy room ; db $BE, $4F ; IP drop to fairy room
db $FF dw $FFFF
WarpTable: WarpTable:
dw $2009, $104B ; PoD Basement (start) dw $2009, $104B ; PoD Basement (start)