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

Moving some hijacked DR code to new location

Browse Source
This commit is contained in:
codemann8
2023-03-17 20:06:56 -05:00
committed by aerinon
parent b10dff8a30
commit bd2432d2ce
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LTTP_RND_GeneralBugfixes.asm
View File

@@ -510,6 +510,9 @@ Module_PreDungeon:
org $028296 org $028296
.setAmbientSfx .setAmbientSfx
org $828AD9
Underworld_SetBossOrSancMusicUponEntry:
org $02A0A8 org $02A0A8
Dungeon_SaveRoomData: Dungeon_SaveRoomData:

7
doorrando/drhooks.asm
View File

@@ -192,10 +192,9 @@ JSL.l Underworld_DoorDown_Entry : CPX #$FF
BEQ + : db $80, $1C ; BRA $028B04 BEQ + : db $80, $1C ; BRA $028B04
NOP #6 : + NOP #6 : +
org $82C3F2 ; <- Bank02.asm:10521 Unused call org $82FD00 ; unreachable code
Underworld_DoorDown_Call: Underworld_SetBossOrSancMusicUponEntry_long:
org $82C3F3 JSR Underworld_SetBossOrSancMusicUponEntry : RTL
dw $8AD9 ; address of Bank02.asm:2085
org $81AA90 org $81AA90
JSL BigKeyDoorCheck : NOP JSL BigKeyDoorCheck : NOP

2
doorrando/normal.asm
View File

@@ -412,7 +412,7 @@ StraightStairsTrapDoor:
.animateTraps .animateTraps
lda #$05 : sta $11 lda #$05 : sta $11
inc $0468 : stz $068e : stz $0690 inc $0468 : stz $068e : stz $0690
++ JSL Underworld_DoorDown_Call : rtl ++ JML Underworld_SetBossOrSancMusicUponEntry_long
+ JML Dungeon_ApproachFixedColor ; what we wrote over + JML Dungeon_ApproachFixedColor ; what we wrote over
} }