Added cut scene introducing when Bird Trio Spawn

Pokemon White Crystal ChangeLog README.txt

@@ -53,6 +53,7 @@ AI Improvements
 
 Known Glitches
 ---------------
+-Group10 Spriteset needs SPRITE_YOUNGSTER to fit
 -Elm's Aides rewards script does not account for a full inventory
 
 
@@ -152,7 +153,7 @@ Game Corner Changes
 Version 1.0 ToDo List
 ----------------------
 -Block Saffron city N and E exit, use same bit as trigger for finishing power plant
--Legendary birds appear after 16 Badges/Cut Scene
+-Spawn the 3 birds
 -Mandatory 'Set' battle style
 -Create 1/3 Recoil effect
 -Berry Pocket
@@ -187,6 +188,7 @@ Wish List
 -Permanent Cut Trees
 -Hatchet to Cut Trees
 -Items of Potential
+-Improve Bird Trio Cut Scene
 
 
 Github Functions
@@ -205,6 +207,14 @@ cd /cygdrive/d/Games/Program\ Files/Cygwin/home/choud_000/pokecrystal
 cd d:/Games/Program\ Files/Cygwin/home/choud_000/pokecrystal
 
 
+Disassembly Notes
+------------------
+To add triggers to a map that did not already have some, you'd need to:
+(1) Add the map to engine/map_triggers.asm
+(2) Give it a new trigger byte in the "Map Triggers" section of wram.asm 
+	The "ds 49" declares enough free space for 49 more
+
+
 ASM/Binary Functions
 ---------------------
 Arithmetic operators on binary numbers: +, -, * or �, / or �

constants/event_flags.asm

@@ -290,7 +290,7 @@
 	const EVENT_GAVE_KURTDAUGHTER_WHT_APRICORN
 	const EVENT_GAVE_KURTDAUGHTER_BLK_APRICORN
 	const EVENT_GAVE_KURTDAUGHTER_PNK_APRICORN
-	const EVENT_11A
+	const EVENT_SAW_BIRDS
 	const EVENT_11B
 	const EVENT_11C
 	const EVENT_11D

engine/map_triggers.asm

@@ -87,8 +87,9 @@ ENDM
 	trigger_def MOUNT_MOON_SQUARE,                      wMountMoonSquareTrigger
 	trigger_def MOBILE_TRADE_ROOM_MOBILE,               wMobileTradeRoomMobileTrigger
 	trigger_def MOBILE_BATTLE_ROOM,                     wMobileBattleRoomTrigger
-	trigger_def VIOLET_GYM,                     wFirstGymBattleWarning1
-	trigger_def VIOLET_GYM,                     wFirstGymBattleWarning2
+	trigger_def VIOLET_GYM,                     		wFirstGymBattleWarning1
+	trigger_def VIOLET_GYM,                     		wFirstGymBattleWarning2
+	trigger_def SILVER_CAVE_OUTSIDE,					wBirdTrioSpawn
 	db -1
 
 ; 4d15b

engine/overworld.asm

@@ -944,8 +944,6 @@ Group26Sprites: ; 14600
 ;Route30
 ;Route31
 ;CherrygroveCity
-Group19Sprites: ; 14617
-;Route28
 	db SPRITE_SILVER
 	db SPRITE_TEACHER
 	db SPRITE_FISHER
@@ -957,6 +955,21 @@ Group19Sprites: ; 14617
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
+
+Group19Sprites: ; 14617
+;Route28
+;SilverCaveOutside
+	db SPRITE_ZAPDOS
+	db SPRITE_ARTICUNO
+	db SPRITE_MOLTRES
+	db SPRITE_COOLTRAINER_M
+	db SPRITE_YOUNGSTER
+	db SPRITE_MONSTER
+	db SPRITE_GRAMPS
+	db SPRITE_BUG_CATCHER
+	db SPRITE_COOLTRAINER_F
+	db SPRITE_POKE_BALL
+	db SPRITE_FRUIT_TREE
 ; 1462e
 
 Group10Sprites: ; 1462e

maps/SilverCaveOutside.asm

@@ -1,17 +1,116 @@
+const_value set 2
+	const SILVERCAVEOUTSIDE_ARTICUNO
+	const SILVERCAVEOUTSIDE_ZAPDOS
+	const SILVERCAVEOUTSIDE_MOLTRES
+
 SilverCaveOutside_MapScriptHeader:
 .MapTriggers:
-	db 0
+	db 1
+
+	maptrigger .Trigger0
 
 .MapCallbacks:
-	db 1
+	db 2
 
 	; callbacks
+	
+	dbw MAPCALLBACK_NEWMAP, .HideBirds
+
 	dbw MAPCALLBACK_NEWMAP, .FlyPoint
 
+.Trigger0:
+	end
+
+.HideBirds:
+	disappear SILVERCAVEOUTSIDE_ARTICUNO
+	disappear SILVERCAVEOUTSIDE_ZAPDOS
+	disappear SILVERCAVEOUTSIDE_MOLTRES
+	return
+
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_SILVER_CAVE
 	return
 
+BirdTrio:
+	showemote EMOTE_SHOCK, PLAYER, 15
+	applymovement PLAYER, PlayerJump
+	spriteface PLAYER, UP
+	appear SILVERCAVEOUTSIDE_ARTICUNO
+	applymovement SILVERCAVEOUTSIDE_ARTICUNO, ArticunoInitial
+	appear SILVERCAVEOUTSIDE_MOLTRES
+	applymovement SILVERCAVEOUTSIDE_MOLTRES, MoltresInitial
+	appear SILVERCAVEOUTSIDE_ZAPDOS
+	applymovement SILVERCAVEOUTSIDE_ZAPDOS, ZapdosInitial
+	opentext
+	writetext BirdTrioAlertText
+	waitbutton
+	closetext
+	applymovement SILVERCAVEOUTSIDE_ARTICUNO, ArticunoFlee
+	disappear SILVERCAVEOUTSIDE_ARTICUNO
+	applymovement SILVERCAVEOUTSIDE_ZAPDOS, ZapdosFlee
+	disappear SILVERCAVEOUTSIDE_ZAPDOS
+	showemote EMOTE_SHOCK, SILVERCAVEOUTSIDE_MOLTRES, 15
+	applymovement SILVERCAVEOUTSIDE_MOLTRES, MoltresFlee
+	disappear SILVERCAVEOUTSIDE_MOLTRES
+	setevent EVENT_SAW_BIRDS
+	dotrigger $1
+	end
+
+PlayerJump:
+	set_sliding
+	big_step DOWN
+	big_step DOWN
+	remove_sliding
+	step_end
+
+ArticunoInitial:
+	step DOWN
+	step RIGHT
+	step_end
+
+MoltresInitial:
+	step DOWN
+	step LEFT
+	step_end
+
+ZapdosInitial:
+	step DOWN
+	step_end
+
+ArticunoFlee:
+	set_sliding
+	big_step RIGHT
+	big_step RIGHT
+	big_step RIGHT
+	big_step RIGHT
+	big_step RIGHT
+	big_step RIGHT
+	remove_sliding
+	step_end
+
+ZapdosFlee:
+	set_sliding
+	big_step RIGHT
+	big_step RIGHT
+	big_step DOWN
+	big_step DOWN
+	big_step DOWN
+	big_step DOWN
+	big_step DOWN
+	big_step DOWN
+	remove_sliding
+	step_end
+
+MoltresFlee:
+	step LEFT
+	step LEFT
+	step DOWN
+	step DOWN
+	step DOWN
+	step DOWN
+	step LEFT
+	step_end
+	
 MtSilverPokeCenterSign:
 	jumpstd pokecentersign
 
@@ -25,6 +124,11 @@ MtSilverSignText:
 	text "MT.SILVER"
 	done
 
+BirdTrioAlertText:	
+	text "Wow, they look so"
+	line "majestic!"
+	done
+	
 SilverCaveOutside_MapEventHeader:
 	; filler
 	db 0, 0
@@ -35,7 +139,8 @@ SilverCaveOutside_MapEventHeader:
 	warp_def $b, $12, 1, SILVER_CAVE_ROOM_1
 
 .XYTriggers:
-	db 0
+	db 1
+	xy_trigger 0, $c, $12, $0, BirdTrio, $0, $0
 
 .Signposts:
 	db 3
@@ -44,4 +149,7 @@ SilverCaveOutside_MapEventHeader:
 	signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFossil
 
 .PersonEvents:
-	db 0
+	db 3
+	person_event SPRITE_ARTICUNO, 11, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BirdTrio, EVENT_SAW_BIRDS
+	person_event SPRITE_ZAPDOS, 11, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BirdTrio, EVENT_SAW_BIRDS
+	person_event SPRITE_MOLTRES, 11, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BirdTrio, EVENT_SAW_BIRDS

wram.asm

@@ -2611,10 +2611,11 @@ wFastShipB1FTrigger::                        ds 1 ; d9bd
 wMountMoonSquareTrigger::                    ds 1 ; d9be
 wMobileTradeRoomMobileTrigger::              ds 1 ; d9bf
 wMobileBattleRoomTrigger::                   ds 1 ; d9c0
-wFirstGymBattleWarning1::				  ds 1;
-wFirstGymBattleWarning2::				  ds 1;
+wFirstGymBattleWarning1::				 	 ds 1;
+wFirstGymBattleWarning2::				  	 ds 1;
+wBirdTrioSpawn::							 ds 1;
 
-	ds 47
+	ds 46
 
 
 ;SECTION "Events", WRAMX, BANK [1]