thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-10-15 11:44:17 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

7
constants/event_constants.asm
View file

@ -751,7 +751,12 @@
const_skip 15
const EVENT_BEAT_MANSION_3_TRAINER_0
const EVENT_BEAT_MANSION_3_TRAINER_1
const_skip 14
const_skip 6
const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1
const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2
const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3
const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4
const_skip 4
const EVENT_BEAT_MANSION_4_TRAINER_0
const EVENT_BEAT_MANSION_4_TRAINER_1

3
constants/hide_show_constants.asm
View file

@ -251,4 +251,5 @@ DEF SHOW EQU $15
const HS_GLADE_GZAP_1 ; EE
const HS_GLADE_GZAP_2 ; EF
const HS_GLADE_GZAP_3 ; F0
DEF NUM_HS_OBJECTS EQU const_value ; F1 - FE all go unused.
const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1
DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused.

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

2
maps/CinnabarVolcano.blk
View file

@ -1 +1 @@
..............}vvvvvvvvvvvv}Qvvvvvvvvvvvv}vvvvvvvvvvvvvvvvvvvv !" !"vvv+,vvvv !" !!"vvNvvv)vvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+,vvvv8-888vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN

4
maps/CinnabarVolcanoFloors.blk
View file

@ -1,4 +1,4 @@
,+,+|__b "+
,+,+|__b "+
 vvvfvvvvvvv-vvvvfvvv-v |fyvr
 _,+,+|#'  r+vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_
 _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_
 " ___$

2
maps/PokemonMansionB1F.blk
View file

@ -1 +1 @@
`saaBaaaabAAAABdFfwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ
`aaaBaaaabAAAABdF /fwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ

2
ram/wram.asm
View file

@ -2043,7 +2043,6 @@ wSSAnneB1FRoomsCurScript:: db
wVermilionCityCurScript:: db
wPokemonTower2FCurScript:: db
wPokemonTower3FCurScript:: db
ds 1 ;was wPokemonTower4FCurScript
wPokemonTower5FCurScript:: db
wPokemonTower6FCurScript:: db
wPokemonTower7FCurScript:: db
@ -2062,6 +2061,7 @@ wPokemonMansion3FCurScript:: db
wPokemonMansionB1FCurScript:: db
wDiglettsCaveCurScript:: db
wCinnabarVolcanoCurScript:: db
wCinnabarVolcanoFloorsCurScript:: db
wCeladonUniversityOutsideCurScript:: db
wUnderwaterTunnelCurScript:: db
wVictoryRoad2FCurScript:: db

6
scripts/CinnabarVolcano.asm
View file

@ -14,6 +14,12 @@ CinnabarVolcano_ScriptPointers:
CinnabarVolcano_TextPointers:
dw MoltresText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoTrainerHeaders:
def_trainers

109
scripts/CinnabarVolcanoFloors.asm
View file

@ -1,6 +1,113 @@
CinnabarVolcanoFloors_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, CinnabarVolcanoFloorsTrainerHeaders
ld de, CinnabarVolcanoFloors_ScriptPointers
ld a, [wCinnabarVolcanoFloorsCurScript]
call ExecuteCurMapScriptInTable
ld [wCinnabarVolcanoFloorsCurScript], a
ret
CinnabarVolcanoFloors_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
CinnabarVolcanoFloors_TextPointers:
dw CinnabarVolcanoFloorsText1
dw CinnabarVolcanoFloorsText2
dw CinnabarVolcanoFloorsText3
dw CinnabarVolcanoFloorsText4
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoFloorsTrainerHeaders:
def_trainers
CinnabarVolcanoFloorsTrainerHeader0:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1, 2, CinnabarVolcanoFloorsBattleText1, CinnabarVolcanoFloorsEndBattleText1, CinnabarVolcanoFloorsAfterBattleText1
CinnabarVolcanoFloorsTrainerHeader1:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2, 5, CinnabarVolcanoFloorsBattleText2, CinnabarVolcanoFloorsEndBattleText2, CinnabarVolcanoFloorsAfterBattleText2
CinnabarVolcanoFloorsTrainerHeader2:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3, 2, CinnabarVolcanoFloorsBattleText3, CinnabarVolcanoFloorsEndBattleText3, CinnabarVolcanoFloorsAfterBattleText3
CinnabarVolcanoFloorsTrainerHeader3:
trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4, 3, CinnabarVolcanoFloorsBattleText4, CinnabarVolcanoFloorsEndBattleText4, CinnabarVolcanoFloorsAfterBattleText4
db -1 ; end
CinnabarVolcanoFloorsText1:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText1:
text_far _CinnabarVolcanoFloorsBattleText1
text_end
CinnabarVolcanoFloorsEndBattleText1:
text_far _CinnabarVolcanoFloorsEndBattleText1
text_end
CinnabarVolcanoFloorsAfterBattleText1:
text_far _CinnabarVolcanoFloorsAfterBattleText1
text_end
CinnabarVolcanoFloorsText2:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText2:
text_far _CinnabarVolcanoFloorsBattleText2
text_end
CinnabarVolcanoFloorsEndBattleText2:
text_far _CinnabarVolcanoFloorsEndBattleText2
text_end
CinnabarVolcanoFloorsAfterBattleText2:
text_far _CinnabarVolcanoFloorsAfterBattleText2
text_end
CinnabarVolcanoFloorsText3:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText3:
text_far _CinnabarVolcanoFloorsBattleText3
text_end
CinnabarVolcanoFloorsEndBattleText3:
text_far _CinnabarVolcanoFloorsEndBattleText3
text_end
CinnabarVolcanoFloorsAfterBattleText3:
text_far _CinnabarVolcanoFloorsAfterBattleText3
text_end
CinnabarVolcanoFloorsText4:
text_asm
ld hl, CinnabarVolcanoFloorsTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
CinnabarVolcanoFloorsBattleText4:
text_far _CinnabarVolcanoFloorsBattleText4
text_end
CinnabarVolcanoFloorsEndBattleText4:
text_far _CinnabarVolcanoFloorsEndBattleText4
text_end
CinnabarVolcanoFloorsAfterBattleText4:
text_far _CinnabarVolcanoFloorsAfterBattleText4
text_end
text_end ; unused

9
scripts/PokemonMansionB2F.asm
View file

@ -10,15 +10,6 @@ PokemonMansionB2F_TextPointers:
dw B2FBook2
dw PickUpItemText
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
dw B2FPicture
dw B2FTrioPods
dw B2FTrioPods

1
text.asm
View file

@ -298,6 +298,7 @@ INCLUDE "text/GarnetCavern2F.asm"
INCLUDE "text/GiovannisRoom.asm"
INCLUDE "text/CitrineCity.asm"
INCLUDE "text/MtMoonSquare.asm"
INCLUDE "text/CinnabarVolcanoFloors.asm"
SECTION "Pokédex Text", ROMX

68
text/CinnabarVolcanoFloors.asm Normal file
View file

@ -0,0 +1,68 @@
_CinnabarVolcanoFloorsBattleText1::
text "Look out! You'll"
line "get burned!"
done
_CinnabarVolcanoFloorsEndBattleText1::
text "You're"
line "no joke!"
prompt
_CinnabarVolcanoFloorsAfterBattleText1::
text "You'll be fine as"
line "long as you have"
cont "your #MON to"
cont "protect you."
done
_CinnabarVolcanoFloorsBattleText2::
text "Whew! This place"
line "is scorching!"
done
_CinnabarVolcanoFloorsEndBattleText2::
text "Too"
line "hot for me!"
prompt
_CinnabarVolcanoFloorsAfterBattleText2::
text "I'm sweating just"
line "standing here!"
done
_CinnabarVolcanoFloorsBattleText3::
text "My WATER #MON"
line "can keep us cool!"
done
_CinnabarVolcanoFloorsEndBattleText3::
text "Oh"
line "well..."
prompt
_CinnabarVolcanoFloorsAfterBattleText3::
text "BLASTOISE is a"
line "favorite among"
cont "us FIREFIGHTERs!"
done
_CinnabarVolcanoFloorsBattleText4::
text "I'm collecting"
line "volcanic rock"
cont "samples!"
done
_CinnabarVolcanoFloorsEndBattleText4::
text "Ouch!"
line "Hot, hot, hot!"
prompt
_CinnabarVolcanoFloorsAfterBattleText4::
text "I sometimes see"
line "MAGMAR swimming"
cont "in the magma."
para "I wonder if I"
line "could fish one"
cont "up? Hahaha!"
done

2
text/PokemonMansionB1F.asm
View file

@ -41,7 +41,7 @@ _Mansion4Text7::
done
_MansionGuardText::
text "This room is"
text "This area is"
line "off-limits."
para "Beat it, kid!"

30
text/PokemonMansionB2F.asm
View file

@ -24,12 +24,12 @@ _B2FBook2::
para "MEWTWO remains."
line "However..."
para "Its seemed to"
para "It has seemed to"
line "react to the"
cont "situation."
para "Tranquilizers"
line "were administered."
para "Tranquilizers were"
line "administered."
para "We should never"
line "have gone to"
@ -38,11 +38,15 @@ _B2FBook2::
para "Somewhere no one"
line "will ever look."
cont "With any luck,"
cont "it'll end up at"
cont "the bottom of"
cont "the sea..."
done
_B2FPicture::
text "It's charred"
text "It's a charred"
line "picture of a"
cont "happy family."
@ -50,9 +54,9 @@ _B2FPicture::
_B2FComputer1::
text "The screen is"
line "cracked, but"
cont "five graphs"
cont "are visible."
line "cracked, but 5"
cont "graphs are"
cont "visible."
done
@ -64,10 +68,12 @@ _B2FComputer2::
done
_B2FMissingNo::
text "A multicolored,"
line "glitched block"
cont "is visible on"
cont "this screen."
text "Badly corrupted"
line "graphics are on"
cont "this screen..."
para "It's best to"
line "leave it alone."
done
@ -86,7 +92,7 @@ _AmberPod::
_MewtwoPod::
text "Smashed glass"
line "litters the"
line "surrounds this"
cont "pod..."
para "What could have"