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

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
engine/events/bug_contest/contest.asm
View File

@@ -7,11 +7,11 @@ GiveParkBalls:
ret
BugCatchingContestBattleScript::
writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
loadvar VAR_BATTLETYPE, BATTLETYPE_CONTEST
randomwildmon
startbattle
reloadmapafterbattle
copybytetovar wParkBallsRemaining
readmem wParkBallsRemaining
iffalse BugCatchingContestOutOfBallsScript
end

2
engine/events/forced_movement.asm
View File

@@ -1,5 +1,5 @@
Script_ForcedMovement::
checkcode VAR_FACING
readvar VAR_FACING
ifequal DOWN, .down
ifequal UP, .up
ifequal LEFT, .left

6
engine/events/fruit_trees.asm
View File

@@ -1,8 +1,8 @@
FruitTreeScript::
callasm GetCurTreeFruit
opentext
copybytetovar wCurFruit
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
readmem wCurFruit
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext FruitBearingTreeText
buttonsound
callasm TryResetFruitTrees
@@ -14,7 +14,7 @@ FruitTreeScript::
.fruit
writetext HeyItsFruitText
copybytetovar wCurFruit
readmem wCurFruit
giveitem ITEM_FROM_MEM
iffalse .packisfull
buttonsound

4
engine/events/misc_scripts_2.asm
View File

@@ -12,8 +12,8 @@ RepelWoreOffScript::
HiddenItemScript::
opentext
copybytetovar wEngineBuffer3
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
readmem wEngineBuffer3
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext .found_text
giveitem ITEM_FROM_MEM
iffalse .bag_full

26
engine/events/overworld.asm
View File

@@ -414,8 +414,8 @@ UsedSurfScript:
callasm .empty_fn ; empty function
copybytetovar wBuffer2
writevarcode VAR_MOVEMENT
readmem wBuffer2
writevar VAR_MOVEMENT
special ReplaceKrisSprite
special PlayMapMusic
@@ -624,7 +624,7 @@ FlyFunction:
farscall Script_AbortBugContest
special WarpToSpawnPoint
callasm DelayLoadingNewSprites
writecode VAR_MOVEMENT, PLAYER_NORMAL
loadvar VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_FLY
callasm FlyToAnim
special WaitSFX
@@ -871,7 +871,7 @@ dig_incave
applymovement PLAYER, .DigOut
farscall Script_AbortBugContest
special WarpToSpawnPoint
writecode VAR_MOVEMENT, PLAYER_NORMAL
loadvar VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_DOOR
playsound SFX_WARP_FROM
applymovement PLAYER, .DigReturn
@@ -958,7 +958,7 @@ TeleportFunction:
applymovement PLAYER, .TeleportFrom
farscall Script_AbortBugContest
special WarpToSpawnPoint
writecode VAR_MOVEMENT, PLAYER_NORMAL
loadvar VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_TELEPORT
playsound SFX_WARP_FROM
applymovement PLAYER, .TeleportTo
@@ -1025,7 +1025,7 @@ Script_StrengthFromMenu:
Script_UsedStrength:
callasm SetStrengthFlag
writetext .UsedStrength
copybytetovar wBuffer6
readmem wBuffer6
cry 0
pause 3
writetext .StrengthAllowedItToMoveBoulders
@@ -1390,11 +1390,11 @@ RockSmashScript:
special WaitSFX
playsound SFX_STRENGTH
earthquake 84
applymovement2 MovementData_0xcf55
applymovementlasttalked MovementData_0xcf55
disappear -2
callasm RockMonEncounter
copybytetovar wTempWildMonSpecies
readmem wTempWildMonSpecies
iffalse .done
randomwildmon
startbattle
@@ -1609,7 +1609,7 @@ Fishing_CheckFacingUp:
Script_FishCastRod:
reloadmappart
loadvar hBGMapMode, $0
loadmem hBGMapMode, $0
special UpdateTimePals
loademote EMOTE_ROD
callasm LoadFishingGFX
@@ -1735,7 +1735,7 @@ BikeFunction:
Script_GetOnBike:
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_BIKE
loadvar VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnTheBikeText
waitbutton
closetext
@@ -1743,7 +1743,7 @@ Script_GetOnBike:
end
Script_GetOnBike_Register:
writecode VAR_MOVEMENT, PLAYER_BIKE
loadvar VAR_MOVEMENT, PLAYER_BIKE
closetext
special ReplaceKrisSprite
end
@@ -1755,7 +1755,7 @@ Script_GetOnBike_Register:
Script_GetOffBike:
reloadmappart
special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_NORMAL
loadvar VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffTheBikeText
waitbutton
@@ -1766,7 +1766,7 @@ FinishGettingOffBike:
end
Script_GetOffBike_Register:
writecode VAR_MOVEMENT, PLAYER_NORMAL
loadvar VAR_MOVEMENT, PLAYER_NORMAL
jump FinishGettingOffBike
Script_CantGetOffBike:

70
engine/events/std_scripts.asm
View File

@@ -113,7 +113,7 @@ PokecenterNurseScript:
pause 10
special HealParty
playmusic MUSIC_NONE
writebyte HEALMACHINE_POKECENTER
setval HEALMACHINE_POKECENTER
special HealMachineAnim
pause 30
special RestartMapMusic
@@ -203,7 +203,7 @@ HomepageScript:
Radio1Script:
opentext
writebyte MAPRADIO_POKEMON_CHANNEL
setval MAPRADIO_POKEMON_CHANNEL
special MapRadio
closetext
end
@@ -211,7 +211,7 @@ Radio1Script:
Radio2Script:
; Lucky Channel
opentext
writebyte MAPRADIO_LUCKY_CHANNEL
setval MAPRADIO_LUCKY_CHANNEL
special MapRadio
closetext
end
@@ -244,32 +244,32 @@ MartSignScript:
farjumptext MartSignText
DayToTextScript:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal MONDAY, .Monday
ifequal TUESDAY, .Tuesday
ifequal WEDNESDAY, .Wednesday
ifequal THURSDAY, .Thursday
ifequal FRIDAY, .Friday
ifequal SATURDAY, .Saturday
stringtotext .SundayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .SundayText
end
.Monday:
stringtotext .MondayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .MondayText
end
.Tuesday:
stringtotext .TuesdayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .TuesdayText
end
.Wednesday:
stringtotext .WednesdayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .WednesdayText
end
.Thursday:
stringtotext .ThursdayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .ThursdayText
end
.Friday:
stringtotext .FridayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .FridayText
end
.Saturday:
stringtotext .SaturdayText, MEM_BUFFER_0
getstring STRING_BUFFER_3, .SaturdayText
end
.SundayText:
db "SUNDAY@"
@@ -321,7 +321,7 @@ BugContestResultsScript:
farwritetext ContestResults_ReadyToJudgeText
waitbutton
special BugContestJudging
vartomem MEM_BUFFER_0
getnum STRING_BUFFER_3
ifequal 1, BugContestResults_FirstPlace
ifequal 2, BugContestResults_SecondPlace
ifequal 3, BugContestResults_ThirdPlace
@@ -383,7 +383,7 @@ BugContestResults_CleanUp:
BugContestResults_FirstPlace:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
itemtotext SUN_STONE, MEM_BUFFER_1
getitemname STRING_BUFFER_4, SUN_STONE
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem SUN_STONE
@@ -391,7 +391,7 @@ BugContestResults_FirstPlace:
jump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_SecondPlace:
itemtotext EVERSTONE, MEM_BUFFER_1
getitemname STRING_BUFFER_4, EVERSTONE
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem EVERSTONE
@@ -399,7 +399,7 @@ BugContestResults_SecondPlace:
jump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_ThirdPlace:
itemtotext GOLD_BERRY, MEM_BUFFER_1
getitemname STRING_BUFFER_4, GOLD_BERRY
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem GOLD_BERRY
@@ -614,7 +614,7 @@ InitializeEventsScript:
AskNumber1MScript:
special RandomPhoneMon
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -699,7 +699,7 @@ AskNumber1MScript:
AskNumber2MScript:
special RandomPhoneMon
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -790,7 +790,7 @@ RegisteredNumberMScript:
end
NumberAcceptedMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -914,7 +914,7 @@ NumberAcceptedMScript:
end
NumberDeclinedMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -1038,7 +1038,7 @@ NumberDeclinedMScript:
end
PhoneFullMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -1162,7 +1162,7 @@ PhoneFullMScript:
end
RematchMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -1268,7 +1268,7 @@ RematchMScript:
end
GiftMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
ifequal PHONE_BUG_CATCHER_WADE, .Wade
ifequal PHONE_SCHOOLBOY_ALAN, .Alan
@@ -1307,7 +1307,7 @@ GiftMScript:
end
PackFullMScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
ifequal PHONE_YOUNGSTER_JOEY, .Joey
@@ -1378,7 +1378,7 @@ PackFullMScript:
RematchGiftMScript:
opentext
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_YOUNGSTER_JOEY, .Joey
ifequal PHONE_BIRDKEEPER_VANCE, .Vance
@@ -1402,7 +1402,7 @@ RematchGiftMScript:
end
AskNumber1FScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1438,7 +1438,7 @@ AskNumber1FScript:
end
AskNumber2FScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1481,7 +1481,7 @@ RegisteredNumberFScript:
end
NumberAcceptedFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1533,7 +1533,7 @@ NumberAcceptedFScript:
end
NumberDeclinedFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1585,7 +1585,7 @@ NumberDeclinedFScript:
end
PhoneFullFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1637,7 +1637,7 @@ PhoneFullFScript:
end
RematchFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
ifequal PHONE_PICNICKER_LIZ, .Liz
@@ -1683,7 +1683,7 @@ RematchFScript:
end
GiftFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_PICNICKER_GINA, .Gina
ifequal PHONE_LASS_DANA, .Dana
@@ -1707,7 +1707,7 @@ GiftFScript:
end
PackFullFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_PICNICKER_GINA, .Gina
ifequal PHONE_LASS_DANA, .Dana
@@ -1741,7 +1741,7 @@ PackFullFScript:
end
RematchGiftFScript:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_PICNICKER_ERIN, .Erin
.Erin:
@@ -1751,7 +1751,7 @@ RematchGiftFScript:
end
GymStatue1Script:
mapnametotext MEM_BUFFER_0
getcurlandmarkname STRING_BUFFER_3
opentext
farwritetext GymStatue_CityGymText
waitbutton
@@ -1759,7 +1759,7 @@ GymStatue1Script:
end
GymStatue2Script:
mapnametotext MEM_BUFFER_0
getcurlandmarkname STRING_BUFFER_3
opentext
farwritetext GymStatue_CityGymText
buttonsound

12
engine/events/trainer_scripts.asm
View File

@@ -2,30 +2,30 @@ TalkToTrainerScript::
faceplayer
trainerflagaction CHECK_FLAG
iftrue AlreadyBeatenTrainerScript
loadmemtrainer
loadtemptrainer
encountermusic
jump StartBattleWithMapTrainerScript
SeenByTrainerScript::
loadmemtrainer
loadtemptrainer
encountermusic
showemote EMOTE_SHOCK, LAST_TALKED, 30
callasm TrainerWalkToPlayer
applymovement2 wMovementBuffer
applymovementlasttalked wMovementBuffer
writeobjectxy LAST_TALKED
faceobject PLAYER, LAST_TALKED
jump StartBattleWithMapTrainerScript
StartBattleWithMapTrainerScript:
opentext
trainertext $0
trainertext TRAINERTEXT_SEEN
waitbutton
closetext
loadmemtrainer
loadtemptrainer
startbattle
reloadmapafterbattle
trainerflagaction SET_FLAG
loadvar wRunningTrainerBattleScript, -1
loadmem wRunningTrainerBattleScript, -1
AlreadyBeatenTrainerScript:
scripttalkafter