thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 06:38:40 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cinnabar Lab has a proper fossil machine now!

Browse source 
Taken from the RG prototype assets!
This commit is contained in:
Llinos Evans 2023-11-25 13:08:49 +00:00
parent 791689c300
commit e6119651d8
10 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/CinnabarLabFossilRoom.asm
View file

@ -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

3
data/maps/objects/RedsHouse2F.asm
View file

@ -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

1
data/tilesets/collision_tile_ids.asm
View file

@ -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

1
data/tilesets/tileset_headers.asm
View file

@ -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

1
data/tilesets/warp_tile_ids.asm
View file

@ -32,6 +32,7 @@ WarpTileIDPointers:
dw .RocketHouseWarpTileIDs
dw .BetaMartWarpTileIDs
dw .JackyWarpTileIDs
dw .LabWarpTileIDs ; Fossil Lab
assert_table_length NUM_TILESETS
MACRO warp_tiles