Replaced Cerulean Cave Carbos with Scope Lens

SoupPotato · Jan 1, 2024 · c239b3d · c239b3d
1 parent 6783b82
commit c239b3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -733,7 +733,7 @@
 	const EVENT_CERULEAN_CAVE_2F_THUNDERSTONE
 	const EVENT_CERULEAN_CAVE_2F_PP_UP
 	const EVENT_CERULEAN_CAVE_2F_ULTRA_BALL
-	const EVENT_CERULEAN_CAVE_2F_CARBOS
+	const EVENT_CERULEAN_CAVE_2F_SCOPE_LENS
 	const EVENT_CERULEAN_CAVE_2F_HIDDEN_PP_UP
 	const EVENT_CERULEAN_CAVE_2F_HIDDEN_CALCIUM
 	const EVENT_CERULEAN_CAVE_2F_HIDDEN_FULL_HEAL

diff --git a/maps/CeruleanCave2F.asm b/maps/CeruleanCave2F.asm
@@ -35,8 +35,8 @@ CeruleanCave2FPPUP:
 CeruleanCave2FUltraBall:
 	itemball ULTRA_BALL
 
-CeruleanCave2FCarbos:
-	itemball CARBOS
+CeruleanCave2FScopeLens:
+	itemball SCOPE_LENS
 
 CeruleanCave2FRock:
 	jumpstd SmashRockScript
@@ -67,7 +67,7 @@ CeruleanCave2F_MapEvents:
 	object_event 34, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, CeruleanCave2FThunderstone, EVENT_CERULEAN_CAVE_2F_THUNDERSTONE
 	object_event  6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, CeruleanCave2FPPUP, EVENT_CERULEAN_CAVE_2F_PP_UP
 	object_event  3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, CeruleanCave2FUltraBall, EVENT_CERULEAN_CAVE_2F_ULTRA_BALL
-	object_event 22, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, CeruleanCave2FCarbos, EVENT_CERULEAN_CAVE_2F_CARBOS
+	object_event 22, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, CeruleanCave2FScopeLens, EVENT_CERULEAN_CAVE_2F_SCOPE_LENS
 	object_event 17, 20, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCave2FRock, -1
 	object_event 18, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCave2FRock, -1
 	object_event 10, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCave2FRock, -1