From 2aaae32b4b8dad6fb3c1d590bba30071f55e897f Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Mon, 1 May 2023 18:02:47 +0100 Subject: [PATCH] Changing Faraway Island back Warps are messed up at the moment and we need to test it for Old Sea Map purposes. It uses the Fuchsia palette right now but that's not an issue right now --- data/maps/headers/FarawayIslandInside.asm | 2 +- data/maps/headers/FarawayIslandOutside.asm | 2 +- data/maps/objects/FarawayIslandOutside.asm | 6 +++--- maps/FarawayIslandInside.blk | 2 +- maps/FarawayIslandOutside.blk | 4 +++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/maps/headers/FarawayIslandInside.asm b/data/maps/headers/FarawayIslandInside.asm index ec5eefa0..b60263ce 100644 --- a/data/maps/headers/FarawayIslandInside.asm +++ b/data/maps/headers/FarawayIslandInside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 0 + map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0 end_map_header \ No newline at end of file diff --git a/data/maps/headers/FarawayIslandOutside.asm b/data/maps/headers/FarawayIslandOutside.asm index c122a938..a9f14384 100644 --- a/data/maps/headers/FarawayIslandOutside.asm +++ b/data/maps/headers/FarawayIslandOutside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 0 + map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0 end_map_header \ No newline at end of file diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index 112d7ab1..3acbdab4 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -4,11 +4,11 @@ FarawayIslandOutside_Object: def_warp_events warp_event 2, 35, VERMILION_CITY, 10 warp_event 3, 35, VERMILION_CITY, 9 - warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1 - warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2 + warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1 + warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2 def_bg_events - bg_event 3, 27, 1 ; Sign + bg_event 2, 28, 1 ; Sign def_object_events diff --git a/maps/FarawayIslandInside.blk b/maps/FarawayIslandInside.blk index ce587a3f..97b28876 100644 --- a/maps/FarawayIslandInside.blk +++ b/maps/FarawayIslandInside.blk @@ -1 +1 @@ -\QR ((((b bb(((bU PR o PRT[(b(T[T[ (((T[(( Y \ No newline at end of file +\QR ((((b bb(((b \R  \RZ[(b(Z[02 (((Z[(( 02Y \ No newline at end of file diff --git a/maps/FarawayIslandOutside.blk b/maps/FarawayIslandOutside.blk index 6118e512..e76560a8 100644 --- a/maps/FarawayIslandOutside.blk +++ b/maps/FarawayIslandOutside.blk @@ -1 +1,3 @@ -@BB-@BB-@BB-@BZB-@BU_XB-@B__B-@BU_UB-@A>_„‡B-DEFU„‡bCF-ƒ(_…bAAB--ƒ(„‚…ACEF--†€‡ƒ(((…AB----ƒ(…ƒ„€‚„‡CF-c--ƒŠ…ƒ…Aƒ…EF---<=ƒ(…ƒ…Aƒ…-----@ƒ„‡†‡A†‡--c--@†‡EEEEGF-----@Y|||||---c-DE \ No newline at end of file +@BB-@BB-@BB-@BB-@BB-@BB-<===>XB-@ACGFCEFB-DGFCEFcCF-@AA +BbAAB--@AC? +BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE \ No newline at end of file