thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 14:48:43 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when losing to Yujirou

Browse source 
The reason was because not all the infrastructure for an actual battle was set up - this fixes it. It still has some strange text that appears though.

Also did some minor optimisations on the Vermillion Dock stuff - I think the direction I am taking Faraway Island will work. However, something in that script causes any and all special warps to crash in some way. I am not sure what it is that does it.
This commit is contained in:
Llinos Evans 2023-07-14 12:16:28 +01:00
parent 9015062b0a
commit 3ef4cea23d
5 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ ViridianPreGym_Object:
def_object_events
object_event 6, 9, SPRITE_GIRL, STAY, LEFT, 1, OPP_STUDENT, 1 ; person, Trainer 1
object_event 3, 8, SPRITE_GIRL, STAY, RIGHT, 2, OPP_STUDENT, 2 ; person, Trainer 2
object_event 5, 2, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person, Yujirou
object_event 5, 2, SPRITE_YOUNGSTER, STAY, NONE, 3, OPP_YUJIROU, 1 ; person, Yujirou
object_event 1, 6, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
def_warps_to VIRIDIAN_PRE_GYM

2
data/maps/special_warps.asm
View file

@ -78,6 +78,7 @@ FlyWarpDataPtr:
fly_warp_spec ROUTE_4, .Route4
fly_warp_spec ROUTE_10, .Route10
fly_warp_spec REDS_HOUSE_2F, .RedsHouse2F ; This doesn't show on the Fly map, just used so the post-league warp doesn't have a stroke
fly_warp_spec FARAWAY_ISLAND_OUTSIDE, .FarawayIslandOutside
.PalletTown: fly_warp PALLET_TOWN, 5, 6
.ViridianCity: fly_warp VIRIDIAN_CITY, 23, 26
@ -95,3 +96,4 @@ FlyWarpDataPtr:
.Route4: fly_warp ROUTE_4, 11, 6
.Route10: fly_warp ROUTE_10, 11, 20
.RedsHouse2F: fly_warp REDS_HOUSE_2F, 3, 6
.FarawayIslandOutside: fly_warp FARAWAY_ISLAND_OUTSIDE, 2, 23