diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 33748f0f..3ced3768 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -5,10 +5,8 @@ Route6_Object: warp_event 9, 1, ROUTE_6_GATE, 3 warp_event 10, 1, ROUTE_6_GATE, 3 warp_event 10, 7, ROUTE_6_GATE, 1 - warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events - bg_event 19, 15, 7 ; Route6Text7 def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 61faa47f..2d8bc9dc 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -6,10 +6,8 @@ Route8_Object: warp_event 1, 10, ROUTE_8_GATE, 2 warp_event 8, 9, ROUTE_8_GATE, 3 warp_event 8, 10, ROUTE_8_GATE, 4 - warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events - bg_event 17, 3, 10 ; Route8Text10 def_object_events object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm index 6fabb0e3..fd512414 100644 --- a/data/maps/objects/UndergroundPathNorthSouth.asm +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -4,7 +4,7 @@ UndergroundPathNorthSouth_Object: def_warp_events warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 3 warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 3 - warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 3 + warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 2 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 47ae45f9..7f0d4263 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -4,11 +4,12 @@ UndergroundPathRoute7_Object: def_warp_events warp_event 3, 7, LAST_MAP, 5 warp_event 4, 7, LAST_MAP, 5 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 + warp_event 6, 2, UNDERGROUND_PATH_WEST_EAST, 1 + warp_event 1, 3, UNDERGROUND_PATH_NORTH_SOUTH, 2 def_bg_events def_object_events - object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person + object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/maps/Route6.blk b/maps/Route6.blk index b488b37b..04414e4e 100644 --- a/maps/Route6.blk +++ b/maps/Route6.blk @@ -11,7 +11,7 @@ hittt/7:~/ -/ !11111111|~ 1 11 1 1 1111111 1  1 eCCCCCd 1 Qc +//1111111111 1 1 1 1111111 1  1 eCCCCCd 1 Qc 11111 MRR1 diff --git a/maps/Route7.blk b/maps/Route7.blk index 1e58b2f8..eaf5aaf1 100644 --- a/maps/Route7.blk +++ b/maps/Route7.blk @@ -1 +1 @@ -111G _{11G t_{\Kt111_{1111_ ! !\7}~w|~1111_{1111111_{ \ No newline at end of file +111G _{11G _{\Kt111_{1111_ ! !\7}~w|~11 _{11111 _{ \ No newline at end of file diff --git a/maps/Route8.blk b/maps/Route8.blk index 8a9da3d9..6612bd4b 100644 --- a/maps/Route8.blk +++ b/maps/Route8.blk @@ -1,4 +1,4 @@ -(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%N +(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%tt1N diff --git a/maps/UndergroundPathNorthSouth.blk b/maps/UndergroundPathNorthSouth.blk index 6431328e..f42b868a 100644 --- a/maps/UndergroundPathNorthSouth.blk +++ b/maps/UndergroundPathNorthSouth.blk @@ -1 +1 @@ -                      \ No newline at end of file +                      \ No newline at end of file diff --git a/maps/UndergroundPathNorthWest.blk b/maps/UndergroundPathNorthWest.blk new file mode 100644 index 00000000..77b1ba12 --- /dev/null +++ b/maps/UndergroundPathNorthWest.blk @@ -0,0 +1,3 @@ +               +   +        \ No newline at end of file diff --git a/maps/UndergroundPathRoute7.blk b/maps/UndergroundPathRoute7.blk index a17a7ed2..4e3c35fc 100644 Binary files a/maps/UndergroundPathRoute7.blk and b/maps/UndergroundPathRoute7.blk differ