From e6119651d8021409769d70fef0bc75b01baaea19 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 13:08:49 +0000 Subject: [PATCH] Cinnabar Lab has a proper fossil machine now! Taken from the RG prototype assets! --- README.md | 1 + constants/tileset_constants.asm | 1 + data/maps/headers/CinnabarLabFossilRoom.asm | 2 +- data/maps/objects/RedsHouse2F.asm | 3 ++- data/tilesets/collision_tile_ids.asm | 1 + data/tilesets/tileset_headers.asm | 1 + data/tilesets/warp_tile_ids.asm | 1 + gfx/blocksets/fossillab.bst | Bin 0 -> 928 bytes gfx/tilesets.asm | 4 ++++ gfx/tilesets/fossillab.png | Bin 0 -> 2234 bytes 10 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 gfx/blocksets/fossillab.bst create mode 100644 gfx/tilesets/fossillab.png diff --git a/README.md b/README.md index 751f6a56..355c4bb0 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ Improved Areas - Silph Co. 11F's unreferenced Porygon PC was restored. It's on the monitor! - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too... - Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you! + - Cinnabar Lab's Fossil Room now features a unique machine from the prototype blocksets, serving as the fossil machine! - Viridian Gym now has a minor new area once you make Giovanni leave. - Various Move Tutors from FireRed and LeafGreen have been distributed around the region, instead giving their respective TMs. - The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros. diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index c23af843..a519fe43 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -31,4 +31,5 @@ const ROCKETHOUSE const BETAMART const JACKY + const FOSSILLAB DEF NUM_TILESETS EQU const_value diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm index 1d072a50..b229b729 100644 --- a/data/maps/headers/CinnabarLabFossilRoom.asm +++ b/data/maps/headers/CinnabarLabFossilRoom.asm @@ -1,2 +1,2 @@ - map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0 + map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, FOSSILLAB, 0 end_map_header diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 3c719bf4..ffe0315a 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -4,7 +4,7 @@ RedsHouse2F_Object: def_warp_events warp_event 7, 1, REDS_HOUSE_1F, 3 ;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief - warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. + ;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater ;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt @@ -12,6 +12,7 @@ RedsHouse2F_Object: ;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles + warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils def_bg_events diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index d081338c..44b51514 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -55,6 +55,7 @@ Lobby_Coll:: Mansion_Coll:: coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 +FossilLab_Coll:: ; It has the same tileset except the trees are the fossil machine, so... Lab_Coll:: coll_tiles $0c, $26, $16, $1e, $34, $37 diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 4342b619..05e32aa5 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -39,4 +39,5 @@ Tilesets: tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE tileset Jacky, -1, -1, -1, -1, TILEANIM_NONE + tileset FossilLab, -1, -1, -1, -1, TILEANIM_NONE assert_table_length NUM_TILESETS diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 892b1334..9417864e 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -32,6 +32,7 @@ WarpTileIDPointers: dw .RocketHouseWarpTileIDs dw .BetaMartWarpTileIDs dw .JackyWarpTileIDs + dw .LabWarpTileIDs ; Fossil Lab assert_table_length NUM_TILESETS MACRO warp_tiles diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst new file mode 100644 index 0000000000000000000000000000000000000000..91f667919f1ff0d80d916c4e4c36a588b30a62ef GIT binary patch literal 928 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 literal 0 HcmV?d00001