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

Reorganize expanded banks

Browse Source
This commit is contained in:
scawful
2024-01-15 14:11:40 -05:00
parent decc99dc2b
commit 7d71cb1ad9
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dungeons/Objects/Collision/main.asm
View File

@@ -1,5 +1,5 @@
incsrc CollisionTablesExpanded_Hook.asm incsrc CollisionTablesExpanded_Hook.asm
org $348000 org $338000
incsrc CollisionTablesExpanded.asm incsrc CollisionTablesExpanded.asm

5
Dungeons/house_tag.asm
View File

@@ -10,7 +10,8 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
org $01CC5A org $01CC5A
HouseTag_Return: HouseTag_Return:
org $2F8000 ; org $2F8000
pullpc
HouseTag: HouseTag:
{ {
PHX PHX
@@ -110,6 +111,8 @@ HouseTag_End:
RTS RTS
} }
pushpc
; ============================================================================== ; ==============================================================================
; Dying Uncle Code Hook ; Dying Uncle Code Hook
; Uncle won't remove tagalong when interacting ; Uncle won't remove tagalong when interacting

1
Dungeons/spike_subtype.asm
View File

@@ -45,3 +45,4 @@ LDA $0D40, X : EOR.b #$FF : INC A : STA $0D40, X
LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong
RTL RTL
pushpc

6
Dungeons/together_warp_tag.asm
View File

@@ -14,7 +14,7 @@
;relpaces the original tag. ;relpaces the original tag.
dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)" ; dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"
org $01CC1C org $01CC1C
JML WarpTag JML WarpTag
@@ -24,7 +24,9 @@ org $01CC5A
; ============================================================================== ; ==============================================================================
org $338000 ; org $338000
pullpc ; Bank 0x2C
print "Warp Tag", pc
WarpTag: WarpTag:
{ {
PHX PHX

2
Masks/deku_mask.asm
View File

@@ -69,7 +69,7 @@ LinkState_UsingQuake:
warnpc $07A779 warnpc $07A779
org $318000 org $348000
; org $07A013 ; org $07A013
; JSL LinkItem_SlingshotPrepare ; JSL LinkItem_SlingshotPrepare

6
Sprites/all_sprites.asm
View File

@@ -28,12 +28,12 @@ incsrc ZSpriteLib/sprite_functions_hooks.asm
;============================================================================== ;==============================================================================
org $298000 org $308000
incsrc ZSpriteLib/sprite_new_table.asm incsrc ZSpriteLib/sprite_new_table.asm
;============================================================================== ;==============================================================================
org $2A8000 org $318000
incsrc ZSpriteLib/sprite_new_functions.asm incsrc ZSpriteLib/sprite_new_functions.asm
incsrc "Sprites/farore.asm" incsrc "Sprites/farore.asm"
@@ -86,4 +86,4 @@ print "End of poltergeist.asm ", pc
incsrc "Sprites/NPCs/bug_net_kid.asm" incsrc "Sprites/NPCs/bug_net_kid.asm"
warnpc $2B8000 warnpc $328000