Changed story event and added trainers to new map

Dakorias · Dakorias · commit 6ac2306ec66f · 2024-05-31T15:18:18.000-04:00
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -516,6 +516,7 @@
 ; Swimmer F
 
 ; Bird Keeper
+	const EVENT_BEAT_BIRD_KEEPER_PERRY
 
 ; Boarder
 
@@ -584,6 +585,7 @@
 
 ; Lass
 	const EVENT_BEAT_LASS_ALEXIS
+	const EVENT_BEAT_LASS_LANEY
 	const EVENT_BEAT_LASS_CANDICE
 	const EVENT_BEAT_LASS_NICOLE
 ; Hiker
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -103,9 +103,11 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	trainerclass DETECTIVE ; 17
 
 	trainerclass BIRD_KEEPER ; 18
+	const PERRY
 
 	trainerclass LASS ; 19
 	const ALEXIS
+	const LANEY
 	const CANDICE
 	const NICOLE
 
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
@@ -10,7 +10,7 @@ Landmarks:
 	landmark -8, -16, SpecialMapName
 	landmark 20, 84, HeraldCoveName
 	landmark 8, 84, HeraldRouteName
-	landmark 0, 0, HeraldBayName
+	landmark 4, 92, HeraldBayName
 	landmark 12, 73, CraggyBeachName
 	landmark 12, 60, CraggyCoastName
 	landmark 12, 48, ScenicBluffName
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -256,6 +256,14 @@ LassGroup:
 	db 5, FLETCHLING
 	db -1 ; end
 
+	; LASS (1)
+	db "LANEY@", TRAINERTYPE_NORMAL
+	db 5, PIDGEY
+	db 5, KRABBY
+	db 5, SENTRET
+	db 5, FLETCHLING
+	db -1 ; end
+
 	; LASS (2)
 	db "CANDICE@", TRAINERTYPE_NORMAL
 	db 7, PIDGEY
diff --git a/gfx/pokegear/johto.bin b/gfx/pokegear/johto.bin
diff --git a/gfx/pokegear/phone.tilemap.rle b/gfx/pokegear/phone.tilemap.rle
@@ -1,4 +1,4 @@
-O
-OO
-'O
-�
+OOO
+
+O
+�
diff --git a/maps/HeraldBay.asm b/maps/HeraldBay.asm
@@ -1,10 +1,43 @@
 	object_const_def
+	const HERALD_BAY_BIRD_KEEPER
+	const HERALD_BAY_LASS
 
 HeraldBay_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
 
+TrainerBirdKeeperPerry:
+	trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
+
+	.Script:
+		endifjustbattled
+		opentext
+		writetext BirdKeeperPerryAfterText
+		waitbutton
+		closetext
+		end
+
+TrainerLassLaney:
+	trainer LASS, LANEY, EVENT_BEAT_LASS_LANEY, LassLaneySeenText, LassLaneyBeatenText, 0, .Script
+
+	.Script:
+		endifjustbattled
+		opentext
+		writetext LassLaneyAfterText
+		waitbutton
+		closetext
+		end
+
+
+		BirdKeeperPerrySeenText:
+		BirdKeeperPerryBeatenText:
+		BirdKeeperPerryAfterText:
+		LassLaneySeenText:
+		LassLaneyBeatenText:
+		LassLaneyAfterText:
+		text "TEST"
+		done
 
 HeraldBay_MapEvents:
 	db 0, 0 ; filler
@@ -16,5 +49,6 @@ HeraldBay_MapEvents:
 
 	def_bg_events
 
-
 	def_object_events
+	object_event  15, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPerry, -1
+	object_event  11, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerLassLaney, -1
diff --git a/maps/HeraldBayHouse.asm b/maps/HeraldBayHouse.asm
@@ -18,6 +18,11 @@ HeraldBayHouse_MapScripts:
 		closetext
 		setmapscene HERALD_LAB, SCENE_HERALD_LAB_POKEDEX
 		clearevent EVENT_EDWARD_MISSING_FROM_GYM
+		special FadeBlackQuickly
+		special ReloadSpritesNoPalettes
+		disappear HERALD_BAY_EDWARD
+		pause 25
+		special FadeInQuickly
 		end
 
 	EdwardGivesMapText:

-Original file line number
+Diff line change
 -O
 -OO
 -'O
 -�
 +OOO
++
 +O
 +�