diff --git a/README.md b/README.md index 97562d92..19c5d13f 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,8 @@ There are some new items here, with the aim of accomodating new Pokemon, adding - The Wing Fossil is a new item that allows Aerodactyl to be revived, as the Old Amber is instead used for Decilla. It's hidden in Mt. Moon. - The Tea from FireRed/LeafGreen and Let's Go Pikachu/Eevee is added, allowing Saffron access for free. The guards now imply they want a cup of tea. - This also accomodates Mt. Moon Square's shop, which would otherwise break progression due to its contents. Hint hint! -- The Ice, Poison and Heart Stones have been added, the latter two being from the SpaceWorld '97 demo. - - Additional evolution items include the Protector, Black Augurite, Up-Grade, Dubious Disc, and the Metal Coat. +- The Ice, Poison and Heart Stones have been added, the latter two being from the SpaceWorld '97 demo. These can be obtained in Fuchsia City. + - Additional evolution items include the Protector, Black Augurite, Up-Grade, Dubious Disc, and the Metal Coat. These can be obtained in various locations in-game, but the post-game island has renewable options as well. - To accomodate Meltan, the Mystery Box from Pokemon GO is featured. When used, wild encounters are replaced with Meltan until one leaves the location. It can be obtained in the Safari Zone. - The Candy Jar is a new key item that allows Meltan Candy to be collected. Defeating a Meltan rewards 10 Candy, and once 400 are collected, it turns into an evolution item to evolve Meltan into Melmetal. It can be obtained in the Indigo Plateau Lobby. - The Bottle Cap has been added alongside a Hyper Training feature, acting as effectively a Gold Bottle Cap. diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index bba94606..6be9a10f 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -2,7 +2,7 @@ FuchsiaCity_Object: db $f ; border block def_warp_events - warp_event 5, 13, FUCHSIA_MART, 1 + warp_event 15, 19, FUCHSIA_MART, 1 warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER, 1 warp_event 27, 27, WARDENS_HOUSE, 1 @@ -15,7 +15,7 @@ FuchsiaCity_Object: def_bg_events bg_event 25, 17, 12 ; FuchsiaCityText12 bg_event 17, 5, 13 ; FuchsiaCityText13 - bg_event 6, 13, 14 ; MartSignText + bg_event 16, 19, 14 ; MartSignText bg_event 20, 27, 15 ; PokeCenterSignText bg_event 27, 29, 16 ; FuchsiaCityText16 bg_event 21, 17, 17 ; FuchsiaCityText17 diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk index 771890c8..55796514 100644 --- a/maps/FuchsiaCity.blk +++ b/maps/FuchsiaCity.blk @@ -1,4 +1,4 @@ - !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmmzooooyzzz1U1zzzzzzngmzzzVUVooooo11kkkPRRO1U1wwww11_1nttt + !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzzzzzzzz !znlllmzzzzzzz7:~znVwwmmzooooyzzz1U1zzzzzzng !zVUVooooo11kkk|sO1U1wwww11_1nttt diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm index 36d611c4..6f56a2e5 100644 --- a/scripts/CeladonMart4F.asm +++ b/scripts/CeladonMart4F.asm @@ -20,4 +20,4 @@ CeladonMart4Text4: text_end CeladonMart4ClerkText:: - script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, ICE_STONE, POISON_STONE, HEART_STONE + script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE diff --git a/scripts/FuchsiaMart.asm b/scripts/FuchsiaMart.asm index 09b7929e..a3a9a5e3 100644 --- a/scripts/FuchsiaMart.asm +++ b/scripts/FuchsiaMart.asm @@ -15,4 +15,4 @@ FuchsiaMartText3: text_end FuchsiaCashierText:: - script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL + script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL, ICE_STONE, POISON_STONE, HEART_STONE