diff options
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index ed6221d6e..c5b0fd982 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -35,7 +35,7 @@ WaitScript: dec [hl] ret nz - callba Function58b9 + farcall Function58b9 ld a, SCRIPT_READ ld [ScriptMode], a @@ -49,7 +49,7 @@ WaitScriptMovement: bit 7, [hl] ret nz - callba Function58b9 + farcall Function58b9 ld a, SCRIPT_READ ld [ScriptMode], a @@ -277,7 +277,7 @@ Script_special: ld e, a call GetScriptByte ld d, a - callba Special + farcall Special ret Script_ptcallasm: @@ -475,13 +475,13 @@ Script_pokepic: ld a, [ScriptVar] .ok ld [CurPartySpecies], a - callba Pokepic + farcall Pokepic ret Script_closepokepic: ; script command 0x57 - callba ClosePokepic + farcall ClosePokepic ret Script_verticalmenu: @@ -519,7 +519,7 @@ Script_battletowertext: call SetUpTextBox call GetScriptByte ld c, a - callba BattleTowerText + farcall BattleTowerText ret Script_verbosegiveitem: @@ -615,7 +615,7 @@ Script_pocketisfull: Script_specialsound: ; script command 0x88 - callba CheckItemPocket + farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] cp TM_HM ld de, SFX_GET_TM @@ -628,7 +628,7 @@ Script_specialsound: GetPocketName: - callba CheckItemPocket + farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] dec a ld hl, .Pockets @@ -689,7 +689,7 @@ Script_pokemart: ld d, a ld a, [ScriptBank] ld b, a - callba OpenMartDialog + farcall OpenMartDialog ret Script_elevator: @@ -705,7 +705,7 @@ Script_elevator: ld d, a ld a, [ScriptBank] ld b, a - callba Elevator + farcall Elevator ret c ld a, TRUE ld [ScriptVar], a @@ -718,7 +718,7 @@ Script_trade: call GetScriptByte ld e, a - callba NPCTrade + farcall NPCTrade ret Script_phonecall: @@ -732,13 +732,13 @@ Script_phonecall: ld d, a ld a, [ScriptBank] ld b, a - callba PhoneCall + farcall PhoneCall ret Script_hangup: ; script command 0x99 - callba HangUp + farcall HangUp ret Script_askforphonenumber: @@ -750,7 +750,7 @@ Script_askforphonenumber: jr c, .refused call GetScriptByte ld c, a - callba AddPhoneNumber + farcall AddPhoneNumber jr c, .phonefull xor a jr .done @@ -771,7 +771,7 @@ Script_describedecoration: call GetScriptByte ld b, a - callba DescribeDecoration + farcall DescribeDecoration ld h, d ld l, e jp ScriptJump @@ -800,7 +800,7 @@ Script_swarm: ld d, a call GetScriptByte ld e, a - callba StoreSwarmMapIndices + farcall StoreSwarmMapIndices ret Script_trainertext: @@ -897,7 +897,7 @@ Script_encountermusic: ld a, [OtherTrainerClass] ld e, a - callba PlayTrainerEncounterMusic + farcall PlayTrainerEncounterMusic ret Script_playmapmusic: @@ -959,7 +959,7 @@ Script_waitsfx: Script_warpsound: ; script command 0x87 - callba GetWarpSFX + farcall GetWarpSFX call PlaySFX ret @@ -1010,7 +1010,7 @@ Script_applymovement: ApplyMovement: push bc ld a, c - callba SetFlagsForMovement_1 + farcall SetFlagsForMovement_1 pop bc push bc @@ -1032,7 +1032,7 @@ ApplyMovement: ret SetFlagsForMovement_2: - callba _SetFlagsForMovement_2 + farcall _SetFlagsForMovement_2 ret Script_applymovement2: @@ -1054,7 +1054,7 @@ Script_faceplayer: ld d, $0 ld a, [hLastTalked] ld e, a - callba GetRelativeFacing + farcall GetRelativeFacing ld a, d add a add a @@ -1085,7 +1085,7 @@ Script_faceperson: .ok2 ld d, a push de - callba GetRelativeFacing + farcall GetRelativeFacing pop bc ret c ld a, d @@ -1204,7 +1204,7 @@ Script_disappear: ld a, [hMapObjectIndexBuffer] ld b, 1 ; set call ApplyEventActionAppearDisappear - callba _UpdateSprites + farcall _UpdateSprites ret ApplyEventActionAppearDisappear: @@ -1239,13 +1239,13 @@ Script_follow: call GetScriptByte call GetScriptPerson ld c, a - callba StartFollow + farcall StartFollow ret Script_stopfollow: ; script command 0x71 - callba StopFollow + farcall StopFollow ret Script_moveperson: @@ -1264,7 +1264,7 @@ Script_moveperson: call GetScriptByte add 4 ld e, a - callba CopyDECoordsToMapObject + farcall CopyDECoordsToMapObject ret Script_writepersonxy: @@ -1279,7 +1279,7 @@ Script_writepersonxy: ld a, [hLastTalked] .ok ld b, a - callba WritePersonXY + farcall WritePersonXY ret Script_follownotexact: @@ -1294,7 +1294,7 @@ Script_follownotexact: call GetScriptByte call GetScriptPerson ld c, a - callba FollowNotExact + farcall FollowNotExact ret Script_loademote: @@ -1308,7 +1308,7 @@ Script_loademote: ld a, [ScriptVar] .not_var_emote ld c, a - callba LoadEmote + farcall LoadEmote ret Script_showemote: @@ -1451,7 +1451,7 @@ Script_catchtutorial: call GetScriptByte ld [BattleType], a call BufferScreen - callba CatchTutorial + farcall CatchTutorial jp Script_reloadmap Script_reloadmapafterbattle: @@ -1471,7 +1471,7 @@ Script_reloadmapafterbattle: .notblackedout bit 0, d jr z, .was_wild - callba MomTriesToBuySomething + farcall MomTriesToBuySomething jr .done .was_wild @@ -1480,7 +1480,7 @@ Script_reloadmapafterbattle: jr z, .done ld b, BANK(Script_SpecialBillCall) ld de, Script_SpecialBillCall - callba LoadScriptBDE + farcall LoadScriptBDE .done jp Script_reloadmap @@ -1969,7 +1969,7 @@ Script_writecode: GetVarAction: ld c, a - callba _GetVarAction + farcall _GetVarAction ret Script_checkver: @@ -2040,7 +2040,7 @@ Script_mapnametotext: ConvertLandmarkToText: ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld de, StringBuffer1 jp ConvertMemToText @@ -2064,7 +2064,7 @@ Script_trainertotext: ld c, a call GetScriptByte ld b, a - callba GetTrainerName + farcall GetTrainerName jr ConvertMemToText Script_name: @@ -2176,7 +2176,7 @@ Script_givepokeitem: ld a, [ScriptBank] call FarCopyBytes pop bc - callba GivePokeItem + farcall GivePokeItem ret Script_checkpokeitem: @@ -2190,7 +2190,7 @@ Script_checkpokeitem: ld d, a ld a, [ScriptBank] ld b, a - callba CheckPokeItem + farcall CheckPokeItem ret Script_giveitem: @@ -2263,7 +2263,7 @@ Script_givemoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba GiveMoney + farcall GiveMoney ret Script_takemoney: @@ -2274,7 +2274,7 @@ Script_takemoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba TakeMoney + farcall TakeMoney ret Script_checkmoney: @@ -2285,7 +2285,7 @@ Script_checkmoney: call GetMoneyAccount call LoadMoneyAmountToMem - callba CompareMoney + farcall CompareMoney CompareMoneyAction: jr c, .two @@ -2329,7 +2329,7 @@ Script_givecoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba GiveCoins + farcall GiveCoins ret Script_takecoins: @@ -2338,7 +2338,7 @@ Script_takecoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba TakeCoins + farcall TakeCoins ret Script_checkcoins: @@ -2347,7 +2347,7 @@ Script_checkcoins: ; coins (CoinByteParam) call LoadCoinAmountToMem - callba CheckCoins + farcall CheckCoins jr CompareMoneyAction LoadCoinAmountToMem: @@ -2365,7 +2365,7 @@ Script_checktime: xor a ld [ScriptVar], a - callba CheckTime + farcall CheckTime call GetScriptByte and c ret z @@ -2398,7 +2398,7 @@ Script_addcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba AddPhoneNumber + farcall AddPhoneNumber ret nc ld a, TRUE ld [ScriptVar], a @@ -2413,7 +2413,7 @@ Script_delcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba DelCellNum + farcall DelCellNum ret nc ld a, TRUE ld [ScriptVar], a @@ -2429,7 +2429,7 @@ Script_checkcellnum: ld [ScriptVar], a call GetScriptByte ld c, a - callba CheckCellNum + farcall CheckCellNum ret nc ld a, TRUE ld [ScriptVar], a @@ -2487,7 +2487,7 @@ Script_givepoke: call GetScriptByte call GetScriptByte .ok - callba GivePoke + farcall GivePoke ld a, b ld [ScriptVar], a ret @@ -2506,7 +2506,7 @@ Script_giveegg: ld [CurPartySpecies], a call GetScriptByte ld [CurPartyLevel], a - callba GiveEgg + farcall GiveEgg ret nc ld a, 2 ld [ScriptVar], a @@ -2603,7 +2603,7 @@ Script_checkflag: ret _EngineFlagAction: - callba EngineFlagAction + farcall EngineFlagAction ret Script_wildoff: @@ -2735,7 +2735,7 @@ Script_writecmdqueue: ld d, a ld a, [ScriptBank] ld b, a - callba WriteCmdQueue ; no need to farcall + farcall WriteCmdQueue ; no need to farcall ret Script_delcmdqueue: @@ -2747,7 +2747,7 @@ Script_delcmdqueue: ld [ScriptVar], a call GetScriptByte ld b, a - callba DelCmdQueue ; no need to farcall + farcall DelCmdQueue ; no need to farcall ret c ld a, 1 ld [ScriptVar], a @@ -2794,7 +2794,7 @@ Script_reloadmappart:: ld [hBGMapMode], a call OverworldTextModeSwitch call GetMovementPermissions - callba ReloadMapPart + farcall ReloadMapPart call UpdateSprites ret @@ -2803,11 +2803,11 @@ Script_warpcheck: call WarpCheck ret nc - callba EnableEvents + farcall EnableEvents ret Script_enableevents: ; unreferenced - callba EnableEvents + farcall EnableEvents ret Script_newloadmap: @@ -2993,9 +2993,9 @@ Script_halloffame: ld hl, GameTimerPause res 0, [hl] - callba TrainerRankings_HallOfFame - callba TrainerRankings_HallOfFame2 - callba HallOfFame + farcall TrainerRankings_HallOfFame + farcall TrainerRankings_HallOfFame2 + farcall HallOfFame ld hl, GameTimerPause set 0, [hl] jr ReturnFromCredits @@ -3003,7 +3003,7 @@ Script_halloffame: Script_credits: ; script command 0xa2 - callba RedCredits + farcall RedCredits ReturnFromCredits: call Script_end_all ld a, $3 @@ -3031,7 +3031,7 @@ Script_wait: Script_check_save: ; script command 0xa9 - callba CheckSave + farcall CheckSave ld a, c ld [ScriptVar], a ret |