Added OPAL SHARDS to overworld and rearranged routes 3 & 4

SoupPotato · Sep 13, 2024 · 8cb3fc2 · 8cb3fc2
1 parent 9c8d35f
commit 8cb3fc2
Show file tree

Hide file tree

Showing 19 changed files with 147 additions and 117 deletions.
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -264,18 +264,18 @@
 	const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
 	const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
 	const EVENT_ROUTE_4_HIDDEN_BIG_MUSHROOM
-	const_skip ; unused in Sour Crystal
-	const_skip ; unused in Sour Crystal
-	const_skip ; unused in Sour Crystal
-	const_skip ; unused in Sour Crystal
+	const EVENT_ROUTE_39_OPAL_SHARD
+	const EVENT_ROUTE_45_OPAL_SHARD
+	const EVENT_ROUTE_11_OPAL_SHARD
+	const EVENT_ROUTE_4_OPAL_SHARD
 
 ; Sour Crystal events
 	const EVENT_CLIFF_EDGE_GATE_HIDDEN_BIG_PEARL
 	const EVENT_CLIFF_CAVE_HIDDEN_ULTRA_BALL
 	const EVENT_ROUTE_47_REVIVE
 	const EVENT_ROUTE_47_MYSTIC_WATER
 	const EVENT_ROUTE_47_SILVER_POWDER
-	const EVENT_ROUTE_47_MAX_REPEL
+	const EVENT_ROUTE_47_OPAL_SHARD
 	const EVENT_ROUTE_47_HIDDEN_PEARL
 	const EVENT_ROUTE_47_HIDDEN_STARDUST
 	const EVENT_ROUTE_48_NUGGET
@@ -765,9 +765,10 @@
 	const EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_TUTOR_CAUGHT_21_UNOWN
 	const EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_TUTOR_CAUGHT_14_UNOWN
 	const EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_TUTOR_CAUGHT_7_UNOWN
-; Unused: next 98 events
+	const EVENT_ROUTE_16_OPAL_SHARD
+; Unused: next 97 events
 
-	const_next 996
+	const_next 1000
 ; Trainer flags
 ; Swimmer F
 	const EVENT_BEAT_SWIMMERF_ELAINE
@@ -1329,11 +1330,11 @@
 	const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
 	const EVENT_BURNED_TOWER_1F_HP_UP
 	const EVENT_BURNED_TOWER_B1F_TM_ENDURE
-	const EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	const EVENT_NATIONAL_PARK_OPAL_SHARD
 	const EVENT_NATIONAL_PARK_TM_DIG
 	const EVENT_UNION_CAVE_1F_GREAT_BALL
 	const EVENT_UNION_CAVE_1F_X_ATTACK
-	const EVENT_UNION_CAVE_1F_POTION
+	const EVENT_UNION_CAVE_1F_OPAL_SHARD
 	const EVENT_UNION_CAVE_1F_AWAKENING
 	const EVENT_UNION_CAVE_B1F_TM_SWIFT
 	const EVENT_UNION_CAVE_B1F_X_DEFEND
@@ -1723,5 +1724,5 @@
 	const EVENT_VERMILION_GYM_SWITCH_2
 ; Unused: next 41 events
 
-	const_next 2041
+	const_next 2048
 DEF NUM_EVENTS EQU const_value ; 800
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -214,7 +214,7 @@ ENDM
 	map_const ROUTE_10_POKECENTER_2F_BETA,                  8,  4 ;  9
 	map_const POWER_PLANT,                                 10,  9 ; 10
 	map_const BILLS_HOUSE,                                  4,  4 ; 11
-	map_const ROUTE_4,                                     34,  9 ; 12
+	map_const ROUTE_4,                                     44,  9 ; 12
 	map_const ROUTE_9,                                     30,  9 ; 13
 	map_const ROUTE_10_NORTH,                              10, 16 ; 14
 	map_const ROUTE_24,                                    11,  9 ; 15
@@ -315,7 +315,7 @@ ENDM
 	endgroup
 
 	newgroup PEWTER                                               ; 14
-	map_const ROUTE_3,                                     34, 19 ;  1
+	map_const ROUTE_3,                                     34,  9 ;  1
 	map_const PEWTER_CITY,                                 20, 18 ;  2
 	map_const PEWTER_NIDORAN_SPEECH_HOUSE,                  4,  4 ;  3
 	map_const PEWTER_GYM,                                   5,  7 ;  4

diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -241,7 +241,7 @@ ENDM
 
 	map_attributes PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
 	connection south, Route2North, ROUTE_2_NORTH, 4
-	connection east, Route3, ROUTE_3, -6
+	connection east, Route3, ROUTE_3, 4
 
 	map_attributes Route2South, ROUTE_2_SOUTH, $0f, NORTH | SOUTH
 	connection north, Route2North, ROUTE_2_NORTH, 0
@@ -369,12 +369,12 @@ ENDM
 	map_attributes Route25, ROUTE_25, $2c, SOUTH
 	connection south, Route24, ROUTE_24, 0
 
-	map_attributes Route3, ROUTE_3, $2c, WEST | EAST
-	connection west, PewterCity, PEWTER_CITY, 6
-	connection east, Route4, ROUTE_4, 1
+	map_attributes Route3, ROUTE_3, $2c, NORTH | WEST
+	connection north, Route4, ROUTE_4, 24
+	connection west, PewterCity, PEWTER_CITY, -4
 
-	map_attributes Route4, ROUTE_4, $2c, WEST | EAST
-	connection west, Route3, ROUTE_3, -1
+	map_attributes Route4, ROUTE_4, $2c, SOUTH | EAST
+	connection south, Route3, ROUTE_3, -24
 	connection east, CeruleanCity, CERULEAN_CITY, -4
 
 	map_attributes Route8, ROUTE_8, $2c, WEST | EAST

diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
@@ -4,6 +4,7 @@
 	const CINNABARISLAND_ROCK2
 	const CINNABARISLAND_ROCK3
 	const CINNABARISLAND_ROCK4
+	const CINNABARISLAND_SWIMMER_GIRL
 
 CinnabarIsland_MapScripts:
 	def_scene_scripts
@@ -166,3 +167,4 @@ CinnabarIsland_MapEvents:
 	object_event 16,  1, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandRock, -1
 	object_event 14,  8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandRock, -1
 	object_event 20,  7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandRock, -1
+	object_event 16, -2, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, ObjectEvent, -1
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
@@ -227,8 +227,8 @@ MountMoon_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event  3,  3, ROUTE_3, 1
-	warp_event 15, 15, ROUTE_4, 1
+	warp_event  3,  3, ROUTE_4, 1
+	warp_event 15, 15, ROUTE_4, 2
 	warp_event 13,  3, MOUNT_MOON, 7
 	warp_event 15, 11, MOUNT_MOON, 8
 	warp_event 25,  5, MOUNT_MOON_SQUARE, 1

diff --git a/maps/MountMoonPokecenter1F.asm b/maps/MountMoonPokecenter1F.asm
@@ -56,8 +56,8 @@ MountMoonPokecenter1F_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event  3,  7, ROUTE_3, 2
-	warp_event  4,  7, ROUTE_3, 2
+	warp_event  3,  7, ROUTE_4, 3
+	warp_event  4,  7, ROUTE_4, 3
 	warp_event  0,  7, POKECENTER_2F, 1
 
 	def_coord_events

diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
@@ -355,8 +355,8 @@ NationalParkBattleNoticeSign:
 NationalParkTrainerTipsSign:
 	jumptext NationalParkTrainerTipsText
 
-NationalParkParlyzHeal:
-	itemball PARLYZ_HEAL
+NationalParkOpalShard:
+	itemball OPAL_SHARD
 
 NationalParkTMDig:
 	itemball TM_DIG
@@ -588,6 +588,6 @@ NationalPark_MapEvents:
 	object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly, -1
 	object_event 16,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
 	object_event  8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkOpalShard, EVENT_NATIONAL_PARK_OPAL_SHARD
 	object_event 26,  6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkGameboyKidScript, -1
 	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
@@ -106,8 +106,8 @@ NationalParkBugContestBattleNoticeSign:
 NationalParkBugContestTrainerTipsSign:
 	jumptext NationalParkBugContestTrainerTipsText
 
-NationalParkBugContestParlyzHeal:
-	itemball PARLYZ_HEAL
+NationalParkBugContestOpalShard:
+	itemball OPAL_SHARD
 
 NationalParkBugContestTMDig:
 	itemball TM_DIG
@@ -246,5 +246,5 @@ NationalParkBugContest_MapEvents:
 	object_event 11, 27, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8AScript, EVENT_BUG_CATCHING_CONTESTANT_8A
 	object_event 16,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9AScript, EVENT_BUG_CATCHING_CONTESTANT_9A
 	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10AScript, EVENT_BUG_CATCHING_CONTESTANT_10A
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestOpalShard, EVENT_NATIONAL_PARK_OPAL_SHARD
 	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/Route11.asm b/maps/Route11.asm
@@ -7,6 +7,7 @@
 	const ROUTE_11_APRICORN
 	const ROUTE_11_BIG_SNORLAX
 	const ROUTE_11_BIG_SNORLAX_RESPAWN
+	const ROUTE_11_POKE_BALL
 
 Route11_MapScripts:
 	def_scene_scripts
@@ -155,6 +156,9 @@ Route11NoApricorn:
 Route11HiddenRevive:
 	hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE
 
+Route11OpalShard:
+	itemball OPAL_SHARD
+
 YoungsterOwenSeenText:
 	text "There's no cheat-"
 	line "ing in #MON."
@@ -305,3 +309,4 @@ Route11_MapEvents:
 	object_event 53,  1, SPRITE_APRICORN, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route11ApricornTree, EVENT_ROUTE_11_APRICORN
 	object_event  8,  6, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route11Snorlax, EVENT_ROUTE_11_SNORLAX
 	object_event 51, 11, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route11Snorlax, EVENT_ROUTE_11_SNORLAX_RESPAWN
+	object_event 52, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route11OpalShard, EVENT_ROUTE_11_OPAL_SHARD
diff --git a/maps/Route16.asm b/maps/Route16.asm
@@ -1,3 +1,6 @@
+	object_const_def
+	const ROUTE16_POKEBALL
+
 Route16_MapScripts:
 	def_scene_scripts
 
@@ -19,6 +22,9 @@ Route16AlwaysOnBikeCallback:
 CyclingRoadSign:
 	jumptext CyclingRoadSignText
 
+Route16OpalShard:
+	itemball OPAL_SHARD
+
 CyclingRoadSignText:
 	text "CYCLING ROAD"
 
@@ -42,3 +48,4 @@ Route16_MapEvents:
 	bg_event 13, 11, BGEVENT_READ, CyclingRoadSign
 
 	def_object_events
+	object_event 31,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route16OpalShard, EVENT_ROUTE_16_OPAL_SHARD
diff --git a/maps/Route3.asm b/maps/Route3.asm
@@ -1,9 +1,15 @@
 	object_const_def
-	const ROUTE3_FISHER1
-	const ROUTE3_YOUNGSTER1
-	const ROUTE3_YOUNGSTER2
-	const ROUTE3_YOUNGSTER3
-	const ROUTE3_FISHER2
+	const ROUTE3_YOUNGSTER_1
+	const ROUTE3_YOUNGSTER_2
+	const ROUTE3_YOUNGSTER_3
+	const ROUTE3_COOLTRAINER_M
+	const ROUTE3_COOLTRAINER_F
+	const ROUTE3_FISHER_1
+	const ROUTE3_POKEFAN_M_1
+	const ROUTE3_POKEFAN_M_2
+	const ROUTE3_BLACK_BELT_1
+	const ROUTE3_BLACK_BELT_2
+	const ROUTE3_POKEBALL
 
 Route3_MapScripts:
 	def_scene_scripts
@@ -120,23 +126,6 @@ TrainerFirebreatherOtis:
 	closetext
 	end
 
-TrainerFirebreatherBurt:
-	trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
-
-.Script:
-	endifjustbattled
-	opentext
-	writetext FirebreatherBurtAfterBattleText
-	waitbutton
-	closetext
-	end
-
-Route3MtMoonSquareSign:
-	jumptext Route3MtMoonSquareSignText
-
-Route3MtMoonPokecenterSign:
-	jumpstd PokecenterSignScript
-
 HikerBruceSeenText:
 	text "My Bag is"
 	line "digging into my"
@@ -343,53 +332,23 @@ FirebreatherOtisAfterBattleText:
 	cont "ignition…"
 	done
 
-FirebreatherBurtSeenText:
-	text "Step right up and"
-	line "take a look!"
-	done
-
-FirebreatherBurtBeatenText:
-	text "Yow! That's hot!"
-	done
-
-FirebreatherBurtAfterBattleText:
-	text "The greatest fire-"
-	line "breather in KANTO,"
-	cont "that's me."
-
-	para "But not the best"
-	line "trainer…"
-	done
-
-Route3MtMoonSquareSignText:
-	text "MT.MOON SQUARE"
-
-	para "Just go up the"
-	line "stairs."
-	done
-
 Route3_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event 64,  7, MOUNT_MOON, 1
-	warp_event 57,  7, MOUNT_MOON_POKECENTER_1F, 1
 
 	def_coord_events
 
 	def_bg_events
-	bg_event 55, 29, BGEVENT_READ, Route3MtMoonSquareSign
-	bg_event 58,  7, BGEVENT_READ, Route3MtMoonPokecenterSign
 
 	def_object_events
-	object_event 11, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerYoungsterRegis, -1
-	object_event 16, 25, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerYoungsterWarren, -1
-	object_event 19, 24, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJimmy, -1
-	object_event 12, 32, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCoolDuoZacandJen1, -1
-	object_event 13, 32, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCoolDuoZacandJen2, -1
-	object_event 26, 30, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
-	object_event 58, 12, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
-	object_event 34, 25, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerBruce, -1
-	object_event 54, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerDwight, -1
-	object_event 41, 29, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBlackBeltManford, -1
-	object_event 50, 32, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackBeltAnder, -1
+	object_event 11,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerYoungsterRegis, -1
+	object_event 16,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerYoungsterWarren, -1
+	object_event 19,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJimmy, -1
+	object_event 12, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCoolDuoZacandJen1, -1
+	object_event 13, 12, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCoolDuoZacandJen2, -1
+	object_event 26, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
+	object_event 34,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerBruce, -1
+	object_event 54, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerDwight, -1
+	object_event 41,  9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBlackBeltManford, -1
+	object_event 50, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackBeltAnder, -1
diff --git a/maps/Route3.blk b/maps/Route3.blk
@@ -1,4 +1,4 @@
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+WW*,,,,,,,,,,,,,,,,,,,,,,,,,,,+WW% !$*,,,,,,,,,,,,,,,,,,,,,,,,,,)111|r1$*,,,,,,,,,,,,,,,,,,,,,,,,)111111(,,,,,,,,,,,,,,,,,,,,,,,,)11111(,,,,,,,,,,,,,,,,,,,,,,,,)1111(,,,,,,,,,,,,,,,,,,,,,,,,)11111(,,,,,,,,,,,,,,,,,,,,,,,,,;11111(,,,,,,,,,,,,,,,,,,,,,,,,,)111>??,,,,,,,,,,,,,,,,,,,,,,,,,,)m111(,,,,,+WWWWWWWWW*,+WWWWWWWW*,)
+,,,,,,,,,,,,,,,,,,,,,,,,,)m111(,,,,,+WWWWWWWWW*,+WWWWWWWW*,)
 111(,,,,,)
 
 

diff --git a/maps/Route39.asm b/maps/Route39.asm
@@ -11,6 +11,7 @@
 	const ROUTE_39_APRICORN
 	const ROUTE_39_POKEFAN_F2
 	const ROUTE_39_GENTLEMAN_BAOBA
+	const ROUTE_39_POKEBALL
 
 Route39_MapScripts:
 	def_scene_scripts
@@ -296,6 +297,9 @@ Route39BaobaScript:
 Route39HiddenNugget:
 	hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET
 
+Route39OpalShard:
+	itemball OPAL_SHARD
+
 Route39MiltankText:
 	text "MILTANK: Mooo!"
 	done
@@ -601,3 +605,4 @@ Route39_MapEvents:
 	object_event  9,  3, SPRITE_APRICORN, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39ApricornTree, EVENT_ROUTE_39_APRICORN
 	object_event  4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
 	object_event 13,  9, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_39_BAOBA_RETURNED_TO_SAFARI_ZONE
+	object_event  1, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route39OpalShard, EVENT_ROUTE_39_OPAL_SHARD