From 4cc05243ed6c5611e73e6378590f380c227ea36b Mon Sep 17 00:00:00 2001 From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 16 Oct 2022 07:46:08 +0100 Subject: [PATCH] Free roaming from Cerulean, add Faraway Island sign - Replaces tiles east and west of Cerulean so you can roam back to Mt. Moon and over to Rock Tunnel with no issue. - Adds the Faraway Island sign, with a - "JI" bit to represent Mr. Fuji. This was in the Japanese release, but never got translated internationally. "I depart" may need fine-tuning, as it implies he died; this was a mistranslation, obviously. - Added a text bank for the Mew encounter to make Martha's job easier later. --- data/maps/objects/FarawayIslandOutside.asm | 1 + maps/Route4.blk | 2 +- maps/Route9.blk | 2 +- scripts/FarawayIslandOutside.asm | 4 ++++ text.asm | 2 ++ text/FarawayIslandInside.asm | 4 ++++ text/FarawayIslandOutside.asm | 19 +++++++++++++++++++ 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 text/FarawayIslandInside.asm create mode 100644 text/FarawayIslandOutside.asm diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index 09622811..37dac35f 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -6,6 +6,7 @@ FarawayIslandOutside_Object: warp_event 15, 6, 0, FARAWAY_ISLAND_INSIDE def_bg_events + bg_event 2, 22, 10 ; Sign def_object_events diff --git a/maps/Route4.blk b/maps/Route4.blk index cb6a6a74..a9fb235b 100644 --- a/maps/Route4.blk +++ b/maps/Route4.blk @@ -28,7 +28,7 @@ Y X Z/g,)()/[ -Z/okkkk,)() +Z/o\kkkk,)() diff --git a/maps/Route9.blk b/maps/Route9.blk index f9d44ded..c3100545 100644 --- a/maps/Route9.blk +++ b/maps/Route9.blk @@ -12,7 +12,7 @@ (,,)ttM >;/()/$%/>;(,,)RROL()11$%11111111$%1$WW% -51111>,)/>;1>;1>;1111111QQc>;$W%1111 +L1111>,)/>;1>;1>;1111111QQc>;$W%1111 $%$%/()>;>??ttM()/>;/$%$%(,,ttM()1111111() diff --git a/scripts/FarawayIslandOutside.asm b/scripts/FarawayIslandOutside.asm index 842fe408..aba97e45 100644 --- a/scripts/FarawayIslandOutside.asm +++ b/scripts/FarawayIslandOutside.asm @@ -2,5 +2,9 @@ FarawayIslandOutside_Script: jp EnableAutoTextBoxDrawing FarawayIslandOutside_TextPointers: + dw FarawayIslandSign + +FarawayIslandSign: + text_far _FarawayIslandSign text_end ; unused diff --git a/text.asm b/text.asm index ba3a9718..eff201e8 100644 --- a/text.asm +++ b/text.asm @@ -275,6 +275,8 @@ INCLUDE "text/CeladonUniversityOutside.asm" INCLUDE "text/CeladonUniversityInside.asm" INCLUDE "text/CeladonUniversityPokecenter.asm" INCLUDE "text/CinnabarVolcano.asm" +INCLUDE "text/FarawayIslandOutside.asm" +INCLUDE "text/FarawayIslandInside.asm" SECTION "Pokédex Text", ROMX diff --git a/text/FarawayIslandInside.asm b/text/FarawayIslandInside.asm new file mode 100644 index 00000000..a5aca307 --- /dev/null +++ b/text/FarawayIslandInside.asm @@ -0,0 +1,4 @@ +_FarawayIslandMew:: + text "Mew!" + + done \ No newline at end of file diff --git a/text/FarawayIslandOutside.asm b/text/FarawayIslandOutside.asm new file mode 100644 index 00000000..e984d52b --- /dev/null +++ b/text/FarawayIslandOutside.asm @@ -0,0 +1,19 @@ +_FarawayIslandSign:: + text "The writing is" + line "fading as if it" + cont "was written a" + cont "long time ago..." + + text "...ber, 6th day" + + text "If any human..." + line "sets foot here..." + cont "again...et it be" + cont "a kindhearted" + cont "pers..." + + text "...ith that hope," + line "I depar..." + cont "...JI" + + done \ No newline at end of file