From d193a3dc14880a30c4c758558ece3f6da32f0af4 Mon Sep 17 00:00:00 2001 From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com> Date: Mon, 3 Jul 2023 09:37:00 -0600 Subject: [PATCH] Silph Co rerouting This condenses Silph Co A LOT to make it easier to navigate. All warps have been tested. --- data/maps/objects/SilphCo10F.asm | 1 + data/maps/objects/SilphCo11F.asm | 6 +++--- data/maps/objects/SilphCo1F.asm | 4 ++-- data/maps/objects/SilphCo2F.asm | 1 + data/maps/objects/SilphCo3F.asm | 6 +++--- data/maps/objects/SilphCo4F.asm | 1 + data/maps/objects/SilphCo5F.asm | 4 ++-- data/maps/objects/SilphCo6F.asm | 1 + data/maps/objects/SilphCo7F.asm | 10 +++++----- data/maps/objects/SilphCo8F.asm | 1 + data/maps/objects/SilphCo9F.asm | 1 + maps/SilphCo11F.blk | 2 +- maps/SilphCo3F.blk | 2 +- maps/SilphCo5F.blk | 2 +- 14 files changed, 24 insertions(+), 18 deletions(-) diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index b14aa8df..80d104e5 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,4 +1,5 @@ SilphCo10F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 8a3ceb71..b3725e81 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -2,10 +2,10 @@ SilphCo11F_Object: db $d ; border block def_warp_events -; warp_event 9, 0, SILPH_CO_10F, 2 + warp_event 9, 0, SILPH_CO_7F, 1 ; warp_event 13, 0, SILPH_CO_ELEVATOR, 1 - warp_event 2, 2, LAST_MAP, 10 -; warp_event 3, 2, SILPH_CO_5F, 4 +; warp_event 2, 2, LAST_MAP, 10 + warp_event 3, 2, SILPH_CO_7F, 2 def_bg_events diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 7ae2ab44..f09d9a5d 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -4,9 +4,9 @@ SilphCo1F_Object: def_warp_events warp_event 10, 17, LAST_MAP, 6 warp_event 11, 17, LAST_MAP, 6 - warp_event 26, 0, SILPH_CO_2F, 1 + warp_event 26, 0, SILPH_CO_3F, 1 warp_event 14, 0, SILPH_GAUNTLET_1F, 1 - warp_event 16, 10, SILPH_CO_3F, 7 +; warp_event 16, 10, SILPH_CO_3F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index 2c500aa4..3e2b5d89 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,4 +1,5 @@ SilphCo2F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index dda377ed..f05e9e0a 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -2,7 +2,7 @@ SilphCo3F_Object: db $2e ; border block def_warp_events - warp_event 26, 0, SILPH_CO_1F, 2 + warp_event 26, 0, SILPH_CO_1F, 3 warp_event 24, 0, SILPH_CO_5F, 1 ; warp_event 20, 0, SILPH_CO_ELEVATOR, 1 ; warp_event 23, 11, SILPH_CO_3F, 10 @@ -10,8 +10,8 @@ SilphCo3F_Object: 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 11, 11, SILPH_CO_7F, 4 +; warp_event 27, 15, SILPH_CO_3F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 252043ab..174e1332 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,4 +1,5 @@ SilphCo4F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index d3e3d4ce..f5c38bdc 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -7,8 +7,8 @@ SilphCo5F_Object: ; 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/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 27c4e4b2..d804a948 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -1,4 +1,5 @@ SilphCo6F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 8c0cc957..93b12f16 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_11F, 2 - warp_event 22, 0, SILPH_CO_5F, 1 + warp_event 16, 0, SILPH_CO_11F, 1 + warp_event 22, 0, SILPH_CO_5F, 2 ; 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, 7, SILPH_CO_11F, 2 + warp_event 5, 3, SILPH_CO_3F, 5 +; warp_event 21, 15, SILPH_CO_5F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index 66cdb4f5..32a74824 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -1,4 +1,5 @@ SilphCo8F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index d60f22b7..25d6777c 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,4 +1,5 @@ SilphCo9F_Object: +;;;;;;;;;;;;; Ema note: this floor is dummied out db $2e ; border block def_warp_events diff --git a/maps/SilphCo11F.blk b/maps/SilphCo11F.blk index 9bd21b04..2b443615 100644 --- a/maps/SilphCo11F.blk +++ b/maps/SilphCo11F.blk @@ -1 +1 @@ -!"!"""#$921114($35($$*($$*($$*($768*($$*(%&&&%&.&' \ No newline at end of file +!"!""""#$921114($35($$*($$*($$*($768*($$*(%&&&%&.&' \ No newline at end of file diff --git a/maps/SilphCo3F.blk b/maps/SilphCo3F.blk index 9eb420a8..b1948a23 100644 --- a/maps/SilphCo3F.blk +++ b/maps/SilphCo3F.blk @@ -1 +1 @@ -<===========}$>D//F`aaABaAaBZaaabd4VVVfD6GGFD/7Z/ZZ/CCFPIIIJIIIJVIIIQD//FHIIIIIIIIIIIIIJ \ No newline at end of file +<===========}$>DF`aaABaAaBZaaabd4VVVfD6GGFD7Z/ZZCCFPIIIJIIIJVIIIQD/FHIIIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo5F.blk b/maps/SilphCo5F.blk index efe4ff51..08bbeb91 100644 --- a/maps/SilphCo5F.blk +++ b/maps/SilphCo5F.blk @@ -1 +1 @@ -@aaB========}$>D/V /FD/ZAAcgBFD/Z`aBGG{FF`aabdV6FFDVD6FFD5DZGGGFFD/5Z/HIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file +@aaB========}$>DV FDZAAcgBFDZ`aBGG{FF`aabdV6FFDVD6FFD5DZGGGFFD5ZHIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file