Revert "Initial Citrine City music"

This reverts commit ea3727e5b5.

audio.asm

@@ -332,7 +332,6 @@ INCLUDE "crysaudio/music/RBY/safarizone.asm"
 INCLUDE "crysaudio/music/RBY/gym.asm"
 INCLUDE "crysaudio/music/RBY/pokecenter.asm"
 INCLUDE "crysaudio/music/RBY/lavenbar.asm"
-INCLUDE "crysaudio/music/RBY/citrine.asm"
 
 
 SECTION "RBY Songs 2", ROMX

constants/music_constants.asm

@@ -28,7 +28,6 @@
 	const MUSIC_ROUTES4
 	const MUSIC_INDIGO_PLATEAU
 	const MUSIC_LAVENBAR
-	const MUSIC_CITRINE
 	
 	const MUSIC_GYM_LEADER_BATTLE
 	const MUSIC_TRAINER_BATTLE

crysaudio/music/RBY/citrine.asm

@@ -1,765 +0,0 @@
-;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
-	channel 2, Music_Citrine_Ch2
-	channel 3, Music_Citrine_Ch3
-	channel 4, Music_Citrine_Ch4
-
-Music_Citrine_Ch1: ; a913 (2:6913)
-	;; P2-1
-	tempo 144
-	volume 7, 7
-	note_type 12, 13, 3
-	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
-	note E_, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note C#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	octave 4
-	note E_, 1
-	rest 4
-	note E_, 2
-	rest 2
-;; P3-2
-	note D#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note C#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	octave 4
-	note D#, 1
-	rest 8
-;; P3-3
-	note C#, 1
-	rest 1
-	note D#, 1
-	rest 1
-	note C#, 1
-	octave 3
-	note B_, 1
-	rest 2
-	octave 4
-	note C#, 1
-	rest 1
-	note D#, 1
-	rest 1
-	note C#, 1
-	octave 3
-	note B_, 1
-	rest 2
-;; P3-4
-	octave 4
-	note D#, 4
-	note C#, 4
-	note D#, 1
-	note E_, 1
-	rest 1
-	note F#, 1
-	rest 1
-	octave 3
-	note B_, 2
-	rest 1
-;; P3-5
-	octave 4
-	note E_, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note C#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	octave 4
-	note E_, 1
-	rest 8
-;; P3-6
-	note D#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note C#, 1
-	rest 1
-	octave 3
-	note B_, 1
-	octave 4
-	note D#, 1
-	rest 4
-	octave 3
-	note B_, 2
-	rest 2
-;; P3-7
-	octave 4
-	note C#, 1
-	rest 1
-	note D#, 1
-	rest 1
-	note C#, 1
-	octave 3
-	note B_, 1
-	rest 2
-	octave 4
-	note C#, 1
-	rest 1
-	note D#, 1
-	rest 1
-	note E_, 1
-	note F#, 1
-	rest 2
-;; P3-8
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
-	rest 1
-	note F#, 1
-	rest 1
-	note D#, 2
-	rest 3
-;; P3-9 --- tied
-	octave 3
-	note A_, 2
-	rest 2
-	note B_, 2
-	rest 2
-	octave 4
-	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
-	note A_, 2
-	rest 2
-	note B_, 2
-	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
-	note A_, 2
-	note A#, 1
-	note B_, 1
-	rest 4
-	note F#, 2
-	rest 2
-;; P3-14
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	octave 4
-	note C_, 1
-	note C#, 1
-	rest 8
-;; P3-15
-	octave 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	octave 4
-	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_ret
-
-; ============================================================================================================
-
-Music_Citrine_Ch3:
-	note_type 4, 1, 0
-;Bar 1
-	octave 4
-	volume_envelope 2, 0
-	note E_, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note E_, 6
-	rest 6
-	note E_, 6
-	note G#, 6
-	note E_, 6
-;Bar 2
-	note D#, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note D#, 6
-	rest 6
-	note D#, 6
-	note G#, 6
-	note D#, 6
-;Bar 3
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	octave 3
-	note A_, 6
-;Bar 4
-	octave 4
-	note D#, 12
-	note C#, 6
-	octave 3
-	note B_, 12
-	note B_, 6
-	octave 4
-	note C#, 6
-	note D#, 6
-;Bar 5
-	note E_, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note E_, 6
-	rest 6
-	note E_, 6
-	note G#, 6
-	note E_, 6
-;Bar 6
-	note D#, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note D#, 6
-	rest 6
-	note D#, 6
-	note G#, 6
-	note D#, 6
-;Bar 7
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	octave 3
-	note A_, 6
-;Bar 8
-	octave 4
-	note D#, 12
-	note C#, 12
-	note D#, 3
-	note E_, 3
-	rest 3
-	note F#, 3
-	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
-	note F_, 3
-	note F#, 3
-	rest 12
-	note D#, 6
-	rest 6
-;Bar 14
-	note F#, 6
-	note D#, 6
-	note F#, 6
-	note G_, 3
-	note G#, 3
-	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
-	note B_, 6
-	octave 4
-	note E_, 6
-	rest 6
-	note E_, 6
-	note G#, 6
-	note E_, 6
-;Bar 18
-	note D#, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note D#, 6
-	rest 6
-	note D#, 6
-	note G#, 6
-	note D#, 6
-;Bar 19
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	octave 3
-	note A_, 6
-;Bar 20
-	octave 4
-	note D#, 12
-	note C#, 6
-	octave 3
-	note B_, 12
-	note B_, 6
-	octave 4
-	note C#, 6
-	note D#, 6
-;Bar 21
-	note E_, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note E_, 6
-	rest 6
-	note E_, 6
-	note G#, 6
-	note E_, 6
-;Bar 22
-	note D#, 6
-	rest 6
-	octave 3
-	note B_, 6
-	octave 4
-	note D#, 6
-	rest 6
-	note D#, 6
-	note G#, 6
-	note D#, 6
-;Bar 23
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	rest 6
-	octave 3
-	note A_, 6
-	octave 4
-	note C#, 6
-	octave 3
-	note A_, 6
-;Bar 24
-	octave 4
-	note D#, 12
-	note C#, 12
-	note D#, 3
-	note E_, 3
-	rest 3
-	note F#, 3
-	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
-	note F_, 3
-	note F#, 3
-	rest 12
-	note D#, 6
-	rest 6
-;Bar 30
-	note F#, 6
-	note D#, 6
-	note F#, 6
-	note G_, 3
-	note G#, 3
-	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
-	note D#, 6
-	rest 16
-	rest 2
-	sound_loop 0, Music_Citrine_Ch3
-	sound_ret
-
-Music_Citrine_Ch4::
-	toggle_noise 0
-Music_Citrine_Ch4_MainLoop::
-	drum_speed 12
-	sound_call Music_Citrine_branch_ad36
-
-Music_Citrine_branch_acf3::
-	sound_call Music_Citrine_branch_ad36
-	sound_call Music_Citrine_branch_ad45
-	sound_call Music_Citrine_branch_ad45
-	sound_loop 2, Music_Citrine_branch_acf3
-	sound_call Music_Citrine_branch_ad36
-	sound_call Music_Citrine_branch_ad5f
-	sound_call Music_Citrine_branch_ad52
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 4
-	sound_call Music_Citrine_branch_ad6e
-	sound_call Music_Citrine_branch_ad5f
-	sound_call Music_Citrine_branch_ad52
-	sound_call Music_Citrine_branch_ad6e
-	sound_call Music_Citrine_branch_ad52
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 2
-	drum_note 6, 2
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 6, 4
-	drum_note 6, 6
-	drum_note 8, 6
-	drum_note 8, 4
-	sound_loop 0, Music_Citrine_Ch4_MainLoop
-
-Music_Citrine_branch_ad36::
-	drum_note 8, 6
-	drum_note 8, 6
-	drum_note 8, 4
-	drum_note 8, 6
-	drum_note 8, 6
-	drum_note 8, 2
-	drum_note 8, 2
-	sound_ret
-
-Music_Citrine_branch_ad45::
-	drum_note 8, 6
-	drum_note 8, 6
-	drum_note 8, 4
-	drum_note 8, 6
-	drum_note 8, 6
-	drum_note 8, 4
-	sound_ret
-
-Music_Citrine_branch_ad52::
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 4
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 4
-	sound_ret
-
-Music_Citrine_branch_ad5f::
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 4
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 2
-	drum_note 6, 2
-	sound_ret
-
-Music_Citrine_branch_ad6e::
-	drum_note 6, 6
-	drum_note 6, 6
-	drum_note 7, 2
-	drum_note 7, 2
-	sound_ret
-
-; ============================================================================================================
-

crysaudio/music_pointers_red.asm

@@ -24,7 +24,6 @@ Music:
 	dba Music_Routes4
 	dba Music_RBYIndigoPlateau
 	dba Music_Lavenbar
-	dba Music_Citrine
 	dba Music_GymLeaderBattle
 	dba Music_TrainerBattle
 	dba Music_WildBattle

data/maps/songs.asm

@@ -12,7 +12,7 @@ MapSongBanks::
 	db MUSIC_CITIES1, 0 ; SAFFRON_CITY
 	db MUSIC_CINNABAR, 0 ; CINNABAR_ISLAND
 	db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU
-	db MUSIC_CITRINE, 0 ; CITRINE_CITY
+	db MUSIC_CITIES1, 0 ; CITRINE_CITY
 	db MUSIC_ROUTES1, 0 ; ROUTE_1
 	db MUSIC_ROUTES1, 0 ; ROUTE_2
 	db MUSIC_ROUTES3, 0 ; ROUTE_3

data/pokemon/base_stats/sylveon.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/sylveon.pic", 0, 1 ; sprite dimensions
 	dw SylveonPicFront, SylveonPicBack
 
-	db TACKLE, SAND_ATTACK, QUICK_ATTACK, DISARMING_VOICE ; level 1 learnset
+	db TACKLE, SAND_ATTACK, QUICK_ATTACK, FAIRY_WIND ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset

maps/CelesteHillCave.blk

@@ -1,2 +1,2 @@
-,+,<,+,a+,+,.........................................0b	N

	


+,,<,a+,+,.............................................0b	N



	


-
	
r'
jk„


r


,+|)f-) "


 "^$^
+
	
r'
jk„


r


,+=,)+)))^$^