thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore warps to Cerulean Cave

Browse source 
This adds the warp to Cerulean Cave into Cerulean City, including the small walk to Route 4. I've moved the Berserk Gene to be underneath where Mewtwo stands, since its location is no longer necessary.
This commit is contained in:
Llinos Evans 2023-10-23 14:01:48 +01:00
parent 0d7a23c6ea
commit e484b49503
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
maps/CeruleanCaveB1F.asm
View file

@ -34,6 +34,7 @@ CeruleanCaveB1F_MapEvents:
def_bg_events def_bg_events
bg_event 8, 6, BGEVENT_ITEM + MAX_REVIVE, EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE bg_event 8, 6, BGEVENT_ITEM + MAX_REVIVE, EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE
bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL
bg_event 7, 13, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
def_object_events def_object_events
object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO

4
maps/CeruleanCity.ablk
View file

@ -6,9 +6,9 @@
t t
n1m0m+% n1m0mWp
t t
tttm%Ct tttmKt
t t

3
maps/CeruleanCity.asm
View file

@ -283,6 +283,7 @@ CeruleanCity_MapEvents:
warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
warp_event 30, 23, CERULEAN_GYM, 1 warp_event 30, 23, CERULEAN_GYM, 1
warp_event 25, 29, CERULEAN_MART, 2 warp_event 25, 29, CERULEAN_MART, 2
warp_event 2, 11, CERULEAN_CAVE_1F, 1
def_coord_events def_coord_events
@ -295,7 +296,7 @@ CeruleanCity_MapEvents:
bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor
bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign
bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene ;bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene ; To be moved to where Mewtwo will have been sitting.
def_object_events def_object_events
object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1

4
maps/Route4.ablk
View file

@ -9,14 +9,14 @@ X
$WW+% $WW+%
Z/[Y Z/[Y
XX XX
Z/a) Z)
Y Y
XZ/C)/[ XZ/C)/[
Z/ook) Z/oo\k)