scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup dungeons.asm

Browse Source
This commit is contained in:
scawful
2024-06-09 11:35:54 -04:00
parent 5c175ff255
commit 3a2d529dca
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dungeons/dungeons.asm
View File

@@ -1,13 +1,16 @@
incsrc "Dungeons/keyblock.asm" incsrc "Dungeons/keyblock.asm"
print "End of keyblock.asm ", pc print "End of keyblock.asm ", pc
; Pendant from chest position
org $098823
LDY.b #$68
; Disable Code ; Disable Code
; ------------ ; ------------
org $028BE7 org $028BE7
db $EA, $EA db $EA, $EA
; Load Sanctuary music during Room 02 to 12 transition ; Load Sanctuary music during Room 02 to 12 transition
; ----------------------------------------------------
;org $028BDA ;org $028BDA
;db $14 ;db $14
@@ -16,7 +19,6 @@ db $EA, $EA
;db $12 ;db $12
; Load Hyrule Castle music during Room 12 to 02 transition ; Load Hyrule Castle music during Room 12 to 02 transition
; --------------------------------------------------------
;org $028BE3 ;org $028BE3
;db $16 ;db $16
@@ -24,8 +26,6 @@ db $EA, $EA
;org $028BE5 ;org $028BE5
;db $02 ;db $02
incsrc "Dungeons/entrances.asm"
print "End of entrances.asm ", pc
incsrc "Dungeons/enemy_damage.asm" incsrc "Dungeons/enemy_damage.asm"
print "End of enemy_damage.asm ", pc print "End of enemy_damage.asm ", pc
@@ -35,11 +35,10 @@ incsrc "Collision/GlobalCollisionTables.asm"
pullpc ; Bank 0x33 pullpc ; Bank 0x33
; incsrc "Dungeons/house_walls.asm" incsrc "Dungeons/entrances.asm"
print "End of entrances.asm ", pc
; Pendant from chest position ; incsrc "Dungeons/house_walls.asm"
org $098823
LDY.b #$68
; Use of Bank 0x2C begins ; Use of Bank 0x2C begins
incsrc "Dungeons/Objects/object_handler.asm" incsrc "Dungeons/Objects/object_handler.asm"