thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved Cinnabar Volcano + Mansion B2F!

Browse source 
- Cinnabar Volcano now requires Strength to complete, and contains several trainers, including 3 Firefighters.

- The entrance to Mansion B2F has been changed to a warp pad instead of a staircase.

- Removed the boulders in B2F to fix a bug and to prevent softlocks.

- Minor text fixes.
This commit is contained in:
Martha Schilling 2023-11-24 11:36:14 +00:00
parent 29fc579c3f
commit 4384bc639d
19 changed files with 259 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/maps/hide_show_data.asm
View file

@ -236,7 +236,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw CinnabarVolcanoHS
dw NoHS
dw CinnabarVolcanoFloorsHS
dw NoHS
dw SilphCo10FHS
dw SilphCo11FHS
@ -591,4 +591,6 @@ BrunswickGladeHS:
db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1
db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2
db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3
CinnabarVolcanoFloorsHS:
db CINNABAR_VOLCANO_FLOORS, $05, SHOW
assert_table_length NUM_HS_OBJECTS

8
data/maps/objects/CinnabarVolcano.asm
View file

@ -7,6 +7,12 @@ CinnabarVolcano_Object:
def_bg_events
def_object_events
object_event 15, 7, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 15, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 13, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
object_event 14, 13, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 15, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
def_warps_to CINNABAR_VOLCANO

12
data/maps/objects/CinnabarVolcanoFloors.asm
View file

@ -15,5 +15,17 @@ CinnabarVolcanoFloors_Object:
def_bg_events
def_object_events
object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_FIREFIGHTER, 3
object_event 37, 4, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_FIREFIGHTER, 4
object_event 13, 8, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_FIREFIGHTER, 5
object_event 5, 32, SPRITE_SCIENTIST, STAY, RIGHT, 4, OPP_SCIENTIST, 9
object_event 35, 7, SPRITE_POKE_BALL, STAY, DOWN, 5, FULL_RESTORE
object_event 25, 33, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 24, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object_event 25, 28, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
object_event 33, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
object_event 34, 11, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
object_event 11, 35, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
def_warps_to CINNABAR_VOLCANO_FLOORS

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

@ -3,7 +3,7 @@ PokemonMansionB1F_Object:
def_warp_events
warp_event 23, 22, POKEMON_MANSION_1F, 6
warp_event 2, 1, POKEMON_MANSION_B2F, 1 ; temp for debugging purposes...unless?
warp_event 17, 3, POKEMON_MANSION_B2F, 1 ; temp for debugging purposes...unless?
def_bg_events
@ -16,6 +16,6 @@ PokemonMansionB1F_Object:
object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person
object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
object_event 2, 1, SPRITE_GUARD, STAY, NONE, 9 ; person
object_event 15, 4, SPRITE_GUARD, STAY, NONE, 9 ; person
def_warps_to POKEMON_MANSION_B1F

29
data/maps/objects/PokemonMansionB2F.asm
View file

@ -3,32 +3,23 @@ PokemonMansionB2F_Object:
def_warp_events
warp_event 26, 22, CINNABAR_ISLAND, 1 ; this should not be accessible, only something the player arrives at.
warp_event 27, 2, CINNABAR_ISLAND, 6
warp_event 27, 2, CINNABAR_ISLAND, 1
def_bg_events
bg_event 23, 0, 14 ; photo
bg_event 18, 2, 15 ; starter pod
bg_event 14, 2, 16 ; starter pod
bg_event 10, 2, 17 ; starter pod
bg_event 6, 2, 18 ; amber's pod
bg_event 1, 2, 19 ; mewtwo's pod
bg_event 12, 6, 20 ; computer 1
bg_event 14, 6, 21 ; computer 2
bg_event 16, 6, 22 ; computer 3, missingno
bg_event 23, 0, 5 ; photo
bg_event 18, 2, 6 ; starter pod
bg_event 14, 2, 7 ; starter pod
bg_event 10, 2, 8 ; starter pod
bg_event 6, 2, 9 ; amber's pod
bg_event 1, 2, 10 ; mewtwo's pod
bg_event 12, 6, 11 ; computer 1
bg_event 14, 6, 12 ; computer 2
bg_event 16, 6, 13 ; computer 3
def_object_events
object_event 7, 8, SPRITE_POKEDEX, STAY, NONE, 1 ; Book 1
object_event 26, 6, SPRITE_POKEDEX, STAY, NONE, 2 ; Book 2
object_event 8, 8, SPRITE_POKE_BALL, STAY, NONE, 3, TM_PSYCHIC_M
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 6, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 9, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 5, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object_event 17, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
object_event 11, 21, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
object_event 8, 19, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
object_event 5, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 7, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object_event 12, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
def_warps_to POKEMON_MANSION_B2F

16
data/trainers/parties.asm
View file

@ -548,24 +548,24 @@ ChiefData:
ScientistData:
; Silph Gauntlet 4F (Lavender Tower)
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
; Silph Co. 2F
; Silph Co. 2F (unused)
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
db 28, MAGNETITE, VOLTORB, MAGNETON, 0
; Silph Co. 3F/Mansion 1F
db 29, ELECTRODE, MUK, 0
; Silph Co. 4F
; Silph Co. 4F (unused)
db 33, VOLTORB, ELECTRODE, KOFFING, 0
; Silph Co. 5F
db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0
; Silph Co. 6F
; Silph Co. 6F (unused)
db 25, VOLTORB, KOFFING, MAGNETITE, MAGNEMITE, KOFFING, 0
; Silph Co. 7F
db 29, PORYGON, 0 ; stolen technology!!!
; Silph Co. 8F
db 29, GRIMER, ELECTRODE, 0
; Cinnabar Volcano
db 37, GAVILLAIN, WEEZING, 0
; Silph Co. 9F
db 28, VOLTORB, KOFFING, MAGNETON, 0
; Silph Co. 10F
; Silph Co. 10F (unused)
db 29, MAGNETITE, KOFFING, 0
; Mansion 3F
db 33, MAGNETITE, MAGNETON, DITTO, 0
@ -738,6 +738,10 @@ FirefighterData:
db 15, POLIWAG, CHEEP, SQUIRTLE, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
; Cinnabar Volcano
db 36, WARTORTLE, MAROWAK, POLITOED, 0
db 35, SANDSLASH, OMANYTE, SEAKING, CROAKOZUNA, 0
db 38, SEADRA, BLASTOISE, 0
JuniorData:
; to be removed