thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/pret/pokered

Browse source
This commit is contained in:
dannye 2019-04-13 17:21:23 -05:00
commit b1108ba91e
1427 changed files with 13219 additions and 8377 deletions
Download patch file Download diff file Expand all files Collapse all files

12
home/overworld.asm
View file

@ -494,7 +494,7 @@ WarpFound2::
ld [wUnusedD366], a ; not read
ld a, [hWarpDestinationMap]
ld [wCurMap], a
cp ROCK_TUNNEL_1
cp ROCK_TUNNEL_1F
jr nz, .notRockTunnel
ld a, $06
ld [wMapPalOffset], a
@ -718,15 +718,15 @@ CheckIfInOutsideMap::
; sets carry if the check passes, otherwise clears carry
ExtraWarpCheck::
ld a, [wCurMap]
cp SS_ANNE_3
cp SS_ANNE_3F
jr z, .useFunction1
cp ROCKET_HIDEOUT_1
cp ROCKET_HIDEOUT_B1F
jr z, .useFunction2
cp ROCKET_HIDEOUT_2
cp ROCKET_HIDEOUT_B2F
jr z, .useFunction2
cp ROCKET_HIDEOUT_4
cp ROCKET_HIDEOUT_B4F
jr z, .useFunction2
cp ROCK_TUNNEL_1
cp ROCK_TUNNEL_1F
jr z, .useFunction2
ld a, [wCurMapTileset]
and a ; outside tileset (OVERWORLD)