From d4437ee259faf15103b7974d5554a8926d57debb Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:36:14 +0100 Subject: [PATCH] minor tweaks viridian forest and pewter museum crash on entry, cerulean cave needs the map dimensions fixed --- data/maps/maps.asm | 2 +- maps/Route2.ablk | 10 ++++++---- maps/Route2.asm | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index da69788..fde6e0c 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -491,7 +491,7 @@ MapGroup_Viridian: map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_VIRIDIAN_MAPS diff --git a/maps/Route2.ablk b/maps/Route2.ablk index c99fd22..17d66bc 100644 --- a/maps/Route2.ablk +++ b/maps/Route2.ablk @@ -3,12 +3,14 @@ >??; 11111$W% -mn2l1tt -mn -11111 ! -17~11112ll// + +2l1tt +OPm +11111 T! + +17}~11112ll// OP T! !|}~RO|~R/UUUUUn diff --git a/maps/Route2.asm b/maps/Route2.asm index b39d6de..1115bed 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -153,8 +153,8 @@ Route2_MapEvents: warp_event 17, 27, ROUTE_2_GATE, 2 warp_event 12, 7, DIGLETTS_CAVE, 3 warp_event 5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1 - warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3 - warp_event 4, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4 + warp_event 2, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3 + warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4 def_coord_events