diff options
Diffstat (limited to 'engine/billspc.asm')
| -rwxr-xr-x | engine/billspc.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/engine/billspc.asm b/engine/billspc.asm index 9595bffc6..2dd9a512f 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -208,7 +208,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN ld a, $0 ld [wJumptableIndex], a @@ -472,7 +472,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld [CurPartyMon], a ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN ld a, $0 ld [wJumptableIndex], a @@ -1108,7 +1108,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) predef GetUnownLetter call GetBaseData ld de, VTiles2 tile $00 - predef GetFrontpic + predef GetMonFrontpic xor a ld [wBillsPC_MonHasMail], a ld a, [CurPartySpecies] @@ -1125,7 +1125,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) ld a, $3 ld [MonType], a - callba GetGender + farcall GetGender jr c, .skip_gender ld a, "♂" jr nz, .printgender @@ -1140,7 +1140,7 @@ PCMonInfo: ; e2ac6 (38:6ac6) ret z ld d, a - callab ItemIsMail + callfar ItemIsMail jr c, .mail ld a, $5d ; item icon jr .printitem @@ -1656,7 +1656,7 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18) ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted jr c, .AllOthersFainted ld a, [wBillsPC_MonHasMail] and a @@ -1773,7 +1773,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ret .party @@ -1816,7 +1816,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ret DepositPokemon: ; e307c (38:707c) @@ -1833,7 +1833,7 @@ DepositPokemon: ; e307c (38:707c) jr c, .asm_boxisfull xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -1888,7 +1888,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa) jr c, .PartyFull ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -2020,7 +2020,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 .dw_return ; e322a pop af ld e, a - callba MovePkmnWOMail_InsertMon_SaveGame + farcall MovePkmnWOMail_InsertMon_SaveGame ret ; e3233 @@ -2056,7 +2056,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 call .CopyFromParty ld a, $1 ld [wGameLogicPaused], a - callba SaveGameData + farcall SaveGameData xor a ld [wGameLogicPaused], a call .CopyToBox @@ -2106,7 +2106,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_BackupLoadedBox] dec a ld e, a - callba MovePkmnWOMail_SaveGame + farcall MovePkmnWOMail_SaveGame ld a, [wBillsPC_BackupCursorPosition] ld hl, wBillsPC_BackupScrollPosition add [hl] @@ -2123,10 +2123,10 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - callba CalcwBufferMonStats + farcall CalcwBufferMonStats ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ret ; e32fa @@ -2134,12 +2134,12 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_LoadedBox] dec a ld e, a - callba MovePkmnWOMail_SaveGame + farcall MovePkmnWOMail_SaveGame ld a, [wBillsPC_CursorPosition] ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba InsertPokemonIntoBox + farcall InsertPokemonIntoBox ret ; e3316 @@ -2159,7 +2159,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 call CopyMonToTemp xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ret ; e3346 @@ -2168,7 +2168,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld hl, wBillsPC_ScrollPosition add [hl] ld [CurPartyMon], a - callba InsertPokemonIntoParty + farcall InsertPokemonIntoParty ret ; e3357 @@ -2523,7 +2523,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) ld a, [MenuSelection] dec a ld c, a - callba PrintPCBox + farcall PrintPCBox call BillsPC_ClearTilemap and a ret @@ -2540,13 +2540,13 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) ld a, [wCurBox] cp e ret z - callba ChangeBoxSaveGame + farcall ChangeBoxSaveGame ret .Name: ld b, $4 ; box ld de, wd002 - callba NamingScreen + farcall NamingScreen call ClearTileMap call LoadStandardFont call LoadFontsBattleExtra |