From 02bfe0a22d501a7a13ae85c96f21ec03d66fec0d Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Mon, 2 Sep 2024 17:44:37 +0100 Subject: [PATCH] Restored Route 4's barrier --- constants/event_flags.asm | 2 +- maps/Route4.asm | 4 ++++ maps/Route4.blk | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a7a9d39e4..4cdb51943 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -263,7 +263,7 @@ const EVENT_CELADON_CITY_HIDDEN_PP_UP const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL - const_EVENT_ROUTE_4_HIDDEN_BIG_MUSHROOM + const EVENT_ROUTE_4_HIDDEN_BIG_MUSHROOM const_skip ; unused in Sour Crystal const_skip ; unused in Sour Crystal const_skip ; unused in Sour Crystal diff --git a/maps/Route4.asm b/maps/Route4.asm index a7a222170..9c8cdd69c 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -63,6 +63,9 @@ Route4HPUp: Route4HiddenUltraBall: hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL +Route4HiddenBigMushroom: + hiddenitem BIG_MUSHROOM, EVENT_ROUTE_4_HIDDEN_BIG_MUSHROOM + BirdKeeperHankSeenText: text "I'm raising my" line "#MON. Want to" @@ -141,6 +144,7 @@ Route4_MapEvents: def_bg_events bg_event 5, 7, BGEVENT_READ, MtMoonSquareSign bg_event 18, 3, BGEVENT_ITEM, Route4HiddenUltraBall + bg_event 62, 4, BGEVENT_ITEM, Route4HiddenBigMushroom def_object_events object_event 27, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 diff --git a/maps/Route4.blk b/maps/Route4.blk index 3fd2e2a7d..1e823db30 100644 --- a/maps/Route4.blk +++ b/maps/Route4.blk @@ -16,7 +16,7 @@ Z/[Y X X -Z\aaaaa)11 +Z\RRO11)11