From 74c062204027177afea754944f29679f9e148983 Mon Sep 17 00:00:00 2001 From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com> Date: Fri, 30 Sep 2022 15:59:25 -0600 Subject: [PATCH] Silph Co Warps and elevator commented out --- data/maps/objects/SilphCo10F.asm | 8 ++++---- data/maps/objects/SilphCo11F.asm | 4 ++-- data/maps/objects/SilphCo1F.asm | 2 +- data/maps/objects/SilphCo2F.asm | 10 +++++----- data/maps/objects/SilphCo3F.asm | 16 ++++++++-------- data/maps/objects/SilphCo4F.asm | 10 +++++----- data/maps/objects/SilphCo5F.asm | 12 ++++++------ data/maps/objects/SilphCo6F.asm | 6 +++--- data/maps/objects/SilphCo7F.asm | 8 ++++---- data/maps/objects/SilphCo8F.asm | 10 +++++----- data/maps/objects/SilphCo9F.asm | 6 +++--- maps/SilphCo10F.blk | 2 +- maps/SilphCo1F.blk | 2 +- maps/SilphCo2F.blk | 2 +- maps/SilphCo3F.blk | 2 +- maps/SilphCo4F.blk | 2 +- maps/SilphCo5F.blk | 2 +- maps/SilphCo6F.blk | 2 +- maps/SilphCo8F.blk | 2 +- maps/SilphCo9F.blk | 2 +- 20 files changed, 55 insertions(+), 55 deletions(-) diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 20249425..b14aa8df 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -4,10 +4,10 @@ SilphCo10F_Object: def_warp_events warp_event 8, 0, SILPH_CO_9F, 1 warp_event 10, 0, SILPH_CO_11F, 1 - warp_event 12, 0, SILPH_CO_ELEVATOR, 1 - warp_event 9, 11, SILPH_CO_4F, 4 - warp_event 13, 15, SILPH_CO_4F, 6 - warp_event 13, 7, SILPH_CO_4F, 7 +; warp_event 12, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 9, 11, SILPH_CO_4F, 4 +; warp_event 13, 15, SILPH_CO_4F, 6 +; warp_event 13, 7, SILPH_CO_4F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index a067139f..d75296c0 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -3,9 +3,9 @@ SilphCo11F_Object: def_warp_events warp_event 9, 0, SILPH_CO_10F, 2 - warp_event 13, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 13, 0, SILPH_CO_ELEVATOR, 1 warp_event 5, 5, LAST_MAP, 10 - warp_event 3, 2, SILPH_CO_7F, 4 +; warp_event 3, 2, SILPH_CO_5F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 605edd9d..93b12d01 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -5,7 +5,7 @@ SilphCo1F_Object: warp_event 10, 17, LAST_MAP, 6 warp_event 11, 17, LAST_MAP, 6 warp_event 26, 0, SILPH_CO_2F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + ;warp_event 20, 0, SILPH_CO_ELEVATOR, 1 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 3ee8de9c..2c500aa4 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -4,11 +4,11 @@ SilphCo2F_Object: def_warp_events warp_event 24, 0, SILPH_CO_1F, 3 warp_event 26, 0, SILPH_CO_3F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 1 - warp_event 3, 3, SILPH_CO_3F, 7 - warp_event 13, 3, SILPH_CO_8F, 5 - warp_event 27, 15, SILPH_CO_8F, 6 - warp_event 9, 15, SILPH_CO_6F, 5 +; warp_event 20, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 3, 3, SILPH_CO_3F, 7 +; warp_event 13, 3, SILPH_CO_8F, 5 +; warp_event 27, 15, SILPH_CO_8F, 6 +; warp_event 9, 15, SILPH_CO_6F, 5 def_bg_events diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 6b050aad..20670ba3 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -4,14 +4,14 @@ SilphCo3F_Object: def_warp_events warp_event 26, 0, SILPH_CO_2F, 2 warp_event 24, 0, SILPH_CO_4F, 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 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 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 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 def_bg_events diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 7dbc12ca..252043ab 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -4,11 +4,11 @@ SilphCo4F_Object: def_warp_events warp_event 24, 0, SILPH_CO_3F, 2 warp_event 26, 0, SILPH_CO_5F, 2 - warp_event 20, 0, SILPH_CO_ELEVATOR, 1 - warp_event 11, 7, SILPH_CO_10F, 4 - warp_event 17, 3, SILPH_CO_6F, 4 - warp_event 3, 15, SILPH_CO_10F, 5 - warp_event 17, 11, SILPH_CO_10F, 6 +; warp_event 20, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 11, 7, SILPH_CO_10F, 4 +; warp_event 17, 3, SILPH_CO_6F, 4 +; warp_event 3, 15, SILPH_CO_10F, 5 +; warp_event 17, 11, SILPH_CO_10F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 7910f473..7b48edb9 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -4,11 +4,11 @@ SilphCo5F_Object: def_warp_events warp_event 24, 0, SILPH_CO_6F, 2 warp_event 26, 0, SILPH_CO_4F, 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 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 def_bg_events @@ -19,7 +19,7 @@ SilphCo5F_Object: object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1 object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29 object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN - object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN + object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 2495790d..27c4e4b2 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -4,9 +4,9 @@ SilphCo6F_Object: def_warp_events warp_event 16, 0, SILPH_CO_7F, 2 warp_event 14, 0, SILPH_CO_5F, 1 - warp_event 18, 0, SILPH_CO_ELEVATOR, 1 - warp_event 3, 3, SILPH_CO_4F, 5 - warp_event 23, 3, SILPH_CO_2F, 7 +; warp_event 18, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 3, 3, SILPH_CO_4F, 5 +; warp_event 23, 3, SILPH_CO_2F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index b7854e3c..6643d5c7 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -4,10 +4,10 @@ SilphCo7F_Object: def_warp_events warp_event 16, 0, SILPH_CO_8F, 2 warp_event 22, 0, SILPH_CO_6F, 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 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 def_bg_events diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index ded21400..66cdb4f5 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -4,11 +4,11 @@ SilphCo8F_Object: def_warp_events warp_event 16, 0, SILPH_CO_9F, 2 warp_event 14, 0, SILPH_CO_7F, 1 - warp_event 18, 0, SILPH_CO_ELEVATOR, 1 - warp_event 3, 11, SILPH_CO_8F, 7 - warp_event 3, 15, SILPH_CO_2F, 5 - warp_event 11, 5, SILPH_CO_2F, 6 - warp_event 11, 9, SILPH_CO_8F, 4 +; warp_event 18, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 3, 11, SILPH_CO_8F, 7 +; warp_event 3, 15, SILPH_CO_2F, 5 +; warp_event 11, 5, SILPH_CO_2F, 6 +; warp_event 11, 9, SILPH_CO_8F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 261df23c..d60f22b7 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -4,9 +4,9 @@ SilphCo9F_Object: def_warp_events warp_event 14, 0, SILPH_CO_10F, 1 warp_event 16, 0, SILPH_CO_8F, 1 - warp_event 18, 0, SILPH_CO_ELEVATOR, 1 - warp_event 9, 3, SILPH_CO_3F, 8 - warp_event 17, 15, SILPH_CO_5F, 5 +; warp_event 18, 0, SILPH_CO_ELEVATOR, 1 +; warp_event 9, 3, SILPH_CO_3F, 8 +; warp_event 17, 15, SILPH_CO_5F, 5 def_bg_events diff --git a/maps/SilphCo10F.blk b/maps/SilphCo10F.blk index 88669221..36691ed2 100644 --- a/maps/SilphCo10F.blk +++ b/maps/SilphCo10F.blk @@ -1,2 +1,2 @@ -<===$}|>DFDZcgBDF /F@*+BcgBD5F/{FD5F{7FD +<===$}=>DFDZcgBDF /F@*+BcgBD5F/{FD5F{7FD F7/FHIIJIIIJ \ No newline at end of file diff --git a/maps/SilphCo1F.blk b/maps/SilphCo1F.blk index 3bf7c8f0..fca3d471 100644 --- a/maps/SilphCo1F.blk +++ b/maps/SilphCo1F.blk @@ -1 +1 @@ -<========|==}>~""# FD[[FD  [[[[[[9 FD[[FD  FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file +<===========}>~""# FD[[FD  [[[[[[9 FD[[FD  FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo2F.blk b/maps/SilphCo2F.blk index 33003175..63fe7a9d 100644 --- a/maps/SilphCo2F.blk +++ b/maps/SilphCo2F.blk @@ -1 +1 @@ -@aaaaB====|=$}>D/F/F@cgaaaaaaAcgBDFD{{ @aab@cgAB66 UfD{ F66FD7/F77YG/FHIIIIJIIIIIHIIJ \ No newline at end of file +@aaaaB======$}>D/F/F@cgaaaaaaAcgBDFD{{ @aab@cgAB66 UfD{ F66FD7/F77YG/FHIIIIJIIIIIHIIJ \ No newline at end of file diff --git a/maps/SilphCo3F.blk b/maps/SilphCo3F.blk index 15dcaf1f..9eb420a8 100644 --- a/maps/SilphCo3F.blk +++ b/maps/SilphCo3F.blk @@ -1 +1 @@ -<=========|=}$>D//F`aaABaAaBZaaabd4VVVfD6GGFD/7Z/ZZ/CCFPIIIJIIIJVIIIQD//FHIIIIIIIIIIIIIJ \ No newline at end of file +<===========}$>D//F`aaABaAaBZaaabd4VVVfD6GGFD/7Z/ZZ/CCFPIIIJIIIJVIIIQD//FHIIIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo4F.blk b/maps/SilphCo4F.blk index 4e6c32f8..628f3898 100644 --- a/maps/SilphCo4F.blk +++ b/maps/SilphCo4F.blk @@ -1 +1 @@ -<===>aaaa<|=$}>D55F/DFD555FGGD@cgBD55F/DD 4 FD5FcgaDD6FDF/DD 6 F@cgAcgApD6FD/D 7 FHIIIIIIIIIHIIIJ \ No newline at end of file +<===>aaaa<==$}>D55F/DFD555FGGD@cgBD55F/DD 4 FD5FcgaDD6FDF/DD 6 F@cgAcgApD6FD/D 7 FHIIIIIIIIIHIIIJ \ No newline at end of file diff --git a/maps/SilphCo5F.blk b/maps/SilphCo5F.blk index 1fa92a59..efe4ff51 100644 --- a/maps/SilphCo5F.blk +++ b/maps/SilphCo5F.blk @@ -1 +1 @@ -@aaB======|=}$>DV /FD/ZAAcgBFDZ`aBGG{FFPIIQdV6FFDVD6FFD5DZGGGFFD/5Z/HIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file +@aaB========}$>D/V /FD/ZAAcgBFD/Z`aBGG{FF`aabdV6FFDVD6FFD5DZGGGFFD/5Z/HIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo6F.blk b/maps/SilphCo6F.blk index 02d5b56e..8899142f 100644 --- a/maps/SilphCo6F.blk +++ b/maps/SilphCo6F.blk @@ -1 +1 @@ -`aB====$}|==>d/V/FD`aAAcgBF d44444FF@ABD67776FFDV64446FFD77777FFDZgcgAAAcFHIJIIIIIIIIIJ \ No newline at end of file +`aB=====}|==>d/V/FD`aAAcgBF d44444FF@ABD67776FFDV64446FFD77777FFDZgcgAAAcFHIJIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo8F.blk b/maps/SilphCo8F.blk index 5df4ebd8..855898fa 100644 --- a/maps/SilphCo8F.blk +++ b/maps/SilphCo8F.blk @@ -1 +1 @@ -@AABaab$}|==>D44FfFD66F/F@AAABD66VWQDCC FD76/FDFD/7ZGFDG FPIIJWJHXWQ/FHIIIIIIIIIIIJ \ No newline at end of file +@AABaab$}===>D44FfFD66F/F@AAABD66VWQDCC FD76/FDFD/7ZGFDG FPIIJWJHXWQ/FHIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo9F.blk b/maps/SilphCo9F.blk index 47d080dd..3b5c6847 100644 --- a/maps/SilphCo9F.blk +++ b/maps/SilphCo9F.blk @@ -1 +1 @@ -@AAAABA}$|==>D/FFDZgAAB@cgYFDVGGFD4FDg@B D7FDZUV @cgBFPJCCDG{VFDCCCYZD/GFHIIIHJIHIIIIJ \ No newline at end of file +@AAAABA}$===>D/FFDZgAAB@cgYFDVGGFD4FDg@B D7FDZUV @cgBFPJCCDG{VFDCCCYZD/GFHIIIHJIHIIIIJ \ No newline at end of file