mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-11-05 21:20:58 +13:00
Cinnabar Lab has a proper fossil machine now!
Taken from the RG prototype assets!
This commit is contained in:
parent
791689c300
commit
e6119651d8
|
|
@ -146,6 +146,7 @@ Improved Areas
|
||||||
- Silph Co. 11F's unreferenced Porygon PC was restored. It's on the monitor!
|
- 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 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 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.
|
- 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.
|
- 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.
|
- The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros.
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,5 @@
|
||||||
const ROCKETHOUSE
|
const ROCKETHOUSE
|
||||||
const BETAMART
|
const BETAMART
|
||||||
const JACKY
|
const JACKY
|
||||||
|
const FOSSILLAB
|
||||||
DEF NUM_TILESETS EQU const_value
|
DEF NUM_TILESETS EQU const_value
|
||||||
|
|
|
||||||
|
|
@ -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
|
end_map_header
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ RedsHouse2F_Object:
|
||||||
def_warp_events
|
def_warp_events
|
||||||
warp_event 7, 1, REDS_HOUSE_1F, 3
|
warp_event 7, 1, REDS_HOUSE_1F, 3
|
||||||
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
|
;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, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
|
||||||
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
|
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
|
||||||
;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt
|
;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, GARNET_CAVERN_B1F, 1 ; Test GCuno
|
||||||
;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
|
;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
|
||||||
;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
|
;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
|
def_bg_events
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@ Lobby_Coll::
|
||||||
Mansion_Coll::
|
Mansion_Coll::
|
||||||
coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53
|
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::
|
Lab_Coll::
|
||||||
coll_tiles $0c, $26, $16, $1e, $34, $37
|
coll_tiles $0c, $26, $16, $1e, $34, $37
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,4 +39,5 @@ Tilesets:
|
||||||
tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE
|
tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE
|
||||||
tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE
|
tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE
|
||||||
tileset Jacky, -1, -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
|
assert_table_length NUM_TILESETS
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ WarpTileIDPointers:
|
||||||
dw .RocketHouseWarpTileIDs
|
dw .RocketHouseWarpTileIDs
|
||||||
dw .BetaMartWarpTileIDs
|
dw .BetaMartWarpTileIDs
|
||||||
dw .JackyWarpTileIDs
|
dw .JackyWarpTileIDs
|
||||||
|
dw .LabWarpTileIDs ; Fossil Lab
|
||||||
assert_table_length NUM_TILESETS
|
assert_table_length NUM_TILESETS
|
||||||
|
|
||||||
MACRO warp_tiles
|
MACRO warp_tiles
|
||||||
|
|
|
||||||
BIN
gfx/blocksets/fossillab.bst
Normal file
BIN
gfx/blocksets/fossillab.bst
Normal file
Binary file not shown.
|
|
@ -84,3 +84,7 @@ Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst"
|
||||||
|
|
||||||
Jacky_GFX:: INCBIN "gfx/tilesets/jacky.2bpp"
|
Jacky_GFX:: INCBIN "gfx/tilesets/jacky.2bpp"
|
||||||
Jacky_Block:: INCBIN "gfx/blocksets/jacky.bst"
|
Jacky_Block:: INCBIN "gfx/blocksets/jacky.bst"
|
||||||
|
|
||||||
|
FossilLab_GFX:: INCBIN "gfx/tilesets/fossillab.2bpp"
|
||||||
|
FossilLab_Block:: INCBIN "gfx/blocksets/fossillab.bst"
|
||||||
|
|
||||||
|
|
|
||||||
BIN
gfx/tilesets/fossillab.png
Normal file
BIN
gfx/tilesets/fossillab.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Loading…
Reference in a new issue