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

Groundwork for Garnet Cavern

Browse source 
Currently just uses the RG Unknown Dungeon map, which should be changed accordingly. The warps and stuff outside of basic entry aren't implemented.

Has a halved encounter rate compared to other maps, which matches the idea that caverns don't sustain much wildlife.

Mt Moon theme may not be used in the final product.
This commit is contained in:
Llinos Evans 2023-04-30 17:06:44 +01:00
parent 986c84d02d
commit 4d40fe09f0
33 changed files with 198 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/GarnetCavern1F.asm Normal file
View file

@ -0,0 +1,2 @@
map_header GarnetCavern1F, GARNET_CAVERN_1F, CAVERN, 0
end_map_header

2
data/maps/headers/GarnetCavernB1F.asm Normal file
View file

@ -0,0 +1,2 @@
map_header GarnetCavernB1F, GARNET_CAVERN_B1F, CAVERN, 0
end_map_header

2
data/maps/headers/GarnetCavernB2F.asm Normal file
View file

@ -0,0 +1,2 @@
map_header GarnetCavernB2F, GARNET_CAVERN_B2F, CAVERN, 0
end_map_header

5
data/maps/hide_show_data.asm
View file

@ -241,7 +241,7 @@ MapHSPointers:
dw SilphCo10FHS
dw SilphCo11FHS
dw NoHS
dw NoHS
dw GarnetCavernB2FHS
dw UnderwaterTunnelHS
dw NoHS
dw NoHS
@ -598,6 +598,9 @@ MtMoonCraterHS:
db MT_MOON_CRATER, $0A, SHOW ; HS_MT_MOON_CRATER_ITEM_10
db MT_MOON_CRATER, $0B, SHOW ; HS_MT_MOON_CRATER_ITEM_11
GarnetCavernB2FHS:
; db GARNET_CAVE_B2F, $01, HIDE ; Moltres
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

6
data/maps/map_header_banks.asm
View file

@ -207,8 +207,8 @@ MapHeaderBanks::
db BANK(RocketHideoutB4F_h)
db BANK(RocketHideoutElevator_h)
db BANK(CitrineMart_h) ; was UNUSED_MAP_CC
db $01 ; UNUSED_MAP_CD
db $01 ; UNUSED_MAP_CE
db BANK(GarnetCavern1F_h) ; was UNUSED_MAP_CD
db BANK(GarnetCavernB1F_h) ; was UNUSED_MAP_CE
db BANK(SilphCo2F_h)
db BANK(SilphCo3F_h)
db BANK(SilphCo4F_h)
@ -239,7 +239,7 @@ MapHeaderBanks::
db BANK(SilphCo10F_h)
db BANK(SilphCo11F_h)
db BANK(SilphCoElevator_h)
db $11 ; UNUSED_MAP_ED
db BANK(GarnetCavernB2F_h) ; was UNUSED_MAP_ED
db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE
db BANK(TradeCenter_h)
db BANK(Colosseum_h)

6
data/maps/map_header_pointers.asm
View file

@ -207,8 +207,8 @@ MapHeaderPointers::
dw RocketHideoutB4F_h
dw RocketHideoutElevator_h
dw CitrineMart_h ; UNUSED_MAP_CC
dw RocketHideoutElevator_h ; UNUSED_MAP_CD, used hideout elevator
dw RocketHideoutElevator_h ; UNUSED_MAP_CE
dw GarnetCavern1F_h ; UNUSED_MAP_CD, used hideout elevator
dw GarnetCavernB1F_h ; UNUSED_MAP_CE, used hideout elevator
dw SilphCo2F_h
dw SilphCo3F_h
dw SilphCo4F_h
@ -239,7 +239,7 @@ MapHeaderPointers::
dw SilphCo10F_h
dw SilphCo11F_h
dw SilphCoElevator_h
dw SilphCo2F_h ; UNUSED_MAP_ED
dw GarnetCavernB2F_h ; UNUSED_MAP_ED, used silph 2f
dw UnderwaterTunnel_h ; UNUSED_MAP_EE
dw TradeCenter_h
dw Colosseum_h

1
data/maps/objects/CitrineCity.asm
View file

@ -6,6 +6,7 @@ CitrineCity_Object:
warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1
warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1
warp_event 22, 5, GARNET_CAVERN_1F, 1
def_bg_events

12
data/maps/objects/GarnetCavern1F.asm Normal file
View file

@ -0,0 +1,12 @@
GarnetCavern1F_Object:
db $03 ; border block
def_warp_events
warp_event 24, 17, CITRINE_CITY, 5
warp_event 25, 17, CITRINE_CITY, 5
def_bg_events
def_object_events
def_warps_to GARNET_CAVERN_1F

11
data/maps/objects/GarnetCavernB1F.asm Normal file
View file

@ -0,0 +1,11 @@
GarnetCavernB1F_Object:
db $03 ; border block
def_warp_events
warp_event 4, 11, CITRINE_CITY, 1
def_bg_events
def_object_events
def_warps_to GARNET_CAVERN_B1F

11
data/maps/objects/GarnetCavernB2F.asm Normal file
View file

@ -0,0 +1,11 @@
GarnetCavernB2F_Object:
db $03 ; border block
def_warp_events
warp_event 4, 11, CITRINE_CITY, 1
def_bg_events
def_object_events
def_warps_to GARNET_CAVERN_B2F

4
data/maps/objects/SilphCoElevator.asm
View file

@ -2,8 +2,8 @@ SilphCoElevator_Object:
db $f ; border block
def_warp_events
warp_event 1, 3, UNUSED_MAP_ED, 1
warp_event 2, 3, UNUSED_MAP_ED, 1
;warp_event 1, 3, UNUSED_MAP_ED, 1
;warp_event 2, 3, UNUSED_MAP_ED, 1
def_bg_events
bg_event 3, 0, 1 ; SilphCoElevatorText1

6
data/maps/songs.asm
View file

@ -206,8 +206,8 @@ MapSongBanks::
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR
db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC
db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CD
db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CE
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_B2F, was UNUSED_MAP_CE
db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F
@ -238,7 +238,7 @@ MapSongBanks::
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_ED
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_B2F, was UNUSED_MAP_ED
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_EE / Underwater Tunnel
db MUSIC_CELADON, 0 ; TRADE_CENTER
db MUSIC_CELADON, 0 ; COLOSSEUM

1
data/maps/town_map_entries.asm
View file

@ -112,7 +112,6 @@ InternalMapEntries:
internal_map DIGLETTS_CAVE, 3, 4, DiglettsCaveName
internal_map VICTORY_ROAD_3F, 0, 4, VictoryRoadName
internal_map ROCKET_HIDEOUT_B1F, 7, 5, RocketHQName
internal_map UNUSED_MAP_CE, 7, 10, CitrineCityName
internal_map SILPH_CO_8F, 10, 5, SilphCoName
internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName
internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName