repointed route 5 maps, fixed route 8 sprites

StarBeasts · Jul 8, 2024 · c4445f9 · c4445f9
1 parent f9fde65
commit c4445f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm
@@ -2,8 +2,8 @@ Daycare_Object:
 	db $a ; border block
 
 	def_warp_events
-	warp_event  2,  7, LAST_MAP, 5
-	warp_event  3,  7, LAST_MAP, 5
+	warp_event  2,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 4
 
 	def_bg_events
 

diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm
@@ -12,11 +12,11 @@ Route8_Object:
 	bg_event 17,  3, 10 ; Route8Text10
 
 	def_object_events
-	object_event  8,  5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
+	object_event  8,  5, SPRITE_ERIKA, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
 	object_event 13,  9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5
-	object_event 42,  6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4
+	object_event 42,  6, SPRITE_ERIKA, STAY, UP, 3, OPP_SUPER_NERD, 4
 	object_event 26,  3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13
-	object_event 26,  4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
+	object_event 26,  4, SPRITE_ERIKA, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
 	object_event 26,  5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14
 	object_event 26,  6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15
 	object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7

diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm
@@ -2,8 +2,8 @@ UndergroundPathRoute5_Object:
 	db $a ; border block
 
 	def_warp_events
-	warp_event  3,  7, LAST_MAP, 4
-	warp_event  4,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 3
+	warp_event  4,  7, LAST_MAP, 3
 	warp_event  4,  4, UNDERGROUND_PATH_NORTH_SOUTH, 1
 
 	def_bg_events