Functioning Galarian Moltres

- Moltres now functions correctly, seeing you like a normal trainer would.

- Slightly tidied up Brunswick Trail and Celeste Hill Outside's maps

- Celeste Hill Outside and Cave now play Digda01 as a music track

data/maps/objects/BrunswickTrail.asm

@@ -4,13 +4,12 @@ BrunswickTrail_Object:
 	def_warp_events
 	warp_event 12,  9, GARNET_CAVERN_1F, 1
 	warp_event 40,  5, BRUNSWICK_GROTTO, 1
-	warp_event 41,  5, BRUNSWICK_GROTTO, 1
 
 	def_bg_events
 
 	def_object_events
 	object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
 	object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person
-	object_event 50, 16, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person
+	object_event 54,  9, SPRITE_BIRD, STAY, DOWN, 3 ; person
 
 	def_warps_to BRUNSWICK_TRAIL

data/maps/objects/GarnetCavernB1F.asm

@@ -7,10 +7,10 @@ GarnetCavernB1F_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  5, 11, SPRITE_BIRD, STAY, DOWN, 1, ARTICUNO_G, 70 | OW_POKEMON ; person
+	object_event  5, 11, SPRITE_BIRD, STAY, RIGHT, 1, ARTICUNO_G, 70 | OW_POKEMON ; person
 	object_event 24,  1, SPRITE_POKE_BALL, STAY, DOWN, 2, MAX_REVIVE
 	object_event 19,  2, SPRITE_POKE_BALL, STAY, DOWN, 3, ESCAPE_ROPE
-	object_event 22, 10, SPRITE_BIRD, STAY, DOWN, 4 ; cuno copy 1
+	object_event  9,  1, SPRITE_BIRD, STAY, DOWN, 4 ; cuno copy 1
-	object_event 14,  1, SPRITE_BIRD, STAY, DOWN, 5 ; cuno copy 2
+	object_event 19,  7, SPRITE_BIRD, STAY, LEFT, 5 ; cuno copy 2
 	
 	def_warps_to GARNET_CAVERN_B1F

data/maps/songs.asm

@@ -254,6 +254,6 @@ MapSongBanks::
 	db MUSIC_GYM, 0 ; BATTLE_TENT
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
-	db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_CAVE
+	db MUSIC_DIGDA01, 0 ; CELESTE_HILL_CAVE
-	db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_OUTSIDE
+	db MUSIC_DIGDA01, 0 ; CELESTE_HILL_OUTSIDE
 	assert_table_length NUM_MAPS

gfx/blocksets/citrine.bst

@@ -27,7 +27,7 @@ KKKK
 
 

9$$$$$[[[[%&
 
-KKKK
[[[[[[*+,,:;,,,,,,,,,,
+KKKK
[[[[[[@A@APQPQ@A@PQ[P
 
 ()KKKKKKR,,@A,,PQ,,@A74PQ##!######!   !########   ![[[[[[[[[[   !######!##!   ########![[[[[[[[[[,,,,,,,,@A,,PQ,,,,*+,,:;,,*+,,:;*+,,:;,,*+,,:;,,,,*+,,:;*+*+:;:;*+,,:;,,*+*+:;:;*+*+:;:;,,,,,,,,,,,,,,,,*+*+:;:;,,*+,,:;,,,,,,,,<<<<<<<<<<<<<<<<[[[[[[,,,,,,,,,,FG,,VW77777777',,,',,,',,,',,,,,$,,$,,$,,$
 
@@ -75,4 +75,4 @@ KKKK
 
 
 
-KKKK@A@APQPQHI@AXYPQ
+KKKK@A@APQPQHIAXYQ[

scripts/CelesteHill.asm

@@ -8,57 +8,20 @@ CelesteHill_Script:
 	ret
 
 CelesteHill_ScriptPointers:
-	dw GMoltFound
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	
-; Galarian Moltres fight script.
+CelesteHillTrainerHeaders:
-; Unlike other legendary Pokemon, Moltres will engage the player first.
+	def_trainers
-GMoltFound:
+GalarianMoltresTrainerHeader:
-	CheckEvent EVENT_BEAT_GALARIAN_MOLTRES
+	trainer EVENT_BEAT_GALARIAN_MOLTRES, 3, GalarianMoltresBattleText, GalarianMoltresBattleText, GalarianMoltresBattleText
-	jr nz, .done
-	ld hl, CelesteHillCoords1
-	call ArePlayerCoordsInArray
-	jp nc, CheckFightingMapTrainers
-	ld a, [wCoordIndex]
-	ld [wcf0d], a
-	xor a
-	ldh [hJoyHeld], a
-	ld a, $f0
-	ld [wJoyIgnore], a
-	
-	ld a, $1
-	ldh [hSpriteIndex], a
-	call SetSpriteMovementBytesToFF
-	ld de, GMoltMovement
-	call MoveSprite
-	
-	ld a, $1
-	ldh [hSpriteIndexOrTextID], a
-	call DisplayTextID
-.done
-	ret
-
-CelesteHillCoords1:
-	dbmapcoord 11, 9
-	db -1 ; end
-
-GMoltMovement:
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
 	db -1 ; end
 
 CelesteHill_TextPointers:
 	dw GalarianMoltresText
 	dw CelesteHillSign
 
-CelesteHillTrainerHeaders:
-	def_trainers
-GalarianMoltresTrainerHeader:
-	trainer EVENT_BEAT_GALARIAN_MOLTRES, 0, GalarianMoltresBattleText, GalarianMoltresBattleText, GalarianMoltresBattleText
-	db -1 ; end
-
 GalarianMoltresText:
 	text_asm
 	ld hl, GalarianMoltresTrainerHeader