Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-04-25 16:20:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove remaining legacy macros from current code.

Browse Source
This commit is contained in:
entrpntr 2020-05-15 09:51:36 -04:00
parent 82c33aacb0
commit 05b591cd95
124 changed files with 515 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/music/titlescreen.asm
View File

@ -8,7 +8,7 @@ Music_TitleScreen:
Music_TitleScreen_Ch1:
tempo 256
volume 7, 7
dutycycle 3
duty_cycle 3
pitch_offset 2
vibrato 16, 1, 2
stereo_panning TRUE, FALSE

5
macros.asm
View File

@ -15,7 +15,10 @@ INCLUDE "macros/scripts/battle_commands.asm"
INCLUDE "macros/scripts/battle_anims.asm"
INCLUDE "macros/scripts/trade_anims.asm"
INCLUDE "macros/legacy.asm"
; TODO: Should this be included or not?
; - Leave out for now so no code depending on legacy macros gets introduced
;
; INCLUDE "macros/legacy.asm"
dr: macro
IF DEF(_GOLD)

4
maps/AzaleaGym.asm
View File

@ -30,7 +30,7 @@ AzaleaGymBugsyScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_HIVEBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall AzaleaGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM49_FURY_CUTTER
@ -144,7 +144,7 @@ AzaleaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BUGSY, BUGSY1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, BUGSY, BUGSY1
jumpstd gymstatue2
BugsyText_INeverLose:

8
maps/AzaleaTown.asm
View File

@ -38,7 +38,7 @@ AzaleaTownRivalBattleScene1:
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
turnobject PLAYER, DOWN
jump AzaleaTownRivalBattleScript
sjump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2:
turnobject PLAYER, RIGHT
@ -65,7 +65,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.Totodile:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@ -74,7 +74,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.Chikorita:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@ -83,7 +83,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.AfterBattle:
playmusic MUSIC_RIVAL_AFTER

4
maps/BillsFamilysHouse.asm
View File

@ -19,7 +19,7 @@ BillScript:
writetext BillImCountingOnYouText
promptbutton
waitsfx
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .NoRoom
writetext ReceivedEeveeText
playsound SFX_CAUGHT_MON
@ -95,7 +95,7 @@ BillsSisterScript:
.NoRoom:
writetext BillsSisterPhoneFullText
promptbutton
jump .Refused
sjump .Refused
BillsHouseBookshelf1:
jumpstd picturebookshelf

12
maps/BillsHouse.asm
View File

@ -40,7 +40,7 @@ BillsGrandpa:
ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung
sjump .ShowedLickitung
.GotEverstone:
writetext BillsGrandpaOddishText
@ -54,7 +54,7 @@ BillsGrandpa:
ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish
sjump .ShowedOddish
.GotLeafStone:
writetext BillsGrandpaStaryuText
@ -68,7 +68,7 @@ BillsGrandpa:
ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu
sjump .ShowedStaryu
.GotWaterStone:
checkver
@ -84,7 +84,7 @@ BillsGrandpa:
ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.AskVulpix:
writetext BillsGrandpaVulpixText
@ -98,7 +98,7 @@ BillsGrandpa:
ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.GotFireStone:
writetext BillsGrandpaPichuText
@ -112,7 +112,7 @@ BillsGrandpa:
ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu
sjump .ShowedPichu
.ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA

4
maps/BlackthornCity.asm
View File

@ -21,7 +21,7 @@ BlackthornCity_MapScripts:
return
.Santos:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS
return
@ -90,7 +90,7 @@ SantosScript:
opentext
checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue .Saturday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SATURDAY, .NotSaturday
checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos

2
maps/BlackthornGym1F.asm
View File

@ -143,7 +143,7 @@ BlackthornGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CLAIR, CLAIR1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, CLAIR, CLAIR1
jumpstd gymstatue2
ClairIntroText:

6
maps/BlackthornGym2F.asm
View File

@ -29,15 +29,15 @@ BlackthornGym2F_MapScripts:
.Boulder1:
disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall
sjump .Fall
.Boulder2:
disappear BLACKTHORNGYM2F_BOULDER2
jump .Fall
sjump .Fall
.Boulder3:
disappear BLACKTHORNGYM2F_BOULDER3
jump .Fall
sjump .Fall
.Fall:
pause 30

2
maps/BluesHouse.asm
View File

@ -9,7 +9,7 @@ BluesHouse_MapScripts:
DaisyScript:
faceplayer
opentext
checkcode VAR_HOUR
readvar VAR_HOUR
ifequal 15, .ThreePM
writetext DaisyHelloText
waitbutton

2
maps/BrunosRoom.asm
View File

@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
priorityjump .BrunosDoorLocksBehindYou
prioritysjump .BrunosDoorLocksBehindYou
end
.DummyScene:

8
maps/BurnedTower1F.asm
View File

@ -17,7 +17,7 @@ BurnedTower1F_MapScripts:
db 0 ; callbacks
.RivalScene:
priorityjump .Rival
prioritysjump .Rival
end
.DummyScene1:
@ -53,7 +53,7 @@ BurnedTower1F_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.totodile
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@ -62,7 +62,7 @@ BurnedTower1F_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@ -71,7 +71,7 @@ BurnedTower1F_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.returnfrombattle
playmusic MUSIC_RIVAL_AFTER

4
maps/CeladonCafe.asm
View File

@ -94,7 +94,7 @@ CeladonCafeTrashcan:
giveitem LEFTOVERS
iffalse .PackFull
opentext
itemtotext LEFTOVERS, STRING_BUFFER_3
getitemname STRING_BUFFER_3, LEFTOVERS
writetext FoundLeftoversText
playsound SFX_ITEM
waitsfx
@ -105,7 +105,7 @@ CeladonCafeTrashcan:
.PackFull:
opentext
itemtotext LEFTOVERS, STRING_BUFFER_3
getitemname STRING_BUFFER_3, LEFTOVERS
writetext FoundLeftoversText
promptbutton
writetext NoRoomForLeftoversText

18
maps/CeladonDeptStore6F.asm
View File

@ -33,8 +33,8 @@ CeladonDeptStore6FVendingMachine:
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 200
itemtotext FRESH_WATER, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, FRESH_WATER
sjump .VendItem
.SodaPop:
checkmoney YOUR_MONEY, 300
@ -42,8 +42,8 @@ CeladonDeptStore6FVendingMachine:
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 300
itemtotext SODA_POP, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, SODA_POP
sjump .VendItem
.Lemonade:
checkmoney YOUR_MONEY, 350
@ -51,8 +51,8 @@ CeladonDeptStore6FVendingMachine:
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 350
itemtotext LEMONADE, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, LEMONADE
sjump .VendItem
.VendItem:
pause 10
@ -60,17 +60,17 @@ CeladonDeptStore6FVendingMachine:
writetext CeladonClangText
promptbutton
itemnotify
jump .Start
sjump .Start
.NotEnoughMoney:
writetext CeladonVendingNoMoneyText
waitbutton
jump .Start
sjump .Start
.NotEnoughSpace:
writetext CeladonVendingNoSpaceText
waitbutton
jump .Start
sjump .Start
.MenuHeader:
db MENU_BACKUP_TILES ; flags

6
maps/CeladonGameCorner.asm
View File

@ -58,7 +58,7 @@ CeladonGameCornerFisherScript:
iffalse .NoCoinCase
checkcoins MAX_COINS - 1
ifequal HAVE_MORE, .FullCoinCase
stringtotext .coinname, STRING_BUFFER_4
getstring STRING_BUFFER_4, .coinname
scall .GiveCoins
givecoins 18
setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
@ -112,14 +112,14 @@ CeladonGameCornerLuckySlotMachineScript:
random 6
ifequal 0, CeladonGameCornerSlotMachineScript
refreshscreen
writebyte FALSE
setval FALSE
special SlotMachine
closetext
end
CeladonGameCornerSlotMachineScript:
refreshscreen
writebyte TRUE
setval TRUE
special SlotMachine
closetext
end

42
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -29,40 +29,40 @@ CeladonPrizeRoom_tmcounterloop:
ifequal 1, .doubleteam
ifequal 2, .psychic
ifequal 3, .hyperbeam
jump CeladonPrizeRoom_cancel
sjump CeladonPrizeRoom_cancel
.doubleteam
checkcoins 1500
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_DOUBLE_TEAM
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_DOUBLE_TEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins 1500
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
.psychic
checkcoins 3500
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_PSYCHIC_M
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_PSYCHIC_M
iffalse CeladonPrizeRoom_notenoughroom
takecoins 3500
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
.hyperbeam
checkcoins 7500
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_HYPER_BEAM
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_HYPER_BEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins 7500
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
CeladonPrizeRoom_askbuy:
writetext CeladonPrizeRoom_ConfirmPurchaseText
@ -74,7 +74,7 @@ CeladonPrizeRoom_purchased:
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
jump CeladonPrizeRoom_tmcounterloop
sjump CeladonPrizeRoom_tmcounterloop
CeladonPrizeRoom_notenoughcoins:
writetext CeladonPrizeRoom_NotEnoughCoinsText
@ -130,61 +130,61 @@ CeladonGameCornerPrizeRoomPokemonVendor:
ifequal 1, .mrmime
ifequal 2, .eevee
ifequal 3, .porygon
jump CeladonPrizeRoom_cancel
sjump CeladonPrizeRoom_cancel
.mrmime
checkcoins 3333
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem MR__MIME, STRING_BUFFER_3
getmonname STRING_BUFFER_3, MR__MIME
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte MR__MIME
setval MR__MIME
special GameCornerPrizeMonCheckDex
givepoke MR__MIME, 15
takecoins 3333
jump .loop
sjump .loop
.eevee
checkcoins 6666
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem EEVEE, STRING_BUFFER_3
getmonname STRING_BUFFER_3, EEVEE
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte EEVEE
setval EEVEE
special GameCornerPrizeMonCheckDex
givepoke EEVEE, 15
takecoins 6666
jump .loop
sjump .loop
.porygon
checkcoins 9999
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, STRING_BUFFER_3
getmonname STRING_BUFFER_3, PORYGON
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PORYGON
setval PORYGON
special GameCornerPrizeMonCheckDex
givepoke PORYGON, 20
takecoins 9999
jump .loop
sjump .loop
.MenuHeader:
db MENU_BACKUP_TILES ; flags

2
maps/CeladonGym.asm
View File

@ -107,7 +107,7 @@ CeladonGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext ERIKA, ERIKA1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, ERIKA, ERIKA1
jumpstd gymstatue2
ErikaBeforeBattleText:

2
maps/CeladonMansion3F.asm
View File

@ -13,7 +13,7 @@ GameFreakGameDesignerScript:
faceplayer
opentext
writetext GameFreakGameDesignerText
checkcode VAR_DEXCAUGHT
readvar VAR_DEXCAUGHT
ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi
waitbutton
closetext

4
maps/CeruleanGym.asm
View File

@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
end
.GruntRunsOut:
priorityjump .GruntRunsOutScript
prioritysjump .GruntRunsOutScript
end
.GruntRunsOutScript:
@ -158,7 +158,7 @@ CeruleanGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MISTY, MISTY1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, MISTY, MISTY1
jumpstd gymstatue2
CeruleanGymGruntRunsDownMovement:

18
maps/CherrygroveCity.asm
View File

@ -29,7 +29,7 @@ CherrygroveCityGuideGent:
writetext GuideGentIntroText
yesorno
iffalse .No
jump .Yes
sjump .Yes
.Yes:
writetext GuideGentTourText1
waitbutton
@ -67,7 +67,7 @@ CherrygroveCityGuideGent:
opentext
writetext GuideGentGiftText
promptbutton
stringtotext .mapcardname, STRING_BUFFER_4
getstring STRING_BUFFER_4, .mapcardname
scall .JumpstdReceiveItem
setflag ENGINE_MAP_CARD
writetext GotMapCardText
@ -120,34 +120,34 @@ CherrygroveSilverSceneNorth:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1_TOTODILE
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.Totodile:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1_CHIKORITA
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.Chikorita:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.AfterVictorious:
playmusic MUSIC_RIVAL_AFTER
@ -155,7 +155,7 @@ CherrygroveSilverSceneNorth:
writetext CherrygroveRivalText_YouWon
waitbutton
closetext
jump .FinishRival
sjump .FinishRival
.AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER

4
maps/CianwoodGym.asm
View File

@ -47,7 +47,7 @@ CianwoodGymChuckScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_STORMBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall CianwoodGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM01_DYNAMICPUNCH
@ -136,7 +136,7 @@ CianwoodGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CHUCK, CHUCK1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, CHUCK, CHUCK1
jumpstd gymstatue2
CianwoodGymMovement_ChuckChucksBoulder:

2
maps/Colosseum.asm
View File

@ -11,7 +11,7 @@ Colosseum_MapScripts:
callback MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeColosseum:
priorityjump .InitializeAndPreparePokecenter2F
prioritysjump .InitializeAndPreparePokecenter2F
end
.DummyScene1:

2
maps/CopycatsHouse2F.asm
View File

@ -61,7 +61,7 @@ Copycat:
takeitem LOST_ITEM
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
jump .GivePass
sjump .GivePass
.TryGivePassAgain:
opentext

2
maps/DanceTheatre.asm
View File

@ -86,7 +86,7 @@ DanceTheaterSurfGuy:
iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
iffalse .KimonoGirlsUndefeated
jump .GetSurf
sjump .GetSurf
.KimonoGirlsUndefeated:
writetext SurfGuyLadGiftText

12
maps/DragonsDenB1F.asm
View File

@ -22,7 +22,7 @@ DragonsDenB1F_MapScripts:
return
.CheckDay:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .AppearSilver
ifequal THURSDAY, .AppearSilver
disappear DRAGONSDENB1F_SILVER
@ -37,15 +37,15 @@ DragonsDenB1FDragonFangScript:
iffalse .BagFullDragonFang
disappear DRAGONSDENB1F_POKE_BALL1
opentext
itemtotext DRAGON_FANG, STRING_BUFFER_3
getitemname STRING_BUFFER_3, DRAGON_FANG
writetext Text_FoundDragonFang
playsound SFX_ITEM
waitsfx
itemnotify
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, .next
jump .next2
sjump .next2
.next
moveobject DRAGONSDENB1F_CLAIR, 34, 21
.next2
@ -68,7 +68,7 @@ DragonsDenB1FDragonFangScript:
setevent EVENT_GOT_TM24_DRAGONBREATH
writetext ClairText_DescribeDragonbreathDragonDen
promptbutton
jump .ClairLastText
sjump .ClairLastText
.ClairLastText
writetext ClairText_WhatsTheMatterDragonDen
waitbutton
@ -79,7 +79,7 @@ DragonsDenB1FDragonFangScript:
.BagFullDragonFang:
opentext
itemtotext DRAGON_FANG, STRING_BUFFER_3
getitemname STRING_BUFFER_3, DRAGON_FANG
writetext Text_FoundDragonFang
promptbutton
writetext Text_NoRoomForDragonFang

10
maps/EarlsPokemonAcademy.asm
View File

@ -78,27 +78,27 @@ AcademyBlackboard:
.Poison:
writetext AcademyPoisonText
waitbutton
jump .Loop
sjump .Loop
.Paralysis:
writetext AcademyParalysisText
waitbutton
jump .Loop
sjump .Loop
.Sleep:
writetext AcademySleepText
waitbutton
jump .Loop
sjump .Loop
.Burn:
writetext AcademyBurnText
waitbutton
jump .Loop
sjump .Loop
.Freeze:
writetext AcademyFreezeText
waitbutton
jump .Loop
sjump .Loop
.BlackboardMenuHeader:
db MENU_BACKUP_TILES ; flags

4
maps/EcruteakGym.asm
View File

@ -30,7 +30,7 @@ EcruteakGymMortyScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_FOGBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall EcruteakGymActivateRockets
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED
.FightDone:
@ -133,7 +133,7 @@ EcruteakGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MORTY, MORTY1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, MORTY, MORTY1
jumpstd gymstatue2
MortyIntroText:

4
maps/EcruteakPokecenter1F.asm
View File

@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts:
db 0 ; callbacks
.MeetBill:
priorityjump .BillActivatesTimeCapsule
prioritysjump .BillActivatesTimeCapsule
end
.DummyScene:
@ -39,7 +39,7 @@ EcruteakPokecenter1F_MapScripts:
opentext
writetext EcruteakPokecenter1F_BillText1
promptbutton
jump .PointlessJump
sjump .PointlessJump
.PointlessJump:
writetext EcruteakPokecenter1F_BillText2

36
maps/ElmsLab.asm
View File

@ -18,7 +18,7 @@ ElmsLab_MapScripts:
db 0 ; callbacks
.MeetElm:
priorityjump .WalkUpToElm
prioritysjump .WalkUpToElm
end
.DummyScene1:
@ -65,10 +65,10 @@ ElmCheckEverstone:
iftrue ElmGiveEverstoneScript
checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
iffalse ElmCheckTogepiEgg
writebyte TOGEPI
setval TOGEPI
special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
setval TOGETIC
special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writetext ElmThoughtEggHatchedText
@ -77,13 +77,13 @@ ElmCheckEverstone:
end
ElmEggHatchedScript:
writebyte TOGEPI
setval TOGEPI
special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
setval TOGETIC
special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
jump ElmCheckGotEggAgain
sjump ElmCheckGotEggAgain
ElmCheckTogepiEgg:
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@ -133,17 +133,17 @@ CyndaquilPokeBallScript:
writetext ChoseStarterText
promptbutton
waitsfx
pokenamemem CYNDAQUIL, STRING_BUFFER_3
getmonname STRING_BUFFER_3, CYNDAQUIL
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke CYNDAQUIL, 5, BERRY
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, ElmDirectionsScript
applymovement PLAYER, AfterCyndaquilMovement
jump ElmDirectionsScript
sjump ElmDirectionsScript
TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@ -163,7 +163,7 @@ TotodilePokeBallScript:
writetext ChoseStarterText
promptbutton
waitsfx
pokenamemem TOTODILE, STRING_BUFFER_3
getmonname STRING_BUFFER_3, TOTODILE
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@ -171,7 +171,7 @@ TotodilePokeBallScript:
givepoke TOTODILE, 5, BERRY
closetext
applymovement PLAYER, AfterTotodileMovement
jump ElmDirectionsScript
sjump ElmDirectionsScript
ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@ -191,7 +191,7 @@ ChikoritaPokeBallScript:
writetext ChoseStarterText
promptbutton
waitsfx
pokenamemem CHIKORITA, STRING_BUFFER_3
getmonname STRING_BUFFER_3, CHIKORITA
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@ -199,7 +199,7 @@ ChikoritaPokeBallScript:
givepoke CHIKORITA, 5, BERRY
closetext
applymovement PLAYER, AfterChikoritaMovement
jump ElmDirectionsScript
sjump ElmDirectionsScript
DidntChooseStarterScript:
writetext DidntChooseStarterText
@ -267,7 +267,7 @@ ElmsLabHealingMachine:
ElmsLabHealingMachine_HealParty:
special HealParty
playmusic MUSIC_NONE
writebyte HEALMACHINE_ELMS_LAB
setval HEALMACHINE_ELMS_LAB
special HealMachineAnim
pause 30
special RestartMapMusic
@ -376,7 +376,7 @@ ElmGiveTicketScript:
ElmJumpBackScript1:
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal DOWN, ElmJumpDownScript
ifequal UP, ElmJumpUpScript
ifequal LEFT, ElmJumpLeftScript
@ -385,7 +385,7 @@ ElmJumpBackScript1:
ElmJumpBackScript2:
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal DOWN, ElmJumpUpScript
ifequal UP, ElmJumpDownScript
ifequal LEFT, ElmJumpRightScript
@ -455,7 +455,7 @@ AideScript_GiveYouBalls:
opentext
writetext AideText_GiveYouBalls
promptbutton
itemtotext POKE_BALL, STRING_BUFFER_4
getitemname STRING_BUFFER_4, POKE_BALL
scall AideScript_ReceiveTheBalls
giveitem POKE_BALL, 5
writetext AideText_ExplainBalls
@ -526,7 +526,7 @@ ElmsLabWindow:
iftrue .Normal
checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
iftrue .BreakIn
jump .Normal
sjump .Normal
.BreakIn:
writetext ElmsLabWindowText2

4
maps/FastShip1F.asm
View File

@ -16,7 +16,7 @@ FastShip1F_MapScripts:
end
.EnterFastShip:
priorityjump .EnterFastShipScript
prioritysjump .EnterFastShipScript
end
.DummyScene2:
@ -87,7 +87,7 @@ FastShip1FSailor1Script:
end
.LetThePlayerOut:
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, .YouAreFacingRight
applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
applymovement PLAYER, MovementData_0x75235

2
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -97,7 +97,7 @@ FastShipLazySailorScript:
closetext
setevent EVENT_FAST_SHIP_LAZY_SAILOR
setmapscene FAST_SHIP_B1F, SCENE_FINISHED
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, .Movement2
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1
playsound SFX_EXIT_BUILDING

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -70,7 +70,7 @@ SSAquaGranddaughterBefore:
promptbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
setmapscene FAST_SHIP_1F, SCENE_DEFAULT
jump SSAquaMetalCoatAndDocking
sjump SSAquaMetalCoatAndDocking
SSAquaGrandpa:
faceplayer

4
maps/FuchsiaGym.asm
View File

@ -39,7 +39,7 @@ FuchsiaGymJanineScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_SOULBADGE
jump .AfterBattle
sjump .AfterBattle
.FightDone:
faceplayer
opentext
@ -214,7 +214,7 @@ FuchsiaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext JANINE, JANINE1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, JANINE, JANINE1
jumpstd gymstatue2
Movement_NinjaSpin:

10
maps/GoldenrodDeptStore5F.asm
View File

@ -13,7 +13,7 @@ GoldenrodDeptStore5F_MapScripts:
callback MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, .yes
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return
@ -29,12 +29,12 @@ GoldenrodDeptStore5FClerkScript:
iftrue .headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .onlyrocksmash
jump .neither
sjump .neither
.headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .both
jump .onlyheadbutt
sjump .onlyheadbutt
.neither
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
@ -59,7 +59,7 @@ GoldenrodDeptStore5FClerkScript:
GoldenrodDeptStore5FReceptionistScript:
faceplayer
opentext
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SUNDAY, .EventIsOver
checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
iftrue .EventIsOver
@ -68,7 +68,7 @@ GoldenrodDeptStore5FReceptionistScript:
promptbutton
ifgreater 150 - 1, .VeryHappy
ifgreater 50 - 1, .SomewhatHappy
jump .NotVeryHappy
sjump .NotVeryHappy
.VeryHappy:
writetext UnknownText_0x5615a

18
maps/GoldenrodDeptStore6F.asm
View File

@ -27,8 +27,8 @@ GoldenrodVendingMachine:
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 200
itemtotext FRESH_WATER, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, FRESH_WATER
sjump .VendItem
.SodaPop:
checkmoney YOUR_MONEY, 300
@ -36,8 +36,8 @@ GoldenrodVendingMachine:
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 300
itemtotext SODA_POP, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, SODA_POP
sjump .VendItem
.Lemonade:
checkmoney YOUR_MONEY, 350
@ -45,8 +45,8 @@ GoldenrodVendingMachine:
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 350
itemtotext LEMONADE, STRING_BUFFER_3
jump .VendItem
getitemname STRING_BUFFER_3, LEMONADE
sjump .VendItem
.VendItem:
pause 10
@ -54,17 +54,17 @@ GoldenrodVendingMachine:
writetext GoldenrodClangText
promptbutton
itemnotify
jump .Start
sjump .Start
.NotEnoughMoney:
writetext GoldenrodVendingNoMoneyText
waitbutton
jump .Start
sjump .Start
.NotEnoughSpace:
writetext GoldenrodVendingNoSpaceText
waitbutton
jump .Start
sjump .Start
.MenuHeader:
db MENU_BACKUP_TILES ; flags

4
maps/GoldenrodDeptStoreB1F.asm
View File

@ -18,11 +18,11 @@ GoldenrodDeptStoreB1F_MapScripts:
.ClearBoxes:
checkevent EVENT_RECEIVED_CARD_KEY
iftrue .GotCardKey
jump .Continue
sjump .Continue
.GotCardKey:
changeblock 16, 4, $0d ; floor
jump .Continue
sjump .Continue
.Continue:
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2

72
maps/GoldenrodGameCorner.asm
View File

@ -35,40 +35,40 @@ GoldenrodGameCornerTMVendor_LoopScript:
ifequal 1, .Thunder
ifequal 2, .Blizzard
ifequal 3, .FireBlast
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.Thunder:
checkcoins 5500
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_THUNDER, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_THUNDER
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_THUNDER
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
jump GoldenrodGameCornerTMVendor_FinishScript
sjump GoldenrodGameCornerTMVendor_FinishScript
.Blizzard:
checkcoins 5500
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_BLIZZARD, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_BLIZZARD
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_BLIZZARD
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
jump GoldenrodGameCornerTMVendor_FinishScript
sjump GoldenrodGameCornerTMVendor_FinishScript
.FireBlast:
checkcoins 5500
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_FIRE_BLAST, STRING_BUFFER_3
getitemname STRING_BUFFER_3, TM_FIRE_BLAST
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_FIRE_BLAST
iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
jump GoldenrodGameCornerTMVendor_FinishScript
sjump GoldenrodGameCornerTMVendor_FinishScript
GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript:
writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText
@ -80,7 +80,7 @@ GoldenrodGameCornerTMVendor_FinishScript:
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
jump GoldenrodGameCornerTMVendor_LoopScript
sjump GoldenrodGameCornerTMVendor_LoopScript
GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript:
writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText
@ -138,61 +138,61 @@ GoldenrodGameCornerPrizeMonVendorScript:
ifequal 1, .gold_abra
ifequal 2, .gold_ekans
ifequal 3, .gold_dratini
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.gold_abra
checkcoins 200
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, STRING_BUFFER_3
getmonname STRING_BUFFER_3, ABRA
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte ABRA
setval ABRA
special GameCornerPrizeMonCheckDex
givepoke ABRA, 10
takecoins 200
jump .gold_loop
sjump .gold_loop
.gold_ekans
checkcoins 700
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem EKANS, STRING_BUFFER_3
getmonname STRING_BUFFER_3, EKANS
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte EKANS
setval EKANS
special GameCornerPrizeMonCheckDex
givepoke EKANS, 10
takecoins 700
jump .gold_loop
sjump .gold_loop
.gold_dratini
checkcoins 2100
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem DRATINI, STRING_BUFFER_3
getmonname STRING_BUFFER_3, DRATINI
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte DRATINI
setval DRATINI
special GameCornerPrizeMonCheckDex
givepoke DRATINI, 10
takecoins 2100
jump .gold_loop
sjump .gold_loop
.gold_MenuHeader:
db MENU_BACKUP_TILES ; flags
@ -217,61 +217,61 @@ GoldenrodGameCornerPrizeMonVendorScript:
ifequal 1, .silver_abra
ifequal 2, .silver_sandshrew
ifequal 3, .silver_dratini
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.silver_abra
checkcoins 200
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, STRING_BUFFER_3
getmonname STRING_BUFFER_3, ABRA
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte ABRA
setval ABRA
special GameCornerPrizeMonCheckDex
givepoke ABRA, 10
takecoins 200
jump .silver_loop
sjump .silver_loop
.silver_sandshrew
checkcoins 700
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem SANDSHREW, STRING_BUFFER_3
getmonname STRING_BUFFER_3, SANDSHREW
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte SANDSHREW
setval SANDSHREW
special GameCornerPrizeMonCheckDex
givepoke SANDSHREW, 10
takecoins 700
jump .silver_loop
sjump .silver_loop
.silver_dratini
checkcoins 2100
ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem DRATINI, STRING_BUFFER_3
getmonname STRING_BUFFER_3, DRATINI
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte DRATINI
setval DRATINI
special GameCornerPrizeMonCheckDex
givepoke DRATINI, 10
takecoins 2100
jump .silver_loop
sjump .silver_loop
.silver_MenuHeader:
db MENU_BACKUP_TILES ; flags
@ -342,14 +342,14 @@ GoldenrodGameCornerSlotsMachineScript:
random 6
ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen
writebyte FALSE
setval FALSE
special SlotMachine
closetext
end
GoldenrodGameCornerLuckySlotsMachineScript:
refreshscreen
writebyte TRUE
setval TRUE
special SlotMachine
closetext
end

4
maps/GoldenrodGym.asm
View File

@ -59,7 +59,7 @@ GoldenrodGymWhitneyScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_PLAINBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall GoldenrodGymActivateRockets
.GotPlainBadge:
writetext WhitneyPlainBadgeText
@ -169,7 +169,7 @@ GoldenrodGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext WHITNEY, WHITNEY1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1
jumpstd gymstatue2
BridgetWalksUpMovement:

2
maps/GoldenrodHappinessRater.asm
View File

@ -19,7 +19,7 @@ GoldenrodHappinessRaterTeacherScript:
ifgreater 150 - 1, .SortOfHappy
ifgreater 100 - 1, .QuiteCute
ifgreater 50 - 1, .NotUsedToYou
jump .LooksMean
sjump .LooksMean
.LovesYouALot:
writetext GoldenrodHappinessRatingText_LovesYouALot

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -32,7 +32,7 @@ GoldenrodMagnetTrainStationOfficerScript:
closetext
applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146
applymovement PLAYER, MovementData_0x5514f
writebyte FALSE
setval FALSE
special MagnetTrain
warpcheck
newloadmap MAPSETUP_TRAIN

72
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -176,7 +176,7 @@ UndergroundSilverBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
sjump .FinishRivalBattle
.Totodile:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@ -185,7 +185,7 @@ UndergroundSilverBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
sjump .FinishRivalBattle
.Chikorita:
winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@ -194,7 +194,7 @@ UndergroundSilverBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
sjump .FinishRivalBattle
.FinishRivalBattle:
playmusic MUSIC_RIVAL_AFTER
@ -279,21 +279,21 @@ Switch1Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar 1
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval 1
writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar -1
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval -1
writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch2Script:
opentext
@ -304,21 +304,21 @@ Switch2Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar 2
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval 2
writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar -2
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval -2
writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
Switch3Script:
opentext
@ -329,21 +329,21 @@ Switch3Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar 3
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval 3
writemem wUndergroundSwitchPositions
setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar wUndergroundSwitchPositions
addvar -3
copyvartobyte wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
addval -3
writemem wUndergroundSwitchPositions
clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
EmergencySwitchScript:
opentext
@ -354,32 +354,32 @@ EmergencySwitchScript:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 7
copyvartobyte wUndergroundSwitchPositions
setval 7
writemem wUndergroundSwitchPositions
setevent EVENT_EMERGENCY_SWITCH
setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2
setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
.On:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 0
copyvartobyte wUndergroundSwitchPositions
setval 0
writemem wUndergroundSwitchPositions
clearevent EVENT_EMERGENCY_SWITCH
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
closetext
end
GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
copybytetovar wUndergroundSwitchPositions
readmem wUndergroundSwitchPositions
ifequal 0, .Position0
ifequal 1, .Position1
ifequal 2, .Position2
@ -498,8 +498,8 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Set14
reloadmappart
closetext
writebyte 6
copyvartobyte wUndergroundSwitchPositions
setval 6
writemem wUndergroundSwitchPositions
end
.Set4:

4
maps/GoldenrodUndergroundWarehouse.asm
View File

@ -29,8 +29,8 @@ GoldenrodUndergroundWarehouse_MapScripts:
clearevent EVENT_SWITCH_12
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte 0
copyvartobyte wUndergroundSwitchPositions
setval 0
writemem wUndergroundSwitchPositions
return
TrainerGruntM24:

4
maps/HallOfFame.asm
View File

@ -9,7 +9,7 @@ HallOfFame_MapScripts:
db 0 ; callbacks
.EnterHallOfFame:
priorityjump .EnterHallOfFameScript
prioritysjump .EnterHallOfFameScript
end
.DummyScene:
@ -28,7 +28,7 @@ HallOfFame_MapScripts:
applymovement PLAYER, HallOfFame_SlowlyApproachMachine
setscene SCENE_FINISHED
pause 15
writebyte HEALMACHINE_HALL_OF_FAME
setval HEALMACHINE_HALL_OF_FAME
special HealMachineAnim
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY

8
maps/IcePathB1F.asm
View File

@ -28,22 +28,22 @@ IcePathB1F_MapScripts:
.Boulder1:
disappear ICEPATHB1F_BOULDER1
clearevent EVENT_BOULDER_IN_ICE_PATH_1A
jump .FinishBoulder
sjump .FinishBoulder
.Boulder2:
disappear ICEPATHB1F_BOULDER2
clearevent EVENT_BOULDER_IN_ICE_PATH_2A
jump .FinishBoulder
sjump .FinishBoulder
.Boulder3:
disappear ICEPATHB1F_BOULDER3
clearevent EVENT_BOULDER_IN_ICE_PATH_3A
jump .FinishBoulder
sjump .FinishBoulder
.Boulder4:
disappear ICEPATHB1F_BOULDER4
clearevent EVENT_BOULDER_IN_ICE_PATH_4A
jump .FinishBoulder
sjump .FinishBoulder
.FinishBoulder:
pause 30

2
maps/IlexForest.asm
View File

@ -243,7 +243,7 @@ FarfetchdCryAndCheckFacing:
cry FARFETCH_D
waitbutton
closetext
checkcode VAR_FACING
readvar VAR_FACING
end
IlexForestCharcoalMasterScript:

12
maps/IndigoPlateauPokecenter1F.asm
View File

@ -46,7 +46,7 @@ PlateauRivalBattle1:
iffalse PlateauRivalScriptDone
checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
iftrue PlateauRivalScriptDone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, PlateauRivalScriptDone
ifequal TUESDAY, PlateauRivalScriptDone
ifequal THURSDAY, PlateauRivalScriptDone
@ -61,14 +61,14 @@ PlateauRivalBattle1:
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
playmusic MUSIC_RIVAL_ENCOUNTER
turnobject PLAYER, RIGHT
jump PlateauRivalBattleCommon
sjump PlateauRivalBattleCommon
PlateauRivalBattle2:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iffalse PlateauRivalScriptDone
checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
iftrue PlateauRivalScriptDone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, PlateauRivalScriptDone
ifequal TUESDAY, PlateauRivalScriptDone
ifequal THURSDAY, PlateauRivalScriptDone
@ -99,7 +99,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
.Totodile:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
@ -108,7 +108,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
.Chikorita:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
@ -117,7 +117,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
PlateauRivalPostBattle:
playmusic MUSIC_RIVAL_AFTER

2
maps/KarensRoom.asm
View File

@ -10,7 +10,7 @@ KarensRoom_MapScripts:
callback MAPCALLBACK_TILES, .KarensRoomDoors
.LockDoor:
priorityjump .KarensDoorLocksBehindYou
prioritysjump .KarensDoorLocksBehindYou
end
.DummyScene:

2
maps/KogasRoom.asm
View File

@ -10,7 +10,7 @@ KogasRoom_MapScripts:
callback MAPCALLBACK_TILES, .KogasRoomDoors
.LockDoor:
priorityjump .KogasDoorLocksBehindYou
prioritysjump .KogasDoorLocksBehindYou
end
.DummyScene:

30
maps/KurtsHouse.asm
View File

@ -38,7 +38,7 @@ Kurt1:
closetext
special FadeOutMusic
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
readvar VAR_FACING
ifequal UP, .RunAround
turnobject PLAYER, DOWN
playsound SFX_FLY
@ -117,31 +117,31 @@ Kurt1:
ifequal PNK_APRICORN, .Pnk
; .Red
setevent EVENT_GAVE_KURT_RED_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Blu:
setevent EVENT_GAVE_KURT_BLU_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Ylw:
setevent EVENT_GAVE_KURT_YLW_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Grn:
setevent EVENT_GAVE_KURT_GRN_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Wht:
setevent EVENT_GAVE_KURT_WHT_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Blk:
setevent EVENT_GAVE_KURT_BLK_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.Pnk:
setevent EVENT_GAVE_KURT_PNK_APRICORN
jump .GaveKurtApricorns
sjump .GaveKurtApricorns
.GaveKurtApricorns:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@ -181,7 +181,7 @@ Kurt1:
verbosegiveitem LEVEL_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_RED_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveLureBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -191,7 +191,7 @@ Kurt1:
verbosegiveitem LURE_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_BLU_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveMoonBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -201,7 +201,7 @@ Kurt1:
verbosegiveitem MOON_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_YLW_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveFriendBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -211,7 +211,7 @@ Kurt1:
verbosegiveitem FRIEND_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_GRN_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveFastBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -221,7 +221,7 @@ Kurt1:
verbosegiveitem FAST_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_WHT_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveHeavyBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -231,7 +231,7 @@ Kurt1:
verbosegiveitem HEAVY_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_BLK_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
.GiveLoveBall:
checkflag ENGINE_KURT_MAKING_BALLS
@ -241,7 +241,7 @@ Kurt1:
verbosegiveitem LOVE_BALL
iffalse .NoRoomForBall
clearevent EVENT_GAVE_KURT_PNK_APRICORN
jump ._ThatTurnedOutGreat
sjump ._ThatTurnedOutGreat
KurtsGranddaughter:
faceplayer

8
maps/LakeOfRage.asm
View File

@ -32,7 +32,7 @@ LakeOfRage_MapScripts:
return
.Wesley:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal WEDNESDAY, .WesleyAppears
disappear LAKEOFRAGE_WESLEY
return
@ -76,7 +76,7 @@ LakeOfRageLanceScript:
writetext UnknownText_0x703a5
yesorno
iffalse .RefusedToHelp
jump .AgreedToHelp
sjump .AgreedToHelp
RedGyarados:
opentext
@ -85,7 +85,7 @@ RedGyarados:
cry GYARADOS
closetext
loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle
ifequal $1, .NotBeaten
disappear LAKEOFRAGE_GYARADOS
@ -192,7 +192,7 @@ WesleyScript:
opentext
checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY
iftrue WesleyWednesdayScript
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal WEDNESDAY, WesleyNotWednesdayScript
checkevent EVENT_MET_WESLEY_OF_WEDNESDAY
iftrue .MetWesley

4
maps/LakeOfRageMagikarpHouse.asm
View File

@ -37,7 +37,7 @@ MagikarpLengthRaterScript:
end
.AskedForMagikarp:
writebyte MAGIKARP
setval MAGIKARP
special FindPartyMonThatSpecies
iffalse .ClearedRocketHideout
writetext MagikarpLengthRaterText_YouHaveAMagikarp
@ -47,7 +47,7 @@ MagikarpLengthRaterScript:
ifequal MAGIKARPLENGTH_REFUSED, .Refused
ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort
; MAGIKARPLENGTH_BEAT_RECORD
jump .GetReward
sjump .GetReward
.GetReward:
writetext MagikarpLengthRaterText_Memento

4
maps/LancesRoom.asm
View File

@ -12,7 +12,7 @@ LancesRoom_MapScripts:
callback MAPCALLBACK_TILES, .LancesRoomDoors
.LockDoor:
priorityjump .LancesDoorLocksBehindYou
prioritysjump .LancesDoorLocksBehindYou
end
.DummyScene:
@ -44,7 +44,7 @@ LancesRoom_MapScripts:
Script_ApproachLanceFromLeft:
special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromLeft
jump LancesRoomLanceScript
sjump LancesRoomLanceScript
Script_ApproachLanceFromRight:
special FadeOutMusic

2
maps/LavRadioTower1F.asm
View File

@ -34,7 +34,7 @@ LavRadioTower1FGentlemanScript:
.ReturnedMachinePart:
writetext LavRadioTower1FGentlemanText_ReturnedMachinePart
promptbutton
stringtotext .expncardname, STRING_BUFFER_4
getstring STRING_BUFFER_4, .expncardname
scall .receiveitem
setflag ENGINE_EXPN_CARD
.GotExpnCard:

4
maps/MahoganyGym.asm
View File

@ -30,7 +30,7 @@ MahoganyGymPryceScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_GLACIERBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall MahoganyGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM16_ICY_WIND
@ -144,7 +144,7 @@ MahoganyGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext PRYCE, PRYCE1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, PRYCE, PRYCE1
jumpstd gymstatue2
PryceText_Intro:

2
maps/MahoganyMart1F.asm
View File

@ -17,7 +17,7 @@ MahoganyMart1F_MapScripts:
end
.LanceUncoversStaircase:
priorityjump MahoganyMart1FLanceUncoversStaircaseScript
prioritysjump MahoganyMart1FLanceUncoversStaircaseScript
end
.MahoganyMart1FStaircase:

8
maps/MountMoon.asm
View File

@ -9,7 +9,7 @@ MountMoon_MapScripts:
db 0 ; callbacks
.RivalEncounter:
priorityjump .RivalBattle
prioritysjump .RivalBattle
end
.DummyScene:
@ -36,7 +36,7 @@ MountMoon_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
sjump .FinishBattle
.Totodile:
winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
@ -45,7 +45,7 @@ MountMoon_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
sjump .FinishBattle
.Chikorita:
winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
@ -54,7 +54,7 @@ MountMoon_MapScripts:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
sjump .FinishBattle
.FinishBattle:
playmusic MUSIC_RIVAL_AFTER

2
maps/MountMoonSquare.asm
View File

@ -25,7 +25,7 @@ MountMoonSquare_MapScripts:
ClefairyDance:
checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
iftrue .NoDancing
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal MONDAY, .NoDancing
checktime NITE
iffalse .NoDancing

2
maps/MountMortarB1F.asm
View File

@ -32,7 +32,7 @@ MountMortarB1FKiyoScript:
writetext UnknownText_0x7e2c0
promptbutton
waitsfx
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .NoRoom
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON

6
maps/MrPokemonsHouse.asm
View File

@ -10,7 +10,7 @@ MrPokemonsHouse_MapScripts:
db 0 ; callbacks
.MeetMrPokemon:
priorityjump .MrPokemonEvent
prioritysjump .MrPokemonEvent
end
.DummyScene:
@ -45,7 +45,7 @@ MrPokemonsHouse_MapScripts:
writetext MrPokemonIntroText5
waitbutton
closetext
jump MrPokemonsHouse_OakScript
sjump MrPokemonsHouse_OakScript
MrPokemonsHouse_MrPokemonScript:
faceplayer
@ -72,7 +72,7 @@ MrPokemonsHouse_MrPokemonScript:
verbosegiveitem EXP_SHARE
iffalse .full
takeitem RED_SCALE
jump .AlwaysNewDiscoveries
sjump .AlwaysNewDiscoveries
.refused
writetext MrPokemonText_Disappointed

12
maps/NationalPark.asm
View File

@ -85,7 +85,7 @@ TrainerSchoolboyJack1:
promptbutton
setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .RequestNumber
sjump .RequestNumber
.AskAgain:
scall .AskNumber2
@ -93,9 +93,9 @@ TrainerSchoolboyJack1:
askforphonenumber PHONE_SCHOOLBOY_JACK
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, JACK1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd
@ -179,7 +179,7 @@ TrainerPokefanfBeverly1:
promptbutton
setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .RequestNumber
sjump .RequestNumber
.AskAgain:
scall .AskNumber2
@ -187,9 +187,9 @@ TrainerPokefanfBeverly1:
askforphonenumber PHONE_POKEFAN_BEVERLY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEFANF, BEVERLY1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd

10
maps/OaksLab.asm
View File

@ -23,10 +23,10 @@ Oak:
promptbutton
setevent EVENT_TALKED_TO_OAK_IN_KANTO
.CheckBadges:
checkcode VAR_BADGES
readvar VAR_BADGES
ifequal NUM_BADGES, .OpenMtSilver
ifequal NUM_JOHTO_BADGES, .Complain
jump .AhGood
sjump .AhGood
.CheckPokedex:
writetext OakLabDexCheckText
@ -41,17 +41,17 @@ Oak:
writetext OakOpenMtSilverText
promptbutton
setevent EVENT_OPENED_MT_SILVER
jump .CheckPokedex
sjump .CheckPokedex
.Complain:
writetext OakNoKantoBadgesText
promptbutton
jump .CheckPokedex
sjump .CheckPokedex
.AhGood:
writetext OakYesKantoBadgesText
promptbutton
jump .CheckPokedex
sjump .CheckPokedex
OaksAssistant1Script:
jumptextfaceplayer OaksAssistant1Text

4
maps/OlivineGym.asm
View File

@ -25,7 +25,7 @@ OlivineGymJasmineScript:
playsound SFX_GET_BADGE
waitsfx
setflag ENGINE_MINERALBADGE
checkcode VAR_BADGES
readvar VAR_BADGES
scall OlivineGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM23_IRON_TAIL
@ -89,7 +89,7 @@ OlivineGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext JASMINE, JASMINE1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, JASMINE, JASMINE1
jumpstd gymstatue2
Jasmine_SteelTypeIntro:

6
maps/OlivineLighthouse2F.asm
View File

@ -34,7 +34,7 @@ TrainerSailorHuey:
promptbutton
setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedBefore:
scall .AskNumber2
@ -42,9 +42,9 @@ TrainerSailorHuey:
askforphonenumber PHONE_SAILOR_HUEY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SAILOR, HUEY1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, SAILOR, HUEY1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

4
maps/OlivineLighthouse6F.asm
View File

@ -67,7 +67,7 @@ OlivineLighthouseJasmine:
closetext
setevent EVENT_JASMINE_RETURNED_TO_GYM
clearevent EVENT_OLIVINE_GYM_JASMINE
checkcode VAR_FACING
readvar VAR_FACING
ifequal DOWN, .FacingDown
ifequal RIGHT, .FacingRight
applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
@ -107,7 +107,7 @@ OlivineLighthouseAmphy:
checkevent EVENT_JASMINE_RETURNED_TO_GYM
iftrue .HealthyNow
writetext AmphyPalPalooText
writebyte AMPHAROS
setval AMPHAROS
special PlaySlowCry
promptbutton
writetext AmphyBreathingLaboredText

14
maps/OlivinePort.asm
View File

@ -18,7 +18,7 @@ OlivinePort_MapScripts:
end
.LeaveFastShip:
priorityjump .LeaveFastShipScript
prioritysjump .LeaveFastShipScript
end
.LeaveFastShipScript:
@ -82,7 +82,7 @@ OlivinePortWalkUpToShipScript:
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse .FirstTime
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, .NextShipMonday
ifequal SATURDAY, .NextShipMonday
ifequal TUESDAY, .NextShipFriday
@ -101,7 +101,7 @@ OlivinePortWalkUpToShipScript:
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74a37
jump OlivinePortSailorAtGangwayScript
sjump OlivinePortSailorAtGangwayScript
.NoTicket:
writetext UnknownText_0x74b41
@ -147,7 +147,7 @@ OlivinePortSailorAfterHOFScript:
iftrue OlivinePortAlreadyRodeScript
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse .FirstTime
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, .NextShipMonday
ifequal SATURDAY, .NextShipMonday
ifequal TUESDAY, .NextShipFriday
@ -165,14 +165,14 @@ OlivinePortSailorAfterHOFScript:
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, .Right
applymovement PLAYER, MovementData_0x74a3f
jump OlivinePortSailorAtGangwayScript
sjump OlivinePortSailorAtGangwayScript
.Right:
applymovement PLAYER, MovementData_0x74a49
jump OlivinePortSailorAtGangwayScript
sjump OlivinePortSailorAtGangwayScript
.NoTicket:
writetext UnknownText_0x74b41

2
maps/PewterGym.asm
View File

@ -70,7 +70,7 @@ PewterGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BROCK, BROCK1, STRING_BUFFER_4
gettrainername STRING_BUFFER_4, BROCK, BROCK1
jumpstd gymstatue2
BrockIntroText:

12
maps/PlayersHouse1F.asm
View File

@ -12,7 +12,7 @@ PlayersHouse1F_MapScripts:
db 0 ; callbacks
.DummyScene0:
priorityjump MeetMomScript
prioritysjump MeetMomScript
end
.DummyScene1:
@ -27,7 +27,7 @@ MeetMomScript:
opentext
writetext ElmsLookingForYouText
promptbutton
stringtotext GearName, STRING_BUFFER_4
getstring STRING_BUFFER_4, GearName
scall PlayersHouse1FReceiveItemStd
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD
@ -45,7 +45,7 @@ MeetMomScript:
special InitialSetDSTFlag
yesorno
iffalse .SetDayOfWeek
jump .DayOfWeekDone
sjump .DayOfWeekDone
.WrongDay:
special InitialClearDSTFlag
@ -55,17 +55,17 @@ MeetMomScript:
writetext ComeHomeForDSTText
yesorno
iffalse .ExplainPhone
jump .KnowPhone
sjump .KnowPhone
.KnowPhone:
writetext KnowTheInstructionsText
promptbutton
jump .FinishPhone
sjump .FinishPhone
.ExplainPhone:
writetext DontKnowTheInstructionsText
promptbutton
jump .FinishPhone
sjump .FinishPhone
.FinishPhone:
writetext InstructionsNextText

32
maps/Pokecenter2F.asm
View File

@ -19,21 +19,21 @@ Pokecenter2F_MapScripts:
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Scene0Done
priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
prioritysjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
.Scene0Done:
end
.Scene1:
priorityjump Script_LeftCableTradeCenter
prioritysjump Script_LeftCableTradeCenter
end
.Scene2:
priorityjump Script_LeftCableColosseum
prioritysjump Script_LeftCableColosseum
end
.Scene3:
priorityjump Script_LeftTimeCapsule
prioritysjump Script_LeftTimeCapsule
end
Pokecenter2F_AppearMysteryGiftDeliveryGuy:
@ -76,14 +76,14 @@ LinkReceptionistScript_Trade:
writetext Text_PleaseWait
special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
readmem wOtherPlayerLinkMode
iffalse .LinkedToFirstGen
special CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
waitbutton
closetext
applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp
warpcheck
end
@ -109,7 +109,7 @@ LinkReceptionistScript_Trade:
.LinkTimedOut:
writetext Text_LinkTimedOut
jump .AbortLink
sjump .AbortLink
.DidNotSave:
writetext Text_PleaseComeAgain
@ -137,14 +137,14 @@ LinkReceptionistScript_Battle:
writetext Text_PleaseWait
special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
readmem wOtherPlayerLinkMode
iffalse .LinkedToFirstGen
special CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
waitbutton
closetext
applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp
warpcheck
end
@ -170,7 +170,7 @@ LinkReceptionistScript_Battle:
.LinkTimedOut:
writetext Text_LinkTimedOut
jump .AbortLink
sjump .AbortLink
.DidNotSave:
writetext Text_PleaseComeAgain
@ -213,7 +213,7 @@ LinkReceptionistScript_TimeCapsule:
writetext Text_PleaseWait
special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
readmem wOtherPlayerLinkMode
iffalse .OK
special CheckBothSelectedSameRoom
writetext Text_IncompatibleRooms
@ -226,10 +226,10 @@ LinkReceptionistScript_TimeCapsule:
writetext Text_PleaseComeIn2
waitbutton
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal LEFT, .MaleFacingLeft
ifequal RIGHT, .MaleFacingRight
applymovement2 Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight
applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp
warpcheck
end
@ -242,7 +242,7 @@ LinkReceptionistScript_TimeCapsule:
.LinkTimedOut:
writetext Text_LinkTimedOut
jump .Cancel
sjump .Cancel
.DidNotSave:
writetext Text_PleaseComeAgain
@ -267,13 +267,13 @@ LinkReceptionistScript_TimeCapsule:
end
.MaleFacingLeft:
applymovement2 Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight
applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsLeftUp
warpcheck
end
.MaleFacingRight:
applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksDown
applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsRightLooksDown
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsRightUp
warpcheck
end

10
maps/RadioTower1F.asm
View File

@ -58,7 +58,7 @@ RadioTower1FLuckyNumberManScript:
ifequal 1, .FirstPlace
ifequal 2, .SecondPlace
ifequal 3, .ThirdPlace
jump .NoPrize
sjump .NoPrize
.GameOver:
writetext UnknownText_0x5cf7e
@ -75,7 +75,7 @@ RadioTower1FLuckyNumberManScript:
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
jump .GameOver
sjump .GameOver
.SecondPlace:
writetext UnknownText_0x5d023
@ -86,7 +86,7 @@ RadioTower1FLuckyNumberManScript:
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
jump .GameOver
sjump .GameOver
.ThirdPlace:
writetext UnknownText_0x5d076
@ -97,7 +97,7 @@ RadioTower1FLuckyNumberManScript:
iffalse .BagFull
itemnotify
setflag ENGINE_LUCKY_NUMBER_SHOW
jump .GameOver
sjump .GameOver
.NoPrize:
writetext UnknownText_0x5d0c0
@ -146,7 +146,7 @@ RadioTower1FRadioCardWomanScript:
waitsfx
writetext UnknownText_0x5d37b
promptbutton
stringtotext .RadioCardText, STRING_BUFFER_4
getstring STRING_BUFFER_4, .RadioCardText
scall .ReceiveItem
writetext UnknownText_0x5d3c0
promptbutton

2
maps/RadioTower5F.asm
View File

@ -129,7 +129,7 @@ RadioTower5FRocketBossScene:
setscene SCENE_RADIOTOWER5F_NOTHING
setevent EVENT_GOT_RAINBOW_WING
setevent EVENT_TEAM_ROCKET_DISBANDED
jump .UselessJump
sjump .UselessJump
.SilverWing
verbosegiveitem SILVER_WING
writetext RadioTower5FDirectorDescribeSilverWingText

4
maps/Route16.asm
View File

@ -5,9 +5,9 @@ Route16_MapScripts:
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
checkcode VAR_YCOORD
readvar VAR_YCOORD
ifless 5, .CanWalk
checkcode VAR_XCOORD
readvar VAR_XCOORD
ifgreater 13, .CanWalk
setflag ENGINE_ALWAYS_ON_BIKE
return

12
maps/Route26.asm
View File

@ -40,7 +40,7 @@ TrainerCooltrainermGaven3:
promptbutton
setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -48,9 +48,9 @@ TrainerCooltrainermGaven3:
askforphonenumber PHONE_COOLTRAINERM_GAVEN
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERM, GAVEN3, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@ -134,7 +134,7 @@ TrainerCooltrainerfBeth1:
promptbutton
setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -142,9 +142,9 @@ TrainerCooltrainerfBeth1:
askforphonenumber PHONE_COOLTRAINERF_BETH
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERF, BETH1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

14
maps/Route27.asm
View File

@ -26,7 +26,7 @@ FirstStepIntoKantoLeftScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a66
jump FirstStepIntoKantoScene_Continue
sjump FirstStepIntoKantoScene_Continue
FirstStepIntoKantoRightScene:
turnobject ROUTE27_FISHER, LEFT
@ -73,7 +73,7 @@ TrainerBirdKeeperJose2:
promptbutton
setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -81,9 +81,9 @@ TrainerBirdKeeperJose2:
askforphonenumber PHONE_BIRDKEEPER_JOSE
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext BIRD_KEEPER, JOSE2, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@ -178,7 +178,7 @@ TrainerCooltrainerfReena:
promptbutton
setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -186,9 +186,9 @@ TrainerCooltrainerfReena:
askforphonenumber PHONE_COOLTRAINERF_REENA
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERF, REENA1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

2
maps/Route27SandstormHouse.asm
View File

@ -15,7 +15,7 @@ SandstormHouseWoman:
writetext SandstormHouseWomanText1
promptbutton
ifgreater 150 - 1, .Loyal
jump .Disloyal
sjump .Disloyal
.Loyal:
writetext SandstormHouseWomanLoyalText

6
maps/Route29.asm
View File

@ -31,7 +31,7 @@ Route29_MapScripts:
return
.DoesTuscanyAppear:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal TUESDAY, .TuscanyDisappears
appear ROUTE29_TUSCANY
return
@ -105,7 +105,7 @@ Script_RefusedTutorial2:
CatchingTutorialDudeScript:
faceplayer
opentext
checkcode VAR_BOXSPACE
readvar VAR_BOXSPACE
ifequal 0, .BoxFull
checkevent EVENT_LEARNED_TO_CATCH_POKEMON
iftrue .BoxFull
@ -169,7 +169,7 @@ TuscanyScript:
opentext
checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
iftrue TuscanyTuesdayScript
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal TUESDAY, TuscanyNotTuesdayScript
checkevent EVENT_MET_TUSCANY_OF_TUESDAY
iftrue .MetTuscany

6
maps/Route30.asm
View File

@ -52,7 +52,7 @@ TrainerYoungsterJoey:
promptbutton
setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .RequestNumber
sjump .RequestNumber
.AskAgain:
scall .AskNumber2
@ -60,9 +60,9 @@ TrainerYoungsterJoey:
askforphonenumber PHONE_YOUNGSTER_JOEY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext YOUNGSTER, JOEY1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd

6
maps/Route31.asm
View File

@ -38,7 +38,7 @@ TrainerBugCatcherWade1:
waitbutton
setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
scall .AskPhoneNumberSTD
jump .Continue
sjump .Continue
.AskAgain:
scall .AskAgainSTD
@ -46,9 +46,9 @@ TrainerBugCatcherWade1:
askforphonenumber PHONE_BUG_CATCHER_WADE
ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD
ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
trainertotext BUG_CATCHER, WADE1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
scall .RegisterNumberSTD
jump .AcceptedNumberSTD
sjump .AcceptedNumberSTD
.WadeRematch:
scall .RematchSTD

20
maps/Route32.asm
View File

@ -33,7 +33,7 @@ Route32_MapScripts:
end
.Frieda:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal FRIDAY, .FriedaAppears
disappear ROUTE32_FRIEDA
return
@ -69,7 +69,7 @@ Route32CooltrainerMContinueScene:
verbosegiveitem MIRACLE_SEED
iffalse .BagFull
setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
jump .GotMiracleSeed
sjump .GotMiracleSeed
.DontHaveZephyrBadge:
writetext Route32CooltrainerMText_VioletGym
@ -120,7 +120,7 @@ Route32RoarTMGuyScript:
Route32WannaBuyASlowpokeTailScript:
turnobject ROUTE32_FISHER4, DOWN
turnobject PLAYER, UP
jump _OfferToSellSlowpokeTail
sjump _OfferToSellSlowpokeTail
SlowpokeTailSalesmanScript:
faceplayer
@ -179,7 +179,7 @@ TrainerFisherRalph1:
promptbutton
setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskAgain:
scall .AskNumber2
@ -187,9 +187,9 @@ TrainerFisherRalph1:
askforphonenumber PHONE_FISHER_RALPH
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, RALPH1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, FISHER, RALPH1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd
@ -273,7 +273,7 @@ TrainerPicnickerLiz1:
promptbutton
setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskAgain:
scall .AskNumber2
@ -281,9 +281,9 @@ TrainerPicnickerLiz1:
askforphonenumber PHONE_PICNICKER_LIZ
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, LIZ1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd
@ -378,7 +378,7 @@ FriedaScript:
opentext
checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
iftrue .Friday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checkevent EVENT_MET_FRIEDA_OF_FRIDAY
iftrue .MetFrieda

6
maps/Route33.asm
View File

@ -24,7 +24,7 @@ TrainerHikerAnthony:
promptbutton
setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForPhoneNumber
sjump .AskForPhoneNumber
.AskAgain:
scall .AskNumber2
@ -32,9 +32,9 @@ TrainerHikerAnthony:
askforphonenumber PHONE_HIKER_ANTHONY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext HIKER, ANTHONY2, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd

22
maps/Route34.asm
View File

@ -24,22 +24,22 @@ Route34_MapScripts:
iftrue .PutDayCareManOutside
clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
jump .CheckMon1
sjump .CheckMon1
.PutDayCareManOutside:
setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
jump .CheckMon1
sjump .CheckMon1
.CheckMon1:
checkflag ENGINE_DAY_CARE_MAN_HAS_MON
iffalse .HideMon1
clearevent EVENT_DAY_CARE_MON_1
jump .CheckMon2
sjump .CheckMon2
.HideMon1:
setevent EVENT_DAY_CARE_MON_1
jump .CheckMon2
sjump .CheckMon2
.CheckMon2:
checkflag ENGINE_DAY_CARE_LADY_HAS_MON
@ -59,7 +59,7 @@ DayCareManScript_Outside:
closetext
ifequal TRUE, .end_fail
clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
checkcode VAR_FACING
readvar VAR_FACING
ifequal RIGHT, .walk_around_player
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
playsound SFX_ENTER_DOOR
@ -101,7 +101,7 @@ TrainerCamperTodd1:
promptbutton
setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER
scall .AskNumber
jump .FinishAsk
sjump .FinishAsk
.AskAgain:
scall .AskNumber2
@ -109,9 +109,9 @@ TrainerCamperTodd1:
askforphonenumber PHONE_CAMPER_TODD
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext CAMPER, TODD1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, CAMPER, TODD1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd
@ -184,7 +184,7 @@ TrainerPicnickerGina1:
promptbutton
setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .FinishAsk
sjump .FinishAsk
.AskAgain:
scall .AskNumber2
@ -192,9 +192,9 @@ TrainerPicnickerGina1:
askforphonenumber PHONE_PICNICKER_GINA
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, GINA1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, PICNICKER, GINA1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd

12
maps/Route35.asm
View File

@ -43,7 +43,7 @@ TrainerJugglerIrwin:
promptbutton
setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
scall Route35AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route35AskNumber2M
@ -51,9 +51,9 @@ TrainerJugglerIrwin:
askforphonenumber PHONE_JUGGLER_IRWIN
ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
trainertotext JUGGLER, IRWIN1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
scall Route35RegisteredNumberM
jump Route35NumberAcceptedM
sjump Route35NumberAcceptedM
.WantsBattle:
scall Route35RematchM
@ -170,7 +170,7 @@ TrainerBugCatcherArnie:
promptbutton
setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
scall Route35AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route35AskNumber2M
@ -178,9 +178,9 @@ TrainerBugCatcherArnie:
askforphonenumber PHONE_BUG_CATCHER_ARNIE
ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
trainertotext BUG_CATCHER, ARNIE1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
scall Route35RegisteredNumberM
jump Route35NumberAcceptedM
sjump Route35NumberAcceptedM
.WantsBattle:
scall Route35RematchM

2
maps/Route35GoldenrodGate.asm
View File

@ -23,7 +23,7 @@ RandyScript:
writetext UnknownText_0x69e48
promptbutton
waitsfx
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .partyfull
writetext UnknownText_0x69eb8
playsound SFX_KEY_ITEM

22
maps/Route35NationalParkGate.asm
View File

@ -20,7 +20,7 @@ Route35NationalParkGate_MapScripts:
end
.LeaveContestEarly:
priorityjump .LeavingContestEarly
prioritysjump .LeavingContestEarly
end
.CheckIfContestRunning:
@ -34,7 +34,7 @@ Route35NationalParkGate_MapScripts:
return
.CheckIfContestAvailable:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .SetContestOfficer
ifequal THURSDAY, .SetContestOfficer
ifequal SATURDAY, .SetContestOfficer
@ -55,9 +55,9 @@ Route35NationalParkGate_MapScripts:
applymovement PLAYER, MovementData_0x6a2e2
turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext
checkcode VAR_CONTESTMINUTES
addvar 1
vartomem STRING_BUFFER_3
readvar VAR_CONTESTMINUTES
addval 1
getnum STRING_BUFFER_3
writetext UnknownText_0x6a79a
yesorno
iffalse .GoBackToContest
@ -78,7 +78,7 @@ Route35NationalParkGate_MapScripts:
end
Route35OfficerScriptContest:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, Route35NationalParkGate_NoContestToday
ifequal MONDAY, Route35NationalParkGate_NoContestToday
ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday
@ -91,7 +91,7 @@ Route35OfficerScriptContest:
writetext UnknownText_0x6a2eb
yesorno
iffalse Route35NationalParkGate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@ -116,7 +116,7 @@ Route35NationalParkGate_OkayToProceed:
end
Route35NationalParkGate_EnterContest:
checkcode VAR_FACING
readvar VAR_FACING
ifequal LEFT, Route35NationalParkGate_FacingLeft
applymovement PLAYER, MovementData_0x6a2e5
end
@ -126,9 +126,9 @@ Route35NationalParkGate_FacingLeft:
end
Route35NationalParkGate_LeaveTheRestBehind:
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
checkcode VAR_BOXSPACE
readvar VAR_BOXSPACE
ifequal 0, Route35NationalParkGate_NoRoomInBox
Route35NationalParkGate_LessThanFullParty:
@ -146,7 +146,7 @@ Route35NationalParkGate_LessThanFullParty:
playsound SFX_GOT_SAFARI_BALLS
waitsfx
promptbutton
jump Route35NationalParkGate_OkayToProceed
sjump Route35NationalParkGate_OkayToProceed
Route35NationalParkGate_DeclinedToParticipate:
writetext UnknownText_0x6a5dc

10
maps/Route36.asm
View File

@ -14,7 +14,7 @@ Route36_MapScripts:
callback MAPCALLBACK_OBJECTS, .ArthurCallback
.ArthurCallback:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR
return
@ -128,7 +128,7 @@ TrainerSchoolboyAlan1:
promptbutton
setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .ContinueAskForPhoneNumber
sjump .ContinueAskForPhoneNumber
.AskAgainForPhoneNumber:
scall .AskNumber2
@ -136,9 +136,9 @@ TrainerSchoolboyAlan1:
askforphonenumber PHONE_SCHOOLBOY_ALAN
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, ALAN1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.ChooseRematch:
scall .Rematch
@ -211,7 +211,7 @@ ArthurScript:
opentext
checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
iftrue .AlreadyGotStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal THURSDAY, ArthurNotThursdayScript
checkevent EVENT_MET_ARTHUR_OF_THURSDAY
iftrue .MetArthur

20
maps/Route36NationalParkGate.asm
View File

@ -29,7 +29,7 @@ Route36NationalParkGate_MapScripts:
end
.LeaveContestEarly:
priorityjump .LeavingContestEarly
prioritysjump .LeavingContestEarly
end
.CheckIfContestRunning:
@ -45,7 +45,7 @@ Route36NationalParkGate_MapScripts:
.CheckIfContestAvailable:
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
iftrue .Return
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .SetContestOfficer
ifequal THURSDAY, .SetContestOfficer
ifequal SATURDAY, .SetContestOfficer
@ -64,9 +64,9 @@ Route36NationalParkGate_MapScripts:
.LeavingContestEarly:
turnobject PLAYER, UP
opentext
checkcode VAR_CONTESTMINUTES
addvar 1
vartomem STRING_BUFFER_3
readvar VAR_CONTESTMINUTES
addval 1
getnum STRING_BUFFER_3
writetext UnknownText_0x6b284
yesorno
iffalse .GoBackToContest
@ -139,7 +139,7 @@ Route36NationalParkGate_MapScripts:
end
Route36OfficerScriptContest:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, _ContestNotOn
ifequal MONDAY, _ContestNotOn
ifequal WEDNESDAY, _ContestNotOn
@ -152,7 +152,7 @@ Route36OfficerScriptContest:
writetext UnknownText_0x6add5
yesorno
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifgreater 1, .LeaveMonsWithOfficer
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@ -179,9 +179,9 @@ Route36OfficerScriptContest:
end
.LeaveMonsWithOfficer:
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifless PARTY_LENGTH, .ContinueLeavingMons
checkcode VAR_BOXSPACE
readvar VAR_BOXSPACE
ifequal 0, .BoxFull
.ContinueLeavingMons:
special CheckFirstMonIsEgg
@ -198,7 +198,7 @@ Route36OfficerScriptContest:
playsound SFX_GOT_SAFARI_BALLS
waitsfx
promptbutton
jump .ResumeStartingContest
sjump .ResumeStartingContest
.DecidedNotToJoinContest:
writetext UnknownText_0x6b0c6

4
maps/Route37.asm
View File

@ -14,7 +14,7 @@ Route37_MapScripts:
callback MAPCALLBACK_OBJECTS, .Sunny
.Sunny:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal SUNDAY, .SunnyAppears
disappear ROUTE37_SUNNY
return
@ -61,7 +61,7 @@ SunnyScript:
opentext
checkevent EVENT_GOT_MAGNET_FROM_SUNNY
iftrue SunnySundayScript
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SUNDAY, SunnyNotSundayScript
checkevent EVENT_MET_SUNNY_OF_SUNDAY
iftrue .MetSunny

12
maps/Route38.asm
View File

@ -50,7 +50,7 @@ TrainerLassDana1:
promptbutton
setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1F
jump .AskForPhoneNumber
sjump .AskForPhoneNumber
.SecondTimeAsking:
scall .AskNumber2F
@ -58,9 +58,9 @@ TrainerLassDana1:
askforphonenumber PHONE_LASS_DANA
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
trainertotext LASS, DANA1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, LASS, DANA1
scall .RegisteredPhoneNumber
jump .NumberAccepted
sjump .NumberAccepted
.DanaRematch:
scall .Rematch
@ -133,7 +133,7 @@ TrainerSchoolboyChad1:
promptbutton
setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
scall .AskPhoneNumber1
jump .AskToRegisterNumber
sjump .AskToRegisterNumber
.SecondTimeAsking:
scall .AskPhoneNumber2
@ -141,9 +141,9 @@ TrainerSchoolboyChad1:
askforphonenumber PHONE_SCHOOLBOY_CHAD
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .SaidNo
trainertotext SCHOOLBOY, CHAD1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
scall .RegisteredChad
jump .HaveChadsNumber
sjump .HaveChadsNumber
.ChadRematch:
scall .Rematch

6
maps/Route39.asm
View File

@ -39,7 +39,7 @@ TrainerPokefanmDerek:
promptbutton
setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -47,9 +47,9 @@ TrainerPokefanmDerek:
askforphonenumber PHONE_POKEFANM_DEREK
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEFANM, DEREK1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

8
maps/Route39Barn.asm
View File

@ -49,7 +49,7 @@ MoomooScript:
checkevent EVENT_HEALED_MOOMOO
iftrue .HappyCow
writetext MoomooWeakMooText
writebyte MILTANK
setval MILTANK
special PlaySlowCry
promptbutton
writetext Route39BarnItsCryIsWeakText
@ -67,9 +67,9 @@ MoomooScript:
checkitem BERRY
iffalse .NoBerriesInBag
takeitem BERRY
copybytetovar wMooMooBerries
addvar 1
copyvartobyte wMooMooBerries
readmem wMooMooBerries
addval 1
writemem wMooMooBerries
ifequal 3, .ThreeBerries
ifequal 5, .FiveBerries
ifequal 7, .SevenBerries

4
maps/Route40.asm
View File

@ -19,7 +19,7 @@ Route40_MapScripts:
callback MAPCALLBACK_OBJECTS, .MonicaCallback
.MonicaCallback:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal MONDAY, .MonicaAppears
disappear ROUTE40_MONICA
return
@ -80,7 +80,7 @@ MonicaScript:
opentext
checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
iftrue .Monday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday
checkevent EVENT_MET_MONICA_OF_MONDAY
iftrue .MetMonica

6
maps/Route42.asm
View File

@ -30,7 +30,7 @@ TrainerFisherChris:
promptbutton
setevent EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -38,9 +38,9 @@ TrainerFisherChris:
askforphonenumber PHONE_FISHER_CHRIS
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, CHRIS1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, FISHER, CHRIS1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

12
maps/Route43.asm
View File

@ -62,7 +62,7 @@ TrainerPokemaniacBrent:
promptbutton
setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -70,9 +70,9 @@ TrainerPokemaniacBrent:
askforphonenumber PHONE_POKEMANIAC_BRENT
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEMANIAC, BRENT1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@ -167,7 +167,7 @@ TrainerPicnickerTiffany:
promptbutton
setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@ -175,9 +175,9 @@ TrainerPicnickerTiffany:
askforphonenumber PHONE_PICNICKER_TIFFANY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, TIFFANY3, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch

16
maps/Route43Gate.asm
View File

@ -14,7 +14,7 @@ Route43Gate_MapScripts:
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.RocketShakedown:
priorityjump .RocketTakeover
prioritysjump .RocketTakeover
end
.DummyScene:
@ -32,7 +32,7 @@ Route43Gate_MapScripts:
.RocketTakeover:
playmusic MUSIC_ROCKET_ENCOUNTER
checkcode VAR_FACING
readvar VAR_FACING
ifequal DOWN, RocketScript_Southbound
ifequal UP, RocketScript_Northbound
setscene SCENE_FINISHED
@ -50,17 +50,17 @@ RocketScript_Southbound:
promptbutton
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
ifequal HAVE_MORE, RocketScript_TollSouth
jump RocketScript_YoureBrokeSouth
sjump RocketScript_YoureBrokeSouth
RocketScript_TollSouth:
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownSouth
sjump RocketScript_ShakeDownSouth
RocketScript_YoureBrokeSouth:
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownSouth
sjump RocketScript_ShakeDownSouth
RocketScript_ShakeDownSouth:
promptbutton
@ -82,17 +82,17 @@ RocketScript_Northbound:
promptbutton
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
ifequal HAVE_MORE, RocketScript_TollNorth
jump RocketScript_YoureBrokeNorth
sjump RocketScript_YoureBrokeNorth
RocketScript_TollNorth:
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownNorth
sjump RocketScript_ShakeDownNorth
RocketScript_YoureBrokeNorth:
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownNorth
sjump RocketScript_ShakeDownNorth
RocketScript_ShakeDownNorth:
promptbutton

12
maps/Route44.asm
View File

@ -32,7 +32,7 @@ TrainerBirdKeeperVance1:
promptbutton
setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
scall Route44AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route44AskNumber2M
@ -40,9 +40,9 @@ TrainerBirdKeeperVance1:
askforphonenumber PHONE_BIRDKEEPER_VANCE
ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext BIRD_KEEPER, VANCE1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
sjump Route44NumberAcceptedM
.WantsBattle:
scall Route44RematchM
@ -126,7 +126,7 @@ TrainerFisherWilton1:
promptbutton
setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
scall Route44AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route44AskNumber2M
@ -134,9 +134,9 @@ TrainerFisherWilton1:
askforphonenumber PHONE_FISHER_WILTON
ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext FISHER, WILTON1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, FISHER, WILTON1
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
sjump Route44NumberAcceptedM
.WantsBattle:
scall Route44RematchM

12
maps/Route45.asm
View File

@ -34,7 +34,7 @@ TrainerBlackbeltKenji:
waitbutton
setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
scall Route45AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route45AskNumber2M
@ -42,9 +42,9 @@ TrainerBlackbeltKenji:
askforphonenumber PHONE_BLACKBELT_KENJI
ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
trainertotext BLACKBELT_T, KENJI3, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
scall Route45RegisteredNumberM
jump Route45NumberAcceptedM
sjump Route45NumberAcceptedM
.WantsBattle:
scall Route45RematchM
@ -139,7 +139,7 @@ TrainerHikerParry:
promptbutton
setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER
scall Route45AskNumber1M
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route45AskNumber2M
@ -147,9 +147,9 @@ TrainerHikerParry:
askforphonenumber PHONE_HIKER_PARRY
ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
trainertotext HIKER, PARRY1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, HIKER, PARRY1
scall Route45RegisteredNumberM
jump Route45NumberAcceptedM
sjump Route45NumberAcceptedM
.WantsBattle:
scall Route45RematchM

6
maps/Route46.asm
View File

@ -38,7 +38,7 @@ TrainerPicnickerErin1:
promptbutton
setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
scall Route46AskNumber1F
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route46AskNumber2F
@ -46,9 +46,9 @@ TrainerPicnickerErin1:
askforphonenumber PHONE_PICNICKER_ERIN
ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF
ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
trainertotext PICNICKER, ERIN1, STRING_BUFFER_3
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
scall Route46RegisteredNumberF
jump Route46NumberAcceptedF
sjump Route46NumberAcceptedF
.WantsBattle:
scall Route46RematchF

2
maps/RuinsOfAlphAerodactylChamber.asm
View File

@ -16,7 +16,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
RuinsOfAlphAerodactylChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_AERODACTYL
setval UNOWNPUZZLE_AERODACTYL
special UnownPuzzle
closetext
iftrue .PuzzleComplete

2
maps/RuinsOfAlphHoOhChamber.asm
View File

@ -16,7 +16,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
RuinsOfAlphHoOhChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_HO_OH
setval UNOWNPUZZLE_HO_OH
special UnownPuzzle
closetext
iftrue .PuzzleComplete

2
maps/RuinsOfAlphInnerChamber.asm
View File

@ -14,7 +14,7 @@ RuinsOfAlphInnerChamber_MapScripts:
end
.UnownAppear:
priorityjump .StrangePresenceScript
prioritysjump .StrangePresenceScript
end
.StrangePresenceScript:

2
maps/RuinsOfAlphKabutoChamber.asm
View File

@ -23,7 +23,7 @@ RuinsOfAlphKabutoChamberHiddenDoors:
RuinsOfAlphKabutoChamberPuzzle:
refreshscreen
writebyte UNOWNPUZZLE_KABUTO
setval UNOWNPUZZLE_KABUTO
special UnownPuzzle
closetext
iftrue .PuzzleComplete

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