thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 10:23:34 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/hide_show_constants.asm
View file

@ -261,4 +261,5 @@ DEF SHOW EQU $15
const HS_MT_MOON_CRATER_ITEM_9 ; F9
const HS_MT_MOON_CRATER_ITEM_10 ; FA
const HS_MT_MOON_CRATER_ITEM_11 ; FB
;const HS_GARNET_CAVERN_MOLTRES_G ; FC
DEF NUM_HS_OBJECTS EQU const_value

6
constants/map_constants.asm
View file

@ -225,8 +225,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const ROCKET_HIDEOUT_B4F, 15, 12 ; $CB - Currently unused
map_const ROCKET_HIDEOUT_ELEVATOR, 3, 4 ; $CC - Currently unused
map_const CITRINE_MART, 4, 4 ; $CD - was UNUSED_MAP_CC
map_const UNUSED_MAP_CD, 0, 0 ; $CE - Unused
map_const UNUSED_MAP_CE, 0, 0 ; $CF - Unused
map_const GARNET_CAVERN_1F, 15, 9 ; $CE - was UNUSED_MAP_CD
map_const GARNET_CAVERN_B1F, 15, 9 ; $CF - was UNUSED_MAP_CE
map_const SILPH_CO_2F, 15, 9 ; $D0
map_const SILPH_CO_3F, 15, 9 ; $D1
map_const SILPH_CO_4F, 15, 9 ; $D2
@ -257,7 +257,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const SILPH_CO_10F, 8, 9 ; $EB
map_const SILPH_CO_11F, 9, 9 ; $EC
map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED
map_const UNUSED_MAP_ED, 0, 0 ; $EE - Unused
map_const GARNET_CAVERN_B2F, 15, 9 ; $EE - was UNUSED_MAP_ED
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE
map_const TRADE_CENTER, 5, 4 ; $F0
map_const COLOSSEUM, 5, 4 ; $F1

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

11
data/wild/grass_water.asm
View file

@ -206,8 +206,8 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw GarnetCavern1FWildMons
dw GarnetCavernB1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
@ -238,7 +238,7 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw GarnetCavernB2FWildMons
dw UnderwaterTunnelWildMons
dw NothingWildMons
dw NothingWildMons
@ -334,4 +334,7 @@ INCLUDE "data/wild/maps/MtMoonCrater.asm"
INCLUDE "data/wild/maps/UnderwaterTunnel.asm"
INCLUDE "data/wild/maps/BillsGarden.asm"
INCLUDE "data/wild/maps/CelesteHill.asm"
INCLUDE "data/wild/maps/BrunswickTrail.asm"
INCLUDE "data/wild/maps/BrunswickTrail.asm"
INCLUDE "data/wild/maps/GarnetCavern1F.asm"
INCLUDE "data/wild/maps/GarnetCavernB1F.asm"
INCLUDE "data/wild/maps/GarnetCavernB2F.asm"

26
data/wild/maps/GarnetCavern1F.asm Normal file
View file

@ -0,0 +1,26 @@
GarnetCavern1FWildMons:
def_grass_wildmons 5 ; encounter rate
db 46, GOLBAT
db 46, HYPNO
db 46, MAGNETON
db 49, DODRIO
db 49, VENOMOTH
db 52, ARBOK
db 49, KADABRA
db 52, PARASECT
db 53, RAICHU
db 53, CLEFAIRY
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
end_water_wildmons

26
data/wild/maps/GarnetCavernB1F.asm Normal file
View file

@ -0,0 +1,26 @@
GarnetCavernB1FWildMons:
def_grass_wildmons 5 ; encounter rate
db 46, GOLBAT
db 46, HYPNO
db 46, MAGNETON
db 49, DODRIO
db 49, VENOMOTH
db 52, ARBOK
db 49, KADABRA
db 52, PARASECT
db 53, RAICHU
db 53, CLEFAIRY
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
end_water_wildmons

26
data/wild/maps/GarnetCavernB2F.asm Normal file
View file

@ -0,0 +1,26 @@
GarnetCavernB2FWildMons:
def_grass_wildmons 5 ; encounter rate
db 46, GOLBAT
db 46, HYPNO
db 46, MAGNETON
db 49, DODRIO
db 49, VENOMOTH
db 52, ARBOK
db 49, KADABRA
db 52, PARASECT
db 53, RAICHU
db 53, CLEFAIRY
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
db 60, SKIMPER
end_water_wildmons

3
main.asm
View file

@ -51,7 +51,6 @@ INCLUDE "engine/overworld/daycare_exp.asm"
INCLUDE "data/maps/hide_show_data.asm"
INCLUDE "engine/overworld/field_move_messages.asm"
INCLUDE "engine/items/inventory.asm"
INCLUDE "engine/overworld/wild_mons.asm"
INCLUDE "engine/items/item_effects.asm"
INCLUDE "engine/menus/draw_badges.asm"
INCLUDE "engine/overworld/update_map.asm"
@ -73,6 +72,8 @@ INCLUDE "engine/events/hidden_objects/elevator.asm"
INCLUDE "engine/events/hidden_objects/town_map.asm"
INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm"
SECTION "bank3 Spillover", ROMX
INCLUDE "engine/overworld/wild_mons.asm"
SECTION "Font Graphics", ROMX

15
maps.asm
View file

@ -1345,3 +1345,18 @@ INCLUDE "data/maps/headers/CitrineMart.asm"
INCLUDE "scripts/CitrineMart.asm"
INCLUDE "data/maps/objects/CitrineMart.asm"
CitrineMart_Blocks: INCBIN "maps/CitrineMart.blk"
INCLUDE "data/maps/headers/GarnetCavern1F.asm"
INCLUDE "scripts/GarnetCavern1F.asm"
INCLUDE "data/maps/objects/GarnetCavern1F.asm"
GarnetCavern1F_Blocks: INCBIN "maps/GarnetCavern1F.blk"
INCLUDE "data/maps/headers/GarnetCavernB1F.asm"
INCLUDE "scripts/GarnetCavernB1F.asm"
INCLUDE "data/maps/objects/GarnetCavernB1F.asm"
GarnetCavernB1F_Blocks: INCBIN "maps/GarnetCavernB1F.blk"
INCLUDE "data/maps/headers/GarnetCavernB2F.asm"
INCLUDE "scripts/GarnetCavernB2F.asm"
INCLUDE "data/maps/objects/GarnetCavernB2F.asm"
GarnetCavernB2F_Blocks: INCBIN "maps/GarnetCavernB2F.blk"

6
maps/CitrineCity.blk
View file

@ -1,9 +1,7 @@
G>>>>hi(,,)>>>>gFCCZ[(,,)CCC<FdZ[$W%eC<Fd|}~
G>>>>hi(,,)>>>>gFCCZ[(,,)CCC<FdZ[$W%eC<Fd|}~VteC<Fd
I#####Ht
t
eC<Fd
I#####Ht
Vt
eC<Fd

3
maps/GarnetCavern1F.blk Normal file
View file

@ -0,0 +1,3 @@
|_vvvv|bRvvvvvfm,+vvvvv'fv,+|vvtvf,v=vvv f S
^-f+
$

1
maps/GarnetCavernB1F.blk Normal file
View file

@ -0,0 +1 @@
n !"n,- " L  "avvv "Q-+tv "vfvvNvvvvvvf--SQvvvvvL 

1
maps/GarnetCavernB2F.blk Normal file
View file

@ -0,0 +1 @@
 (  ((    (#(

10
scan_includes.exe.stackdump
View file

@ -1,15 +1,15 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
rax=FFFFFFF7FFF970C1 rbx=0000000000001024 rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800058C39 rdi=0000000000000000
rax=FFFFFFF7FFF8C381 rbx=000000000000006A rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800063A0E rdi=0000000000000000
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=0000000800068F40 r13=0000000100403148
r11=0000000100401282 r12=0000000800073C80 r13=0000000100403148
r14=0000000000000000 r15=0000000000000001
rbp=0000000100403156 rsp=00000000FFFFCA60
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 923, thread main
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1243, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100403156 00100401246 (00800058C39, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401246 (00800063A0E, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)

6
scripts/GarnetCavern1F.asm Normal file
View file

@ -0,0 +1,6 @@
GarnetCavern1F_Script:
jp EnableAutoTextBoxDrawing
GarnetCavern1F_TextPointers:
text_end ; unused

6
scripts/GarnetCavernB1F.asm Normal file
View file

@ -0,0 +1,6 @@
GarnetCavernB1F_Script:
jp EnableAutoTextBoxDrawing
GarnetCavernB1F_TextPointers:
text_end ; unused

6
scripts/GarnetCavernB2F.asm Normal file
View file

@ -0,0 +1,6 @@
GarnetCavernB2F_Script:
jp EnableAutoTextBoxDrawing
GarnetCavernB2F_TextPointers:
text_end ; unused

3
text.asm
View file

@ -290,6 +290,9 @@ INCLUDE "text/SilphGauntlet4F.asm"
INCLUDE "text/SilphGauntlet7F.asm"
INCLUDE "text/CitrinePokecenter.asm"
INCLUDE "text/CitrineMart.asm"
INCLUDE "text/GarnetCavern1F.asm"
INCLUDE "text/GarnetCavernB1F.asm"
INCLUDE "text/GarnetCavernB2F.asm"
SECTION "Pokédex Text", ROMX

0
text/GarnetCavern1F.asm Normal file
View file

0
text/GarnetCavernB1F.asm Normal file
View file

3
text/GarnetCavernB2F.asm Normal file
View file

@ -0,0 +1,3 @@
_GalarianMoltresBattleText::
text "Gyaoo!"
prompt