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

2
constants/battle_tower_constants.asm
View File

@@ -7,7 +7,7 @@ BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)" 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_def
const BATTLETOWERACTION_CHECK_EXPLANATION_READ const BATTLETOWERACTION_CHECK_EXPLANATION_READ
const BATTLETOWERACTION_SET_EXPLANATION_READ const BATTLETOWERACTION_SET_EXPLANATION_READ

28
constants/script_constants.asm
View File

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

4
docs/bugs_and_glitches.md
View File

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

265
docs/event_commands.md
View File

File diff suppressed because it is too large Load Diff

176
docs/move_effect_commands.md
View File

File diff suppressed because it is too large Load Diff

39
docs/movement_commands.md
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> ## `$00`−`$03`: <code>turn_head <i>direction</i></code>
## `$04`−`$07`: <code>turn_step <i>direction</i></code> ## `$04`−`$07`: <code>turn_step <i>direction</i></code>
## `$08`−`$0B`: <code>slow_step <i>direction</i></code> ## `$08`−`$0B`: <code>slow_step <i>direction</i></code>
## `$0C`−`$0F`: <code>step <i>direction</i></code> ## `$0C`−`$0F`: <code>step <i>direction</i></code>
## `$10`−`$13`: <code>big_step <i>direction</i></code> ## `$10`−`$13`: <code>big_step <i>direction</i></code>
## `$14`−`$17`: <code>slow_slide_step <i>direction</i></code> ## `$14`−`$17`: <code>slow_slide_step <i>direction</i></code>
## `$18`−`$1B`: <code>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> ## `$1C`−`$1F`: <code>fast_slide_step <i>direction</i></code>
## `$20`−`$23`: <code>turn_away <i>direction</i></code> ## `$20`−`$23`: <code>turn_away <i>direction</i></code>
## `$24`−`$27`: <code>turn_in <i>direction</i></code> ## `$24`−`$27`: <code>turn_in <i>direction</i></code>
## `$28`−`$2B`: <code>turn_waterfall <i>direction</i></code> ## `$28`−`$2B`: <code>turn_waterfall <i>direction</i></code>
## `$2C`−`$2F`: <code>slow_jump_step <i>direction</i></code> ## `$2C`−`$2F`: <code>slow_jump_step <i>direction</i></code>
## `$30`−`$33`: <code>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> ## `$34`−`$37`: <code>fast_jump_step <i>direction</i></code>
## `$38`: `remove_sliding` ## `$38`: `remove_sliding`
## `$39`: `set_sliding` ## `$39`: `set_sliding`
## `$3A`: `remove_fixed_facing` ## `$3A`: `remove_fixed_facing`
## `$3B`: `fix_facing` ## `$3B`: `fix_facing`
## `$3C`: `show_object` ## `$3C`: `show_object`
## `$3D`: `hide_object` ## `$3D`: `hide_object`
## `$3E`−`$46`: <code>step_sleep <i>length</i></code> ## `$3E`−`$46`: <code>step_sleep <i>length</i></code>
## `$47`: `step_end` ## `$47`: `step_end`
## `$48`: <code>step_48 <i>param</i></code> ## `$48`: <code>step_48 <i>param</i></code>
## `$49`: `remove_object` ## `$49`: `remove_object`
## `$4A`: `step_loop` ## `$4A`: `step_loop`
## `$4B`: `step_4b` ## `$4B`: `step_4b`
## `$4C`: `teleport_from` ## `$4C`: `teleport_from`
## `$4D`: `teleport_to` ## `$4D`: `teleport_to`
## `$4E`: `skyfall` ## `$4E`: `skyfall`
## `$4F`: <code>step_dig <i>length</i></code> ## `$4F`: <code>step_dig <i>length</i></code>
## `$50`: `step_bump` ## `$50`: `step_bump`
## `$51`: `fish_got_bite` ## `$51`: `fish_got_bite`
## `$52`: `fish_cast_rod` ## `$52`: `fish_cast_rod`
## `$53`: `hide_emote` ## `$53`: `hide_emote`
## `$54`: `show_emote` ## `$54`: `show_emote`
## `$55`: <code>step_shake <i>displacement</i></code> ## `$55`: <code>step_shake <i>displacement</i></code>
## `$56`: `tree_shake` ## `$56`: `tree_shake`
## `$57`: <code>rock_smash <i>length</i></code> ## `$57`: <code>rock_smash <i>length</i></code>
## `$58`: <code>return_dig <i>length</i></code> ## `$58`: <code>return_dig <i>length</i></code>
## `$59`: `skyfall_top` ## `$59`: `skyfall_top`

4
engine/events/bug_contest/contest.asm
View File

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

2
engine/events/forced_movement.asm
View File

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

6
engine/events/fruit_trees.asm
View File

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

4
engine/events/misc_scripts_2.asm
View File

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

26
engine/events/overworld.asm
View File

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

70
engine/events/std_scripts.asm
View File

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

12
engine/events/trainer_scripts.asm
View File

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

2
engine/overworld/events.asm
View File

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

148
engine/overworld/scripting.asm
View File

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

14
engine/phone/scripts/alan.asm
View File

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

16
engine/phone/scripts/anthony.asm
View File

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

16
engine/phone/scripts/arnie.asm
View File

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

10
engine/phone/scripts/beth.asm
View File

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

8
engine/phone/scripts/beverly.asm
View File

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

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