diff options
Diffstat (limited to 'engine')
44 files changed, 356 insertions, 356 deletions
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 7a5d0885a..cf8c284ae 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -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 diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index 69f27bfe2..fcd2793f2 100644 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm @@ -1,5 +1,5 @@ Script_ForcedMovement:: - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, .down ifequal UP, .up ifequal LEFT, .left diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 92e66c07e..af9c594bd 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -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 diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 61d9d11f1..514bb2790 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -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 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 7dc43c15a..f7d1f972e 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -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: diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 28272405c..f6860d654 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -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 diff --git a/engine/events/trainer_scripts.asm b/engine/events/trainer_scripts.asm index 6f0bb2d29..5097f51b0 100644 --- a/engine/events/trainer_scripts.asm +++ b/engine/events/trainer_scripts.asm @@ -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 diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index fe2c51560..6cbfab329 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -849,7 +849,7 @@ SelectMenuScript: StartMenuCallback: SelectMenuCallback: - copybytetovar hMenuReturn + readmem hMenuReturn ifequal HMENURETURN_SCRIPT, .Script ifequal HMENURETURN_ASM, .Asm end diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index e998da7c3..1919a0ff1 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -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 diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index e5f7680f7..a8e40532f 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -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 diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 3dc298f8f..df9297f83 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -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: diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index 908e7ff6d..7fdcad9d3 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -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: diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index 4aae343a7..4c69e58e9 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -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 diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index abc86cb9d..d930738f4 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -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 diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm index 733224f22..5683e4b27 100644 --- a/engine/phone/scripts/bill.asm +++ b/engine/phone/scripts/bill.asm @@ -20,8 +20,8 @@ BillPhoneCalleeScript: .main farwritetext BillPhoneGenericText buttonsound - checkcode VAR_BOXSPACE - vartomem MEM_BUFFER_0 + readvar VAR_BOXSPACE + getnum STRING_BUFFER_3 ifequal 0, .full ifless PARTY_LENGTH, .nearlyfull farwritetext BillPhoneNotFullText diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index ef18f06b9..63217a7b0 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -1,11 +1,11 @@ BrentPhoneCalleeScript: - trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 checkflag ENGINE_BRENT iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_BRENT_MONDAY_MORNING iftrue .NotMonday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checktime MORN iftrue BrentMondayMorning @@ -14,11 +14,11 @@ BrentPhoneCalleeScript: farjump UnknownScript_0xa0998 .WantsBattle: - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 farjump UnknownScript_0xa0a87 BrentPhoneCallerScript: - trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, BrentBillTrivia @@ -36,7 +36,7 @@ BrentMondayMorning: setflag ENGINE_BRENT_MONDAY_MORNING BrentWantsBattle: - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 setflag ENGINE_BRENT farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index 3e08fcd40..1a8868b6e 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -1,7 +1,7 @@ BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket - checkcode VAR_HOUR + readvar VAR_HOUR ifgreater 17, BuenaPhoneScript_AfterMidnight1 scall BuenaPhoneScript_CheckTimeOfDay1 jump BuenaPhoneScript_Random1 @@ -36,7 +36,7 @@ BuenaPhoneScript_AfterMidnight1: end BuenaPhoneScript_CheckTimeOfDay2: - checkcode VAR_HOUR + readvar VAR_HOUR ifgreater 17, BuenaPhoneScript_AfterMidnight2 checktime MORN iftrue .morn diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index e89563a09..d3465699c 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -1,11 +1,11 @@ ChadPhoneCalleeScript: - trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 checkflag ENGINE_CHAD iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_CHAD_FRIDAY_MORNING iftrue .NotFriday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal FRIDAY, .NotFriday checktime MORN iftrue ChadFridayMorning @@ -14,11 +14,11 @@ ChadPhoneCalleeScript: farjump UnknownScript_0xa0980 .WantsBattle: - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 farjump UnknownScript_0xa0a7d ChadPhoneCallerScript: - trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, ChadOakGossip @@ -38,7 +38,7 @@ ChadFridayMorning: setflag ENGINE_CHAD_FRIDAY_MORNING ChadWantsBattle: - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 setflag ENGINE_CHAD farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index b072820a6..41d5d87ac 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -1,5 +1,5 @@ DanaPhoneCalleeScript: - trainertotext LASS, DANA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, LASS, DANA1 checkflag ENGINE_DANA iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female @@ -7,7 +7,7 @@ DanaPhoneCalleeScript: iftrue .NotThursday checkflag ENGINE_DANA_HAS_THUNDERSTONE iftrue .HasThunderstone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime NITE iftrue DanaThursdayNight @@ -16,15 +16,15 @@ DanaPhoneCalleeScript: farjump UnknownScript_0xa0978 .WantsBattle: - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 farjump UnknownScript_0xa0a78 .HasThunderstone: - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 farjump UnknownScript_0xa0acd DanaPhoneCallerScript: - trainertotext LASS, DANA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, LASS, DANA1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_DANA iftrue .Generic @@ -52,7 +52,7 @@ DanaThursdayNight: setflag ENGINE_DANA_THURSDAY_NIGHT DanaWantsBattle: - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 setflag ENGINE_DANA farjump PhoneScript_WantsToBattle_Female @@ -61,5 +61,5 @@ DanaFoundRare: DanaHasThunderstone: setflag ENGINE_DANA_HAS_THUNDERSTONE - landmarktotext ROUTE_38, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_38 farjump PhoneScript_FoundItem_Female diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index 95ff8bb76..4f3f5d94e 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -1,5 +1,5 @@ DerekPhoneCalleeScript: - trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_DEREK_HAS_NUGGET iftrue .Nugget @@ -7,7 +7,7 @@ DerekPhoneCalleeScript: ifequal 0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST iftrue .NoContest - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .ContestToday ifequal THURSDAY, .ContestToday ifequal SATURDAY, .ContestToday @@ -19,17 +19,17 @@ DerekPhoneCalleeScript: farjump PhoneScript_BugCatchingContest .Nugget: - landmarktotext ROUTE_39, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_39 farjump UnknownScript_0xa0ad5 DerekPhoneCallerScript: - trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST iftrue .NoContest - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .ContestToday ifequal THURSDAY, .ContestToday ifequal SATURDAY, .ContestToday @@ -44,5 +44,5 @@ DerekPhoneCallerScript: .Nugget: setflag ENGINE_DEREK_HAS_NUGGET - landmarktotext ROUTE_39, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_39 farjump PhoneScript_FoundItem_Male diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index 2890a14b9..d1b54905d 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -1,5 +1,5 @@ ElmPhoneCalleeScript: - checkcode VAR_SPECIALPHONECALL + readvar VAR_SPECIALPHONECALL ifequal SPECIALCALL_POKERUS, .pokerus checkevent EVENT_SHOWED_TOGEPI_TO_ELM iftrue .discovery @@ -62,7 +62,7 @@ ElmPhoneCalleeScript: end ElmPhoneCallerScript: - checkcode VAR_SPECIALPHONECALL + readvar VAR_SPECIALPHONECALL ifequal SPECIALCALL_ROBBED, .disaster ifequal SPECIALCALL_ASSISTANT, .assistant ifequal SPECIALCALL_WEIRDBROADCAST, .rocket diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 1bf6f2154..10cd903d9 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -1,11 +1,11 @@ ErinPhoneCalleeScript: - trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 checkflag ENGINE_ERIN iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_ERIN_SATURDAY_NIGHT iftrue .NotSaturday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime NITE iftrue ErinSaturdayNight @@ -14,11 +14,11 @@ ErinPhoneCalleeScript: farjump ErinWorkingHardScript .WantsBattle: - landmarktotext ROUTE_46, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_46 farjump ErinComeBattleScript ErinPhoneCallerScript: - trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ERIN iftrue .GenericCall @@ -35,6 +35,6 @@ ErinSaturdayNight: setflag ENGINE_ERIN_SATURDAY_NIGHT ErinWantsBattle: - landmarktotext ROUTE_46, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_46 setflag ENGINE_ERIN farjump PhoneScript_WantsToBattle_Female diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index bf4804e4e..4445d86c4 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -1,11 +1,11 @@ GavenPhoneCalleeScript: - trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 checkflag ENGINE_GAVEN iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_GAVEN_THURSDAY_MORNING iftrue .NotThursday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN iftrue GavenThursdayMorning @@ -14,11 +14,11 @@ GavenPhoneCalleeScript: farjump UnknownScript_0xa0910 .WantsBattle: - landmarktotext ROUTE_26, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_26 farjump UnknownScript_0xa0a37 GavenPhoneCallerScript: - trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_GAVEN iftrue .WaitingForBattle @@ -36,7 +36,7 @@ GavenThursdayMorning: setflag ENGINE_GAVEN_THURSDAY_MORNING GavenWantsRematch: - landmarktotext ROUTE_26, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_26 setflag ENGINE_GAVEN farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 407480d36..d282aeb92 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -23,7 +23,7 @@ PhoneScript_AnswerPhone_Male: iftrue PhoneScript_AnswerPhone_Male_Day checktime NITE iftrue PhoneScript_AnswerPhone_Male_Nite - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -146,7 +146,7 @@ PhoneScript_AnswerPhone_Male: end PhoneScript_AnswerPhone_Male_Day: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -269,7 +269,7 @@ PhoneScript_AnswerPhone_Male_Day: end PhoneScript_AnswerPhone_Male_Nite: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -396,7 +396,7 @@ PhoneScript_AnswerPhone_Female: iftrue PhoneScript_AnswerPhone_Female_Day checktime NITE iftrue PhoneScript_AnswerPhone_Female_Nite - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -447,7 +447,7 @@ PhoneScript_AnswerPhone_Female: end PhoneScript_AnswerPhone_Female_Day: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -498,7 +498,7 @@ PhoneScript_AnswerPhone_Female_Day: end PhoneScript_AnswerPhone_Female_Nite: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -553,7 +553,7 @@ PhoneScript_GreetPhone_Male: iftrue PhoneScript_GreetPhone_Male_Day checktime NITE iftrue PhoneScript_GreetPhone_Male_Nite - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -676,7 +676,7 @@ PhoneScript_GreetPhone_Male: end PhoneScript_GreetPhone_Male_Day: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -799,7 +799,7 @@ PhoneScript_GreetPhone_Male_Day: end PhoneScript_GreetPhone_Male_Nite: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -926,7 +926,7 @@ PhoneScript_GreetPhone_Female: iftrue PhoneScript_GreetPhone_Female_Day checktime NITE iftrue PhoneScript_GreetPhone_Female_Nite - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -977,7 +977,7 @@ PhoneScript_GreetPhone_Female: end PhoneScript_GreetPhone_Female_Day: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -1028,7 +1028,7 @@ PhoneScript_GreetPhone_Female_Day: end PhoneScript_GreetPhone_Female_Nite: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -1079,7 +1079,7 @@ PhoneScript_GreetPhone_Female_Nite: end PhoneScript_Generic_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven ifequal PHONE_BIRDKEEPER_JOSE, .Jose @@ -1189,7 +1189,7 @@ PhoneScript_Generic_Male: end PhoneScript_Generic_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm index a929ba1d8..a450a5407 100644 --- a/engine/phone/scripts/generic_caller.asm +++ b/engine/phone/scripts/generic_caller.asm @@ -55,7 +55,7 @@ Phone_GotAwayCall_Female: farjump PhoneScript_HangupText_Female Phone_WhosBragging_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven ifequal PHONE_BIRDKEEPER_JOSE, .Jose @@ -160,7 +160,7 @@ Phone_WhosBragging_Male: end Phone_WhosBragging_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -211,7 +211,7 @@ Phone_WhosBragging_Female: end Phone_WhoDefeatedMon_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven ifequal PHONE_BIRDKEEPER_JOSE, .Jose @@ -316,7 +316,7 @@ Phone_WhoDefeatedMon_Male: end Phone_WhoDefeatedMon_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -367,7 +367,7 @@ Phone_WhoDefeatedMon_Female: end Phone_WhoLostAMon_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven ifequal PHONE_BIRDKEEPER_JOSE, .Jose @@ -472,7 +472,7 @@ Phone_WhoLostAMon_Male: end Phone_WhoLostAMon_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -531,7 +531,7 @@ PhoneScript_WantsToBattle_Female: farjump PhoneScript_HangupText_Female PhoneScript_RematchText_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -636,7 +636,7 @@ PhoneScript_RematchText_Male: end PhoneScript_RematchText_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena ifequal PHONE_PICNICKER_LIZ, .Liz @@ -689,7 +689,7 @@ TiffanyItsAwful: end PhoneScript_HangupText_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -792,7 +792,7 @@ PhoneScript_HangupText_Male: end PhoneScript_HangupText_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth ifequal PHONE_COOLTRAINERF_REENA, .Reena @@ -855,7 +855,7 @@ PhoneScriptRareWildMon: end PhoneScript_BugCatchingContest: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_BUG_CATCHER_WADE, .Wade ifequal PHONE_POKEFANM_DEREK, .Derek @@ -895,7 +895,7 @@ UnknownScript_0xa05de: jump PhoneScript_HangupText_Male PhoneScript_FoundItem_Male: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_BIRDKEEPER_JOSE, .Jose ifequal PHONE_BUG_CATCHER_WADE, .Wade ifequal PHONE_SCHOOLBOY_ALAN, .Alan @@ -928,7 +928,7 @@ PhoneScript_FoundItem_Male: end PhoneScript_FoundItem_Female: - checkcode VAR_CALLERID + readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_PICNICKER_GINA, .Gina ifequal PHONE_LASS_DANA, .Dana diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index 79514a46e..c0d1016e9 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -1,5 +1,5 @@ GinaPhoneCalleeScript: - trainertotext PICNICKER, GINA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, GINA1 checkflag ENGINE_GINA iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female @@ -7,7 +7,7 @@ GinaPhoneCalleeScript: iftrue .NotSunday checkflag ENGINE_GINA_HAS_LEAF_STONE iftrue .HasLeafStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime DAY iftrue GinaSundayDay @@ -21,15 +21,15 @@ GinaPhoneCalleeScript: farjump UnknownScript_0xa05c6 .WantsBattle: - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 farjump UnknownScript_0xa0a69 .HasLeafStone: - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 farjump UnknownScript_0xa0abd GinaPhoneCallerScript: - trainertotext PICNICKER, GINA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, GINA1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue GinaRockets @@ -59,7 +59,7 @@ GinaSundayDay: setflag ENGINE_GINA_SUNDAY_AFTERNOON GinaWantsBattle: - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 setflag ENGINE_GINA farjump PhoneScript_WantsToBattle_Female @@ -68,5 +68,5 @@ GinaRockets: GinaHasLeafStone: setflag ENGINE_GINA_HAS_LEAF_STONE - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 farjump PhoneScript_FoundItem_Female diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm index 3dca4a0bb..713f8eac9 100644 --- a/engine/phone/scripts/hangups.asm +++ b/engine/phone/scripts/hangups.asm @@ -150,7 +150,7 @@ UnknownScript_0xa09e6: jump PhoneScript_HangupText_Male KenjiAnswerPhoneScript: - checkcode VAR_KENJI_BREAK + readvar VAR_KENJI_BREAK ifequal 2, .Training ifequal 1, .OnBreak farwritetext UnknownText_0x66e17 diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index e0398a62a..49b09b62c 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -1,11 +1,11 @@ HueyPhoneCalleeScript: - trainertotext SAILOR, HUEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SAILOR, HUEY1 checkflag ENGINE_HUEY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_HUEY_WEDNESDAY_NIGHT iftrue .NotWednesday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime NITE iftrue HueyWednesdayNight @@ -15,11 +15,11 @@ HueyPhoneCalleeScript: farjump UnknownScript_0xa0908 .WantsBattle: - landmarktotext LIGHTHOUSE, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, LIGHTHOUSE farjump HueyWantsBattleScript HueyPhoneCallerScript: - trainertotext SAILOR, HUEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SAILOR, HUEY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_HUEY iftrue .Flavor @@ -36,6 +36,6 @@ HueyWednesdayNight: setflag ENGINE_HUEY_WEDNESDAY_NIGHT HueyWantsBattle: - landmarktotext LIGHTHOUSE, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, LIGHTHOUSE setflag ENGINE_HUEY farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index 11e7198f0..b65986c82 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -1,5 +1,5 @@ IrwinPhoneCalleeScript: - trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets @@ -9,7 +9,7 @@ IrwinPhoneCalleeScript: farjump IrwinRocketRumor IrwinPhoneCallerScript: - trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index a02c3c36a..61a30f96e 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -1,11 +1,11 @@ JackPhoneCalleeScript: - trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 checkflag ENGINE_JACK iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JACK_MONDAY_MORNING iftrue .NotMonday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checktime MORN iftrue JackMondayMorning @@ -14,11 +14,11 @@ JackPhoneCalleeScript: farjump JackPhoneTips .WantsBattle: - landmarktotext NATIONAL_PARK, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, NATIONAL_PARK farjump JackWantsBattleScript JackPhoneCallerScript: - trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, JackBattleTrivia @@ -38,7 +38,7 @@ JackMondayMorning: setflag ENGINE_JACK_MONDAY_MORNING JackWantsToBattle: - landmarktotext NATIONAL_PARK, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, NATIONAL_PARK setflag ENGINE_JACK farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 0d2c6267a..f5abce673 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -1,11 +1,11 @@ JoeyPhoneCalleeScript: - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 checkflag ENGINE_JOEY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOEY_MONDAY_AFTERNOON iftrue .NotMonday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checktime DAY iftrue JoeyMondayAfternoon @@ -15,11 +15,11 @@ JoeyPhoneCalleeScript: farjump UnknownScript_0xa0930 .WantsBattle: - landmarktotext ROUTE_30, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_30 farjump UnknownScript_0xa0a4b JoeyPhoneCallerScript: - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOEY iftrue .Generic @@ -36,6 +36,6 @@ JoeyMondayAfternoon: setflag ENGINE_JOEY_MONDAY_AFTERNOON JoeyWantsBattle: - landmarktotext ROUTE_30, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_30 setflag ENGINE_JOEY farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 38bd0a99f..f1d8c9fa4 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -1,5 +1,5 @@ JosePhoneCalleeScript: - trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 checkflag ENGINE_JOSE iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ JosePhoneCalleeScript: iftrue .NotSaturday checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue .HasItem - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime NITE iftrue JoseSaturdayNight @@ -16,15 +16,15 @@ JosePhoneCalleeScript: farjump UnknownScript_0xa0920 .WantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 farjump UnknownScript_0xa0a41 .HasItem: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 farjump UnknownScript_0xa0a41 JosePhoneCallerScript: - trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOSE iftrue .Generic @@ -46,7 +46,7 @@ JoseSaturdayNight: setflag ENGINE_JOSE_SATURDAY_NIGHT JoseWantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 setflag ENGINE_JOSE farjump PhoneScript_WantsToBattle_Male @@ -55,5 +55,5 @@ JoseFoundRare: JoseHasStarPiece: setflag ENGINE_JOSE_HAS_STAR_PIECE - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 farjump PhoneScript_FoundItem_Male diff --git a/engine/phone/scripts/kenji.asm b/engine/phone/scripts/kenji.asm index 3888afbfd..4b7f3bf85 100644 --- a/engine/phone/scripts/kenji.asm +++ b/engine/phone/scripts/kenji.asm @@ -1,9 +1,9 @@ KenjiPhoneCalleeScript: - trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 farscall PhoneScript_AnswerPhone_Male farjump KenjiAnswerPhoneScript KenjiPhoneCallerScript: - trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 farscall PhoneScript_GreetPhone_Male farjump KenjiCallingPhoneScript diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 31df3d4e9..61efabd75 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -1,11 +1,11 @@ LizPhoneCalleeScript: - trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 checkflag ENGINE_LIZ iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_LIZ_THURSDAY_AFTERNOON iftrue .NotThursday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime DAY iftrue LizThursdayAfternoon @@ -15,11 +15,11 @@ LizPhoneCalleeScript: farjump UnknownScript_0xa0948 .WantsBattle: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 farjump UnknownScript_0xa0a5a LizPhoneCallerScript: - trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 farscall PhoneScript_Random4 ifequal 0, LizWrongNumber farscall PhoneScript_GreetPhone_Female @@ -43,7 +43,7 @@ LizThursdayAfternoon: setflag ENGINE_LIZ_THURSDAY_AFTERNOON LizWantsBattle: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 setflag ENGINE_LIZ farjump PhoneScript_WantsToBattle_Female @@ -63,39 +63,39 @@ LizGossip: ifequal 8, .PokefanM .CoolTrainerM: - trainerclassname COOLTRAINERM, NICK + gettrainerclassname STRING_BUFFER_4, COOLTRAINERM jump LizGossipScript .Beauty: - trainerclassname BEAUTY, VICTORIA + gettrainerclassname STRING_BUFFER_4, BEAUTY jump LizGossipScript .Grunt: - trainerclassname GRUNTM, GRUNTM_1 + gettrainerclassname STRING_BUFFER_4, GRUNTM jump LizGossipScript .Teacher: - trainerclassname TEACHER, COLETTE + gettrainerclassname STRING_BUFFER_4, TEACHER jump LizGossipScript .SwimmerF: - trainerclassname SWIMMERF, ELAINE + gettrainerclassname STRING_BUFFER_4, SWIMMERF jump LizGossipScript .KimonoGirl: - trainerclassname KIMONO_GIRL, NAOKO1 + gettrainerclassname STRING_BUFFER_4, KIMONO_GIRL jump LizGossipScript .Skier: - trainerclassname SKIER, ROXANNE + gettrainerclassname STRING_BUFFER_4, SKIER jump LizGossipScript .Medium: - trainerclassname MEDIUM, MARTHA + gettrainerclassname STRING_BUFFER_4, MEDIUM jump LizGossipScript .PokefanM: - trainerclassname POKEFANM, WILLIAM + gettrainerclassname STRING_BUFFER_4, POKEFANM jump LizGossipScript LizGossipScript: diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index 9b8e1fcf3..22887f3e9 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -14,8 +14,8 @@ MomPhoneCalleeScript: iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText buttonsound - mapnametotext MEM_BUFFER_0 - checkcode VAR_ROOFPALETTE + getcurlandmarkname STRING_BUFFER_3 + readvar VAR_ROOFPALETTE ifequal 1, MomPhonePalette1 ifequal 2, MomPhonePalette2 jump MomPhoneOther @@ -26,7 +26,7 @@ MomPhoneLandmark: jump MomSavingMoney MomPhonePalette1: - checkcode VAR_MAPGROUP + readvar VAR_MAPGROUP ifequal GROUP_NEW_BARK_TOWN, .newbark ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove ifequal GROUP_VIOLET_CITY, .violet @@ -47,13 +47,13 @@ MomPhonePalette1: jump MomSavingMoney .violet - landmarktotext SPROUT_TOWER, MEM_BUFFER_1 + getlandmarkname STRING_BUFFER_4, SPROUT_TOWER jump MomPhoneLandmark .azalea - landmarktotext SLOWPOKE_WELL, MEM_BUFFER_1 + getlandmarkname STRING_BUFFER_4, SLOWPOKE_WELL jump MomPhoneLandmark .goldenrod - landmarktotext RADIO_TOWER, MEM_BUFFER_1 + getlandmarkname STRING_BUFFER_4, RADIO_TOWER jump MomPhoneLandmark MomPhonePalette2: @@ -79,7 +79,7 @@ MomSavingMoney: jump .NoMoney .SavingHasMoney: - readmoney MOMS_MONEY, MEM_BUFFER_0 + getmoney STRING_BUFFER_3, MOMS_MONEY farwritetext MomCheckBalanceText yesorno iftrue MomPhoneSaveMoneyScript @@ -98,7 +98,7 @@ MomSavingMoney: jump MomPhoneWontSaveMoneyScript .HasMoney: - readmoney MOMS_MONEY, MEM_BUFFER_0 + getmoney STRING_BUFFER_3, MOMS_MONEY farwritetext MomYouveSavedText yesorno iftrue MomPhoneSaveMoneyScript diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index 0ab95ad9f..55733b9b2 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -1,11 +1,11 @@ ParryPhoneCalleeScript: - trainertotext HIKER, PARRY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, HIKER, PARRY1 checkflag ENGINE_PARRY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_PARRY_FRIDAY_AFTERNOON iftrue .WantsRematch - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal FRIDAY, .WantsRematch checktime DAY iftrue ParryFridayDay @@ -14,11 +14,11 @@ ParryPhoneCalleeScript: farjump ParryBattleWithMe .WantsBattle: - landmarktotext ROUTE_45, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_45 farjump ParryHaventYouGottenTo ParryPhoneCallerScript: - trainertotext HIKER, PARRY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, HIKER, PARRY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_PARRY iftrue .GenericCall @@ -35,6 +35,6 @@ ParryFridayDay: setflag ENGINE_PARRY_FRIDAY_AFTERNOON ParryWantsBattle: - landmarktotext ROUTE_45, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_45 setflag ENGINE_PARRY farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 0baf77b33..ed23c69c3 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -1,11 +1,11 @@ RalphPhoneCalleeScript: - trainertotext FISHER, RALPH1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, RALPH1 checkflag ENGINE_RALPH iftrue .Rematch farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_RALPH_WEDNESDAY_MORNING iftrue .CheckSwarm - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .CheckSwarm checktime MORN iftrue Ralph_WednesdayMorning @@ -15,15 +15,15 @@ RalphPhoneCalleeScript: farjump UnknownScript_0xa0940 .Rematch: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 farjump UnknownScript_0xa0a55 .ReportSwarm: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 farjump UnknownScript_0xa0af5 RalphPhoneCallerScript: - trainertotext FISHER, RALPH1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, RALPH1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD iffalse .CheckSwarm @@ -41,7 +41,7 @@ RalphPhoneCallerScript: Ralph_WednesdayMorning: setflag ENGINE_RALPH_WEDNESDAY_MORNING Ralph_FightMe: - landmarktotext ROUTE_32, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_32 setflag ENGINE_RALPH farjump PhoneScript_WantsToBattle_Male @@ -49,9 +49,9 @@ Ralph_SetUpSwarm: checkflag ENGINE_FISH_SWARM iftrue .Generic setflag ENGINE_FISH_SWARM - pokenamemem QWILFISH, MEM_BUFFER_1 - landmarktotext ROUTE_32, MEM_BUFFER_2 - writebyte FISHSWARM_QWILFISH + getmonname STRING_BUFFER_4, QWILFISH + getlandmarkname STRING_BUFFER_5, ROUTE_32 + setval FISHSWARM_QWILFISH special ActivateFishingSwarm farjump UnknownScript_0xa05d6 diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index a90f8e669..56e576e07 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -1,11 +1,11 @@ ReenaPhoneCalleeScript: - trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 checkflag ENGINE_REENA iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_REENA_SUNDAY_MORNING iftrue .NotSunday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime MORN iftrue ReenaSundayMorning @@ -14,11 +14,11 @@ ReenaPhoneCalleeScript: farjump UnknownScript_0xa0928 .WantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 farjump UnknownScript_0xa0a46 ReenaPhoneCallerScript: - trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_REENA iftrue .Generic @@ -34,6 +34,6 @@ ReenaSundayMorning: setflag ENGINE_REENA_SUNDAY_MORNING ReenaWantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 setflag ENGINE_REENA farjump PhoneScript_WantsToBattle_Female diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 967f97135..91d56150c 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -1,5 +1,5 @@ TiffanyPhoneCalleeScript: - trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 checkflag ENGINE_TIFFANY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female @@ -7,7 +7,7 @@ TiffanyPhoneCalleeScript: iftrue .NotTuesday checkflag ENGINE_TIFFANY_HAS_PINK_BOW iftrue .HasItem - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal TUESDAY, .NotTuesday checktime DAY iftrue TiffanyTuesdayAfternoon @@ -16,15 +16,15 @@ TiffanyPhoneCalleeScript: farjump UnknownScript_0xa09a0 .WantsBattle: - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 farjump UnknownScript_0xa0a8c .HasItem: - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 farjump UnknownScript_0xa0ae5 TiffanyPhoneCallerScript: - trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 farscall PhoneScript_Random4 ifequal 0, TiffanysFamilyMembers farscall PhoneScript_GreetPhone_Female @@ -52,7 +52,7 @@ TiffanyTuesdayAfternoon: setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON TiffanyWantsBattle: - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 setflag ENGINE_TIFFANY farjump PhoneScript_WantsToBattle_Female @@ -66,27 +66,27 @@ TiffanysFamilyMembers: ifequal 5, .Brother .Grandma: - stringtotext GrandmaString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, GrandmaString jump .PoorClefairy .Grandpa: - stringtotext GrandpaString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, GrandpaString jump .PoorClefairy .Mom: - stringtotext MomString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, MomString jump .PoorClefairy .Dad: - stringtotext DadString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, DadString jump .PoorClefairy .Sister: - stringtotext SisterString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, SisterString jump .PoorClefairy .Brother: - stringtotext BrotherString, MEM_BUFFER_1 + getstring STRING_BUFFER_4, BrotherString jump .PoorClefairy .PoorClefairy: @@ -94,5 +94,5 @@ TiffanysFamilyMembers: TiffanyHasPinkBow: setflag ENGINE_TIFFANY_HAS_PINK_BOW - landmarktotext ROUTE_43, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_43 farjump PhoneScript_FoundItem_Female diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index 3aafb740a..f9a5357a9 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -1,11 +1,11 @@ ToddPhoneCalleeScript: - trainertotext CAMPER, TODD1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, CAMPER, TODD1 checkflag ENGINE_TODD iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TODD_SATURDAY_MORNING iftrue .NotSaturday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime MORN iftrue ToddSaturdayMorning @@ -16,14 +16,14 @@ ToddPhoneCalleeScript: farjump UnknownScript_0xa0958 .WantsBattle: - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 farjump UnknownScript_0xa0a64 .SaleOn: farjump UnknownScript_0xa0b04 ToddPhoneCallerScript: - trainertotext CAMPER, TODD1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, CAMPER, TODD1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TODD iftrue .TryForSale @@ -47,7 +47,7 @@ ToddSaturdayMorning: setflag ENGINE_TODD_SATURDAY_MORNING ToddWantsBattle: - landmarktotext ROUTE_34, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_34 setflag ENGINE_TODD farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index b6bf84ba7..12adc8f7d 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -1,5 +1,5 @@ TullyPhoneCalleeScript: - trainertotext FISHER, TULLY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, TULLY1 checkflag ENGINE_TULLY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ TullyPhoneCalleeScript: iftrue .NotSunday checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue .WaterStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime NITE iftrue TullySundayNight @@ -16,15 +16,15 @@ TullyPhoneCalleeScript: farjump UnknownScript_0xa0990 .WantsBattle: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump UnknownScript_0xa0a82 .WaterStone: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump UnknownScript_0xa0add TullyPhoneCallerScript: - trainertotext FISHER, TULLY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, TULLY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TULLY iftrue .Generic @@ -50,11 +50,11 @@ TullySundayNight: setflag ENGINE_TULLY_SUNDAY_NIGHT TullyWantsBattle: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 setflag ENGINE_TULLY farjump PhoneScript_WantsToBattle_Male TullyFoundWaterStone: setflag ENGINE_TULLY_HAS_WATER_STONE - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump PhoneScript_FoundItem_Male diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 8410289cb..8ef017e40 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -1,11 +1,11 @@ VancePhoneCalleeScript: - trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 checkflag ENGINE_VANCE iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_VANCE_WEDNESDAY_NIGHT iftrue .NotWednesday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime NITE iftrue VanceWednesdayNight @@ -14,11 +14,11 @@ VancePhoneCalleeScript: farjump VanceLookingForward .WantsBattle: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 farjump VanceHurryHurry VancePhoneCallerScript: - trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_VANCE iftrue .WantsBattle @@ -35,6 +35,6 @@ VanceWednesdayNight: setflag ENGINE_VANCE_WEDNESDAY_NIGHT VanceWantsRematch: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 setflag ENGINE_VANCE farjump PhoneScript_WantsToBattle_Male diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 31931f06a..557b7aac6 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -1,5 +1,5 @@ WadePhoneCalleeScript: - trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 checkflag ENGINE_WADE iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ WadePhoneCalleeScript: iftrue .NotTuesday checkflag ENGINE_WADE_HAS_ITEM iftrue .HasItem - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal TUESDAY, .NotTuesday checktime NITE iftrue WadeTuesdayNight @@ -17,7 +17,7 @@ WadePhoneCalleeScript: ifequal 0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST iftrue .NoContest - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .ContestToday ifequal THURSDAY, .ContestToday ifequal SATURDAY, .ContestToday @@ -29,21 +29,21 @@ WadePhoneCalleeScript: farjump PhoneScript_BugCatchingContest .WantsBattle: - landmarktotext ROUTE_31, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_31 farjump UnknownScript_0xa0a50 .HasItem: - landmarktotext ROUTE_31, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_31 farjump UnknownScript_0xa0ab5 WadePhoneCallerScript: - trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST iftrue .NoContest - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .ContestToday ifequal THURSDAY, .ContestToday ifequal SATURDAY, .ContestToday @@ -74,7 +74,7 @@ WadeTuesdayNight: setflag ENGINE_WADE_TUESDAY_NIGHT WadeWantsBattle2: - landmarktotext ROUTE_31, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_31 setflag ENGINE_WADE farjump PhoneScript_WantsToBattle_Male @@ -83,7 +83,7 @@ WadeFoundRare: WadeHasItem2: setflag ENGINE_WADE_HAS_ITEM - landmarktotext ROUTE_31, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_31 clearevent EVENT_WADE_HAS_BERRY clearevent EVENT_WADE_HAS_PSNCUREBERRY clearevent EVENT_WADE_HAS_PRZCUREBERRY diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 9d2f0e906..6bc09685c 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -1,5 +1,5 @@ WiltonPhoneCalleeScript: - trainertotext FISHER, WILTON1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, WILTON1 checkflag ENGINE_WILTON iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ WiltonPhoneCalleeScript: iftrue .NotThursday checkflag ENGINE_WILTON_HAS_ITEM iftrue .HasItem - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN iftrue WiltonThursdayMorning @@ -16,15 +16,15 @@ WiltonPhoneCalleeScript: farjump WiltonHaventFoundAnything .WantsBattle: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 farjump WiltonNotBiting .HasItem: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 farjump WiltonWantThis WiltonPhoneCallerScript: - trainertotext FISHER, WILTON1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, WILTON1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON iftrue .GenericCall @@ -44,13 +44,13 @@ WiltonThursdayMorning: setflag ENGINE_WILTON_THURSDAY_MORNING WiltonWantsBattle: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 setflag ENGINE_WILTON farjump PhoneScript_WantsToBattle_Male WiltonHasItem: setflag ENGINE_WILTON_HAS_ITEM - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 clearevent EVENT_WILTON_HAS_ULTRA_BALL clearevent EVENT_WILTON_HAS_GREAT_BALL clearevent EVENT_WILTON_HAS_POKE_BALL |