FRLG Legendary Battle theme

LuciShrimp strikes again! A demake of the Legendary Battle theme from FireRed/LeafGreen.

This theme is set to change down the line, possibly taking elements from the Emerald theme Mew uses to differentiate itself more. Mainly committing as the infrastructure has been put in place.

README.md

@@ -96,7 +96,9 @@ New Areas
 
 New Music
 ====
-- Mewtwo has its own theme song, being a demake of the iconic Stadium battle theme. Composed by LuciShrimp.
+- Mewtwo has its own battle theme: A demake of the iconic Stadium track! It features some creative deviations to give it a distinct Game Boy feel while fitting with Mewtwo's mystique. Composed by LuciShrimp.
+- Mew and the Kantonian Birds have their own battle theme, a demake of the FireRed/LeafGreen pitch-shifted remix. Not simply pitching it up, percussion elements have been added to give it that rustic FRLG "feel" that distinguishes it from the original games. Composed by LuciShrimp.
+- Pokemon Yellow's various tracks have been backported, such as Jessie and James's encounter theme.
 - Several pieces of unused music, including Digda01, Victory4, Field6, Kincho01, and Giovanni's theme have been implemented.
 	- A remix of the unused Koukan (trading) music is also used as a town theme. Composed by BGVC.
 
@@ -357,7 +359,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 * DuoM2 - Showdown Mod assistance
 * Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.)
 * BlueZangoose / Vimescarrot - Pokemon box expansion, Instatext option, general assistance.
-* LuciShrimp - Mewtwo & Galarian Bird custom battle music
+* LuciShrimp - Mewtwo & FireRed/LeafGreen Legendary custom battle music
 * dannye33 - Assisting with crysaudio implementation
 * Frrf - Assisting with the development of the Pikachu / Eevee Mode + 5 Starters scenes in Oak's Lab, debugging
 * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects.

audio.asm

@@ -379,6 +379,7 @@ INCLUDE "crysaudio/music/RBY/field06.asm"
 INCLUDE "crysaudio/music/RBY/victory4.asm"
 INCLUDE "crysaudio/music/RBY/kinchou01.asm"
 INCLUDE "crysaudio/music/RBY/mewtwo01.asm"
+INCLUDE "crysaudio/music/RBY/legendarybattle.asm"
 
 SECTION "TCG Songs 1", ROMX
 

audio/play_battle_music.asm

@@ -13,9 +13,25 @@ PlayBattleMusic::
 	ld a, MUSIC_GYM_LEADER_BATTLE
 	jr .playSong
 .notGymLeaderBattle
-	ld a, [wCurOpponent]
+	ld a, [wCurOpponent] ; This can probably be made better with a list thing but uhhh idk how to do it. seethe.
 	cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check.
 	jr z, .mewtwoBattle
+	cp ARTICUNO
+	jr z, .legendaryBattle
+	cp ZAPDOS
+	jr z, .legendaryBattle
+	cp MOLTRES
+	jr z, .legendaryBattle
+	cp MEW
+	jr z, .legendaryBattle
+	cp OMEGA
+	jr z, .legendaryBattle
+	cp ARTICUNO_G ; Temporary - plans for galar bird themes have been made.
+	jr z, .legendaryBattle
+	cp ZAPDOS_G
+	jr z, .legendaryBattle
+	cp MOLTRES_G
+	jr z, .legendaryBattle
 	cp OPP_ID_OFFSET
 	jr c, .wildBattle
 	cp OPP_YUJIROU
@@ -35,8 +51,6 @@ PlayBattleMusic::
 	cp OPP_CHIEF
 	jr z, .finalBattle 
 	jr nz, .normalTrainerBattle
-	ld a, MUSIC_FINAL_BATTLE
-	jr .playSong
 .Elite4Battle
 	ld a, MUSIC_GYM_LEADER_BATTLE
 	jr .playSong
@@ -49,6 +63,9 @@ PlayBattleMusic::
 .mewtwoBattle
 	ld a, MUSIC_MEWTWO01
 	jr .playSong
+.legendaryBattle
+	ld a, MUSIC_LEGENDARYBATTLE
+	jr .playSong
 .wildBattle
 	ld a, MUSIC_WILD_BATTLE
 .playSong

constants/music_constants.asm

@@ -63,6 +63,7 @@
 	const MUSIC_VICTORY4
 	const MUSIC_KINCHOU01
 	const MUSIC_MEWTWO01
+	const MUSIC_LEGENDARYBATTLE
 
 	const NUM_SONGS
 

crysaudio/music_pointers_red.asm

@@ -57,3 +57,4 @@ Music:
 	dba Music_Victory4
 	dba Music_Kinchou01
 	dba Music_Mewtwo01
+	dba Music_LegendaryBattle

data/maps/objects/CitrineCity.asm

@@ -8,8 +8,8 @@ CitrineCity_Object:
 	warp_event 15, 27, CITRINE_MART, 1
 	warp_event 23,  5, CELESTE_HILL_OUTSIDE, 1
 	warp_event 11,  7, BATTLE_TENT, 1
-	warp_event 27, 33, VERMILION_CITY, 6
-	warp_event 26, 33, VERMILION_CITY, 6
+	warp_event 27, 33, VERMILION_CITY, 9
+	warp_event 26, 33, VERMILION_CITY, 10
 
 	def_bg_events
 	bg_event 16, 27,  5 ; Citrine Shop

data/maps/objects/VermilionCity.asm

@@ -10,8 +10,8 @@ VermilionCity_Object:
 	warp_event 18, 31, VERMILION_DOCK, 1
 	warp_event 19, 31, VERMILION_DOCK, 1
 	warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
-	warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2
-	warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1
+	warp_event 10, 31, CITRINE_CITY, 7
+	warp_event 11, 31, CITRINE_CITY, 8
 
 	def_bg_events
 	bg_event 27,  3,  9 ; VermilionCityText7

engine/debug/debug_menu.asm

@@ -130,7 +130,7 @@ TestBattle:
 	ld [hli], a
 	
 	; Opponent's Pokemon.
-	ld a, MEWTWO ; Test new theme
+	ld a, ARTICUNO ; Test new theme
 	ld [wCurOpponent], a
 	ld a, 100 ; Set the level you want here.
 	ld [wCurEnemyLVL], a