Rename more script commands for consistency and predictability

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

View File

@ -7,7 +7,7 @@ BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)"
; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm)
; BattleTowerAction setval arguments (see engine/events/battle_tower/battle_tower.asm)
const_def
const BATTLETOWERACTION_CHECK_EXPLANATION_READ
const BATTLETOWERACTION_SET_EXPLANATION_READ

View File

@ -2,12 +2,12 @@
PLAYER EQU 0
LAST_TALKED EQU -2
; memory constants
; string buffer constants
const_def
const MEM_BUFFER_0 ; use wStringBuffer3
const MEM_BUFFER_1 ; use wStringBuffer4
const MEM_BUFFER_2 ; use wStringBuffer5
NUM_MEM_BUFFERS EQU const_value
const STRING_BUFFER_3 ; use wStringBuffer3
const STRING_BUFFER_4 ; use wStringBuffer4
const STRING_BUFFER_5 ; use wStringBuffer5
NUM_STRING_BUFFERS EQU const_value
; checkmoney/takemoney accounts
const_def
@ -34,7 +34,13 @@ NUM_MEM_BUFFERS EQU const_value
const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2
; writecode/checkcode arguments
; trainertext arguments
const_def
const TRAINERTEXT_SEEN
const TRAINERTEXT_WIN
const TRAINERTEXT_LOSS
; readvar/writevar/loadvar arguments
; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
const_def
const VAR_STRINGBUFFER2 ; 00
@ -223,7 +229,7 @@ NUM_FRUIT_TREES EQU const_value + -1
const SWARM_DUNSPARCE ; 0
const SWARM_YANMA ; 1
; ActivateFishingSwarm writebyte arguments
; ActivateFishingSwarm setval arguments
const_def
const FISHSWARM_NONE ; 0
const FISHSWARM_QWILFISH ; 1
@ -256,14 +262,14 @@ NUM_FRUIT_TREES EQU const_value + -1
const BUGCONTEST_BOXED_MON ; 1
const BUGCONTEST_NO_CATCH ; 2
; HealMachineAnim writebyte arguments
; HealMachineAnim setval arguments
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
const_def
const HEALMACHINE_POKECENTER ; 0
const HEALMACHINE_ELMS_LAB ; 1
const HEALMACHINE_HALL_OF_FAME ; 2
; UnownPuzzle writebyte arguments
; UnownPuzzle setval arguments
; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm)
const_def
const UNOWNPUZZLE_KABUTO ; 0
@ -272,7 +278,7 @@ NUM_FRUIT_TREES EQU const_value + -1
const UNOWNPUZZLE_HO_OH ; 3
NUM_UNOWN_PUZZLES EQU const_value
; DisplayUnownWords writebyte arguments
; DisplayUnownWords setval arguments
; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm)
const_def
const UNOWNWORDS_ESCAPE ; 0
@ -280,7 +286,7 @@ NUM_UNOWN_PUZZLES EQU const_value
const UNOWNWORDS_WATER ; 2
const UNOWNWORDS_HO_OH ; 3
; MoveTutor writebyte arguments
; MoveTutor setval arguments
const_def 1
const MOVETUTOR_FLAMETHROWER ; 1
const MOVETUTOR_THUNDERBOLT ; 2

View File

@ -1388,8 +1388,8 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](/engine/events/ove
callasm .empty_fn ; empty function
copybytetovar wBuffer2
writevarcode VAR_MOVEMENT
readmem wBuffer2
writevar VAR_MOVEMENT
special ReplaceKrisSprite
special PlayMapMusic

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -5,80 +5,119 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
## `$00``$03`: <code>turn_head <i>direction</i></code>
## `$04``$07`: <code>turn_step <i>direction</i></code>
## `$08``$0B`: <code>slow_step <i>direction</i></code>
## `$0C``$0F`: <code>step <i>direction</i></code>
## `$10``$13`: <code>big_step <i>direction</i></code>
## `$14``$17`: <code>slow_slide_step <i>direction</i></code>
## `$18``$1B`: <code>slide_step <i>direction</i></code>
## `$1C``$1F`: <code>fast_slide_step <i>direction</i></code>
## `$20``$23`: <code>turn_away <i>direction</i></code>
## `$24``$27`: <code>turn_in <i>direction</i></code>
## `$28``$2B`: <code>turn_waterfall <i>direction</i></code>
## `$2C``$2F`: <code>slow_jump_step <i>direction</i></code>
## `$30``$33`: <code>jump_step <i>direction</i></code>
## `$34``$37`: <code>fast_jump_step <i>direction</i></code>
## `$38`: `remove_sliding`
## `$39`: `set_sliding`
## `$3A`: `remove_fixed_facing`
## `$3B`: `fix_facing`
## `$3C`: `show_object`
## `$3D`: `hide_object`
## `$3E``$46`: <code>step_sleep <i>length</i></code>
## `$47`: `step_end`
## `$48`: <code>step_48 <i>param</i></code>
## `$49`: `remove_object`
## `$4A`: `step_loop`
## `$4B`: `step_4b`
## `$4C`: `teleport_from`
## `$4D`: `teleport_to`
## `$4E`: `skyfall`
## `$4F`: <code>step_dig <i>length</i></code>
## `$50`: `step_bump`
## `$51`: `fish_got_bite`
## `$52`: `fish_cast_rod`
## `$53`: `hide_emote`
## `$54`: `show_emote`
## `$55`: <code>step_shake <i>displacement</i></code>
## `$56`: `tree_shake`
## `$57`: <code>rock_smash <i>length</i></code>
## `$58`: <code>return_dig <i>length</i></code>
## `$59`: `skyfall_top`

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

View File

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

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

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

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:

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

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

View File

@ -849,7 +849,7 @@ SelectMenuScript:
StartMenuCallback:
SelectMenuCallback:
copybytetovar hMenuReturn
readmem hMenuReturn
ifequal HMENURETURN_SCRIPT, .Script
ifequal HMENURETURN_ASM, .Asm
end

View File

@ -84,16 +84,16 @@ ScriptCommandTable:
dw Script_setmapscene ; 12
dw Script_checkscene ; 13
dw Script_setscene ; 14
dw Script_writebyte ; 15
dw Script_addvar ; 16
dw Script_setval ; 15
dw Script_addval ; 16
dw Script_random ; 17
dw Script_checkver ; 18
dw Script_copybytetovar ; 19
dw Script_copyvartobyte ; 1a
dw Script_loadvar ; 1b
dw Script_checkcode ; 1c
dw Script_writevarcode ; 1d
dw Script_writecode ; 1e
dw Script_readmem ; 19
dw Script_writemem ; 1a
dw Script_loadmem ; 1b
dw Script_readvar ; 1c
dw Script_writevar ; 1d
dw Script_loadvar ; 1e
dw Script_giveitem ; 1f
dw Script_takeitem ; 20
dw Script_checkitem ; 21
@ -124,14 +124,14 @@ ScriptCommandTable:
dw Script_warpmod ; 3a
dw Script_blackoutmod ; 3b
dw Script_warp ; 3c
dw Script_readmoney ; 3d
dw Script_readcoins ; 3e
dw Script_vartomem ; 3f
dw Script_pokenamemem ; 40
dw Script_itemtotext ; 41
dw Script_mapnametotext ; 42
dw Script_trainertotext ; 43
dw Script_stringtotext ; 44
dw Script_getmoney ; 3d
dw Script_getcoins ; 3e
dw Script_getnum ; 3f
dw Script_getmonname ; 40
dw Script_getitemname ; 41
dw Script_getcurlandmarkname ; 42
dw Script_gettrainername ; 43
dw Script_getstring ; 44
dw Script_itemnotify ; 45
dw Script_pocketisfull ; 46
dw Script_opentext ; 47
@ -157,7 +157,7 @@ endc
dw Script_verticalmenu ; 59
dw Script_loadpikachudata ; 5a
dw Script_randomwildmon ; 5b
dw Script_loadmemtrainer ; 5c
dw Script_loadtemptrainer ; 5c
dw Script_loadwildmon ; 5d
dw Script_loadtrainer ; 5e
dw Script_startbattle ; 5f
@ -171,7 +171,7 @@ endc
dw Script_checkjustbattled ; 67
dw Script_setlasttalked ; 68
dw Script_applymovement ; 69
dw Script_applymovement2 ; 6a
dw Script_applymovementlasttalked ; 6a
dw Script_faceplayer ; 6b
dw Script_faceobject ; 6c
dw Script_variablesprite ; 6d
@ -186,7 +186,7 @@ endc
dw Script_turnobject ; 76
dw Script_follownotexact ; 77
dw Script_earthquake ; 78
dw Script_changemap ; 79
dw Script_changemapblocks ; 79
dw Script_changeblock ; 7a
dw Script_reloadmap ; 7b
dw Script_reloadmappart ; 7c
@ -224,15 +224,15 @@ endc
dw Script_specialphonecall ; 9c
dw Script_checkphonecall ; 9d
dw Script_verbosegiveitem ; 9e
dw Script_verbosegiveitem2 ; 9f
dw Script_verbosegiveitemvar ; 9f
dw Script_swarm ; a0
dw Script_halloffame ; a1
dw Script_credits ; a2
dw Script_warpfacing ; a3
dw Script_battletowertext ; a4
dw Script_landmarktotext ; a5
dw Script_trainerclassname ; a6
dw Script_name ; a7
dw Script_getlandmarkname ; a5
dw Script_gettrainerclassname ; a6
dw Script_getname ; a7
dw Script_wait ; a8
dw Script_checksave ; a9
@ -496,7 +496,7 @@ Script__2dmenu:
Script_battletowertext:
; script command 0xa4
; parameters: pointer, memory
; parameters: bttext_id
call SetUpTextBox
call GetScriptByte
@ -511,7 +511,7 @@ Script_verbosegiveitem:
call Script_giveitem
call CurItemName
ld de, wStringBuffer1
ld a, MEM_BUFFER_1
ld a, STRING_BUFFER_4
call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
@ -539,7 +539,7 @@ ReceivedItemText:
text_far UnknownText_0x1c4719
text_end
Script_verbosegiveitem2:
Script_verbosegiveitemvar:
; script command 0x9f
; parameters: item, var
@ -562,7 +562,7 @@ Script_verbosegiveitem2:
ld [wScriptVar], a
call CurItemName
ld de, wStringBuffer1
ld a, MEM_BUFFER_1
ld a, STRING_BUFFER_4
call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
@ -754,12 +754,12 @@ Script_swarm:
Script_trainertext:
; script command 0x62
; parameters: which_text
; parameters: text_id
call GetScriptByte
ld c, a
ld b, 0
ld hl, wWalkingX
ld hl, wSeenTextPointer
add hl, bc
add hl, bc
ld a, [hli]
@ -972,7 +972,7 @@ SetFlagsForMovement_2:
farcall _SetFlagsForMovement_2
ret
Script_applymovement2:
Script_applymovementlasttalked:
; script command 0x6a
; parameters: data
; apply movement to last talked
@ -1250,9 +1250,9 @@ Script_showemote:
ShowEmoteScript:
loademote EMOTE_FROM_MEM
applymovement2 .Show
applymovementlasttalked .Show
pause 0
applymovement2 .Hide
applymovementlasttalked .Hide
end
.Show:
@ -1307,7 +1307,7 @@ Script_randomwildmon:
ld [wBattleScriptFlags], a
ret
Script_loadmemtrainer:
Script_loadtemptrainer:
; script command 0x5c
ld a, (1 << 7) | 1
@ -1702,7 +1702,7 @@ DoScene:
.no_scene
ret
Script_copybytetovar:
Script_readmem:
; script command 0x19
; parameters: address
@ -1714,7 +1714,7 @@ Script_copybytetovar:
ld [wScriptVar], a
ret
Script_copyvartobyte:
Script_writemem:
; script command 0x1a
; parameters: address
@ -1726,7 +1726,7 @@ Script_copyvartobyte:
ld [hl], a
ret
Script_loadvar:
Script_loadmem:
; script command 0x1b
; parameters: address, value
@ -1738,7 +1738,7 @@ Script_loadvar:
ld [hl], a
ret
Script_writebyte:
Script_setval:
; script command 0x15
; parameters: value
@ -1746,7 +1746,7 @@ Script_writebyte:
ld [wScriptVar], a
ret
Script_addvar:
Script_addval:
; script command 0x16
; parameters: value
@ -1809,7 +1809,7 @@ Script_random:
add c
ret
Script_checkcode:
Script_readvar:
; script command 0x1c
; parameters: variable_id
@ -1819,7 +1819,7 @@ Script_checkcode:
ld [wScriptVar], a
ret
Script_writevarcode:
Script_writevar:
; script command 0x1d
; parameters: variable_id
@ -1829,7 +1829,7 @@ Script_writevarcode:
ld [de], a
ret
Script_writecode:
Script_loadvar:
; script command 0x1e
; parameters: variable_id, value
@ -1854,9 +1854,9 @@ Script_checkver:
.gs_version:
db GS_VERSION
Script_pokenamemem:
Script_getmonname:
; script command 0x40
; parameters: pokemon (0 aka USE_SCRIPT_VAR to use wScriptVar), memory
; parameters: string_buffer, mon_id (0 aka USE_SCRIPT_VAR to use wScriptVar)
call GetScriptByte
and a
@ -1867,9 +1867,9 @@ Script_pokenamemem:
call GetPokemonName
ld de, wStringBuffer1
ConvertMemToText:
GetStringBuffer:
call GetScriptByte
cp NUM_MEM_BUFFERS
cp NUM_STRING_BUFFERS
jr c, .ok
xor a
.ok
@ -1881,9 +1881,9 @@ CopyConvertedText:
call CopyName2
ret
Script_itemtotext:
Script_getitemname:
; script command 0x41
; parameters: item (0 aka USE_SCRIPT_VAR to use wScriptVar), memory
; parameters: string_buffer, item_id (0 aka USE_SCRIPT_VAR to use wScriptVar)
call GetScriptByte
and a ; USE_SCRIPT_VAR
@ -1893,11 +1893,11 @@ Script_itemtotext:
ld [wNamedObjectIndexBuffer], a
call GetItemName
ld de, wStringBuffer1
jr ConvertMemToText
jr GetStringBuffer
Script_mapnametotext:
Script_getcurlandmarkname:
; script command 0x42
; parameters: memory
; parameters: string_buffer
ld a, [wMapGroup]
ld b, a
@ -1909,29 +1909,29 @@ ConvertLandmarkToText:
ld e, a
farcall GetLandmarkName
ld de, wStringBuffer1
jp ConvertMemToText
jp GetStringBuffer
Script_landmarktotext:
Script_getlandmarkname:
; script command 0xa5
; parameters: id, memory
; parameters: string_buffer, landmark_id
call GetScriptByte
jr ConvertLandmarkToText
Script_trainertotext:
Script_gettrainername:
; script command 0x43
; parameters: trainer_id, trainer_group, memory
; parameters: string_buffer, trainer_group, trainer_id
call GetScriptByte
ld c, a
call GetScriptByte
ld b, a
farcall GetTrainerName
jr ConvertMemToText
jr GetStringBuffer
Script_name:
Script_getname:
; script command 0xa7
; parameters: type, id, memory
; parameters: string_buffer, type, id
call GetScriptByte
ld [wNamedObjectTypeBuffer], a
@ -1941,19 +1941,19 @@ ContinueToGetName:
ld [wCurSpecies], a
call GetName
ld de, wStringBuffer1
jp ConvertMemToText
jp GetStringBuffer
Script_trainerclassname:
Script_gettrainerclassname:
; script command 0xa6
; parameters: id, memory
; parameters: string_buffer, trainer_group
ld a, TRAINER_NAME
ld [wNamedObjectTypeBuffer], a
jr ContinueToGetName
Script_readmoney:
Script_getmoney:
; script command 0x3d
; parameters: account, memory
; parameters: string_buffer, account
call ResetStringBuffer1
call GetMoneyAccount
@ -1961,11 +1961,11 @@ Script_readmoney:
lb bc, PRINTNUM_RIGHTALIGN | 3, 6
call PrintNum
ld de, wStringBuffer1
jp ConvertMemToText
jp GetStringBuffer
Script_readcoins:
Script_getcoins:
; script command 0x3e
; parameters: memory
; parameters: string_buffer
call ResetStringBuffer1
ld hl, wStringBuffer1
@ -1973,11 +1973,11 @@ Script_readcoins:
lb bc, PRINTNUM_RIGHTALIGN | 2, 6
call PrintNum
ld de, wStringBuffer1
jp ConvertMemToText
jp GetStringBuffer
Script_vartomem:
Script_getnum:
; script command 0x3f
; parameters: memory
; parameters: string_buffer
call ResetStringBuffer1
ld de, wScriptVar
@ -1985,7 +1985,7 @@ Script_vartomem:
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
call PrintNum
ld de, wStringBuffer1
jp ConvertMemToText
jp GetStringBuffer
ResetStringBuffer1:
ld hl, wStringBuffer1
@ -1994,9 +1994,9 @@ ResetStringBuffer1:
call ByteFill
ret
Script_stringtotext:
Script_getstring:
; script command 0x44
; parameters: text_pointer, memory
; parameters: string_buffer, text_pointer
call GetScriptByte
ld e, a
@ -2006,7 +2006,7 @@ Script_stringtotext:
ld hl, CopyName1
rst FarCall
ld de, wStringBuffer2
jp ConvertMemToText
jp GetStringBuffer
Script_givepokemail:
; script command 0x2f
@ -2551,7 +2551,7 @@ Script_delcmdqueue:
ld [wScriptVar], a
ret
Script_changemap:
Script_changemapblocks:
; script command 0x79
; parameters: map_data_pointer

View File

@ -1,5 +1,5 @@
AlanPhoneCalleeScript:
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
checkflag ENGINE_ALAN
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
@ -7,7 +7,7 @@ AlanPhoneCalleeScript:
iftrue .NotWednesday
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .FireStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday
checktime DAY
iftrue AlanWednesdayDay
@ -16,15 +16,15 @@ AlanPhoneCalleeScript:
farjump UnknownScript_0xa0970
.WantsBattle:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0a73
.FireStone:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0ac5
AlanPhoneCallerScript:
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ALAN
iftrue .Generic
@ -50,11 +50,11 @@ AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
AlanWantsBattle:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
setflag ENGINE_ALAN
farjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump PhoneScript_FoundItem_Male

View File

@ -1,11 +1,11 @@
AnthonyPhoneCalleeScript:
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
checkflag ENGINE_ANTHONY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime NITE
iftrue AnthonyFridayNight
@ -16,15 +16,15 @@ AnthonyPhoneCalleeScript:
farjump UnknownScript_0xa0950
.WantsBattle:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0a5f
.AlreadySwarming:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0afa
AnthonyPhoneCallerScript:
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .TriesSwarm
@ -44,7 +44,7 @@ AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT
AnthonyWantsBattle:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
setflag ENGINE_ANTHONY
farjump PhoneScript_WantsToBattle_Male
@ -52,9 +52,9 @@ AnthonyTriesDunsparceSwarm:
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .Generic
setflag ENGINE_DUNSPARCE_SWARM
pokenamemem DUNSPARCE, MEM_BUFFER_1
getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
landmarktotext DARK_CAVE, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, DARK_CAVE
farjump UnknownScript_0xa05de
.Generic:

View File

@ -1,11 +1,11 @@
ArniePhoneCalleeScript:
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
checkflag ENGINE_ARNIE
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .NotTuesday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday
checktime MORN
iftrue ArnieTuesdayMorning
@ -16,15 +16,15 @@ ArniePhoneCalleeScript:
farjump UnknownScript_0xa0968
.WantsBattle:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0a6e
.AlreadySwarming:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0aff
ArniePhoneCallerScript:
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ARNIE
iftrue .Swarm
@ -44,7 +44,7 @@ ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING
ArnieWantsBattle:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
setflag ENGINE_ARNIE
farjump PhoneScript_WantsToBattle_Male
@ -52,9 +52,9 @@ ArnieYanmaSwarm: ; start swarm
checkflag ENGINE_YANMA_SWARM
iftrue ArnieYanmaAlreadySwarming
setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, MEM_BUFFER_1
getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa05ce
ArnieFoundRare:

View File

@ -1,11 +1,11 @@
BethPhoneCalleeScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
checkflag ENGINE_BETH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime DAY
iftrue BethFridayAfternoon
@ -14,11 +14,11 @@ BethPhoneCalleeScript:
farjump UnknownScript_0xa0918
.WantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump BethBattleReminderScript
BethPhoneCallerScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_BETH
iftrue .Generic
@ -34,6 +34,6 @@ BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON
BethWantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_BETH
farjump PhoneScript_WantsToBattle_Female

View File

@ -1,16 +1,16 @@
BeverlyPhoneCalleeScript:
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
farjump UnknownScript_0xa0900
.HasNugget:
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump UnknownScript_0xa0aa5
BeverlyPhoneCallerScript:
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
@ -22,5 +22,5 @@ BeverlyPhoneCallerScript:
.FoundNugget:
setflag ENGINE_BEVERLY_HAS_NUGGET
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump PhoneScript_FoundItem_Female

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