diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index d75296c0..64b5c392 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -2,7 +2,7 @@ SilphCo11F_Object: db $d ; border block def_warp_events - warp_event 9, 0, SILPH_CO_10F, 2 +; warp_event 9, 0, SILPH_CO_10F, 2 ; warp_event 13, 0, SILPH_CO_ELEVATOR, 1 warp_event 5, 5, LAST_MAP, 10 ; warp_event 3, 2, SILPH_CO_5F, 4 diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 20670ba3..dda377ed 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -2,16 +2,16 @@ SilphCo3F_Object: db $2e ; border block def_warp_events - warp_event 26, 0, SILPH_CO_2F, 2 - warp_event 24, 0, SILPH_CO_4F, 1 + warp_event 26, 0, SILPH_CO_1F, 2 + warp_event 24, 0, SILPH_CO_5F, 1 ; warp_event 20, 0, SILPH_CO_ELEVATOR, 1 ; warp_event 23, 11, SILPH_CO_3F, 10 -; warp_event 3, 3, SILPH_CO_5F, 6 -; warp_event 3, 15, SILPH_CO_5F, 7 + warp_event 3, 3, SILPH_CO_5F, 6 + warp_event 3, 15, SILPH_CO_5F, 7 ; warp_event 27, 3, SILPH_CO_2F, 4 ; warp_event 3, 11, SILPH_CO_9F, 4 ; warp_event 11, 11, SILPH_CO_7F, 5 -; warp_event 27, 15, SILPH_CO_3F, 4 + warp_event 27, 15, SILPH_CO_3F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 7b48edb9..d3e3d4ce 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -2,13 +2,13 @@ SilphCo5F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_6F, 2 - warp_event 26, 0, SILPH_CO_4F, 2 + warp_event 24, 0, SILPH_CO_7F, 2 + warp_event 26, 0, SILPH_CO_3F, 2 ; warp_event 20, 0, SILPH_CO_ELEVATOR, 1 ; warp_event 27, 3, SILPH_CO_7F, 6 ; warp_event 9, 15, SILPH_CO_9F, 5 -; warp_event 11, 5, SILPH_CO_3F, 5 -; warp_event 3, 15, SILPH_CO_3F, 6 + warp_event 11, 5, SILPH_CO_3F, 5 + warp_event 3, 15, SILPH_CO_3F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 6643d5c7..8c0cc957 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -2,12 +2,12 @@ SilphCo7F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_8F, 2 - warp_event 22, 0, SILPH_CO_6F, 1 + warp_event 16, 0, SILPH_CO_11F, 2 + warp_event 22, 0, SILPH_CO_5F, 1 ; warp_event 18, 0, SILPH_CO_ELEVATOR, 1 ; warp_event 5, 7, SILPH_CO_11F, 4 -; warp_event 5, 3, SILPH_CO_3F, 9 -; warp_event 21, 15, SILPH_CO_5F, 4 + warp_event 5, 3, SILPH_CO_3F, 9 + warp_event 21, 15, SILPH_CO_5F, 4 def_bg_events