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

Script commands don't have underscores

Browse Source
This commit is contained in:
Rangi
2018-02-02 21:09:17 -05:00
parent b7e44124d3
commit 68d855c213
152 changed files with 1716 additions and 1716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/AzaleaGym.asm
View File

@@ -57,8 +57,8 @@ AzaleaGymBugsyScript:
end
AzaleaGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
ifequal 7, .RadioTowerRockets
ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -71,7 +71,7 @@ TrainerTwinsAmyandmay1:
trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
endifjustbattled
opentext
writetext TwinsAmyandmay1AfterBattleText
waitbutton
@@ -82,7 +82,7 @@ TrainerTwinsAmyandmay2:
trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
endifjustbattled
opentext
writetext TwinsAmyandmay2AfterBattleText
waitbutton
@@ -93,7 +93,7 @@ TrainerBugCatcherBenny:
trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
endifjustbattled
opentext
writetext BugCatcherBennyAfterBattleText
waitbutton
@@ -104,7 +104,7 @@ TrainerBugCatcherAl:
trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
endifjustbattled
opentext
writetext BugCatcherAlAfterBattleText
waitbutton
@@ -115,7 +115,7 @@ TrainerBugCatcherJosh:
trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
endifjustbattled
opentext
writetext BugCatcherJoshAfterBattleText
waitbutton

36
maps/BattleTower1F.asm
View File

@@ -18,10 +18,10 @@ BattleTower1F_MapScripts:
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
if_equal $4, .SkipEverything
ifequal $0, .SkipEverything
ifequal $2, .priorityjump1
ifequal $3, .SkipEverything
ifequal $4, .SkipEverything
opentext
writetext Text_WeveBeenWaitingForYou
waitbutton
@@ -54,28 +54,28 @@ UnknownScript_0x9e3e0:
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
writetext Text_WantToGoIntoABattleRoom
writebyte TRUE
special Menu_ChallengeExplanationCancel
if_equal 1, Script_ChooseChallenge
if_equal 2, Script_BattleTowerExplanation
ifequal 1, Script_ChooseChallenge
ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
ifnotequal FALSE, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
@@ -86,8 +86,8 @@ Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
@@ -122,7 +122,7 @@ Script_GivePlayerHisPrize: ; 0x9e47a
special BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
ifequal POTION, Script_YourPackIsStuffedFull
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
@@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
@@ -186,15 +186,15 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
ifnotequal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
special CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
ifnotequal FALSE, Script_WaitButton
writebyte BATTLETOWERACTION_05
special BattleTowerAction
if_equal $0, .zero
ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue

4
maps/BattleTowerBattleRoom.asm
View File

@@ -33,9 +33,9 @@ Script_BattleRoomLoop: ; 0x9f425
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
ifnotequal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound
disappear BATTLETOWERBATTLEROOM_YOUNGSTER

16
maps/BattleTowerHallway.asm
View File

@@ -36,14 +36,14 @@ BattleTowerHallway_MapScripts:
; at least it should look like that
; because all warps lead to the same room
.WalkToChosenBattleRoom: ; 0x9f5dc
if_equal 3, .L30L40
if_equal 4, .L30L40
if_equal 5, .L50L60
if_equal 6, .L50L60
if_equal 7, .L70L80
if_equal 8, .L70L80
if_equal 9, .L90L100
if_equal 10, .L90L100
ifequal 3, .L30L40
ifequal 4, .L30L40
ifequal 5, .L50L60
ifequal 6, .L50L60
ifequal 7, .L70L80
ifequal 8, .L70L80
ifequal 9, .L90L100
ifequal 10, .L90L100
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom

6
maps/BillsFamilysHouse.asm
View File

@@ -20,7 +20,7 @@ BillScript:
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
if_equal PARTY_LENGTH, UnknownScript_0x54c13
ifequal PARTY_LENGTH, UnknownScript_0x54c13
writetext UnknownText_0x54dae
playsound SFX_CAUGHT_MON
waitsfx
@@ -72,8 +72,8 @@ BillsSisterScript:
iftrue UnknownScript_0x54c58
writetext UnknownText_0x54f9e
askforphonenumber PHONE_BILL
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
waitsfx
addcellnum PHONE_BILL
writetext UnknownText_0x54fd9

12
maps/BillsHouse.asm
View File

@@ -37,7 +37,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal LICKITUNG, .WrongPokemon
ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung
@@ -51,7 +51,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal ODDISH, .WrongPokemon
ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish
@@ -65,7 +65,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal STARYU, .WrongPokemon
ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu
@@ -81,7 +81,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal GROWLITHE, .WrongPokemon
ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
@@ -95,7 +95,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal VULPIX, .WrongPokemon
ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
@@ -109,7 +109,7 @@ BillsGrandpa:
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
if_not_equal PICHU, .WrongPokemon
ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu

4
maps/BlackthornCity.asm
View File

@@ -22,7 +22,7 @@ BlackthornCity_MapScripts:
.Santos:
checkcode VAR_WEEKDAY
if_equal SATURDAY, .SantosAppears
ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS
return
@@ -91,7 +91,7 @@ SantosScript:
checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue .Saturday
checkcode VAR_WEEKDAY
if_not_equal SATURDAY, .NotSaturday
ifnotequal SATURDAY, .NotSaturday
checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos
writetext MeetSantosText

6
maps/BlackthornGym1F.asm
View File

@@ -94,7 +94,7 @@ TrainerCooltrainermPaul:
trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext CooltrainermPaulAfterBattleText
waitbutton
@@ -105,7 +105,7 @@ TrainerCooltrainermMike:
trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext CooltrainermMikeAfterBattleText
waitbutton
@@ -116,7 +116,7 @@ TrainerCooltrainerfLola:
trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext CooltrainerfLolaAfterBattleText
waitbutton

4
maps/BlackthornGym2F.asm
View File

@@ -60,7 +60,7 @@ TrainerCooltrainermCody:
trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext CooltrainermCodyAfterBattleText
waitbutton
@@ -71,7 +71,7 @@ TrainerCooltrainerfFran:
trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext CooltrainerfFranAfterBattleText
waitbutton

6
maps/BluesHouse.asm
View File

@@ -10,7 +10,7 @@ DaisyScript:
faceplayer
opentext
checkcode VAR_HOUR
if_equal 15, .ThreePM
ifequal 15, .ThreePM
writetext DaisyHelloText
waitbutton
closetext
@@ -25,8 +25,8 @@ DaisyScript:
writetext DaisyWhichMonText
waitbutton
special DaisysGrooming
if_equal $0, .Refused
if_equal $1, .CantGroomEgg
ifequal $0, .Refused
ifequal $1, .CantGroomEgg
setflag ENGINE_DAISYS_GROOMING
writetext DaisyAlrightText
waitbutton

2
maps/BurnedTowerB1F.asm
View File

@@ -104,7 +104,7 @@ BurnedTowerB1FEusine:
waitbutton
closetext
checkcode VAR_FACING
if_equal UP, .Movement
ifequal UP, .Movement
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump UnknownScript_0x18622a

12
maps/CeladonDeptStore6F.asm
View File

@@ -26,15 +26,15 @@ CeladonDeptStore6FVendingMachine:
loadmenuheader .MenuHeader
verticalmenu
closewindow
if_equal 1, .FreshWater
if_equal 2, .SodaPop
if_equal 3, .Lemonade
ifequal 1, .FreshWater
ifequal 2, .SodaPop
ifequal 3, .Lemonade
closetext
end
.FreshWater:
checkmoney YOUR_MONEY, 200
if_equal HAVE_LESS, .NotEnoughMoney
ifequal HAVE_LESS, .NotEnoughMoney
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 200
@@ -43,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
.SodaPop:
checkmoney YOUR_MONEY, 300
if_equal HAVE_LESS, .NotEnoughMoney
ifequal HAVE_LESS, .NotEnoughMoney
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 300
@@ -52,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
.Lemonade:
checkmoney YOUR_MONEY, 350
if_equal HAVE_LESS, .NotEnoughMoney
ifequal HAVE_LESS, .NotEnoughMoney
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 350

4
maps/CeladonGameCorner.asm
View File

@@ -57,7 +57,7 @@ CeladonGameCornerFisherScript:
checkitem COIN_CASE
iffalse .NoCoinCase
checkcoins MAX_COINS - 1
if_equal HAVE_MORE, .FullCoinCase
ifequal HAVE_MORE, .FullCoinCase
stringtotext .coinname, MEM_BUFFER_1
scall .GiveCoins
givecoins 18
@@ -110,7 +110,7 @@ CeladonGameCornerPoster2Script:
CeladonGameCornerLuckySlotMachineScript:
random 6
if_equal 0, CeladonGameCornerSlotMachineScript
ifequal 0, CeladonGameCornerSlotMachineScript
refreshscreen
writebyte FALSE
special SlotMachine

30
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -26,14 +26,14 @@ CeladonPrizeRoom_tmcounterloop:
loadmenuheader CeladonPrizeRoom_TMMenuHeader
verticalmenu
closewindow
if_equal 1, .doubleteam
if_equal 2, .psychic
if_equal 3, .hyperbeam
ifequal 1, .doubleteam
ifequal 2, .psychic
ifequal 3, .hyperbeam
jump CeladonPrizeRoom_cancel
.doubleteam
checkcoins 1500
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -44,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop:
.psychic
checkcoins 3500
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -55,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop:
.hyperbeam
checkcoins 7500
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -127,16 +127,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
loadmenuheader .MenuHeader
verticalmenu
closewindow
if_equal 1, .pikachu
if_equal 2, .porygon
if_equal 3, .larvitar
ifequal 1, .pikachu
ifequal 2, .porygon
ifequal 3, .larvitar
jump CeladonPrizeRoom_cancel
.pikachu
checkcoins 2222
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -152,9 +152,9 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.porygon
checkcoins 5555
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -170,9 +170,9 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.larvitar
checkcoins 8888
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel

10
maps/CeladonGym.asm
View File

@@ -51,7 +51,7 @@ TrainerLassMichelle:
trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext LassMichelleAfterBattleText
waitbutton
@@ -62,7 +62,7 @@ TrainerPicnickerTanya:
trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext PicnickerTanyaAfterBattleText
waitbutton
@@ -73,7 +73,7 @@ TrainerBeautyJulia:
trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext BeautyJuliaAfterBattleText
waitbutton
@@ -84,7 +84,7 @@ TrainerTwinsJoandzoe1:
trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext TwinsJoandzoe1AfterBattleText
waitbutton
@@ -95,7 +95,7 @@ TrainerTwinsJoandzoe2:
trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext TwinsJoandzoe2AfterBattleText
waitbutton

2
maps/CeladonMansion3F.asm
View File

@@ -14,7 +14,7 @@ CooltrainerMScript_0x71670:
opentext
writetext UnknownText_0x716ce
checkcode VAR_DEXCAUGHT
if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
waitbutton
closetext
end

2
maps/CeladonPokecenter1F.asm
View File

@@ -43,7 +43,7 @@ CeladonEusine:
waitbutton
closetext
checkcode VAR_FACING
if_equal UP, .Location1
ifequal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue

6
maps/CeruleanGym.asm
View File

@@ -87,7 +87,7 @@ TrainerSwimmerfDiana:
trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext SwimmerfDianaAfterBattleText
waitbutton
@@ -98,7 +98,7 @@ TrainerSwimmerfBriana:
trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext SwimmerfBrianaAfterBattleText
waitbutton
@@ -109,7 +109,7 @@ TrainerSwimmermParker:
trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext SwimmermParkerAfterBattleText
waitbutton

12
maps/CianwoodGym.asm
View File

@@ -74,8 +74,8 @@ ChuckScript_0x9d60f:
end
CianwoodGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
ifequal 7, .RadioTowerRockets
ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -88,7 +88,7 @@ TrainerBlackbeltYoshi:
trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext BlackbeltYoshiAfterText
waitbutton
@@ -99,7 +99,7 @@ TrainerBlackbeltLao:
trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext BlackbeltLaoAfterText
waitbutton
@@ -110,7 +110,7 @@ TrainerBlackbeltNob:
trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext BlackbeltNobAfterText
waitbutton
@@ -121,7 +121,7 @@ TrainerBlackbeltLung:
trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext BlackbeltLungAfterText
waitbutton

10
maps/DanceTheatre.asm
View File

@@ -18,7 +18,7 @@ TrainerKimonoGirlNaoko2:
trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext KimonoGirlNaoko2AfterBattleText
waitbutton
@@ -29,7 +29,7 @@ TrainerKimonoGirlSayo:
trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext KimonoGirlSayoAfterBattleText
waitbutton
@@ -40,7 +40,7 @@ TrainerKimonoGirlZuki:
trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext KimonoGirlZukiAfterBattleText
waitbutton
@@ -51,7 +51,7 @@ TrainerKimonoGirlKuni:
trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext KimonoGirlKuniAfterBattleText
waitbutton
@@ -62,7 +62,7 @@ TrainerKimonoGirlMiki:
trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
.Script:
end_if_just_battled
endifjustbattled
opentext
writetext KimonoGirlMikiAfterBattleText
waitbutton

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