pitchoffset macro to replace forceoctave

This commit is contained in:
PikalaxALT
2016-07-29 10:40:54 -04:00
parent a32b6ccbb5
commit d84ebd2124
22 changed files with 97 additions and 103 deletions

View File

@@ -207,9 +207,9 @@ Music_Clair_branch_1fb77: ; 1fb77
octave 3
note A#, 16
note __, 4
forceoctave $c
pitchoffset 0, CC
callchannel Music_Clair_branch_1fba6
forceoctave $0
pitchoffset 0, C_
octave 5
note F#, 2
note __, 4
@@ -254,7 +254,7 @@ Music_Clair_branch_1fba6: ; 1fba6
Music_Clair_Ch3: ; 1fbb9
notetype $c, $14
forceoctave $c
pitchoffset 0, CC
octave 3
note C#, 2
note __, 4

View File

@@ -142,12 +142,12 @@ Music_Credits_Ch1: ; 1f328
note E_, 7
octave 3
note __, 1
forceoctave $2
pitchoffset 0, D_
callchannel Music_Credits_branch_1f483
callchannel Music_Credits_branch_1f4ed
callchannel Music_Credits_branch_1f4f8
callchannel Music_Credits_branch_1f559
forceoctave $0
pitchoffset 0, C_
octave 3
note A_, 12
notetype $8, $a7
@@ -664,11 +664,11 @@ Music_Credits_Ch2: ; 1f58d
note A_, 4
note G_, 4
notetype $6, $c7
forceoctave $2
pitchoffset 0, D_
callchannel Music_Credits_branch_1f6cb
callchannel Music_Credits_branch_1f73f
callchannel Music_Credits_branch_1f748
forceoctave $0
pitchoffset 0, C_
octave 5
note C#, 1
note D_, 11
@@ -1139,15 +1139,15 @@ Music_Credits_Ch3: ; 1f772
note F_, 1
note F#, 7
note G_, 8
forceoctave $2
pitchoffset 0, D_
callchannel Music_Credits_branch_1f8aa
callchannel Music_Credits_branch_1f8db
forceoctave $12
pitchoffset 1, D_
callchannel Music_Credits_branch_1f8e7
forceoctave $2
pitchoffset 0, D_
callchannel Music_Credits_branch_1f934
callchannel Music_Credits_branch_1f94b
forceoctave $0
pitchoffset 0, C_
octave 6
note C#, 2
octave 5

View File

@@ -13,13 +13,13 @@ Music_Evolution_Ch1: ; f06ed
dutycycle $2
notetype $c, $92
octave 3
slidepitchto 0, 4, A_
slidepitchto 1, 4, A_
note C_, 1
slidepitchto 0, 4, A_
slidepitchto 1, 4, A_
note G_, 1
slidepitchto 0, 4, A_
slidepitchto 1, 4, A_
note C_, 1
slidepitchto 0, 4, A_
slidepitchto 1, 4, A_
note G_, 1
note __, 4
dutycycle $3

View File

@@ -11,16 +11,16 @@ Music_HealPokemon_Ch1: ; f06a0
tone $0001
notetype $c, $81
note __, 2
slidepitchto 0, 4, __
slidepitchto 1, 4, __
note B_, 2
slidepitchto 0, 5, E_
slidepitchto 1, 5, E_
note B_, 2
slidepitchto 0, 4, E_
slidepitchto 1, 4, E_
note E_, 2
note __, 4
slidepitchto 0, 3, __
slidepitchto 1, 3, __
note E_, 4
slidepitchto 0, 4, __
slidepitchto 1, 4, __
note B_, 4
endchannel
; f06c4

View File

@@ -9,7 +9,7 @@ Music_KantoTrainerBattle: ; ec9fa
Music_KantoTrainerBattle_Ch1: ; eca04
tempo 114
volume $77
forceoctave $1b
pitchoffset 1, B_
notetype $c, $b3
vibrato $12, $24
dutycycle $1
@@ -467,7 +467,7 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88
; ecbea
Music_KantoTrainerBattle_Ch2: ; ecbea
forceoctave $1b
pitchoffset 1, B_
vibrato $6, $36
dutycycle $1
notetype $c, $d1
@@ -920,7 +920,7 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41
; ecdd2
Music_KantoTrainerBattle_Ch3: ; ecdd2
forceoctave $1b
pitchoffset 1, B_
vibrato $12, $23
notetype $c, $15
octave 2

View File

@@ -327,17 +327,17 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
notetype $6, $b7
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $0
pitchoffset 0, C_
rept 4
callchannel Music_KantoWildBattle_branch_ed307
endr
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $0
pitchoffset 0, C_
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
note __, 16
@@ -384,9 +384,9 @@ endr
note G#, 1
notetype $6, $b7
callchannel Music_KantoWildBattle_branch_ed31b
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed31b
forceoctave $0
pitchoffset 0, C_
callchannel Music_KantoWildBattle_branch_ed340
octave 2
note C_, 2
@@ -450,9 +450,9 @@ endr
callchannel Music_KantoWildBattle_branch_ed354
callchannel Music_KantoWildBattle_branch_ed340
callchannel Music_KantoWildBattle_branch_ed354
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed340
forceoctave $0
pitchoffset 0, C_
note C#, 2
note __, 2
octave 3

View File

@@ -73,9 +73,9 @@ Music_LookOfficer_branch_ed882: ; ed882
note E_, 2
note G#, 2
loopchannel 2, Music_LookOfficer_branch_ed882
forceoctave $1
pitchoffset 0, C#
callchannel Music_LookOfficer_branch_ed89e
forceoctave $0
pitchoffset 0, C_
callchannel Music_LookOfficer_branch_ed89e
loopchannel 0, Music_LookOfficer_branch_ed882
; ed89e

View File

@@ -8,7 +8,7 @@ Music_LookRocket: ; f74a2
Music_LookRocket_Ch1: ; f74ae
tempo 123
volume $77
forceoctave $2
pitchoffset 0, D_
stereopanning $f
dutycycle $3
vibrato $5, $64
@@ -94,7 +94,7 @@ Music_RocketTheme_branch_f750c: ; f750c
; f7514
Music_LookRocket_Ch2: ; f7514
forceoctave $2
pitchoffset 0, D_
vibrato $4, $64
dutycycle $3
notetype $c, $b7
@@ -216,7 +216,7 @@ Music_RocketTheme_branch_f758a: ; f758a
; f7597
Music_LookRocket_Ch3: ; f7597
forceoctave $2
pitchoffset 0, D_
vibrato $4, $22
notetype $c, $14
stereopanning $f0

View File

@@ -8,7 +8,7 @@ Music_PostCredits: ; cfd9e
Music_PostCredits_Ch1: ; cfda5
tempo 271
volume $77
forceoctave $3
pitchoffset 0, D#
dutycycle $2
notetype $c, $93
note __, 8
@@ -133,7 +133,7 @@ Music_PostCredits_branch_cfdb2: ; cfdb2
; cfe48
Music_PostCredits_Ch2: ; cfe48
forceoctave $3
pitchoffset 0, D#
dutycycle $2
notetype $c, $a3
octave 5

View File

@@ -34,10 +34,10 @@ Music_ProfOak_branch_f4e22: ; f4e22
callchannel Music_ProfOak_branch_f4e58
callchannel Music_ProfOak_branch_f4e6c
callchannel Music_ProfOak_branch_f4e6c
forceoctave $2
pitchoffset 0, D_
callchannel Music_ProfOak_branch_f4e58
callchannel Music_ProfOak_branch_f4e58
forceoctave $0
pitchoffset 0, C_
callchannel Music_ProfOak_branch_f4e6c
callchannel Music_ProfOak_branch_f4e6c
loopchannel 0, Music_ProfOak_branch_f4e22
@@ -241,10 +241,10 @@ Music_ProfOak_branch_f4f1d: ; f4f1d
callchannel Music_ProfOak_branch_f4f5a
callchannel Music_ProfOak_branch_f4f69
callchannel Music_ProfOak_branch_f4f69
forceoctave $2
pitchoffset 0, D_
callchannel Music_ProfOak_branch_f4f5a
callchannel Music_ProfOak_branch_f4f5a
forceoctave $0
pitchoffset 0, C_
callchannel Music_ProfOak_branch_f4f69
callchannel Music_ProfOak_branch_f4f69
loopchannel 0, Music_ProfOak_branch_f4f1d

View File

@@ -276,9 +276,9 @@ Music_SSAqua_branch_eaed5: ; eaed5
octave 4
note C#, 1
note E_, 1
forceoctave $c
pitchoffset 0, CC
callchannel Music_SSAqua_branch_eafe0
forceoctave $0
pitchoffset 0, C_
octave 3
note B_, 1
note __, 1

View File

@@ -425,7 +425,7 @@ Music_Surf_branch_f5333: ; f5333
note B_, 16
octave 4
note C#, 8
forceoctave $c
pitchoffset 0, CC
dutycycle $3
callchannel Music_Surf_branch_f53d6
intensity $b8
@@ -436,7 +436,7 @@ Music_Surf_branch_f5333: ; f5333
intensity $b8
dutycycle $1
callchannel Music_Surf_branch_f5404
forceoctave $0
pitchoffset 0, C_
notetype $c, $b8
octave 4
note B_, 12

View File

@@ -29,14 +29,14 @@ Music_WildPokemonVictory_branch_f4538: ; f4538
intensity $78
octave 3
note G_, 4
forceoctave $1
pitchoffset 0, C#
callchannel Music_WildPokemonVictory_branch_f455c
note F#, 2
note F#, 2
note F#, 4
callchannel Music_WildPokemonVictory_branch_f455c
note G#, 4
forceoctave $0
pitchoffset 0, C_
intensity $78
octave 3
note F#, 4
@@ -97,7 +97,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587
note E_, 1
note G_, 1
note A#, 1
forceoctave $1
pitchoffset 0, C#
callchannel Music_WildPokemonVictory_branch_f45b5
octave 4
note B_, 2
@@ -106,7 +106,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587
callchannel Music_WildPokemonVictory_branch_f45b5
octave 4
note B_, 4
forceoctave $0
pitchoffset 0, C_
intensity $81
octave 3
note B_, 1
@@ -156,7 +156,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf
note E_, 2
note __, 2
note C_, 4
forceoctave $1
pitchoffset 0, C#
callchannel Music_WildPokemonVictory_branch_f45f4
note D#, 2
note C#, 2
@@ -166,7 +166,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf
callchannel Music_WildPokemonVictory_branch_f45f4
note E_, 2
note __, 2
forceoctave $0
pitchoffset 0, C_
octave 2
note B_, 4
loopchannel 0, Music_WildPokemonVictory_branch_f45cf