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

Cleanup Ocarina song notes and comments

Browse Source
This commit is contained in:
scawful
2024-12-15 16:29:58 -05:00
parent c430f9c4a9
commit e0166057c7
1 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
Items/ocarina.asm
View File

@@ -1,86 +1,75 @@
; ========================================================= ; =========================================================
; Ocarina Multiple Song Select ; Ocarina Multiple Song Select
; ;
; ========================================================= ; $030F - Current Song RAM
; 00 - No Song
AddTravelBird = $0994FE ; 01 - Song of Storms
AddWeathervaneExplosion = $098D11 ; 02 - Song of Healing
Player_DoSfx1 = $078021 ; 03 - Song of Soaring
; 04 - Song of Time
; =========================================================
; Song of Healing
; SFX2_Accomp ; SFX2_Accomp
; SFX2 13 (Previous $3E) ; SFX2 13 (Previous $3E)
org $1A8C60 org $1A8C60 : db $00
db $00
; SFX2_13 ; SFX2_13
org $1A9750 org $1A9750
Song_of_Healing: Song_of_Healing:
{ {
db $E0, $0D %SetInstrument($0D) ; Ocarina
db $2A ; change this to change length of quarter note db $2A ; length of quarter note
db $46 db $46
db $A3, $A1, $9D db B3, A3, F3
db $A3, $A1, $9D db B3, A3, F3
db $A3, $A1 db B3, A3
db $15 ; make this half of whatever you made quarter note db $15 ; make this half of whatever you made quarter note
db $9C, $9A db E3, D3
db $7F ; make this triple whatever you made quarter note (max value 7F) db $7F ; make this triple whatever you made quarter note (max value 7F)
db $9C db E3
db $00 db End
} }
assert pc() <= $1A9765
; ========================================================= ; =========================================================
; D F D - D F D - E F E - F E C ; D F D - D F D - E F E - F E C
; D F d D F d e f e f e c ; D F d D F d e f e f e c
; SFX2_12
; org $1A977D
!Storms_Duration = $0F
!Storms_Params = $46
!Storms_Duration2 = $1E
!Storms_Params2 = $3C
org $1A92F7 ; SFX2_2F org $1A92F7 ; SFX2_2F
Song_of_Storms: Song_of_Storms:
{ {
db $E0, $0D ; set sfx instrument - twee !Storms_Duration = $0F
!Storms_Params = $46
!Storms_Duration2 = $1E
!Storms_Params2 = $3C
%SetInstrument($0D)
db !Storms_Duration db !Storms_Duration
db !Storms_Params ; duration 1/4 db !Storms_Params ; duration 1/4
db $9A ; play note D3 db D3, F3
db $9D ; play note F3
db !Storms_Duration2 db !Storms_Duration2
db !Storms_Params ; duration 1/2 db !Storms_Params ; duration 1/2
db $9A ; play note D3 db D3
db !Storms_Duration db !Storms_Duration
db !Storms_Params ; duration 1/4 db !Storms_Params ; duration 1/4
db $9A ; play note D3 db D3, F3
db $9D ; play note F3
db !Storms_Duration2 db !Storms_Duration2
db !Storms_Params ; duration 1/2 db !Storms_Params ; duration 1/2
db $9A ; play note D3 db D3
db !Storms_Duration db !Storms_Duration
db !Storms_Params2 ; duration 1/4 db !Storms_Params2 ; duration 1/4
db $9C ; play note E3 db E3, F3, E3
db $9D ; play note F3
db $9C ; play note E3
db $9D ; play note F3 db F3, E3
db $9C ; play note E3
db !Storms_Duration2 db !Storms_Duration2
db !Storms_Params2 ; duration 1/2 db !Storms_Params2 ; duration 1/2
db $98 ; play note C3 db C3
db End
db $00 ; end sfx
} }
; assert pc() <= $1A8FD4 assert pc() <= $1A931F
; ========================================================= ; =========================================================
@@ -94,8 +83,7 @@ Song_of_Time:
!Time4th = $2A !Time4th = $2A
!TimeParams = $46 !TimeParams = $46
db $E0, $0D ; set sfx instrument - twee %SetInstrument($0D)
db !Time4th ; duration 1/4 db !Time4th ; duration 1/4
db !TimeParams ; params db !TimeParams ; params
db A3 db A3
@@ -117,12 +105,16 @@ Song_of_Time:
db !TimeParams ; params db !TimeParams ; params
db F3 db F3
db $00 ; end sfx db End
} }
assert pc() <= $1A922B assert pc() <= $1A922B
; ========================================================= ; =========================================================
AddTravelBird = $0994FE
AddWeathervaneExplosion = $098D11
Player_DoSfx1 = $078021
org $07A3DB org $07A3DB
LinkItem_FluteHook: LinkItem_FluteHook:
JSR LinkItem_NewFlute JSR LinkItem_NewFlute
@@ -305,12 +297,12 @@ OcarinaEffect_SummonStorms:
; Y: E8 06, X: 48 0C ; Y: E8 06, X: 48 0C
CheckForZoraEvent: CheckForZoraEvent:
{ {
LDA $20 : CMP.w #$06E8 : BNE .notZora LDA $20 : CMP.w #$06E8 : BNE .not_zora
LDA $22 : CMP.w #$0C48 : BNE .notZora LDA $22 : CMP.w #$0C48 : BNE .not_zora
LDA.b #$01 : STA $04C6 LDA.b #$01 : STA $04C6
SEC SEC
RTS RTS
.notZora .not_zora
CLC CLC
RTS RTS
} }
@@ -333,7 +325,7 @@ CheckRealTable:
CMP.b #$9F : BNE .not_rain_area CMP.b #$9F : BNE .not_rain_area
RTL RTL
.not_rain_area .not_rain_area
STZ.b $1D
JML RainAnimation_Overridden_skipMovement JML RainAnimation_Overridden_skipMovement
} }
@@ -349,13 +341,6 @@ ResetOcarinaFlag:
RTL RTL
} }
; $030F - Current Song RAM
; 00 - No Song
; 01 - Song of Storms
; 02 - Song of Healing
; 03 - Song of Soaring
; 04 - Song of Time
; Values at $7EF34C determine scrolling behavior ; Values at $7EF34C determine scrolling behavior
; 01 - No scrolling allowed ; 01 - No scrolling allowed
; 02 - Scroll between two songs ; 02 - Scroll between two songs
@@ -415,10 +400,8 @@ print "End of Items/ocarina.asm ", pc
pushpc ; Bank2B freespace pushpc ; Bank2B freespace
org $02F210 ; OverworldTransitionScrollAndLoadMap ; OverworldTransitionScrollAndLoadMap
{ org $02F210 : JSL ResetOcarinaFlag
JSL ResetOcarinaFlag
}
; ZS OW ; ZS OW
org $02A4CD org $02A4CD