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

Minor fixes to the Vermilion warp thing

Browse source 
Makes minor progress on the warp issue. Still unsure why this isn't working properly...
This commit is contained in:
Llinos Evans 2023-05-01 19:09:20 +01:00
parent 2aaae32b4b
commit 6413e7806e
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,8 @@ CitrineCity_Object:
warp_event 15, 17, CITRINE_POKECENTER, 1 warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1 warp_event 15, 27, CITRINE_MART, 1
warp_event 22, 5, GARNET_CAVERN_1F, 1 warp_event 22, 5, GARNET_CAVERN_1F, 1
warp_event 39, 31, VERMILION_CITY, 6
warp_event 39, 30, VERMILION_CITY, 6
def_bg_events def_bg_events

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

@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
db $2d ; border block db $2d ; border block
def_warp_events def_warp_events
warp_event 2, 35, VERMILION_CITY, 10 warp_event 2, 35, VERMILION_CITY, 6
warp_event 3, 35, VERMILION_CITY, 9 warp_event 3, 35, VERMILION_CITY, 6
warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1 warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2 warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2

8
scripts/VermilionCity.asm
View file

@ -242,9 +242,6 @@ PassListings:
ldh [hWarpDestinationMap], a ldh [hWarpDestinationMap], a
ld a, $1 ld a, $1
ld [wDestinationWarpID], a ld [wDestinationWarpID], a
ld a, VERMILION_CITY
ld [wLastMap], a
call PlayMapChangeSound
call WarpFound2 call WarpFound2
jr .done jr .done
.choseCitrine .choseCitrine
@ -252,11 +249,8 @@ PassListings:
call PrintText call PrintText
ld a, CITRINE_CITY ld a, CITRINE_CITY
ldh [hWarpDestinationMap], a ldh [hWarpDestinationMap], a
ld a, $1 ld a, $6
ld [wDestinationWarpID], a ld [wDestinationWarpID], a
ld a, VERMILION_CITY
ld [wLastMap], a
call PlayMapChangeSound
call WarpFound2 call WarpFound2
jr .done jr .done
.cancelledPass .cancelledPass