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

The Safari Zone is now functional!

Browse source 
This adds a clause into the wild encounter setup that sets the Safari BattleType if you're within the relevant landmarks. Therefore, all that's now needed is a way to check the Safari Balls in the player's bag before kicking them out, which should be easily triggered by looking in their bag.
This commit is contained in:
Llinos Evans 2024-07-29 17:15:27 +01:00
parent 5ef2108ce4
commit b64504b9fd
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engine/overworld/wildmons.asm
View file

@ -370,6 +370,22 @@ ChooseWildEncounter:
ld [wTempWildMonSpecies], a
.startwildbattle
; Check if the player is in a Safari Zone; if we're in there, let's get the type sorted now.
ld a, [wMapGroup]
ld b, a
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp LANDMARK_KANTO_SAFARI_ZONE ; I am 99.9% sure this can be done better but oh give it a REST
jr nz, .skip
; cp LANDMARK_JOHTO_SAFARI_ZONE enable these when they're up pls
; jr nz, .skip
; cp LANDMARK_NIHON_SAFARI_ZONE
; jr nz, .skip
ld a, BATTLETYPE_SAFARI
ld [wBattleType], a
.skip
xor a
ret