mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-11-07 22:21:00 +13:00
The Safari Zone is now functional!
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:
parent
5ef2108ce4
commit
b64504b9fd
|
|
@ -100,7 +100,7 @@ Landmarks:
|
|||
landmark 68, 92, Route17Name
|
||||
landmark 80, 116, Route18Name
|
||||
landmark 92, 116, FuchsiaCityName
|
||||
landmark 0, 0, UnknownName ; Kanto Safari Zone
|
||||
landmark 92, 108, SafariZoneName ; Kanto Safari Zone
|
||||
landmark 92, 128, Route19Name
|
||||
landmark 76, 132, Route20Name
|
||||
landmark 68, 132, SeafoamIslandsName
|
||||
|
|
@ -187,7 +187,7 @@ MtMoonName: db "MT.MOON@"
|
|||
RockTunnelName: db "ROCK TUNNEL@"
|
||||
LavRadioTowerName: db "LAV¯RADIO TOWER@"
|
||||
SilphCoName: db "SILPH CO.@" ; unreferenced
|
||||
SafariZoneName: db "SAFARI ZONE@" ; unreferenced
|
||||
SafariZoneName: db "KANTO¯SAFARI ZONE@"
|
||||
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
|
||||
PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
|
||||
CeruleanCaveName: db "CERULEAN¯CAVE@"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ DebugRoom_MapEvents:
|
|||
warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp
|
||||
warp_event 35, 17, OLD_CITY, 1 ; east warp
|
||||
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
|
||||
warp_event 19, 34, BLUE_FOREST, 1 ; southern warp
|
||||
warp_event 19, 34, SAFARI_ZONE_BETA, 1 ; southern warp
|
||||
warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp
|
||||
warp_event 5, 3, AZALEA_TOWN, 1
|
||||
warp_event 34, 11, WINNERS_PATH, 3
|
||||
|
|
|
|||
Loading…
Reference in a new issue