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

Rename more script commands for consistency and predictability

Browse Source 
Fixes #540
This commit is contained in:
Rangi
2019-03-10 15:31:59 -04:00
parent 6393ecb7e5
commit e002b536af
157 changed files with 1494 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, MEM_BUFFER_1
gettrainername STRING_BUFFER_4, BUGSY, BUGSY1
jumpstd gymstatue2
BugsyText_INeverLose:

48
maps/BattleTower1F.asm
View File

@@ -13,10 +13,10 @@ BattleTower1F_MapScripts:
db 0 ; callbacks
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction
ifequal $0, .SkipEverything
ifequal $2, .priorityjump1
@@ -31,9 +31,9 @@ BattleTower1F_MapScripts:
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
writebyte BATTLETOWERACTION_06
setval BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
setscene SCENE_FINISHED
@@ -52,27 +52,27 @@ BattleTower1FRulesSign:
end
BattleTower1FReceptionistScript:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction
ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel:
writetext Text_WantToGoIntoABattleRoom
writebyte TRUE
setval TRUE
special Menu_ChallengeExplanationCancel
ifequal 1, Script_ChooseChallenge
ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge:
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special CheckForBattleTowerRules
ifnotequal FALSE, Script_WaitButton
@@ -83,23 +83,23 @@ Script_ChooseChallenge:
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
setval BATTLETOWERACTION_11
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD
setval BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction
jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
setval BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
@@ -108,7 +108,7 @@ Script_WalkToBattleTowerElevator:
setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
setval BATTLETOWERACTION_0A
special BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
@@ -118,15 +118,15 @@ Script_WalkToBattleTowerElevator:
end
Script_GivePlayerHisPrize:
writebyte BATTLETOWERACTION_1C
setval BATTLETOWERACTION_1C
special BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
setval BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
ifequal POTION, Script_YourPackIsStuffedFull
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
getitemname STRING_BUFFER_4, USE_SCRIPT_VAR
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D
setval BATTLETOWERACTION_1D
special BattleTowerAction
closetext
end
@@ -144,7 +144,7 @@ Script_BattleTowerIntroductionYesNo:
Script_BattleTowerExplanation:
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
@@ -170,7 +170,7 @@ UnreferencedScript_0x9e4be:
iffalse Script_Menu_ChallengeExplanationCancel
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
ifequal $a, Script_Menu_ChallengeExplanationCancel
@@ -184,15 +184,15 @@ UnreferencedScript_0x9e4be:
end
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
setval BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
ifnotequal $0, Script_AMonLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
setval BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
special CheckForBattleTowerRules
ifnotequal FALSE, Script_WaitButton
writebyte BATTLETOWERACTION_05
setval BATTLETOWERACTION_05
special BattleTowerAction
ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
@@ -210,9 +210,9 @@ continue:
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED
writebyte BATTLETOWERACTION_06
setval BATTLETOWERACTION_06
special BattleTowerAction
writebyte BATTLETOWERACTION_12
setval BATTLETOWERACTION_12
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton

22
maps/BattleTowerBattleRoom.asm
View File

@@ -20,7 +20,7 @@ Script_BattleRoom:
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
; beat all 7 opponents in a row
Script_BattleRoomLoop:
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
setval BATTLETOWERBATTLEROOM_YOUNGSTER
special LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
@@ -34,7 +34,7 @@ Script_BattleRoomLoop:
special FadeOutPalettes
reloadmap
ifnotequal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers
readmem wNrOfBeatenBattleTowerTrainers
ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound
@@ -65,11 +65,11 @@ Script_DontBattleNextOpponent:
writetext Text_SaveAndEndTheSession
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
setval BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
setval BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
setval BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
playsound SFX_SAVE
waitsfx
@@ -79,9 +79,9 @@ Script_DontSaveAndEndTheSession:
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
writebyte BATTLETOWERACTION_06
setval BATTLETOWERACTION_06
special BattleTowerAction
closetext
special FadeOutPalettes
@@ -93,7 +93,7 @@ Script_FailedBattleTowerChallenge:
pause 60
special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
writetext Text_ThanksForVisiting
@@ -111,7 +111,7 @@ Script_BeatenAllTrainers2:
jump Script_GivePlayerHisPrize
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
@@ -120,9 +120,9 @@ UnreferencedScript_0x9f4eb:
end
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
writebyte BATTLETOWERACTION_06
setval BATTLETOWERACTION_06
special BattleTowerAction
opentext
writetext Text_ThanksForVisiting

2
maps/BattleTowerElevator.asm
View File

@@ -18,7 +18,7 @@ BattleTowerElevator_MapScripts:
follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A
setval BATTLETOWERACTION_0A
special BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60

2
maps/BillsFamilysHouse.asm
View File

@@ -19,7 +19,7 @@ BillScript:
writetext BillImCountingOnYouText
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .NoRoom
writetext ReceivedEeveeText
playsound SFX_CAUGHT_MON

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

4
maps/BlackthornGym1F.asm
View File

@@ -68,7 +68,7 @@ BlackthornGymClairScript:
buttonsound
giveitem TM_DRAGONBREATH
iffalse .BagFull
itemtotext TM_DRAGONBREATH, MEM_BUFFER_0
getitemname STRING_BUFFER_3, TM_DRAGONBREATH
writetext BlackthornGymText_ReceivedTM24
playsound SFX_ITEM
waitsfx
@@ -144,7 +144,7 @@ BlackthornGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CLAIR, CLAIR1, MEM_BUFFER_1
gettrainername STRING_BUFFER_4, CLAIR, CLAIR1
jumpstd gymstatue2
ClairIntroText:

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/BurnedTowerB1F.asm
View File

@@ -103,7 +103,7 @@ BurnedTowerB1FEusine:
writetext BurnedTowerB1FEusineText
waitbutton
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal UP, .Movement2
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump .Finish

4
maps/CeladonCafe.asm
View File

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

6
maps/CeladonDeptStore6F.asm
View File

@@ -42,7 +42,7 @@ CeladonDeptStore6FVendingMachine:
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE
itemtotext FRESH_WATER, MEM_BUFFER_0
getitemname STRING_BUFFER_3, FRESH_WATER
jump .VendItem
.SodaPop:
@@ -51,7 +51,7 @@ CeladonDeptStore6FVendingMachine:
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
itemtotext SODA_POP, MEM_BUFFER_0
getitemname STRING_BUFFER_3, SODA_POP
jump .VendItem
.Lemonade:
@@ -60,7 +60,7 @@ CeladonDeptStore6FVendingMachine:
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
itemtotext LEMONADE, MEM_BUFFER_0
getitemname STRING_BUFFER_3, LEMONADE
jump .VendItem
.VendItem:

6
maps/CeladonGameCorner.asm
View File

@@ -58,7 +58,7 @@ CeladonGameCornerFisherScript:
iffalse .NoCoinCase
checkcoins MAX_COINS - 1
ifequal HAVE_MORE, .FullCoinCase
stringtotext .coinname, MEM_BUFFER_1
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

24
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -41,7 +41,7 @@ CeladonPrizeRoom_tmcounterloop:
.DoubleTeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
getitemname STRING_BUFFER_3, TM_DOUBLE_TEAM
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
giveitem TM_DOUBLE_TEAM
@@ -52,7 +52,7 @@ CeladonPrizeRoom_tmcounterloop:
.Psychic:
checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
getitemname STRING_BUFFER_3, TM_PSYCHIC_M
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
giveitem TM_PSYCHIC_M
@@ -63,7 +63,7 @@ CeladonPrizeRoom_tmcounterloop:
.HyperBeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
getitemname STRING_BUFFER_3, TM_HYPER_BEAM
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
giveitem TM_HYPER_BEAM
@@ -142,16 +142,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.Pikachu:
checkcoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, MEM_BUFFER_0
getmonname STRING_BUFFER_3, PIKACHU
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PIKACHU
setval PIKACHU
special GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25
takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
@@ -160,16 +160,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.Porygon:
checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, MEM_BUFFER_0
getmonname STRING_BUFFER_3, PORYGON
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PORYGON
setval PORYGON
special GameCornerPrizeMonCheckDex
givepoke PORYGON, 15
takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
@@ -178,16 +178,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.Larvitar:
checkcoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, MEM_BUFFER_0
getmonname STRING_BUFFER_3, LARVITAR
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte LARVITAR
setval LARVITAR
special GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40
takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS

2
maps/CeladonGym.asm
View File

@@ -107,7 +107,7 @@ CeladonGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext ERIKA, ERIKA1, MEM_BUFFER_1
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/CeladonPokecenter1F.asm
View File

@@ -27,7 +27,7 @@ CeladonEusine:
opentext
writetext CeladonEusineText1
buttonsound
writebyte SUICUNE
setval SUICUNE
special MonCheck
iffalse .NoSuicune
special BeastsCheck
@@ -42,7 +42,7 @@ CeladonEusine:
writetext EusineLeavesCeladonText
waitbutton
closetext
checkcode VAR_FACING
readvar VAR_FACING
ifequal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue

2
maps/CeruleanGym.asm
View File

@@ -158,7 +158,7 @@ CeruleanGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MISTY, MISTY1, MEM_BUFFER_1
gettrainername STRING_BUFFER_4, MISTY, MISTY1
jumpstd gymstatue2
CeruleanGymGruntRunsDownMovement:

8
maps/CherrygroveCity.asm
View File

@@ -67,7 +67,7 @@ CherrygroveCityGuideGent:
opentext
writetext GuideGentGiftText
buttonsound
stringtotext .mapcardname, MEM_BUFFER_1
getstring STRING_BUFFER_4, .mapcardname
scall .JumpstdReceiveItem
setflag ENGINE_MAP_CARD
writetext GotMapCardText
@@ -120,7 +120,7 @@ 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
@@ -131,7 +131,7 @@ CherrygroveSilverSceneNorth:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1_CHIKORITA
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
reloadmap
@@ -142,7 +142,7 @@ CherrygroveSilverSceneNorth:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
setlasttalked CHERRYGROVECITY_SILVER
loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
reloadmap

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, MEM_BUFFER_1
gettrainername STRING_BUFFER_4, CHUCK, CHUCK1
jumpstd gymstatue2
CianwoodGymMovement_ChuckChucksBoulder:

2
maps/DayCare.asm
View File

@@ -28,7 +28,7 @@ DayCareManScript_Inside:
writetext DayCareManText_GiveOddEgg
buttonsound
closetext
checkcode VAR_PARTYCOUNT
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .PartyFull
special GiveOddEgg
opentext

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