pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add a LANDMARK_ prefix to landmark constants

Browse Source 
Resolves #697
This commit is contained in:
Rangi 2020-03-15 17:26:10 -04:00
parent 65f22544e0
commit ad50e94b50
37 changed files with 630 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
constants/landmark_constants.asm
View File

@ -2,108 +2,108 @@
const_def const_def
; Johto landmarks ; Johto landmarks
const SPECIAL_MAP ; 00 const LANDMARK_SPECIAL ; 00
const NEW_BARK_TOWN ; 01 const LANDMARK_NEW_BARK_TOWN ; 01
const ROUTE_29 ; 02 const LANDMARK_ROUTE_29 ; 02
const CHERRYGROVE_CITY ; 03 const LANDMARK_CHERRYGROVE_CITY ; 03
const ROUTE_30 ; 04 const LANDMARK_ROUTE_30 ; 04
const ROUTE_31 ; 05 const LANDMARK_ROUTE_31 ; 05
const VIOLET_CITY ; 06 const LANDMARK_VIOLET_CITY ; 06
const SPROUT_TOWER ; 07 const LANDMARK_SPROUT_TOWER ; 07
const ROUTE_32 ; 08 const LANDMARK_ROUTE_32 ; 08
const RUINS_OF_ALPH ; 09 const LANDMARK_RUINS_OF_ALPH ; 09
const UNION_CAVE ; 0a const LANDMARK_UNION_CAVE ; 0a
const ROUTE_33 ; 0b const LANDMARK_ROUTE_33 ; 0b
const AZALEA_TOWN ; 0c const LANDMARK_AZALEA_TOWN ; 0c
const SLOWPOKE_WELL ; 0d const LANDMARK_SLOWPOKE_WELL ; 0d
const ILEX_FOREST ; 0e const LANDMARK_ILEX_FOREST ; 0e
const ROUTE_34 ; 0f const LANDMARK_ROUTE_34 ; 0f
const GOLDENROD_CITY ; 10 const LANDMARK_GOLDENROD_CITY ; 10
const RADIO_TOWER ; 11 const LANDMARK_RADIO_TOWER ; 11
const ROUTE_35 ; 12 const LANDMARK_ROUTE_35 ; 12
const NATIONAL_PARK ; 13 const LANDMARK_NATIONAL_PARK ; 13
const ROUTE_36 ; 14 const LANDMARK_ROUTE_36 ; 14
const ROUTE_37 ; 15 const LANDMARK_ROUTE_37 ; 15
const ECRUTEAK_CITY ; 16 const LANDMARK_ECRUTEAK_CITY ; 16
const TIN_TOWER ; 17 const LANDMARK_TIN_TOWER ; 17
const BURNED_TOWER ; 18 const LANDMARK_BURNED_TOWER ; 18
const ROUTE_38 ; 19 const LANDMARK_ROUTE_38 ; 19
const ROUTE_39 ; 1a const LANDMARK_ROUTE_39 ; 1a
const OLIVINE_CITY ; 1b const LANDMARK_OLIVINE_CITY ; 1b
const LIGHTHOUSE ; 1c const LANDMARK_LIGHTHOUSE ; 1c
const BATTLE_TOWER ; 1d const LANDMARK_BATTLE_TOWER ; 1d
const ROUTE_40 ; 1e const LANDMARK_ROUTE_40 ; 1e
const WHIRL_ISLANDS ; 1f const LANDMARK_WHIRL_ISLANDS ; 1f
const ROUTE_41 ; 20 const LANDMARK_ROUTE_41 ; 20
const CIANWOOD_CITY ; 21 const LANDMARK_CIANWOOD_CITY ; 21
const ROUTE_42 ; 22 const LANDMARK_ROUTE_42 ; 22
const MT_MORTAR ; 23 const LANDMARK_MT_MORTAR ; 23
const MAHOGANY_TOWN ; 24 const LANDMARK_MAHOGANY_TOWN ; 24
const ROUTE_43 ; 25 const LANDMARK_ROUTE_43 ; 25
const LAKE_OF_RAGE ; 26 const LANDMARK_LAKE_OF_RAGE ; 26
const ROUTE_44 ; 27 const LANDMARK_ROUTE_44 ; 27
const ICE_PATH ; 28 const LANDMARK_ICE_PATH ; 28
const BLACKTHORN_CITY ; 29 const LANDMARK_BLACKTHORN_CITY ; 29
const DRAGONS_DEN ; 2a const LANDMARK_DRAGONS_DEN ; 2a
const ROUTE_45 ; 2b const LANDMARK_ROUTE_45 ; 2b
const DARK_CAVE ; 2c const LANDMARK_DARK_CAVE ; 2c
const ROUTE_46 ; 2d const LANDMARK_ROUTE_46 ; 2d
const SILVER_CAVE ; 2e const LANDMARK_SILVER_CAVE ; 2e
KANTO_LANDMARK EQU const_value KANTO_LANDMARK EQU const_value
const PALLET_TOWN ; 2f const LANDMARK_PALLET_TOWN ; 2f
const ROUTE_1 ; 30 const LANDMARK_ROUTE_1 ; 30
const VIRIDIAN_CITY ; 31 const LANDMARK_VIRIDIAN_CITY ; 31
const ROUTE_2 ; 32 const LANDMARK_ROUTE_2 ; 32
const PEWTER_CITY ; 33 const LANDMARK_PEWTER_CITY ; 33
const ROUTE_3 ; 34 const LANDMARK_ROUTE_3 ; 34
const MT_MOON ; 35 const LANDMARK_MT_MOON ; 35
const ROUTE_4 ; 36 const LANDMARK_ROUTE_4 ; 36
const CERULEAN_CITY ; 37 const LANDMARK_CERULEAN_CITY ; 37
const ROUTE_24 ; 38 const LANDMARK_ROUTE_24 ; 38
const ROUTE_25 ; 39 const LANDMARK_ROUTE_25 ; 39
const ROUTE_5 ; 3a const LANDMARK_ROUTE_5 ; 3a
const UNDERGROUND_PATH ; 3b const LANDMARK_UNDERGROUND_PATH ; 3b
const ROUTE_6 ; 3c const LANDMARK_ROUTE_6 ; 3c
const VERMILION_CITY ; 3d const LANDMARK_VERMILION_CITY ; 3d
const DIGLETTS_CAVE ; 3e const LANDMARK_DIGLETTS_CAVE ; 3e
const ROUTE_7 ; 3f const LANDMARK_ROUTE_7 ; 3f
const ROUTE_8 ; 40 const LANDMARK_ROUTE_8 ; 40
const ROUTE_9 ; 41 const LANDMARK_ROUTE_9 ; 41
const ROCK_TUNNEL ; 42 const LANDMARK_ROCK_TUNNEL ; 42
const ROUTE_10 ; 43 const LANDMARK_ROUTE_10 ; 43
const POWER_PLANT ; 44 const LANDMARK_POWER_PLANT ; 44
const LAVENDER_TOWN ; 45 const LANDMARK_LAVENDER_TOWN ; 45
const LAV_RADIO_TOWER ; 46 const LANDMARK_LAV_RADIO_TOWER ; 46
const CELADON_CITY ; 47 const LANDMARK_CELADON_CITY ; 47
const SAFFRON_CITY ; 48 const LANDMARK_SAFFRON_CITY ; 48
const ROUTE_11 ; 49 const LANDMARK_ROUTE_11 ; 49
const ROUTE_12 ; 4a const LANDMARK_ROUTE_12 ; 4a
const ROUTE_13 ; 4b const LANDMARK_ROUTE_13 ; 4b
const ROUTE_14 ; 4c const LANDMARK_ROUTE_14 ; 4c
const ROUTE_15 ; 4d const LANDMARK_ROUTE_15 ; 4d
const ROUTE_16 ; 4e const LANDMARK_ROUTE_16 ; 4e
const ROUTE_17 ; 4f const LANDMARK_ROUTE_17 ; 4f
const ROUTE_18 ; 50 const LANDMARK_ROUTE_18 ; 50
const FUCHSIA_CITY ; 51 const LANDMARK_FUCHSIA_CITY ; 51
const ROUTE_19 ; 52 const LANDMARK_ROUTE_19 ; 52
const ROUTE_20 ; 53 const LANDMARK_ROUTE_20 ; 53
const SEAFOAM_ISLANDS ; 54 const LANDMARK_SEAFOAM_ISLANDS ; 54
const CINNABAR_ISLAND ; 55 const LANDMARK_CINNABAR_ISLAND ; 55
const ROUTE_21 ; 56 const LANDMARK_ROUTE_21 ; 56
const ROUTE_22 ; 57 const LANDMARK_ROUTE_22 ; 57
const VICTORY_ROAD ; 58 const LANDMARK_VICTORY_ROAD ; 58
const ROUTE_23 ; 59 const LANDMARK_ROUTE_23 ; 59
const INDIGO_PLATEAU ; 5a const LANDMARK_INDIGO_PLATEAU ; 5a
const ROUTE_26 ; 5b const LANDMARK_ROUTE_26 ; 5b
const ROUTE_27 ; 5c const LANDMARK_ROUTE_27 ; 5c
const TOHJO_FALLS ; 5d const LANDMARK_TOHJO_FALLS ; 5d
const ROUTE_28 ; 5e const LANDMARK_ROUTE_28 ; 5e
const FAST_SHIP ; 5f const LANDMARK_FAST_SHIP ; 5f
; used in CaughtData ; used in CaughtData
GIFT_LOCATION EQU $7e LANDMARK_GIFT EQU $7e
EVENT_LOCATION EQU $7f LANDMARK_EVENT EQU $7f
; Regions ; Regions
const_def const_def

48
data/maps/flypoints.asm
View File

@ -2,29 +2,29 @@ Flypoints:
; entries correspond to FLY_* constants ; entries correspond to FLY_* constants
; Johto ; Johto
; landmark, spawn point ; landmark, spawn point
db NEW_BARK_TOWN, SPAWN_NEW_BARK db LANDMARK_NEW_BARK_TOWN, SPAWN_NEW_BARK
db CHERRYGROVE_CITY, SPAWN_CHERRYGROVE db LANDMARK_CHERRYGROVE_CITY, SPAWN_CHERRYGROVE
db VIOLET_CITY, SPAWN_VIOLET db LANDMARK_VIOLET_CITY, SPAWN_VIOLET
db AZALEA_TOWN, SPAWN_AZALEA db LANDMARK_AZALEA_TOWN, SPAWN_AZALEA
db GOLDENROD_CITY, SPAWN_GOLDENROD db LANDMARK_GOLDENROD_CITY, SPAWN_GOLDENROD
db ECRUTEAK_CITY, SPAWN_ECRUTEAK db LANDMARK_ECRUTEAK_CITY, SPAWN_ECRUTEAK
db OLIVINE_CITY, SPAWN_OLIVINE db LANDMARK_OLIVINE_CITY, SPAWN_OLIVINE
db CIANWOOD_CITY, SPAWN_CIANWOOD db LANDMARK_CIANWOOD_CITY, SPAWN_CIANWOOD
db MAHOGANY_TOWN, SPAWN_MAHOGANY db LANDMARK_MAHOGANY_TOWN, SPAWN_MAHOGANY
db LAKE_OF_RAGE, SPAWN_LAKE_OF_RAGE db LANDMARK_LAKE_OF_RAGE, SPAWN_LAKE_OF_RAGE
db BLACKTHORN_CITY, SPAWN_BLACKTHORN db LANDMARK_BLACKTHORN_CITY, SPAWN_BLACKTHORN
db SILVER_CAVE, SPAWN_MT_SILVER db LANDMARK_SILVER_CAVE, SPAWN_MT_SILVER
; Kanto ; Kanto
db PALLET_TOWN, SPAWN_PALLET db LANDMARK_PALLET_TOWN, SPAWN_PALLET
db VIRIDIAN_CITY, SPAWN_VIRIDIAN db LANDMARK_VIRIDIAN_CITY, SPAWN_VIRIDIAN
db PEWTER_CITY, SPAWN_PEWTER db LANDMARK_PEWTER_CITY, SPAWN_PEWTER
db CERULEAN_CITY, SPAWN_CERULEAN db LANDMARK_CERULEAN_CITY, SPAWN_CERULEAN
db VERMILION_CITY, SPAWN_VERMILION db LANDMARK_VERMILION_CITY, SPAWN_VERMILION
db ROCK_TUNNEL, SPAWN_ROCK_TUNNEL db LANDMARK_ROCK_TUNNEL, SPAWN_ROCK_TUNNEL
db LAVENDER_TOWN, SPAWN_LAVENDER db LANDMARK_LAVENDER_TOWN, SPAWN_LAVENDER
db CELADON_CITY, SPAWN_CELADON db LANDMARK_CELADON_CITY, SPAWN_CELADON
db SAFFRON_CITY, SPAWN_SAFFRON db LANDMARK_SAFFRON_CITY, SPAWN_SAFFRON
db FUCHSIA_CITY, SPAWN_FUCHSIA db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA
db CINNABAR_ISLAND, SPAWN_CINNABAR db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR
db INDIGO_PLATEAU, SPAWN_INDIGO db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
db -1 db -1

778
data/maps/maps.asm
View File

File diff suppressed because it is too large Load Diff

14
engine/events/map_name_sign.asm
View File

@ -63,24 +63,24 @@ InitMapNameSign::
ld a, [wPrevLandmark] ld a, [wPrevLandmark]
cp c cp c
ret z ret z
cp SPECIAL_MAP cp LANDMARK_SPECIAL
ret ret
.CheckSpecialMap: .CheckSpecialMap:
; These landmarks do not get pop-up signs. ; These landmarks do not get pop-up signs.
cp -1 cp -1
ret z ret z
cp SPECIAL_MAP ; redundant check cp LANDMARK_SPECIAL ; redundant check
ret z ret z
cp RADIO_TOWER cp LANDMARK_RADIO_TOWER
ret z ret z
cp LAV_RADIO_TOWER cp LANDMARK_LAV_RADIO_TOWER
ret z ret z
cp UNDERGROUND_PATH cp LANDMARK_UNDERGROUND_PATH
ret z ret z
cp INDIGO_PLATEAU cp LANDMARK_INDIGO_PLATEAU
ret z ret z
cp POWER_PLANT cp LANDMARK_POWER_PLANT
ret z ret z
ld a, 1 ld a, 1
and a and a

6
engine/events/poke_seer.asm
View File

@ -218,9 +218,9 @@ GetCaughtLocation:
ld a, [wSeerCaughtGender] ld a, [wSeerCaughtGender]
and CAUGHT_LOCATION_MASK and CAUGHT_LOCATION_MASK
jr z, .Unknown jr z, .Unknown
cp EVENT_LOCATION cp LANDMARK_EVENT
jr z, .event jr z, .event
cp GIFT_LOCATION cp LANDMARK_GIFT
jr z, .fail jr z, .fail
ld e, a ld e, a
farcall GetLandmarkName farcall GetLandmarkName
@ -390,7 +390,7 @@ GetCaughtGender:
ld a, [hl] ld a, [hl]
and CAUGHT_LOCATION_MASK and CAUGHT_LOCATION_MASK
jr z, .genderless jr z, .genderless
cp EVENT_LOCATION cp LANDMARK_EVENT
jr z, .genderless jr z, .genderless
ld a, [hl] ld a, [hl]

6
engine/overworld/landmarks.asm
View File

@ -54,9 +54,9 @@ RegionCheck:
ld a, [wMapNumber] ld a, [wMapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp FAST_SHIP ; S.S. Aqua cp LANDMARK_FAST_SHIP ; S.S. Aqua
jr z, .johto jr z, .johto
cp SPECIAL_MAP cp LANDMARK_SPECIAL
jr nz, .checkagain jr nz, .checkagain
; In a special map, get the backup map group / map id ; In a special map, get the backup map group / map id
@ -71,7 +71,7 @@ RegionCheck:
jr c, .johto jr c, .johto
; Victory Road area is considered to be Johto. ; Victory Road area is considered to be Johto.
cp VICTORY_ROAD cp LANDMARK_VICTORY_ROAD
jr c, .kanto jr c, .kanto
.johto .johto

8
engine/phone/scripts/alan.asm
View File

@ -16,11 +16,11 @@ AlanPhoneCalleeScript:
farsjump AlanHangUpScript farsjump AlanHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump AlanReminderScript farsjump AlanReminderScript
.FireStone: .FireStone:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump AlanComePickUpScript farsjump AlanComePickUpScript
AlanPhoneCallerScript: AlanPhoneCallerScript:
@ -50,11 +50,11 @@ AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
AlanWantsBattle: AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
setflag ENGINE_ALAN setflag ENGINE_ALAN
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone: AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE setflag ENGINE_ALAN_HAS_FIRE_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_36 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

8
engine/phone/scripts/anthony.asm
View File

@ -16,11 +16,11 @@ AnthonyPhoneCalleeScript:
farsjump AnthonyHangUpScript farsjump AnthonyHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
farsjump AnthonyReminderScript farsjump AnthonyReminderScript
.AlreadySwarming: .AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
farsjump AnthonyHurryScript farsjump AnthonyHurryScript
AnthonyPhoneCallerScript: AnthonyPhoneCallerScript:
@ -44,7 +44,7 @@ AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT setflag ENGINE_ANTHONY_FRIDAY_NIGHT
AnthonyWantsBattle: AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
setflag ENGINE_ANTHONY setflag ENGINE_ANTHONY
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
@ -54,7 +54,7 @@ AnthonyTriesDunsparceSwarm:
setflag ENGINE_DUNSPARCE_SWARM setflag ENGINE_DUNSPARCE_SWARM
getmonname STRING_BUFFER_4, DUNSPARCE getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
getlandmarkname STRING_BUFFER_5, DARK_CAVE getlandmarkname STRING_BUFFER_5, LANDMARK_DARK_CAVE
farsjump AnthonySwarmScript farsjump AnthonySwarmScript
.Generic: .Generic:

8
engine/phone/scripts/arnie.asm
View File

@ -16,11 +16,11 @@ ArniePhoneCalleeScript:
farsjump ArnieHangUpScript farsjump ArnieHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieReminderScript farsjump ArnieReminderScript
.AlreadySwarming: .AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieHurryScript farsjump ArnieHurryScript
ArniePhoneCallerScript: ArniePhoneCallerScript:
@ -44,7 +44,7 @@ ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING setflag ENGINE_ARNIE_TUESDAY_MORNING
ArnieWantsBattle: ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
setflag ENGINE_ARNIE setflag ENGINE_ARNIE
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male
@ -54,7 +54,7 @@ ArnieYanmaSwarm: ; start swarm
setflag ENGINE_YANMA_SWARM setflag ENGINE_YANMA_SWARM
getmonname STRING_BUFFER_4, YANMA getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35 swarm SWARM_YANMA, ROUTE_35
getlandmarkname STRING_BUFFER_5, ROUTE_35 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieSwarmScript farsjump ArnieSwarmScript
ArnieFoundRare: ArnieFoundRare:

4
engine/phone/scripts/beth.asm
View File

@ -14,7 +14,7 @@ BethPhoneCalleeScript:
farsjump BethHangUpScript farsjump BethHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
farsjump BethBattleReminderScript farsjump BethBattleReminderScript
BethPhoneCallerScript: BethPhoneCallerScript:
@ -34,6 +34,6 @@ BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON setflag ENGINE_BETH_FRIDAY_AFTERNOON
BethWantsBattle: BethWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
setflag ENGINE_BETH setflag ENGINE_BETH
farsjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female

4
engine/phone/scripts/beverly.asm
View File

@ -6,7 +6,7 @@ BeverlyPhoneCalleeScript:
farsjump BeverlyHangUpScript farsjump BeverlyHangUpScript
.HasNugget: .HasNugget:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
farsjump BeverlyComePickUpScript farsjump BeverlyComePickUpScript
BeverlyPhoneCallerScript: BeverlyPhoneCallerScript:
@ -22,5 +22,5 @@ BeverlyPhoneCallerScript:
.FoundNugget: .FoundNugget:
setflag ENGINE_BEVERLY_HAS_NUGGET setflag ENGINE_BEVERLY_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
farsjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

4
engine/phone/scripts/brent.asm
View File

@ -14,7 +14,7 @@ BrentPhoneCalleeScript:
farsjump BrentHangUpScript farsjump BrentHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
farsjump BrentReminderScript farsjump BrentReminderScript
BrentPhoneCallerScript: BrentPhoneCallerScript:
@ -36,7 +36,7 @@ BrentMondayMorning:
setflag ENGINE_BRENT_MONDAY_MORNING setflag ENGINE_BRENT_MONDAY_MORNING
BrentWantsBattle: BrentWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
setflag ENGINE_BRENT setflag ENGINE_BRENT
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

4
engine/phone/scripts/chad.asm
View File

@ -14,7 +14,7 @@ ChadPhoneCalleeScript:
farsjump ChadHangUpScript farsjump ChadHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
farsjump ChadReminderScript farsjump ChadReminderScript
ChadPhoneCallerScript: ChadPhoneCallerScript:
@ -38,7 +38,7 @@ ChadFridayMorning:
setflag ENGINE_CHAD_FRIDAY_MORNING setflag ENGINE_CHAD_FRIDAY_MORNING
ChadWantsBattle: ChadWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
setflag ENGINE_CHAD setflag ENGINE_CHAD
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

8
engine/phone/scripts/dana.asm
View File

@ -16,11 +16,11 @@ DanaPhoneCalleeScript:
farsjump DanaHangUpScript farsjump DanaHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
farsjump DanaReminderScript farsjump DanaReminderScript
.HasThunderstone: .HasThunderstone:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
farsjump DanaComePickUpScript farsjump DanaComePickUpScript
DanaPhoneCallerScript: DanaPhoneCallerScript:
@ -52,7 +52,7 @@ DanaThursdayNight:
setflag ENGINE_DANA_THURSDAY_NIGHT setflag ENGINE_DANA_THURSDAY_NIGHT
DanaWantsBattle: DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
setflag ENGINE_DANA setflag ENGINE_DANA
farsjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
@ -61,5 +61,5 @@ DanaFoundRare:
DanaHasThunderstone: DanaHasThunderstone:
setflag ENGINE_DANA_HAS_THUNDERSTONE setflag ENGINE_DANA_HAS_THUNDERSTONE
getlandmarkname STRING_BUFFER_5, ROUTE_38 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
farsjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

4
engine/phone/scripts/derek.asm
View File

@ -19,7 +19,7 @@ DerekPhoneCalleeScript:
farsjump PhoneScript_BugCatchingContest farsjump PhoneScript_BugCatchingContest
.Nugget: .Nugget:
getlandmarkname STRING_BUFFER_5, ROUTE_39 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_39
farsjump DerekComePickUpScript farsjump DerekComePickUpScript
DerekPhoneCallerScript: DerekPhoneCallerScript:
@ -44,5 +44,5 @@ DerekPhoneCallerScript:
.Nugget: .Nugget:
setflag ENGINE_DEREK_HAS_NUGGET setflag ENGINE_DEREK_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, ROUTE_39 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_39
farsjump PhoneScript_FoundItem_Male farsjump PhoneScript_FoundItem_Male

4
engine/phone/scripts/erin.asm
View File

@ -14,7 +14,7 @@ ErinPhoneCalleeScript:
farsjump ErinWorkingHardScript farsjump ErinWorkingHardScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46
farsjump ErinComeBattleScript farsjump ErinComeBattleScript
ErinPhoneCallerScript: ErinPhoneCallerScript:
@ -35,6 +35,6 @@ ErinSaturdayNight:
setflag ENGINE_ERIN_SATURDAY_NIGHT setflag ENGINE_ERIN_SATURDAY_NIGHT
ErinWantsBattle: ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46
setflag ENGINE_ERIN setflag ENGINE_ERIN
farsjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female

4
engine/phone/scripts/gaven.asm
View File

@ -14,7 +14,7 @@ GavenPhoneCalleeScript:
farsjump GavenHangUpNotThursdayScript farsjump GavenHangUpNotThursdayScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
farsjump GavenReminderScript farsjump GavenReminderScript
GavenPhoneCallerScript: GavenPhoneCallerScript:
@ -36,7 +36,7 @@ GavenThursdayMorningScript:
setflag ENGINE_GAVEN_THURSDAY_MORNING setflag ENGINE_GAVEN_THURSDAY_MORNING
GavenWantsRematch: GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, ROUTE_26 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
setflag ENGINE_GAVEN setflag ENGINE_GAVEN
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

8
engine/phone/scripts/gina.asm
View File

@ -21,11 +21,11 @@ GinaPhoneCalleeScript:
farsjump GinaRocketRumorScript farsjump GinaRocketRumorScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
farsjump GinaReminderScript farsjump GinaReminderScript
.HasLeafStone: .HasLeafStone:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
farsjump GinaComePickUpScript farsjump GinaComePickUpScript
GinaPhoneCallerScript: GinaPhoneCallerScript:
@ -59,7 +59,7 @@ GinaSundayDay:
setflag ENGINE_GINA_SUNDAY_AFTERNOON setflag ENGINE_GINA_SUNDAY_AFTERNOON
GinaWantsBattle: GinaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
setflag ENGINE_GINA setflag ENGINE_GINA
farsjump PhoneScript_WantsToBattle_Female farsjump PhoneScript_WantsToBattle_Female
@ -68,5 +68,5 @@ GinaRockets:
GinaHasLeafStone: GinaHasLeafStone:
setflag ENGINE_GINA_HAS_LEAF_STONE setflag ENGINE_GINA_HAS_LEAF_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_34 getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
farsjump PhoneScript_FoundItem_Female farsjump PhoneScript_FoundItem_Female

4
engine/phone/scripts/huey.asm
View File

@ -15,7 +15,7 @@ HueyPhoneCalleeScript:
farsjump HueyHangUpScript farsjump HueyHangUpScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
farsjump HueyWantsBattleScript farsjump HueyWantsBattleScript
HueyPhoneCallerScript: HueyPhoneCallerScript:
@ -36,6 +36,6 @@ HueyWednesdayNight:
setflag ENGINE_HUEY_WEDNESDAY_NIGHT setflag ENGINE_HUEY_WEDNESDAY_NIGHT
HueyWantsBattle: HueyWantsBattle:
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
setflag ENGINE_HUEY setflag ENGINE_HUEY
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

4
engine/phone/scripts/jack.asm
View File

@ -14,7 +14,7 @@ JackPhoneCalleeScript:
farsjump JackPhoneTipsScript farsjump JackPhoneTipsScript
.WantsBattle: .WantsBattle:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
farsjump JackWantsBattleScript farsjump JackWantsBattleScript
JackPhoneCallerScript: JackPhoneCallerScript:
@ -38,7 +38,7 @@ JackMondayMorning:
setflag ENGINE_JACK_MONDAY_MORNING setflag ENGINE_JACK_MONDAY_MORNING
JackWantsToBattle: JackWantsToBattle:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
setflag ENGINE_JACK setflag ENGINE_JACK
farsjump PhoneScript_WantsToBattle_Male farsjump PhoneScript_WantsToBattle_Male

Some files were not shown because too many files have changed in this diff Show More