More bug fixes!

- The Zapdos in Brunswick Glade now vanish correctly, due to fixing a desync in the hide/show data

- Brunswick Glade's palette displays correctly

- Improved Citrine City's theme a little

- Changed palettes for Cryithan's line to reflect their upcoming redesign

- Updated Cryithan's sprite
This commit is contained in:
Martha Schilling 2023-07-15 00:07:05 +01:00
parent 6e3a81a163
commit 21b3f0f5a7
13 changed files with 207 additions and 296 deletions

View file

@ -1,10 +1,3 @@
;Coverted using MIDI2ASM
;Code by TriteHexagon
;Version 5.2.0 (16-Nov-2022)
;Visit github.com/TriteHexagon/Midi2ASM-Converter for up-to-date versions.
; ============================================================================================================
Music_Citrine:
channel_count 4
channel 1, Music_Citrine_Ch1
@ -12,178 +5,15 @@ Music_Citrine:
channel 3, Music_Citrine_Ch3
channel 4, Music_Citrine_Ch4
Music_Citrine_Ch1: ; a913 (2:6913)
;; P2-1
Music_Citrine_Ch1:
tempo 144
volume 7, 7
note_type 12, 13, 3
vibrato 5, 1, 6
Music_Citrine_branch_a91b:
note_type 12, 1, 8
octave 4
note E_, 1
rest 1
note G#, 1
rest 1
note F#, 1
rest 1
note A_, 1
note G#, 1
rest 8
;; P2-2
note D#, 1
rest 1
note F#, 1
rest 1
note E_, 1
rest 1
note G#, 1
note F#, 1
rest 4
octave 3
note B_, 2
rest 2
;; P2-3
octave 4
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
;; P2-4
note F#, 4
note E_, 4
note F#, 1
note G#, 1
rest 1
note F#, 1
rest 1
note D#, 2
rest 1
;; P2-5
note E_, 1
rest 1
note G#, 1
rest 1
note F#, 1
rest 1
note A_, 1
note G#, 1
rest 4
note E_, 2
rest 2
;; P2-6
note D#, 1
rest 1
note F#, 1
rest 1
note E_, 1
rest 1
note G#, 1
note F#, 1
rest 8
;; P2-7
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
;; P2-8
note F#, 4
note E_, 4
note F#, 1
note G#, 1
rest 1
note B_, 1
rest 1
note F#, 2
rest 1
;; P2-9
note C#, 2
rest 2
note D#, 2
rest 2
note E_, 2
rest 2
note G#, 2
rest 2
;; P2-10
note D#, 8
rest 2
note E_, 2
note D#, 2
note C#, 2
;; P2-11
octave 3
note B_, 2
rest 2
octave 4
note C#, 2
rest 2
note D#, 2
rest 2
note F#, 2
rest 2
;; P2-12
note C#, 8
rest 2
note D#, 2
note C#, 2
octave 3
note B_, 2
;; P2-13
note A_, 2
note G#, 2
note A_, 2
note G#, 1
note F#, 1
rest 8
;; P2-14
note B_, 2
note A#, 2
note B_, 2
note A_, 1
note G#, 1
rest 4
note G#, 2
rest 2
;; P2-15
note F#, 2
note F_, 2
note F#, 2
note G#, 2
note A_, 2
note E_, 2
note C#, 2
note E_, 2
;; P2-16
note F#, 2
rest 6
note D#, 2
rest 6
sound_loop 0, Music_Citrine_Ch1
sound_ret
Music_Citrine_Ch2: ; a9cf (2:69cf)
note_type 12, 1, 0
volume_envelope 7, 7
octave 4
vibrato 3, 1, 6
note E_, 1
rest 1
octave 3
@ -199,7 +29,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
rest 4
note E_, 2
rest 2
;; P3-2
note D#, 1
rest 1
octave 3
@ -213,7 +42,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
octave 4
note D#, 1
rest 8
;; P3-3
note C#, 1
rest 1
note D#, 1
@ -231,7 +59,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
octave 3
note B_, 1
rest 2
;; P3-4
octave 4
note D#, 4
note C#, 4
@ -243,7 +70,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
octave 3
note B_, 2
rest 1
;; P3-5
octave 4
note E_, 1
rest 1
@ -258,7 +84,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
octave 4
note E_, 1
rest 8
;; P3-6
note D#, 1
rest 1
octave 3
@ -275,7 +100,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
octave 3
note B_, 2
rest 2
;; P3-7
octave 4
note C#, 1
rest 1
@ -293,7 +117,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
note E_, 1
note F#, 1
rest 2
;; P3-8
note F#, 4
note E_, 4
note F#, 1
@ -303,7 +126,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
rest 1
note D#, 2
rest 3
;; P3-9 --- tied
octave 3
note A_, 2
rest 2
@ -313,14 +135,12 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
note C#, 2
rest 2
note E_, 2
;; P3-10
note F#, 8
rest 2
note E_, 2
note D#, 2
note C#, 2
rest 2
;; P3-11 --- tied
octave 3
note G#, 2
rest 2
@ -330,13 +150,11 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
rest 2
octave 4
note D#, 2
;; P3-12
note E_, 8
rest 2
note D#, 2
note C#, 2
note D#, 2
;; P3-13
octave 3
note A_, 2
note G#, 2
@ -346,7 +164,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
rest 4
note F#, 2
rest 2
;; P3-14
note B_, 2
note A#, 2
note B_, 2
@ -354,7 +171,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
note C_, 1
note C#, 1
rest 8
;; P3-15
octave 3
note F#, 2
note F_, 2
@ -365,23 +181,170 @@ Music_Citrine_Ch2: ; a9cf (2:69cf)
note E_, 2
note D#, 2
note C#, 2
;; P3-16
octave 3
note B_, 2
rest 6
note B_, 2
rest 6
sound_loop 0, Music_Citrine_Ch2
sound_loop 0, Music_Citrine_branch_a91b
sound_ret
; ============================================================================================================
Music_Citrine_Ch2:
volume 7, 7
toggle_perfect_pitch
vibrato 6, 1, 5
Music_Citrine_branch_a9d8:
note_type 12, 1, 8
octave 4
volume_envelope 7, 7
vibrato 4, 1, 5
note E_, 1
rest 1
note G#, 1
rest 1
note F#, 1
rest 1
note A_, 1
note G#, 1
rest 8
note D#, 1
rest 1
note F#, 1
rest 1
note E_, 1
rest 1
note G#, 1
note F#, 1
rest 4
octave 3
note B_, 2
rest 2
octave 4
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note F#, 4
note E_, 4
note F#, 1
note G#, 1
rest 1
note F#, 1
rest 1
note D#, 2
rest 1
note E_, 1
rest 1
note G#, 1
rest 1
note F#, 1
rest 1
note A_, 1
note G#, 1
rest 4
note E_, 2
rest 2
note D#, 1
rest 1
note F#, 1
rest 1
note E_, 1
rest 1
note G#, 1
note F#, 1
rest 8
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note C#, 1
rest 1
note D#, 1
rest 1
note E_, 1
note F#, 1
rest 2
note F#, 4
note E_, 4
note F#, 1
note G#, 1
rest 1
note B_, 1
rest 1
note F#, 2
rest 1
note C#, 2
rest 2
note D#, 2
rest 2
note E_, 2
rest 2
note G#, 2
rest 2
note D#, 8
rest 2
note E_, 2
note D#, 2
note C#, 2
octave 3
note B_, 2
rest 2
octave 4
note C#, 2
rest 2
note D#, 2
rest 2
note F#, 2
rest 2
note C#, 8
rest 2
note D#, 2
note C#, 2
octave 3
note B_, 2
note A_, 2
note G#, 2
note A_, 2
note G#, 1
note F#, 1
rest 8
note B_, 2
note A#, 2
note B_, 2
note A_, 1
note G#, 1
rest 4
note G#, 2
rest 2
note F#, 2
note F_, 2
note F#, 2
note G#, 2
note A_, 2
note E_, 2
note C#, 2
note E_, 2
note F#, 2
rest 6
note D#, 2
rest 6
sound_loop 0, Music_Citrine_branch_a9d8
Music_Citrine_Ch3:
note_type 4, 1, 0
;Bar 1
octave 4
volume_envelope 2, 0
note E_, 6
rest 6
octave 3
@ -392,7 +355,6 @@ Music_Citrine_Ch3:
note E_, 6
note G#, 6
note E_, 6
;Bar 2
note D#, 6
rest 6
octave 3
@ -403,7 +365,6 @@ Music_Citrine_Ch3:
note D#, 6
note G#, 6
note D#, 6
;Bar 3
note C#, 6
rest 6
octave 3
@ -417,7 +378,6 @@ Music_Citrine_Ch3:
note C#, 6
octave 3
note A_, 6
;Bar 4
octave 4
note D#, 12
note C#, 6
@ -427,7 +387,6 @@ Music_Citrine_Ch3:
octave 4
note C#, 6
note D#, 6
;Bar 5
note E_, 6
rest 6
octave 3
@ -438,7 +397,6 @@ Music_Citrine_Ch3:
note E_, 6
note G#, 6
note E_, 6
;Bar 6
note D#, 6
rest 6
octave 3
@ -449,7 +407,6 @@ Music_Citrine_Ch3:
note D#, 6
note G#, 6
note D#, 6
;Bar 7
note C#, 6
rest 6
octave 3
@ -463,7 +420,6 @@ Music_Citrine_Ch3:
note C#, 6
octave 3
note A_, 6
;Bar 8
octave 4
note D#, 12
note C#, 12
@ -474,33 +430,28 @@ Music_Citrine_Ch3:
rest 3
note C#, 6
rest 3
;Bar 9
note C#, 12
note D#, 12
note E_, 12
note G#, 12
;Bar 10
note F#, 12
rest 6
note F#, 12
note E_, 6
note D#, 6
note E_, 6
;Bar 11
octave 3
note B_, 12
octave 4
note C#, 12
note D#, 12
note F#, 12
;Bar 12
note E_, 12
rest 6
note E_, 12
note E_, 6
note D#, 6
note C#, 6
;Bar 13
note E_, 6
note D#, 6
note E_, 6
@ -509,7 +460,6 @@ Music_Citrine_Ch3:
rest 12
note D#, 6
rest 6
;Bar 14
note F#, 6
note D#, 6
note F#, 6
@ -518,19 +468,16 @@ Music_Citrine_Ch3:
rest 12
note E_, 6
rest 6
;Bar 15
note A_, 16
note A_, 16
note A_, 4
note G#, 12
;Bar 16
note F#, 6
rest 16
rest 2
note D#, 6
rest 16
rest 2
;Bar 17
note E_, 6
rest 6
octave 3
@ -541,7 +488,6 @@ Music_Citrine_Ch3:
note E_, 6
note G#, 6
note E_, 6
;Bar 18
note D#, 6
rest 6
octave 3
@ -552,7 +498,6 @@ Music_Citrine_Ch3:
note D#, 6
note G#, 6
note D#, 6
;Bar 19
note C#, 6
rest 6
octave 3
@ -566,7 +511,6 @@ Music_Citrine_Ch3:
note C#, 6
octave 3
note A_, 6
;Bar 20
octave 4
note D#, 12
note C#, 6
@ -576,7 +520,6 @@ Music_Citrine_Ch3:
octave 4
note C#, 6
note D#, 6
;Bar 21
note E_, 6
rest 6
octave 3
@ -587,7 +530,6 @@ Music_Citrine_Ch3:
note E_, 6
note G#, 6
note E_, 6
;Bar 22
note D#, 6
rest 6
octave 3
@ -598,7 +540,6 @@ Music_Citrine_Ch3:
note D#, 6
note G#, 6
note D#, 6
;Bar 23
note C#, 6
rest 6
octave 3
@ -612,7 +553,6 @@ Music_Citrine_Ch3:
note C#, 6
octave 3
note A_, 6
;Bar 24
octave 4
note D#, 12
note C#, 12
@ -623,33 +563,28 @@ Music_Citrine_Ch3:
rest 3
note C#, 6
rest 3
;Bar 25
note C#, 12
note D#, 12
note E_, 12
note G#, 12
;Bar 26
note F#, 12
rest 6
note F#, 12
note E_, 6
note D#, 6
note E_, 6
;Bar 27
octave 3
note B_, 12
octave 4
note C#, 12
note D#, 12
note F#, 12
;Bar 28
note E_, 12
rest 6
note E_, 12
note E_, 6
note D#, 6
note C#, 6
;Bar 29
note E_, 6
note D#, 6
note E_, 6
@ -658,7 +593,6 @@ Music_Citrine_Ch3:
rest 12
note D#, 6
rest 6
;Bar 30
note F#, 6
note D#, 6
note F#, 6
@ -667,12 +601,10 @@ Music_Citrine_Ch3:
rest 12
note E_, 6
rest 6
;Bar 31
note A_, 16
note A_, 16
note A_, 4
note G#, 12
;Bar 32
note F#, 6
rest 16
rest 2
@ -680,15 +612,13 @@ Music_Citrine_Ch3:
rest 16
rest 2
sound_loop 0, Music_Citrine_Ch3
sound_ret
Music_Citrine_Ch4::
Music_Citrine_Ch4:
toggle_noise 0
Music_Citrine_Ch4_MainLoop::
Music_Citrine_Ch4_MainLoop:
drum_speed 12
sound_call Music_Citrine_branch_ad36
Music_Citrine_branch_acf3::
Music_Citrine_branch_acf3:
sound_call Music_Citrine_branch_ad36
sound_call Music_Citrine_branch_ad45
sound_call Music_Citrine_branch_ad45
@ -716,7 +646,7 @@ Music_Citrine_branch_acf3::
drum_note 8, 4
sound_loop 0, Music_Citrine_Ch4_MainLoop
Music_Citrine_branch_ad36::
Music_Citrine_branch_ad36:
drum_note 8, 6
drum_note 8, 6
drum_note 8, 4
@ -726,7 +656,7 @@ Music_Citrine_branch_ad36::
drum_note 8, 2
sound_ret
Music_Citrine_branch_ad45::
Music_Citrine_branch_ad45:
drum_note 8, 6
drum_note 8, 6
drum_note 8, 4
@ -735,7 +665,7 @@ Music_Citrine_branch_ad45::
drum_note 8, 4
sound_ret
Music_Citrine_branch_ad52::
Music_Citrine_branch_ad52:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 4
@ -744,7 +674,7 @@ Music_Citrine_branch_ad52::
drum_note 7, 4
sound_ret
Music_Citrine_branch_ad5f::
Music_Citrine_branch_ad5f:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 4
@ -754,12 +684,9 @@ Music_Citrine_branch_ad5f::
drum_note 6, 2
sound_ret
Music_Citrine_branch_ad6e::
Music_Citrine_branch_ad6e:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 2
drum_note 7, 2
sound_ret
; ============================================================================================================