From c5264f160aee6fbbf219c6b67f5bd3f83dd02495 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 26 Apr 2023 09:38:47 +0100 Subject: [PATCH] A few small fixes - Brunswick Trail and Faraway Island now use correct palettes. - Faraway Island has been altered slightly with the same tileset as Celeste Hill - It's now possible to fly from Citrine locations, as well as Faraway Island, and the roof of both Celadon's Mart and Mansion. --- data/maps/headers/FarawayIslandInside.asm | 2 +- data/maps/headers/FarawayIslandOutside.asm | 2 +- data/maps/objects/FarawayIslandOutside.asm | 6 ++-- engine/gfx/palettes.asm | 32 ++++++++++++++++++---- engine/menus/start_sub_menus.asm | 2 +- home/overworld.asm | 13 +++++++++ maps/FarawayIslandInside.blk | 2 +- maps/FarawayIslandOutside.blk | 4 +-- text/SilphCo11F.asm | 6 ++-- text/SilphGauntlet7F.asm | 27 +++++++++--------- 10 files changed, 65 insertions(+), 31 deletions(-) diff --git a/data/maps/headers/FarawayIslandInside.asm b/data/maps/headers/FarawayIslandInside.asm index b60263ce..ec5eefa0 100644 --- a/data/maps/headers/FarawayIslandInside.asm +++ b/data/maps/headers/FarawayIslandInside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0 + map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 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 a9f14384..c122a938 100644 --- a/data/maps/headers/FarawayIslandOutside.asm +++ b/data/maps/headers/FarawayIslandOutside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0 + map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 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 3acbdab4..112d7ab1 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 14, 12, FARAWAY_ISLAND_INSIDE, 1 - warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2 + warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1 + warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2 def_bg_events - bg_event 2, 28, 1 ; Sign + bg_event 3, 27, 1 ; Sign def_object_events diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 00b0ac69..ff29eaf2 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -146,6 +146,8 @@ SetPal_Overworld: jr z, .caveOrBruno cp CELESTE jr z, .celeste + cp CITRINE + jr z, .citrine ld a, [wCurMap] cp FIRST_INDOOR_MAP jr c, .townOrRoute @@ -155,8 +157,8 @@ SetPal_Overworld: jr z, .Lorelei cp CELESTE_HILL jr z, .celeste - cp BRUNSWICK_TRAIL - jr z, .brunswick + cp CITRINE_CITY + jr z, .citrine cp BRUNOS_ROOM jr z, .caveOrBruno .normalDungeonOrBuilding @@ -173,6 +175,29 @@ SetPal_Overworld: ld a, SET_PAL_OVERWORLD ld [wDefaultPaletteCommand], a ret +.citrine + ld a, [wCurMap] + cp BRUNSWICK_TRAIL + jr z, .brunswick + cp CITRINE_CITY + jr c, .citrineDefault +.citrineDefault + ld a, PAL_CITRINE - 1 + jr .town +.celeste + ld a, [wCurMap] + cp FARAWAY_ISLAND_OUTSIDE + jr z, .faraway + cp FARAWAY_ISLAND_INSIDE + jr z, .faraway + cp CELESTE_HILL + jr c, .celesteDefault +.celesteDefault + ld a, PAL_CELESTE - 1 + jr .town +.faraway + ld a, PAL_ROUTE - 1 + jr .town .brunswick ld a, PAL_BRUNSWICK - 1 jr .town @@ -192,9 +217,6 @@ SetPal_Overworld: .caveDefault ld a, PAL_CAVE - 1 jr .town -.celeste - ld a, PAL_CELESTE - 1 - jr .town .Lorelei jr c, .gbcLorelei jr .seafoam diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index ddaba3db..460180a9 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -132,7 +132,7 @@ StartMenu_Pokemon:: .fly bit BIT_THUNDERBADGE, a jp z, .newBadgeRequired - call CheckIfInOutsideMap + call CheckIfInFlyMap jr z, .canFly ld a, [wWhichPokemon] ld hl, wPartyMonNicks diff --git a/home/overworld.asm b/home/overworld.asm index 12895e2b..1493142d 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -724,6 +724,19 @@ PlayMapChangeSound:: and a ret nz jp GBFadeOutToBlack + +CheckIfInFlyMap:: + call CheckIfInOutsideMap + ret z + cp CITRINE + ret z + cp CELESTE + ret z + ld a, [wCurMap] + cp CELADON_MART_ROOF + ret z + cp CELADON_MANSION_ROOF + ret CheckIfInOutsideMap:: ; If the player is in an outside map (a town or route), set the z flag diff --git a/maps/FarawayIslandInside.blk b/maps/FarawayIslandInside.blk index 97b28876..ce587a3f 100644 --- a/maps/FarawayIslandInside.blk +++ b/maps/FarawayIslandInside.blk @@ -1 +1 @@ -\QR ((((b bb(((b \R  \RZ[(b(Z[02 (((Z[(( 02Y \ No newline at end of file +\QR ((((b bb(((bU PR o PRT[(b(T[T[ (((T[(( Y \ No newline at end of file diff --git a/maps/FarawayIslandOutside.blk b/maps/FarawayIslandOutside.blk index e76560a8..6118e512 100644 --- a/maps/FarawayIslandOutside.blk +++ b/maps/FarawayIslandOutside.blk @@ -1,3 +1 @@ -@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 +@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 diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 202ca09a..fd607f45 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -1,5 +1,5 @@ _SilphCoPresidentText:: - text "PRESIDENT: Thank" + text "CHIEF: Thank" line "you for saving" cont "SILPH!" @@ -27,7 +27,7 @@ _ReceivedSilphCoMasterBallText:: text_end _SilphCo10Text_6231c:: - text "PRESIDENT: You" + text "CHIEF: You" line "can't buy that" cont "anywhere!" @@ -62,7 +62,7 @@ _SilphCo11Text3:: text "Ah !" line "So we meet again!" - para "The PRESIDENT and" + para "The CHIEF and" line "I are discussing" cont "a vital business" cont "proposition." diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index 7c69f653..74a9d879 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -1,5 +1,5 @@ _ChiefMonologue:: - text "!" + text "CHIEF: !" line "Congratulations" cont "for making it" cont "this far. I'm" @@ -21,11 +21,12 @@ _ChiefMonologue:: cont "MEWTWO loose and" cont "GIOVANNI gone," cont "our company is" - cont "going under! Now" - cont "there is only one" - cont "way to catch" + cont "going under!" + + para "Now there's only" + line "one way to catch" cont "MEWTWO, and it's" - cont "in your hand!" + cont "in your hands!" para "! Give me" line "that BALL!" @@ -42,14 +43,14 @@ _ChiefVictoryText:: prompt _ChiefAfterBattleText:: - text "I suppose the" - line "child to bring" - cont "down GIOVANNI has" - cont "to be stronger" - cont "than me. There is" - cont "no product I have" - cont "that can trounce" - cont "you." + text "CHIEF: I suppose" + line "the child that" + cont "brought down" + cont "GIOVANNI has to" + cont "be stronger than" + cont "me. No product" + cont "I have can" + cont "trounce you." para "I wanted to make" line "an ultimate BALL"