thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

account for softlock in volcano when saving next to moltres

Browse source
This commit is contained in:
jojobear13 2024-01-13 21:48:38 -06:00
parent 0c650630e0
commit 939f034d5a
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ CinnabarVolcano_Object:
def_warp_events def_warp_events
warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9 warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
warp_event 16, 5, CINNABAR_VOLCANO_FLOORS, 10
def_bg_events def_bg_events

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

@ -11,6 +11,7 @@ CinnabarVolcanoFloors_Object:
warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8 warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7 warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 12, 24, CINNABAR_VOLCANO, 1 warp_event 12, 24, CINNABAR_VOLCANO, 1
warp_event 31, 37, CINNABAR_VOLCANO, 2
def_bg_events def_bg_events
@ -27,5 +28,6 @@ CinnabarVolcanoFloors_Object:
object_event 34, 11, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; 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 11, 35, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object_event 29, 37, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13
def_warps_to CINNABAR_VOLCANO_FLOORS def_warps_to CINNABAR_VOLCANO_FLOORS

2
maps/CinnabarVolcano.blk
View file

@ -1 +1 @@
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN ..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN

4
maps/CinnabarVolcanoFloors.blk
View file

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

1
scripts/CinnabarVolcanoFloors.asm
View file

@ -25,6 +25,7 @@ CinnabarVolcanoFloors_TextPointers:
dw BoulderText dw BoulderText
dw BoulderText dw BoulderText
dw BoulderText dw BoulderText
dw BoulderText
CinnabarVolcanoFloorsTrainerHeaders: CinnabarVolcanoFloorsTrainerHeaders:
def_trainers def_trainers