mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-10-16 20:16:29 +13:00

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.
261 lines
9.3 KiB
NASM
261 lines
9.3 KiB
NASM
MACRO landmark
|
|
; x, y, name
|
|
db \1 + 8, \2 + 16
|
|
dw \3
|
|
ENDM
|
|
|
|
Landmarks:
|
|
; entries correspond to constants/landmark_constants.asm
|
|
table_width 4, Landmarks
|
|
landmark -8, -16, SpecialMapName
|
|
landmark 140, 100, NewBarkTownName
|
|
landmark 128, 100, Route29Name
|
|
landmark 100, 100, CherrygroveCityName
|
|
landmark 100, 80, Route30Name
|
|
landmark 96, 60, Route31Name
|
|
landmark 84, 60, VioletCityName
|
|
landmark 85, 58, SproutTowerName
|
|
landmark 84, 92, Route32Name
|
|
landmark 76, 76, RuinsOfAlphName
|
|
landmark 84, 124, UnionCaveName
|
|
landmark 82, 124, Route33Name
|
|
landmark 68, 124, AzaleaTownName
|
|
landmark 70, 122, SlowpokeWellName
|
|
landmark 52, 120, IlexForestName
|
|
landmark 52, 112, Route34Name
|
|
landmark 52, 92, GoldenrodCityName
|
|
landmark 50, 92, RadioTowerName
|
|
landmark 52, 76, Route35Name
|
|
landmark 52, 60, NationalParkName
|
|
landmark 64, 60, Route36Name
|
|
landmark 68, 52, Route37Name
|
|
landmark 68, 44, EcruteakCityName
|
|
landmark 77, 58, BellchimeTrailName
|
|
landmark 70, 42, TinTowerName
|
|
landmark 66, 42, BurnedTowerName
|
|
landmark 52, 44, Route38Name
|
|
landmark 36, 48, Route39Name
|
|
landmark 36, 60, OlivineCityName
|
|
landmark 38, 62, LighthouseName
|
|
landmark 28, 56, BattleTowerName
|
|
landmark 28, 64, Route40Name
|
|
landmark 28, 92, WhirlIslandsName
|
|
landmark 28, 100, Route41Name
|
|
landmark 20, 100, CianwoodCityName
|
|
landmark 0, 0, UnknownName ; Route 47
|
|
landmark 0, 0, UnknownName ; Route 48
|
|
landmark 0, 0, UnknownName ; Johto Safari Zone
|
|
landmark 92, 44, Route42Name
|
|
landmark 84, 44, MtMortarName
|
|
landmark 108, 44, MahoganyTownName
|
|
landmark 108, 36, Route43Name
|
|
landmark 108, 28, LakeOfRageName
|
|
landmark 120, 44, Route44Name
|
|
landmark 130, 38, IcePathName
|
|
landmark 132, 44, BlackthornCityName
|
|
landmark 132, 36, DragonsDenName
|
|
landmark 132, 64, Route45Name
|
|
landmark 112, 72, DarkCaveName
|
|
landmark 124, 88, Route46Name
|
|
landmark 148, 68, SilverCaveName
|
|
assert_table_length KANTO_LANDMARK
|
|
landmark 52, 108, PalletTownName
|
|
landmark 52, 92, Route1Name
|
|
landmark 52, 76, ViridianCityName
|
|
landmark 52, 64, Route2Name
|
|
landmark 60, 76, ViridianForestName
|
|
landmark 52, 52, PewterCityName
|
|
landmark 64, 52, Route3Name
|
|
landmark 76, 52, MtMoonName
|
|
landmark 0, 0, UnknownName ; Mt. Moon Crater
|
|
landmark 88, 52, Route4Name
|
|
landmark 100, 52, CeruleanCityName
|
|
landmark 108, 52, CeruleanCaveName
|
|
landmark 100, 44, Route24Name
|
|
landmark 108, 36, Route25Name
|
|
landmark 0, 0, UnknownName ; Bill's Garden
|
|
landmark 100, 60, Route5Name
|
|
landmark 108, 76, UndergroundName
|
|
landmark 100, 76, Route6Name
|
|
landmark 100, 84, VermilionCityName
|
|
landmark 88, 60, DiglettsCaveName
|
|
landmark 88, 68, Route7Name
|
|
landmark 116, 68, Route8Name
|
|
landmark 116, 52, Route9Name
|
|
landmark 132, 52, RockTunnelName
|
|
landmark 0, 0, UnknownName ; Underwater Tunnel
|
|
landmark 132, 56, Route10Name
|
|
landmark 132, 60, PowerPlantName
|
|
landmark 132, 68, LavenderTownName
|
|
landmark 140, 68, LavRadioTowerName
|
|
landmark 76, 68, CeladonCityName
|
|
landmark 0, 0, UnknownName ; Celadon University
|
|
landmark 100, 68, SaffronCityName
|
|
landmark 116, 84, Route11Name
|
|
landmark 132, 80, Route12Name
|
|
landmark 124, 100, Route13Name
|
|
landmark 116, 112, Route14Name
|
|
landmark 104, 116, Route15Name
|
|
landmark 68, 68, Route16Name
|
|
landmark 68, 92, Route17Name
|
|
landmark 80, 116, Route18Name
|
|
landmark 92, 116, FuchsiaCityName
|
|
landmark 92, 108, SafariZoneName ; Kanto Safari Zone
|
|
landmark 92, 128, Route19Name
|
|
landmark 76, 132, Route20Name
|
|
landmark 68, 132, SeafoamIslandsName
|
|
landmark 52, 132, CinnabarIslandName
|
|
landmark 52, 120, Route21Name
|
|
landmark 36, 68, Route22Name
|
|
landmark 28, 52, VictoryRoadName
|
|
landmark 28, 44, Route23Name
|
|
landmark 28, 36, IndigoPlateauName
|
|
landmark 0, 0, UnknownName ; Citrine City
|
|
landmark 0, 0, UnknownName ; Brunswick Trail
|
|
landmark 0, 0, UnknownName ; Brunswick Grotto
|
|
landmark 0, 0, UnknownName ; Garnet Cavern
|
|
landmark 0, 0, UnknownName ; Celeste Hill Cave
|
|
landmark 0, 0, UnknownName ; Celeste Hill
|
|
landmark 28, 92, Route26Name
|
|
landmark 20, 100, Route27Name
|
|
landmark 12, 100, TohjoFallsName
|
|
landmark 20, 68, Route28Name
|
|
landmark 140, 116, FastShipName
|
|
; Sevii stuff
|
|
landmark 0, 0, UnknownName ; One Island
|
|
landmark 0, 0, UnknownName ; Two Island
|
|
landmark 0, 0, UnknownName ; Three Island
|
|
landmark 0, 0, UnknownName ; Four Island
|
|
landmark 0, 0, UnknownName ; Five Island
|
|
landmark 0, 0, UnknownName ; Six Island
|
|
landmark 0, 0, UnknownName ; Seven Island
|
|
assert_table_length NIHON_LANDMARK
|
|
landmark 108, 116, WinnersPathName
|
|
landmark 92, 108, SilentHillsName
|
|
landmark 20, 28, UnknownName ; Debug Room
|
|
landmark 84, 108, Route49Name
|
|
landmark 76, 108, QuietCaveName
|
|
landmark 76, 100, OldCityName
|
|
landmark 76, 100, PokemonPagodaName
|
|
landmark 60, 100, Route50Name
|
|
landmark 140, 60, BlueForestName
|
|
landmark 108, 108, Route66Name
|
|
landmark 124, 108, WhiteCityName
|
|
assert_table_length NUM_LANDMARKS
|
|
|
|
NewBarkTownName: db "NEW BARK¯TOWN@"
|
|
CherrygroveCityName: db "CHERRYGROVE¯CITY@"
|
|
VioletCityName: db "VIOLET CITY@"
|
|
AzaleaTownName: db "AZALEA TOWN@"
|
|
GoldenrodCityName: db "GOLDENROD¯CITY@"
|
|
EcruteakCityName: db "ECRUTEAK¯CITY@"
|
|
OlivineCityName: db "OLIVINE¯CITY@"
|
|
CianwoodCityName: db "CIANWOOD¯CITY@"
|
|
MahoganyTownName: db "MAHOGANY¯TOWN@"
|
|
BlackthornCityName: db "BLACKTHORN¯CITY@"
|
|
LakeOfRageName: db "LAKE OF¯RAGE@"
|
|
SilverCaveName: db "SILVER CAVE@"
|
|
SproutTowerName: db "SPROUT¯TOWER@"
|
|
RuinsOfAlphName: db "RUINS¯OF ALPH@"
|
|
UnionCaveName: db "UNION CAVE@"
|
|
SlowpokeWellName: db "SLOWPOKE¯WELL@"
|
|
RadioTowerName: db "RADIO TOWER@"
|
|
PowerPlantName: db "POWER PLANT@"
|
|
NationalParkName: db "NATIONAL¯PARK@"
|
|
BellchimeTrailName: db "BELLCHIME¯TRAIL@"
|
|
TinTowerName: db "TIN TOWER@"
|
|
LighthouseName: db "LIGHTHOUSE@"
|
|
WhirlIslandsName: db "WHIRL¯ISLANDS@"
|
|
MtMortarName: db "MT.MORTAR@"
|
|
DragonsDenName: db "DRAGON'S¯DEN@"
|
|
IcePathName: db "ICE PATH@"
|
|
HauntedHouseName: db "HAUNTED¯HOUSE@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
|
|
PalletTownName: db "PALLET TOWN@"
|
|
ViridianCityName: db "VIRIDIAN¯CITY@"
|
|
PewterCityName: db "PEWTER CITY@"
|
|
CeruleanCityName: db "CERULEAN¯CITY@"
|
|
LavenderTownName: db "LAVENDER¯TOWN@"
|
|
VermilionCityName: db "VERMILION¯CITY@"
|
|
CeladonCityName: db "CELADON¯CITY@"
|
|
SaffronCityName: db "SAFFRON¯CITY@"
|
|
FuchsiaCityName: db "FUCHSIA¯CITY@"
|
|
CinnabarIslandName: db "CINNABAR¯ISLAND@"
|
|
IndigoPlateauName: db "INDIGO¯PLATEAU@"
|
|
VictoryRoadName: db "VICTORY¯ROAD@"
|
|
ViridianForestName: db "VIRIDIAN¯FOREST@"
|
|
MtMoonName: db "MT.MOON@"
|
|
RockTunnelName: db "ROCK TUNNEL@"
|
|
LavRadioTowerName: db "LAV¯RADIO TOWER@"
|
|
SilphCoName: db "SILPH CO.@" ; unreferenced
|
|
SafariZoneName: db "KANTO¯SAFARI ZONE@"
|
|
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
|
|
PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
|
|
CeruleanCaveName: db "CERULEAN¯CAVE@"
|
|
Route1Name: db "ROUTE 1@"
|
|
Route2Name: db "ROUTE 2@"
|
|
Route3Name: db "ROUTE 3@"
|
|
Route4Name: db "ROUTE 4@"
|
|
Route5Name: db "ROUTE 5@"
|
|
Route6Name: db "ROUTE 6@"
|
|
Route7Name: db "ROUTE 7@"
|
|
Route8Name: db "ROUTE 8@"
|
|
Route9Name: db "ROUTE 9@"
|
|
Route10Name: db "ROUTE 10@"
|
|
Route11Name: db "ROUTE 11@"
|
|
Route12Name: db "ROUTE 12@"
|
|
Route13Name: db "ROUTE 13@"
|
|
Route14Name: db "ROUTE 14@"
|
|
Route15Name: db "ROUTE 15@"
|
|
Route16Name: db "ROUTE 16@"
|
|
Route17Name: db "ROUTE 17@"
|
|
Route18Name: db "ROUTE 18@"
|
|
Route19Name: db "ROUTE 19@"
|
|
Route20Name: db "ROUTE 20@"
|
|
Route21Name: db "ROUTE 21@"
|
|
Route22Name: db "ROUTE 22@"
|
|
Route23Name: db "ROUTE 23@"
|
|
Route24Name: db "ROUTE 24@"
|
|
Route25Name: db "ROUTE 25@"
|
|
Route26Name: db "ROUTE 26@"
|
|
Route27Name: db "ROUTE 27@"
|
|
Route28Name: db "ROUTE 28@"
|
|
Route29Name: db "ROUTE 29@"
|
|
Route30Name: db "ROUTE 30@"
|
|
Route31Name: db "ROUTE 31@"
|
|
Route32Name: db "ROUTE 32@"
|
|
Route33Name: db "ROUTE 33@"
|
|
Route34Name: db "ROUTE 34@"
|
|
Route35Name: db "ROUTE 35@"
|
|
Route36Name: db "ROUTE 36@"
|
|
Route37Name: db "ROUTE 37@"
|
|
Route38Name: db "ROUTE 38@"
|
|
Route39Name: db "ROUTE 39@"
|
|
Route40Name: db "ROUTE 40@"
|
|
Route41Name: db "ROUTE 41@"
|
|
Route42Name: db "ROUTE 42@"
|
|
Route43Name: db "ROUTE 43@"
|
|
Route44Name: db "ROUTE 44@"
|
|
Route45Name: db "ROUTE 45@"
|
|
Route46Name: db "ROUTE 46@"
|
|
DarkCaveName: db "DARK CAVE@"
|
|
IlexForestName: db "ILEX¯FOREST@"
|
|
BurnedTowerName: db "BURNED¯TOWER@"
|
|
FastShipName: db "FAST SHIP@"
|
|
DiglettsCaveName: db "DIGLETT'S¯CAVE@"
|
|
TohjoFallsName: db "TOHJO FALLS@"
|
|
UndergroundName: db "UNDERGROUND@"
|
|
BattleTowerName: db "BATTLE¯TOWER@"
|
|
SpecialMapName: db "SPECIAL@"
|
|
WinnersPathName: db "WINNER'S¯PATH@"
|
|
SilentHillsName: db "SILENT¯HILLS@"
|
|
UnknownName: db "?????@"
|
|
Route66Name: db "ROUTE 66@"
|
|
Route49Name: db "ROUTE 49@"
|
|
Route50Name: db "ROUTE 50@"
|
|
QuietCaveName: db "QUIET¯CAVE@"
|
|
OldCityName: db "SEPIA¯CITY@"
|
|
PokemonPagodaName: db "#MON¯PAGODA@"
|
|
; High Tech will be called "Vogue City"
|
|
BlueForestName: db "BLUE¯FOREST@"
|
|
WhiteCityName: db "WHITE¯CITY@"
|