diff options
Diffstat (limited to 'event')
31 files changed, 161 insertions, 161 deletions
diff --git a/event/buena.asm b/event/buena.asm index 2cb3b5a63..1227593eb 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -5,14 +5,14 @@ SpecialBuenasPassword: ; 8af6b call CopyMenuDataHeader ld a, [wBuenasPassword] ld c, a - callba GetBuenasPassword + farcall GetBuenasPassword ld a, [wMenuBorderLeftCoord] add c add $2 ld [wMenuBorderRightCoord], a call PushWindow call DoNthMenu ; menu - callba Buena_ExitMenu + farcall Buena_ExitMenu ld b, $0 ld a, [MenuSelection] ld c, a @@ -58,7 +58,7 @@ SpecialBuenasPassword: ; 8af6b ld a, [MenuSelection] add c ld c, a - callba GetBuenasPassword + farcall GetBuenasPassword pop hl call PlaceString ret diff --git a/event/bug_contest/caught_mon.asm b/event/bug_contest/caught_mon.asm index 729033d8b..5d423f466 100644 --- a/event/bug_contest/caught_mon.asm +++ b/event/bug_contest/caught_mon.asm @@ -3,8 +3,8 @@ BugContest_SetCaughtContestMon: ; e6ce and a jr z, .firstcatch ld [wd265], a - callba DisplayAlreadyCaughtText - callba DisplayCaughtContestMonStats + farcall DisplayAlreadyCaughtText + farcall DisplayCaughtContestMonStats lb bc, 14, 7 call PlaceYesNoBox ret c diff --git a/event/bug_contest/contest.asm b/event/bug_contest/contest.asm index 2cb88ad30..ba561abf2 100644 --- a/event/bug_contest/contest.asm +++ b/event/bug_contest/contest.asm @@ -3,7 +3,7 @@ Special_GiveParkBalls: ; 135db ld [wContestMon], a ld a, 20 ld [wParkBallsRemaining], a - callba StartBugContestTimer + farcall StartBugContestTimer ret BugCatchingContestBattleScript:: ; 0x135eb diff --git a/event/bug_contest/judging.asm b/event/bug_contest/judging.asm index a7a9eb022..901ae88fa 100755 --- a/event/bug_contest/judging.asm +++ b/event/bug_contest/judging.asm @@ -1,22 +1,22 @@ _BugContestJudging: ; 1369d call ContestScore - callba TrainerRankings_BugContestScore + farcall TrainerRankings_BugContestScore call BugContest_JudgeContestants - ld a, [wBugContestThirdPlacePersonID] + ld a, [wBugContestThirdPlaceWinnerID] call LoadContestantName ld a, [wBugContestThirdPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_ThirdPlaceText call PrintText - ld a, [wBugContestSecondPlacePersonID] + ld a, [wBugContestSecondPlaceWinnerID] call LoadContestantName ld a, [wBugContestSecondPlaceMon] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BugContest_SecondPlaceText call PrintText - ld a, [wBugContestFirstPlacePersonID] + ld a, [wBugContestFirstPlaceWinnerID] call LoadContestantName ld a, [wBugContestFirstPlaceMon] ld [wNamedObjectIndexBuffer], a @@ -97,7 +97,7 @@ LoadContestantName: ; 13730 push hl push bc ; Get the Trainer Class name and copy it into wBugContestWinnerName. - callab GetTrainerClassName + callfar GetTrainerClassName ld hl, StringBuffer1 ld de, wBugContestWinnerName ld bc, TRAINER_CLASS_NAME_LENGTH @@ -120,7 +120,7 @@ LoadContestantName: ; 13730 ; Get the name of the trainer with class c and ID b. ld a, [hl] ld b, a - callab GetTrainerName + callfar GetTrainerName ; Append the name to wBugContestWinnerName. ld hl, StringBuffer1 pop de @@ -140,7 +140,7 @@ INCLUDE "data/bug_contest_winners.asm" BugContest_GetPlayersResult: ; 13807 - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID ld de, -4 ld b, 3 .loop @@ -158,7 +158,7 @@ BugContest_GetPlayersResult: ; 13807 BugContest_JudgeContestants: ; 13819 call ClearContestResults call ComputeAIContestantScores - ld hl, wBugContestTempPersonID + ld hl, wBugContestTempWinnerID ld a, 1 ; Player ld [hli], a ld a, [wContestMon] @@ -188,15 +188,15 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_first_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID - ld de, wBugContestSecondPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID + ld de, wBugContestSecondPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestFirstPlacePersonID + ld hl, wBugContestFirstPlaceWinnerID call CopyTempContestant jr .done @@ -206,11 +206,11 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .not_second_place - ld hl, wBugContestSecondPlacePersonID - ld de, wBugContestThirdPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID + ld de, wBugContestThirdPlaceWinnerID ld bc, 4 call CopyBytes - ld hl, wBugContestSecondPlacePersonID + ld hl, wBugContestSecondPlaceWinnerID call CopyTempContestant jr .done @@ -220,7 +220,7 @@ DetermineContestWinners: ; 1383e ld c, 2 call StringCmp jr c, .done - ld hl, wBugContestThirdPlacePersonID + ld hl, wBugContestThirdPlaceWinnerID call CopyTempContestant .done @@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e CopyTempContestant: ; 138a0 ; Could've just called CopyBytes. - ld de, wBugContestTempPersonID + ld de, wBugContestTempWinnerID rept 3 ld a, [de] inc de @@ -251,7 +251,7 @@ ComputeAIContestantScores: ; 138b0 ld a, e inc a inc a - ld [wBugContestTempPersonID], a + ld [wBugContestTempWinnerID], a dec a ld c, a ld b, 0 diff --git a/event/catch_tutorial.asm b/event/catch_tutorial.asm index 8340d8c13..b9352ccd6 100644 --- a/event/catch_tutorial.asm +++ b/event/catch_tutorial.asm @@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554 ld hl, .AutoInput ld a, BANK(.AutoInput) call StartAutoInput - callab StartBattle + callfar StartBattle call StopAutoInput pop af diff --git a/event/celebi.asm b/event/celebi.asm index ab0a333f2..b7bf95145 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -31,7 +31,7 @@ Special_CelebiShrineEvent: ; 4989a push de ld a, $90 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call CelebiEvent_CountDown ld c, 2 call DelayFrames @@ -70,7 +70,7 @@ Special_CelebiShrineEvent: ; 4989a ; 49912 LoadCelebiGFX: ; 49912 - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, SpecialCelebiLeafGFX ld hl, VTiles1 lb bc, BANK(SpecialCelebiLeafGFX), 4 diff --git a/event/daycare.asm b/event/daycare.asm index 128cf674a..6395a40fb 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -30,7 +30,7 @@ Special_DayCareMan: ; 166d6 jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDayCareMan + farcall DepositMonWithDayCareMan ld hl, wDayCareMan set 0, [hl] call DayCare_DepositPokemonText @@ -38,12 +38,12 @@ Special_DayCareMan: ; 166d6 ret .AskWithdrawMon: - callba GetBreedMon1LevelGrowth + farcall GetBreedMon1LevelGrowth ld hl, wBreedMon1Nick call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDayCareMan + farcall RetrievePokemonFromDayCareMan call DayCare_TakeMoney_PlayCry ld hl, wDayCareMan res 0, [hl] @@ -69,7 +69,7 @@ Special_DayCareLady: ; 1672a jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDayCareLady + farcall DepositMonWithDayCareLady ld hl, wDayCareLady set 0, [hl] call DayCare_DepositPokemonText @@ -77,12 +77,12 @@ Special_DayCareLady: ; 1672a ret .AskWithdrawMon: - callba GetBreedMon2LevelGrowth + farcall GetBreedMon2LevelGrowth ld hl, wBreedMon2Nick call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDayCareLady + farcall RetrievePokemonFromDayCareLady call DayCare_TakeMoney_PlayCry ld hl, wDayCareLady res 0, [hl] @@ -124,19 +124,19 @@ DayCareAskDepositPokemon: ; 16798 ld a, DAYCARETEXT_WHICH_ONE call PrintDayCareText ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDayCareMon + farcall SelectTradeOrDayCareMon jr c, .Declined ld a, [CurPartySpecies] cp EGG jr z, .Egg - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .OutOfUsableMons ld hl, PartyMon1Item ld bc, PARTYMON_STRUCT_LENGTH ld a, [CurPartyMon] call AddNTimes ld d, [hl] - callba ItemIsMail + farcall ItemIsMail jr c, .HoldingMail ld hl, PartyMonNicknames ld a, [CurPartyMon] @@ -209,7 +209,7 @@ DayCare_AskWithdrawBreedMon: ; 16807 .check_money ld de, Money ld bc, StringBuffer2 + 2 - callba CompareMoney + farcall CompareMoney jr c, .not_enough_money ld a, [PartyCount] cp PARTY_LENGTH @@ -236,7 +236,7 @@ DayCare_AskWithdrawBreedMon: ; 16807 DayCare_TakeMoney_PlayCry: ; 16850 ld bc, StringBuffer2 + 2 ld de, Money - callba TakeMoney + farcall TakeMoney ld a, DAYCARETEXT_WITHDRAW call PrintDayCareText ld a, [CurPartySpecies] @@ -596,7 +596,7 @@ DayCare_InitBreeding: ; 16a3b ld a, [wDayCareMan] bit 0, a ret z - callab CheckBreedmonCompatibility + callfar CheckBreedmonCompatibility ld a, [wd265] and a ret z @@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b cp DITTO ld a, $0 jr z, .LoadWhichBreedmonIsTheMother - callba GetGender + farcall GetGender ld a, $0 jr z, .LoadWhichBreedmonIsTheMother inc a @@ -653,8 +653,8 @@ DayCare_InitBreeding: ; 16a3b .GotMother: ld [CurPartySpecies], a - callab GetPreEvolution - callab GetPreEvolution + callfar GetPreEvolution + callfar GetPreEvolution ld a, EGG_LEVEL ld [CurPartyLevel], a @@ -685,7 +685,7 @@ DayCare_InitBreeding: ; 16a3b xor a ld [Buffer1], a predef FillMoves - callba InitEggMoves + farcall InitEggMoves ld hl, wEggMonID ld a, [PlayerID] ld [hli], a @@ -693,7 +693,7 @@ DayCare_InitBreeding: ; 16a3b ld [hl], a ld a, [CurPartyLevel] ld d, a - callab CalcExpAtLevel + callfar CalcExpAtLevel ld hl, wEggMonExp ld a, [hMultiplicand] ld [hli], a @@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b ld a, TEMPMON ld [MonType], a push hl - callba GetGender + farcall GetGender pop hl ld de, wBreedMon1DVs ld bc, wBreedMon2DVs diff --git a/event/field_moves.asm b/event/field_moves.asm index 4c4b8cfc1..1c21f4995 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -7,20 +7,20 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - callba FadeOutPalettes + farcall FadeOutPalettes ld hl, StatusFlags set 2, [hl] ; Flash - callba ReplaceTimeOfDayPals - callba UpdateTimeOfDayPal + farcall ReplaceTimeOfDayPals + farcall UpdateTimeOfDayPal ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 - callba FadeInPalettes + farcall LoadOW_BGPal7 + farcall FadeInPalettes ret ; 8c80a ShakeHeadbuttTree: ; 8c80a - callba ClearSpriteAnims + farcall ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -37,7 +37,7 @@ ShakeHeadbuttTree: ; 8c80a ld [hl], $84 ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call HideHeadbuttTree ld a, $20 ld [wcf64], a @@ -52,7 +52,7 @@ ShakeHeadbuttTree: ; 8c80a dec [hl] ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites + farcall DoNextFrameForAllSprites call DelayFrame jr .loop @@ -61,7 +61,7 @@ ShakeHeadbuttTree: ; 8c80a call WaitBGMap xor a ld [hBGMapMode], a - callba ClearSpriteAnims + farcall ClearSpriteAnims ld hl, Sprites + 36 * 4 ld bc, SpritesEnd - (Sprites + 36 * 4) xor a @@ -129,7 +129,7 @@ OWCutAnimation: ; 8c940 jr nz, .finish ld a, 36 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call OWCutJumptable call DelayFrame jr .loop @@ -139,7 +139,7 @@ OWCutAnimation: ; 8c940 ; 8c96d .LoadCutGFX: ; 8c96d - callab ClearSpriteAnims ; pointless to farcall + callfar ClearSpriteAnims ; pointless to farcall ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -343,7 +343,7 @@ FlyFromAnim: ; 8caed jr nz, .exit ld a, 0 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call FlyFunction_FrameTimer call DelayFrame jr .loop @@ -381,7 +381,7 @@ FlyToAnim: ; 8cb33 jr nz, .exit ld a, 0 * 4 ld [wCurrSpriteOAMAddr], a - callab DoNextFrameForAllSprites + callfar DoNextFrameForAllSprites call FlyFunction_FrameTimer call DelayFrame jr .loop @@ -411,7 +411,7 @@ FlyToAnim: ; 8cb33 ret FlyFunction_InitGFX: ; 8cb9b (23:4b9b) - callab ClearSpriteAnims + callfar ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 @@ -424,7 +424,7 @@ FlyFunction_InitGFX: ; 8cb9b (23:4b9b) ld a, [hl] ld [wd265], a ld e, $84 - callba FlyFunction_GetMonIcon + farcall FlyFunction_GetMonIcon xor a ld [wJumptableIndex], a ret diff --git a/event/halloffame.asm b/event/halloffame.asm index 4f37200a4..986c49096 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -14,7 +14,7 @@ HallOfFame:: ; 0x8640e ld hl, StatusFlags set 6, [hl] ; hall of fame - callba HallOfFame_InitSaveIfNeeded + farcall HallOfFame_InitSaveIfNeeded ld hl, wHallOfFameCount ld a, [hl] @@ -22,16 +22,16 @@ HallOfFame:: ; 0x8640e jr nc, .ok inc [hl] .ok - callba SaveGameData + farcall SaveGameData call GetHallOfFameParty - callba AddHallOfFameEntry + farcall AddHallOfFameEntry xor a ld [wGameLogicPaused], a call AnimateHallOfFame pop af ld b, a - callba Credits + farcall Credits ret ; 0x86455 @@ -42,11 +42,11 @@ RedCredits:: ; 86455 ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - callba FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a - callba InitDisplayForRedCredits + farcall InitDisplayForRedCredits ld c, 8 call DelayFrames call DisableSpriteUpdates @@ -54,7 +54,7 @@ RedCredits:: ; 86455 ld [wSpawnAfterChampion], a ld a, [StatusFlags] ld b, a - callba Credits + farcall Credits ret ; 8648e @@ -65,11 +65,11 @@ HallOfFame_FadeOutMusic: ; 8648e ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - callba FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a - callba InitDisplayForHallOfFame + farcall InitDisplayForHallOfFame ld c, 100 jp DelayFrames ; 864b4 @@ -232,7 +232,7 @@ GetHallOfFameParty: ; 8653f AnimateHOFMonEntrance: ; 865b5 push hl call ClearBGPalettes - callba ResetDisplayBetweenHallOfFameMons + farcall ResetDisplayBetweenHallOfFameMons pop hl ld a, [hli] ld [TempMonSpecies], a @@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748 call PlaceString ld a, TEMPMON ld [MonType], a - callba GetGender + farcall GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -541,7 +541,7 @@ HOF_AnimatePlayerPic: ; 86810 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill - callba GetPlayerBackpic + farcall GetPlayerBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 6, 6 @@ -565,7 +565,7 @@ HOF_AnimatePlayerPic: ; 86810 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill - callba HOF_LoadTrainerFrontpic + farcall HOF_LoadTrainerFrontpic xor a ld [hGraphicStartTile], a hlcoord 12, 5 @@ -612,7 +612,7 @@ HOF_AnimatePlayerPic: ; 86810 lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum call WaitBGMap - callba ProfOaksPCRating + farcall ProfOaksPCRating ret ; 868ed diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm index a00d471bb..0c9b5a4df 100755 --- a/event/happiness_egg.asm +++ b/event/happiness_egg.asm @@ -196,7 +196,7 @@ DayCareStep:: ; 7282 call Random ld [hl], a - callab CheckBreedmonCompatibility + callfar CheckBreedmonCompatibility ld a, [wd265] cp 230 ld b, -1 + 32 percent diff --git a/event/itemfinder.asm b/event/itemfinder.asm index 5356a1f86..71aaa5b69 100755 --- a/event/itemfinder.asm +++ b/event/itemfinder.asm @@ -1,5 +1,5 @@ ItemFinder: ; 12580 - callba CheckForHiddenItems + farcall CheckForHiddenItems jr c, .found_something ld hl, .Script_FoundNothing jr .resume diff --git a/event/kurt.asm b/event/kurt.asm index e1fff12c0..9bc06a613 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -57,7 +57,7 @@ Special_SelectApricornForKurt: ; 88018 ; 88055 Kurt_SelectApricorn: ; 88055 - callba FindApricornsInBag + farcall FindApricornsInBag jr c, .nope ld hl, .MenuDataHeader call CopyMenuDataHeader @@ -106,7 +106,7 @@ Kurt_SelectApricorn: ; 88055 ld a, [MenuSelection] and a ret z - callba PlaceMenuItemName + farcall PlaceMenuItemName ret ; 880ab @@ -117,7 +117,7 @@ Kurt_SelectApricorn: ; 88055 ret z ld a, [wItemQuantityChangeBuffer] ld [MenuSelectionQuantity], a - callba PlaceMenuItemQuantity + farcall PlaceMenuItemQuantity ret ; 880c2 @@ -140,7 +140,7 @@ Kurt_SelectQuantity: ; 880c2 call .PlaceApricornName call PlaceApricornQuantity call ApplyTilemap - callba Kurt_SelectQuantity_InterpretJoypad + farcall Kurt_SelectQuantity_InterpretJoypad jr nc, .loop push bc @@ -171,7 +171,7 @@ Kurt_SelectQuantity: ; 880c2 add hl, de ld d, h ld e, l - callba PlaceMenuItemName + farcall PlaceMenuItemName ret ; 88126 diff --git a/event/lucky_number.asm b/event/lucky_number.asm index 8cec7599d..4488cfcc9 100644 --- a/event/lucky_number.asm +++ b/event/lucky_number.asm @@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a ld a, [ScriptVar] and a ret z ; found nothing - callba TrainerRankings_LuckyNumberShow + farcall TrainerRankings_LuckyNumberShow ld a, [wFoundMatchingIDInParty] and a push af diff --git a/event/magikarp.asm b/event/magikarp.asm index e18d087dd..4dab89816 100644 --- a/event/magikarp.asm +++ b/event/magikarp.asm @@ -5,7 +5,7 @@ Special_CheckMagikarpLength: ; fbb32 ; Returns 0 if the Pokemon you select is not a Magikarp. ; Let's start by selecting a Magikarp. - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .declined ld a, [CurPartySpecies] cp MAGIKARP @@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32 ld c, l call CalcMagikarpLength call PrintMagikarpLength - callba TrainerRankings_MagikarpLength + farcall TrainerRankings_MagikarpLength ld hl, .MeasureItText call PrintText diff --git a/event/magnet_train.asm b/event/magnet_train.asm index c6c6da846..3a2f902c2 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -45,7 +45,7 @@ Special_MagnetTrain: ; 8cc04 jr z, .initialize bit 7, a jr nz, .done - callab PlaySpriteAnimations + callfar PlaySpriteAnimations call MagnetTrain_Jumptable call MagnetTrain_UpdateLYOverrides call PushLYOverrides @@ -117,7 +117,7 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9 call ClearBGPalettes call ClearSprites call DisableLCD - callab ClearSpriteAnims + callfar ClearSpriteAnims call SetMagnetTrainPals call DrawMagnetTrain ld a, $90 @@ -131,7 +131,7 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9 push af ld a, $1 ld [rSVBK], a - callba GetPlayerIcon + farcall GetPlayerIcon pop af ld [rSVBK], a ld hl, VTiles0 @@ -423,7 +423,7 @@ MagnetTrain_Jumptable: ; 8cdf7 ; 8ceae MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae - callba PlaySpriteAnimations + farcall PlaySpriteAnimations call MagnetTrain_Jumptable call MagnetTrain_UpdateLYOverrides call PushLYOverrides @@ -434,13 +434,13 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ld [rSVBK], a ld a, [TimeOfDayPal] push af - ld a, [wPermission] + ld a, [wEnvironment] push af ld a, [TimeOfDay] and $3 ld [TimeOfDayPal], a ld a, $1 - ld [wPermission], a + ld [wEnvironment], a ld b, SCGB_MAPPALS call GetSGBLayout call UpdateTimePals @@ -451,7 +451,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ld a, [rOBP1] ld [wOBP1], a pop af - ld [wPermission], a + ld [wEnvironment], a pop af ld [TimeOfDayPal], a pop af diff --git a/event/mom.asm b/event/mom.asm index 80513e5fb..a23b55256 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -161,7 +161,7 @@ Special_BankOfMom: ; 16218 jr z, .CancelDeposit ld de, Money ld bc, StringBuffer2 - callba CompareMoney + farcall CompareMoney jr c, .DontHaveThatMuchToDeposit ld hl, StringBuffer2 ld de, StringBuffer2 + 3 @@ -169,11 +169,11 @@ Special_BankOfMom: ; 16218 call CopyBytes ld bc, wMomsMoney ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney jr c, .CantDepositThatMuch ld bc, StringBuffer2 + 3 ld de, Money - callba TakeMoney + farcall TakeMoney ld hl, StringBuffer2 ld de, wMomsMoney ld bc, 3 @@ -232,15 +232,15 @@ Special_BankOfMom: ; 16218 call CopyBytes ld de, wMomsMoney ld bc, StringBuffer2 - callba CompareMoney + farcall CompareMoney jr c, .InsufficientFundsInBank ld bc, Money ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney jr c, .NotEnoughRoomInWallet ld bc, StringBuffer2 + 3 ld de, wMomsMoney - callba TakeMoney + farcall TakeMoney ld hl, StringBuffer2 ld de, Money ld bc, 3 @@ -568,7 +568,7 @@ Mom_WithdrawDepositMenuJoypad: ; 16571 ld c, l ld b, h ld de, StringBuffer2 - callba GiveMoney + farcall GiveMoney ret .decrementdigit @@ -577,7 +577,7 @@ Mom_WithdrawDepositMenuJoypad: ; 16571 ld c, l ld b, h ld de, StringBuffer2 - callba TakeMoney + farcall TakeMoney ret .getdigitquantity diff --git a/event/mom_phone.asm b/event/mom_phone.asm index aab4abe4b..35021dd42 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -20,7 +20,7 @@ MomTriesToBuySomething:: ; fcfec ret nc ld b, BANK(.Script) ld de, .Script - callba LoadScriptBDE + farcall LoadScriptBDE scf ret ; fd00f @@ -71,7 +71,7 @@ CheckBalance_MomItem2: ; fd044 ld [hMoneyTemp + 2], a ld de, wMomsMoney ld bc, hMoneyTemp - callba CompareMoney + farcall CompareMoney jr nc, .have_enough_money .nope @@ -91,7 +91,7 @@ CheckBalance_MomItem2: ; fd044 .loop ld de, MomItemTriggerBalance ld bc, wMomsMoney - callba CompareMoney + farcall CompareMoney jr z, .exact jr nc, .less_than call .AddMoney @@ -113,7 +113,7 @@ CheckBalance_MomItem2: ; fd044 .AddMoney: ld de, MomItemTriggerBalance ld bc, hMoneyTemp - callba AddMoney + farcall AddMoney ret ; fd0a6 @@ -130,7 +130,7 @@ MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6) ld [hMoneyTemp + 2], a ld de, wMomsMoney ld bc, hMoneyTemp - callba TakeMoney + farcall TakeMoney ret @@ -144,7 +144,7 @@ Mom_GiveItemOrDoll: ; fd0c3 ld a, [hl] ld c, a ld b, 1 - callba DecorationFlagAction_c + farcall DecorationFlagAction_c scf ret diff --git a/event/move_deleter.asm b/event/move_deleter.asm index aa8a1e915..95fc0f1d8 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -5,7 +5,7 @@ MoveDeletion: jr c, .declined ld hl, .AskWhichMonText call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .declined ld a, [CurPartySpecies] cp EGG @@ -20,7 +20,7 @@ MoveDeletion: ld hl, .AskWhichMoveText call PrintText call LoadStandardMenuDataHeader - callba ChooseMoveToDelete + farcall ChooseMoveToDelete push af call ReturnToMapWithSpeechTextbox pop af diff --git a/event/move_tutor.asm b/event/move_tutor.asm index b26114dd0..a15ecaf93 100644 --- a/event/move_tutor.asm +++ b/event/move_tutor.asm @@ -12,12 +12,12 @@ Special_MoveTutor: ; 4925b ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 - callba ChooseMonToLearnTMHM + farcall ChooseMonToLearnTMHM jr c, .cancel jr .enter_loop .loop - callba ChooseMonToLearnTMHM_NoRefresh + farcall ChooseMonToLearnTMHM_NoRefresh jr c, .cancel .enter_loop call CheckCanLearnMoveTutorMove @@ -75,7 +75,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 jr .didnt_learn .can_learn - callab KnowsMove + callfar KnowsMove jr c, .didnt_learn predef LearnMove @@ -84,7 +84,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 jr z, .didnt_learn ld c, HAPPINESS_LEARNMOVE - callab ChangeHappiness + callfar ChangeHappiness jr .learned .didnt_learn diff --git a/event/name_rater.asm b/event/name_rater.asm index 96d0ee363..771c5090a 100644 --- a/event/name_rater.asm +++ b/event/name_rater.asm @@ -7,7 +7,7 @@ NameRater: ; fb6ed ; Select a Pokemon from your party ld hl, NameRaterWhichMonText call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ; He can't rename an egg... ld a, [CurPartySpecies] @@ -34,7 +34,7 @@ NameRater: ; fb6ed call GetBaseData ld b, 0 ld de, StringBuffer2 - callba _NamingScreen + farcall _NamingScreen ; If the new name is empty, treat it as unchanged. call IsNewNameEmpty ld hl, NameRaterSameAsBeforeText diff --git a/event/overworld.asm b/event/overworld.asm index d50c158e9..370162fa9 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -37,7 +37,7 @@ CheckEngineFlag: ; c721 ; Check engine flag de ; Return carry if flag is not set ld b, CHECK_FLAG - callba EngineFlagAction + farcall EngineFlagAction ld a, c and a jr nz, .isset @@ -177,7 +177,7 @@ CheckMapForSomethingToCut: ; c7ce call GetFacingTileCoord ld c, a push de - callba CheckCutCollision + farcall CheckCutCollision pop de jr nc, .fail ; Get the location of the current block in OverworldMap. @@ -233,7 +233,7 @@ CutDownTreeOrGrass: ; c810 call DelayFrame ld a, [Buffer6] ; Animation type ld e, a - callba OWCutAnimation + farcall OWCutAnimation call BufferScreen call GetMovementPermissions call UpdateSprites @@ -290,10 +290,10 @@ OWFlash: ; c8ac .CheckUseFlash: ; c8b5 ; Flash ld de, ENGINE_ZEPHYRBADGE - callba CheckBadge + farcall CheckBadge jr c, .nozephyrbadge push hl - callba SpecialAerodactylChamber + farcall SpecialAerodactylChamber pop hl jr c, .useflash ld a, [wTimeOfDayPalset] @@ -372,7 +372,7 @@ SurfFunction: ; c909 jr nz, .cannotsurf call CheckDirection jr c, .cannotsurf - callba CheckFacingObject + farcall CheckFacingObject jr c, .cannotsurf ld a, $1 ret @@ -428,7 +428,7 @@ UsedSurfScript: ; c986 end .empty_fn ; c9a2 - callba TrainerRankings_Surf + farcall TrainerRankings_Surf ret UsedSurfText: ; c9a9 @@ -571,7 +571,7 @@ FlyFunction: ; ca3b ld de, ENGINE_STORMBADGE call CheckBadge jr c, .nostormbadge - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .outdoors jr .indoors @@ -581,7 +581,7 @@ FlyFunction: ; ca3b ld [hMapAnims], a call LoadStandardMenuDataHeader call ClearSprites - callba _FlyMap + farcall _FlyMap ld a, e cp -1 jr z, .illegal @@ -634,10 +634,10 @@ FlyFunction: ; ca3b end .ReturnFromFly: ; cacb - callba Function561d + farcall Function561d call DelayFrame call ReplaceKrisSprite - callba LoadOverworldFont + farcall LoadOverworldFont ret WaterfallFunction: ; cade @@ -649,7 +649,7 @@ WaterfallFunction: ; cade .TryWaterfall: ; cae7 ; Waterfall ld de, ENGINE_RISINGBADGE - callba CheckBadge + farcall CheckBadge ld a, $80 ret c call CheckMapCanWaterfall @@ -701,7 +701,7 @@ Script_UsedWaterfall: ; 0xcb20 ld a, [PlayerStandingTile] call CheckWaterfallTile ret z - callba TrainerRankings_Waterfall + farcall TrainerRankings_Waterfall ld a, $1 ld [ScriptVar], a ret @@ -783,7 +783,7 @@ dig_incave dw .FailDig .CheckCanDig: ; cbb8 - call GetMapPermission + call GetMapEnvironment cp CAVE jr z, .incave cp DUNGEON @@ -821,7 +821,7 @@ dig_incave ret .escaperope - callba SpecialKabutoChamber + farcall SpecialKabutoChamber ld hl, .UsedEscapeRopeScript call QueueScript ld a, $81 @@ -881,11 +881,11 @@ dig_incave .DigOut: ; 0xcc59 step_dig 32 - hide_person + hide_object step_end .DigReturn: ; 0xcc5d - show_person + show_object return_dig 32 step_end @@ -905,7 +905,7 @@ TeleportFunction: ; cc61 dw .FailTeleport .TryTeleport: ; cc78 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .CheckIfSpawnPoint jr .nope @@ -915,7 +915,7 @@ TeleportFunction: ; cc61 ld d, a ld a, [wLastSpawnMapNumber] ld e, a - callba IsSpawnPoint + farcall IsSpawnPoint jr nc, .nope ld a, c ld [DefaultSpawnpoint], a @@ -1206,7 +1206,7 @@ DisappearWhirlpool: ; ce1d call OverworldTextModeSwitch ld a, [Buffer6] ld e, a - callba PlayWhirlpoolSound + farcall PlayWhirlpoolSound call BufferScreen call GetMovementPermissions ret @@ -1360,7 +1360,7 @@ TryRockSmashFromMenu: ; cef4 ret GetFacingObject: ; cf0d - callba CheckFacingObject + farcall CheckFacingObject jr nc, .fail ld a, [hObjectStructIndexBuffer] @@ -1495,7 +1495,7 @@ FishFunction: ; cf8e ld d, a ld a, [Buffer2] ld e, a - callba Fish + farcall Fish ld a, d and a jr z, .nonibble @@ -1714,7 +1714,7 @@ BikeFunction: ; d0b3 ret .CheckEnvironment: ; d121 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .ok cp CAVE diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 1e81e188f..00c7477bc 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -132,8 +132,8 @@ DoPoisonStep:: ; 505da and %10 jr z, .mon_not_fainted ld c, HAPPINESS_POISONFAINT - callba ChangeHappiness - callba GetPartyNick + farcall ChangeHappiness + farcall GetPartyNick ld hl, .PoisonFaintText call PrintText diff --git a/event/poisonstep_pals.asm b/event/poisonstep_pals.asm index c556ba498..8930d4c5d 100644 --- a/event/poisonstep_pals.asm +++ b/event/poisonstep_pals.asm @@ -20,7 +20,7 @@ LoadPoisonBGPals: ; cbcdd call DmgToCgbBGPals ld c, 4 call DelayFrames - callba _UpdateTimePals + farcall _UpdateTimePals ret .cgb @@ -44,5 +44,5 @@ LoadPoisonBGPals: ; cbcdd ld [hCGBPalUpdate], a ld c, 4 call DelayFrames - callba _UpdateTimePals + farcall _UpdateTimePals ret diff --git a/event/poke_seer.asm b/event/poke_seer.asm index 5e93acc5d..d6e335298 100644 --- a/event/poke_seer.asm +++ b/event/poke_seer.asm @@ -21,7 +21,7 @@ SpecialPokeSeer: ; 4f0bc call JoyWaitAorB ld b, $6 - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] @@ -240,7 +240,7 @@ GetCaughtLocation: ; 4f20a cp $7e jr z, .fail ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, StringBuffer1 ld de, wSeerCaughtLocation ld bc, 17 diff --git a/event/print_photo.asm b/event/print_photo.asm index 448910355..06b01bbcf 100755 --- a/event/print_photo.asm +++ b/event/print_photo.asm @@ -1,7 +1,7 @@ PhotoStudio: ; 16dc7 ld hl, .Text_AskWhichMon call PrintText - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] cp EGG @@ -10,7 +10,7 @@ PhotoStudio: ; 16dc7 ld hl, .Text_HoldStill call PrintText call DisableSpriteUpdates - callba PrintPartymon + farcall PrintPartymon call ReturnToMapWithSpeechTextbox ld a, [hPrinter] and a diff --git a/event/print_unown.asm b/event/print_unown.asm index 5e0162bad..5d3966585 100644 --- a/event/print_unown.asm +++ b/event/print_unown.asm @@ -81,7 +81,7 @@ UnownPrinter: ; 16be4 .pressed_a ld a, [wJumptableIndex] push af - callba PrintUnownStamp + farcall PrintUnownStamp call RestartMapMusic pop af ld [wJumptableIndex], a @@ -148,7 +148,7 @@ UnownPrinter: ; 16be4 lb bc, 7, 7 predef PlaceGraphic ld de, VTiles2 tile $31 - callba RotateUnownFrontpic + farcall RotateUnownFrontpic ret .Load2bppToSRAM: ; 16cff diff --git a/event/special.asm b/event/special.asm index 71323499e..8937698f5 100755 --- a/event/special.asm +++ b/event/special.asm @@ -15,7 +15,7 @@ SpecialGiveShuckle: ; 7305 ; Caught data. ld b, 0 - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData ; Holding a Berry. ld bc, PARTYMON_STRUCT_LENGTH @@ -71,7 +71,7 @@ SpecialShuckleNick: db "SHUCKIE@" SpecialReturnShuckle: ; 737e - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .refused ld a, [CurPartySpecies] @@ -107,7 +107,7 @@ SpecialReturnShuckle: ; 737e jr .CheckOT .done - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .fainted ld a, [CurPartyMon] ld hl, PartyMon1Happiness @@ -119,7 +119,7 @@ SpecialReturnShuckle: ; 737e jr nc, .HappyToStayWithYou xor a ; take from pc ld [wPokemonWithdrawDepositParameter], a - callab RemoveMonFromPartyOrBox + callfar RemoveMonFromPartyOrBox ld a, $2 .HappyToStayWithYou: ld [ScriptVar], a @@ -141,7 +141,7 @@ SpecialReturnShuckle: ; 737e ret Special_BillsGrandfather: ; 73f7 - callba SelectMonFromParty + farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] ld [ScriptVar], a @@ -167,7 +167,7 @@ Special_DaisyMassage: ; 741d MassageOrHaircut: ; 7420 push hl - callba SelectMonFromParty + farcall SelectMonFromParty pop hl jr c, .nope ld a, [CurPartySpecies] diff --git a/event/squirtbottle.asm b/event/squirtbottle.asm index 7b47a96f6..1134f1bb0 100755 --- a/event/squirtbottle.asm +++ b/event/squirtbottle.asm @@ -29,7 +29,7 @@ _Squirtbottle: ; 50730 cp MAP_ROUTE_36 jr nz, .nope - callba GetFacingObject + farcall GetFacingObject jr c, .nope ld a, d diff --git a/event/std_collision.asm b/event/std_collision.asm index 17b1e49b2..79dbc71f1 100644 --- a/event/std_collision.asm +++ b/event/std_collision.asm @@ -1,4 +1,4 @@ -CheckFacingTileForStd:: ; 1365b +CheckFacingTileForStdScript:: ; 1365b ; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. ld a, c ld de, 3 diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index 63eec9922..77567488c 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -34,21 +34,21 @@ SweetScentNothing: ; 0x506e9 ; 0x506ef SweetScentEncounter: ; 506ef - callba CanUseSweetScent + farcall CanUseSweetScent jr nc, .no_battle ld hl, StatusFlags2 bit 2, [hl] jr nz, .not_in_bug_contest - callba GetMapEncounterRate + farcall GetMapEncounterRate ld a, b and a jr z, .no_battle - callba ChooseWildEncounter + farcall ChooseWildEncounter jr nz, .no_battle jr .start_battle .not_in_bug_contest - callba ChooseWildEncounter_BugContest + farcall ChooseWildEncounter_BugContest .start_battle ld a, $1 diff --git a/event/whiteout.asm b/event/whiteout.asm index 159f3a519..a9d6f900e 100755 --- a/event/whiteout.asm +++ b/event/whiteout.asm @@ -49,7 +49,7 @@ BattleBGMap: ; 1250a ; 12513 HalveMoney: ; 12513 - callba TrainerRankings_WhiteOuts + farcall TrainerRankings_WhiteOuts ; Halve the player's money. ld hl, Money @@ -71,7 +71,7 @@ GetWhiteoutSpawn: ; 12527 ld d, a ld a, [wLastSpawnMapNumber] ld e, a - callba IsSpawnPoint + farcall IsSpawnPoint ld a, c jr c, .yes xor a ; SPAWN_HOME |