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

rearrange all_items into exclusively bank 0x2B

Browse Source
This commit is contained in:
scawful
2024-06-21 10:42:08 -04:00
parent 5c97bd3ffc
commit 5ff116af19
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Items/all_items.asm
View File

@@ -1,17 +1,17 @@
; Inherits Free Space from Bank07 ; Inherits Free Space from Bank07
incsrc "Items/bottle_net.asm" incsrc "Items/bottle_net.asm"
; Starts Expanded Bank 0x2B
incsrc "Items/ocarina.asm" incsrc "Items/ocarina.asm"
print "End of Items/ocarina.asm ", pc print "End of Items/ocarina.asm ", pc
incsrc "Items/ice_rod.asm"
print "End of Items/ice_rod.asm ", pc
; Starts Expanded Bank 0x2B
incsrc "Items/jump_feather.asm" incsrc "Items/jump_feather.asm"
incsrc "Items/book_of_secrets.asm" incsrc "Items/book_of_secrets.asm"
incsrc "Items/sword_collect.asm" incsrc "Items/sword_collect.asm"
incsrc "Items/goldstar.asm" incsrc "Items/goldstar.asm"
incsrc "Items/portal_rod.asm" incsrc "Items/portal_rod.asm"
incsrc "Items/fishing_rod.asm" incsrc "Items/fishing_rod.asm"
; League of its own
incsrc "Items/ice_rod.asm"
print "End of Items/ice_rod.asm ", pc

2
Items/jump_feather.asm
View File

@@ -27,7 +27,7 @@ warnpc $07D248
; ========================================================= ; =========================================================
org $2B8000 pullpc
LinkItem_JumpFeather: LinkItem_JumpFeather:
{ {
JSL $07983A ; Reset swim state JSL $07983A ; Reset swim state

8
Items/ocarina.asm
View File

@@ -214,14 +214,14 @@ UpdateFluteSong:
JSL UpdateFluteSong_Long JSL UpdateFluteSong_Long
RTS RTS
} }
pushpc print "Bank07 Free Space: ", pc
; ZS OW ; ZS OW
; Load the rain overlay by default for the song of storms ; Load the rain overlay by default for the song of storms
org $02B011 org $02B011
LDX #$009F LDX #$009F
org $3C8000 org $2B8000
OcarinaEffect_SummonStorms: OcarinaEffect_SummonStorms:
{ {
; Dismiss the rain in the Zora area where it is already raining ; Dismiss the rain in the Zora area where it is already raining
@@ -362,7 +362,7 @@ UpdateFluteSong_Long:
RTL RTL
} }
warnpc $3CA62A pushpc ; Bank2B freespace
org $02F210 ; OverworldTransitionScrollAndLoadMap org $02F210 ; OverworldTransitionScrollAndLoadMap
{ {
@@ -427,5 +427,3 @@ RainAnimation_Overridden:
RTL RTL
} }
warnpc $02A52D warnpc $02A52D
pullpc