diff options
Diffstat (limited to 'mobile')
-rwxr-xr-x | mobile/battle_tower_5c.asm | 56 | ||||
-rwxr-xr-x | mobile/fixed_words.asm | 26 | ||||
-rwxr-xr-x | mobile/mobile_12.asm | 6 | ||||
-rwxr-xr-x | mobile/mobile_12_2.asm | 18 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 50 | ||||
-rw-r--r-- | mobile/mobile_22_2.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 344 | ||||
-rwxr-xr-x | mobile/mobile_41.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_42.asm | 36 | ||||
-rw-r--r-- | mobile/mobile_45.asm | 150 | ||||
-rwxr-xr-x | mobile/mobile_45_sprite_engine.asm | 18 | ||||
-rwxr-xr-x | mobile/mobile_46.asm | 252 | ||||
-rwxr-xr-x | mobile/mobile_5b.asm | 18 | ||||
-rwxr-xr-x | mobile/mobile_5c.asm | 32 | ||||
-rw-r--r-- | mobile/mobile_5e.asm | 12 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 86 | ||||
-rwxr-xr-x | mobile/mobile_menu.asm | 22 | ||||
-rw-r--r-- | mobile/print_opp_message.asm | 2 |
18 files changed, 566 insertions, 566 deletions
diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index 4ab57ea2c..da1691038 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -1,13 +1,13 @@ BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM - callba _BattleTowerRoomMenu + farcall _BattleTowerRoomMenu ret ; 1700ba Function1700ba: ; 1700ba call InitBattleTowerChallengeRAM - callba Function11811a + farcall Function11811a ret ; 1700c4 @@ -56,7 +56,7 @@ Function1700c4: ; 1700c4 Function170114: ; 170114 call InitBattleTowerChallengeRAM call .Function170121 - callba Function11805f + farcall Function11805f ret ; 170121 @@ -111,7 +111,7 @@ Function170139: ; 170139 call CopyBytes ld bc, PlayerID ld de, PlayerGender - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld de, wBT_OTTempPkmn1CaughtGender ld a, c ld [de], a @@ -243,15 +243,15 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - callba TrainerRankings_Healings - callba HealParty + farcall TrainerRankings_Healings + farcall HealParty call ReadBTTrainerParty call Clears5_a89a predef StartBattle - callba LoadPokemonData - callba HealParty + farcall LoadPokemonData + farcall HealParty ld a, [wBattleResult] ld [ScriptVar], a and a @@ -286,7 +286,7 @@ ReadBTTrainerParty: ; 1702b7 ; with their species names. ld de, wBT_OTTempPkmn1Name ; $c643 ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_1 ld a, [wBT_OTTempPkmn1] @@ -301,7 +301,7 @@ ReadBTTrainerParty: ; 1702b7 .skip_mon_1 ld de, wBT_OTTempPkmn2Name ; $c67e ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_2 ld a, [wBT_OTTempPkmn2] ; [$c64e] ld [wNamedObjectIndexBuffer], a @@ -315,7 +315,7 @@ ReadBTTrainerParty: ; 1702b7 .skip_mon_2 ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld c, PKMN_NAME_LENGTH - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .skip_mon_3 ld a, [wBT_OTTempPkmn3] ; [$c689] ld [wNamedObjectIndexBuffer], a @@ -337,7 +337,7 @@ ReadBTTrainerParty: ; 1702b7 ; Repair the trainer name if needed, then copy it to OTPlayerName ld de, wBT_OTTempName ld c, NAME_LENGTH - 1 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .trainer_name_okay ld hl, BT_ChrisName jr .done_trainer_name @@ -675,7 +675,7 @@ Function1704e1: ; 1704e1 bit 7, a jr nz, .done call .DoJumptable - callba ReloadMapPart + farcall ReloadMapPart jr .loop .done @@ -1049,7 +1049,7 @@ Function170729: ; 170729 (5c:4729) BattleTowerAction $1d ret BattleTower_SaveOptions: ; 170737 (5c:4737) BattleTowerAction $1f - callba SaveOptions + farcall SaveOptions ret BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e @@ -1256,7 +1256,7 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09 ld a, [wSaveFileExists] and a jr z, .nope - callba CompareLoadedAndSavedPlayerID + farcall CompareLoadedAndSavedPlayerID jr z, .yes xor a jr .nope @@ -1486,8 +1486,8 @@ Jumptable_1709e7: ; 1709e7 ld a, [$a826] ld [wcd31], a call CloseSRAM - callba Function11b6b4 - callba Function17d0f3 + farcall Function11b6b4 + farcall Function17d0f3 ld a, $1 ld [ScriptVar], a ret @@ -1519,15 +1519,15 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger + jr z, .no_scene ld a, [de] and a ret nz -.no_trigger +.no_scene ld a, $1 ld [ScriptVar], a ret @@ -1544,14 +1544,14 @@ Jumptable_1709e7: ; 1709e7 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e - jr z, .no_trigger_2 + jr z, .no_scene_2 xor a ld [de], a -.no_trigger_2 +.no_scene_2 ret ; 170a9c @@ -1611,7 +1611,7 @@ BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18 ld [wcd4f], a xor a ld [ScriptVar], a - callba BattleTower_LevelCheck ; level check + farcall BattleTower_LevelCheck ; level check ret nc ld a, $5 call GetSRAMBank @@ -1631,7 +1631,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [wcd4f], a xor a ld [ScriptVar], a - callba BattleTower_UbersCheck + farcall BattleTower_UbersCheck ret nc ld a, $5 call GetSRAMBank @@ -1641,7 +1641,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ret Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 - callba Function_LoadOpponentTrainerAndPokemons + farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af ld a, $3 @@ -1681,7 +1681,7 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 ld [hUsedSpriteIndex], a ld a, [hl] ld [hUsedSpriteTile], a - callba GetUsedSprite + farcall GetUsedSprite ret ; 170b90 @@ -1758,7 +1758,7 @@ ret_170bd2: ; 170bd2 ; 170bd3 SpecialCheckForBattleTowerRules: ; 170bd3 - callba CheckForBattleTowerRules + farcall CheckForBattleTowerRules jr c, .asm_170bde xor a jr .asm_170be0 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index d98470095..5f6fc1808 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -329,10 +329,10 @@ Function11c1b9: ; 11c1b9 ld de, VTiles0 call Decompress call EnableLCD - callba ReloadMapPart - callba ClearSpriteAnims - callba LoadPokemonData - callba Pokedex_ABCMode + farcall ReloadMapPart + farcall ClearSpriteAnims + farcall LoadPokemonData + farcall Pokedex_ABCMode ld a, [rSVBK] push af ld a, $5 @@ -385,12 +385,12 @@ EZChat_MasterLoop: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .exit - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearSprites ret ; 11c2ac @@ -719,7 +719,7 @@ Function11c4be: ; 11c4be (47:44be) hlcoord 0, 14, AttrMap ld bc, $28 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11c4db (47:44db) @@ -918,7 +918,7 @@ Function11c618: ; 11c618 (47:4618) hlcoord 0, 6, AttrMap ld bc, $c8 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11c62a (47:462a) @@ -1372,7 +1372,7 @@ BCD2String: ; 11c8c7 xor a ld [hDividend + 2], a push hl - callba Function11a80c + farcall Function11a80c pop hl ld a, [wcd63] add "0" @@ -1530,7 +1530,7 @@ Function11c9ab: ; 11c9ab (47:49ab) hlcoord 0, 6, AttrMap ld bc, $c8 call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret Function11c9bd: ; 11c9bd (47:49bd) @@ -1620,7 +1620,7 @@ Function11ca19: ; 11ca19 (47:4a19) add hl, de dec c jr nz, .asm_11ca22 - callba ReloadMapPart + farcall ReloadMapPart ret ; 11ca38 (47:4a38) @@ -2043,7 +2043,7 @@ Function11cdaa: ; 11cdaa (47:4daa) hlcoord 0, 12, AttrMap ld bc, 4 * SCREEN_WIDTH call ByteFill - callba ReloadMapPart + farcall ReloadMapPart ret ; 11cdc7 (47:4dc7) diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 8b21bb6a6..d3c1c0be3 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -359,7 +359,7 @@ Function48304: ; 48304 (12:4304) ld a, $29 .asm_4833f ld [wMenuScrollPosition], a - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap .asm_48348 call ScrollingMenu ld de, $629 @@ -385,7 +385,7 @@ Function48304: ; 48304 (12:4304) ld [wd003], a .asm_48377 call Function48187 - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap jp Function4840c Function48383: ; 48383 (12:4383) @@ -1626,7 +1626,7 @@ Function48c8e: ; 48c8e ld hl, $d02a ld d, h ld e, l - callba Function48c63 + farcall Function48c63 hlcoord 10, 7 call PlaceString call WaitBGMap diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 37179c122..ba663cf86 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -311,17 +311,17 @@ Function4aa22: ; 4aa22 call ClearBGPalettes Function4aa25: ; 4aa25 - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel call Function4aad3 Function4aa34: ; 4aa34 ld a, PARTYMENUACTION_MOBILE ld [PartyMenuActionText], a - callba WritePartyMenuTilemap + farcall WritePartyMenuTilemap xor a ld [PartyMenuActionText], a - callba PrintPartyMenuText + farcall PrintPartyMenuText call Function4aab6 call WaitBGMap call SetPalettes @@ -443,7 +443,7 @@ Function4aad3: ; 4aad3 push bc push hl ld e, 0 - callba LoadMenuMonIcon + farcall LoadMenuMonIcon ld a, [hObjectStructIndexBuffer] inc a ld [hObjectStructIndexBuffer], a @@ -453,7 +453,7 @@ Function4aad3: ; 4aad3 jr nz, .loop call Function4aa7a - callba PlaySpriteAnimations + farcall PlaySpriteAnimations ret ; 4aafb @@ -683,7 +683,7 @@ Function4ac58: ; 4ac58 lb bc, 2, 18 hlcoord 1, 15 call ClearBox - callba FreezeMonIcons + farcall FreezeMonIcons ld hl, MenuDataHeader_0x4aca2 call LoadMenuDataHeader ld hl, wd019 @@ -823,13 +823,13 @@ UnknownText_0x4ad51: ; 0x4ad51 ; 0x4ad56 Function4ad56: ; 4ad56 - callba OpenPartyStats + farcall OpenPartyStats call WaitBGMap2 ret ; 4ad60 Function4ad60: ; 4ad60 - callba ManagePokemonMoves + farcall ManagePokemonMoves ret ; 4ad67 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 59a858bcd..416f62df8 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -99,7 +99,7 @@ Function8919e: ; 8919e (22:519e) Function891ab: ; 891ab call Mobile22_SetBGMapMode1 - callba ReloadMapPart + farcall ReloadMapPart call Mobile22_SetBGMapMode0 ret ; 891b8 @@ -218,9 +218,9 @@ Mobile22_SetBGMapMode1: ; 89240 Function89245: ; 89245 (22:5245) - callba TryLoadSaveFile + farcall TryLoadSaveFile ret c - callba _LoadData + farcall _LoadData and a ret @@ -777,7 +777,7 @@ Function8956f: ; 8956f add hl, bc ld b, h ld c, l - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld a, c ld [TrainerClass], a ld a, [rSVBK] @@ -1222,13 +1222,13 @@ Function897af: ; 897af add hl, bc ld b, h ld c, l - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass ld a, c ld [TrainerClass], a xor a ld [CurPartySpecies], a ld de, VTiles2 tile $37 - callba GetTrainerPic + farcall GetTrainerPic pop bc ret ; 897d5 @@ -1616,7 +1616,7 @@ Function89a0c: ; 89a0c jr c, .asm_89a1c ld d, h ld e, l - callba Function11c08f + farcall Function11c08f ret .asm_89a1c @@ -1793,14 +1793,14 @@ Function89a57: ; 89a57 Function89b00: ; 89b00 (22:5b00) - callba MG_Mobile_Layout_LoadPals + farcall MG_Mobile_Layout_LoadPals ret ; 89b07 (22:5b07) Function89b07: ; 89b07 call Mobile22_SetBGMapMode0 call DelayFrame - callba Function4a3a7 + farcall Function4a3a7 ret ; 89b14 @@ -1812,7 +1812,7 @@ Function89b14: ; 89b14 ; 89b1e Function89b1e: ; 89b1e (22:5b1e) - callba Function4a485 + farcall Function4a485 call Function89b00 ret @@ -1827,7 +1827,7 @@ Function89b28: ; 89b28 (22:5b28) Function89b3b: ; 89b3b (22:5b3b) call Mobile22_SetBGMapMode0 - callba Function48cda + farcall Function48cda ret Function89b45: ; 89b45 @@ -2180,7 +2180,7 @@ Function89d0d: ; 89d0d (22:5d0d) ld [rSVBK], a call SetPalettes - callba PrintMail_ + farcall PrintMail_ call Mobile22_SetBGMapMode1 ld c, 24 call DelayFrames @@ -2218,7 +2218,7 @@ Function89d75: ; 89d75 (22:5d75) push hl call Mobile22_SetBGMapMode0 call _hl_ - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap pop hl jr asm_89d90 @@ -2249,7 +2249,7 @@ asm_89d90: ; 89d90 (22:5d90) Function89dab: ; 89dab (22:5dab) call Mobile22_SetBGMapMode0 - callba MobileMenuJoypad + farcall MobileMenuJoypad call Mobile22_SetBGMapMode0 ld a, c ld hl, wMenuJoypadFilter @@ -2429,8 +2429,8 @@ Function89ee1: ; 89ee1 (22:5ee1) call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d ret @@ -2958,8 +2958,8 @@ Function8a262: ; 8a262 (22:6262) call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d hlcoord 12, 4 @@ -3052,8 +3052,8 @@ Function8a313: ; 8a313 (22:6313) Function8a31c: ; 8a31c (22:631c) push bc call Mobile22_SetBGMapMode0 - callba Function4a3a7 - callba MG_Mobile_Layout_CreatePalBoxes + farcall Function4a3a7 + farcall MG_Mobile_Layout_CreatePalBoxes hlcoord 1, 0 call Function8a53d hlcoord 12, 4 @@ -3095,7 +3095,7 @@ Function8a31c: ; 8a31c (22:631c) ret Function8a383: ; 8a383 (22:6383) - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -3656,7 +3656,7 @@ Function8a78c: ; 8a78c (22:678c) call Function891fe ld de, wd002 ld b, $5 - callba NamingScreen + farcall NamingScreen call OpenSRAMBank4 call Function8931b push bc @@ -3685,7 +3685,7 @@ Function8a7cb: ; 8a7cb (22:67cb) call Function891de ld de, wd008 ld c, $0 - callba Function17a68f + farcall Function17a68f jr c, .asm_8a7f4 ld hl, wd008 ld a, $ff @@ -4027,7 +4027,7 @@ Function8aa73: ; 8aa73 (22:6a73) call Function891de ld de, wd008 ld c, $0 - callba Function17a68f + farcall Function17a68f jr c, .asm_8aa9d ld hl, wd008 ld a, $ff @@ -4157,7 +4157,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) Function8ab93: ; 8ab93 (22:6b93) call ClearBGPalettes call LoadStandardMenuDataHeader - callba Function105688 + farcall Function105688 call ClearSprites call Function891fe call Function89b28 diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 321998dc7..dfba961e4 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -48,7 +48,7 @@ Function8b35d: ; 8b35d Function8b363: ; 8b363 push bc - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry pop bc ret ; 8b36c diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 79cba8310..a8a60343c 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -39,10 +39,10 @@ Function100022: ; 100022 ld [wcd23], a ld a, b ld [wcd24], a - callba Function10127e - callba MobileFunc_106462 - callba Function106464 ; load broken gfx - callba Function11615a ; init RAM + farcall Function10127e + farcall MobileFunc_106462 + farcall Function106464 ; load broken gfx + farcall Function11615a ; init RAM ld hl, VramState set 1, [hl] ret @@ -144,7 +144,7 @@ Function1000e8: ; 1000e8 ld hl, wcd29 bit 7, [hl] ret z - callba Function115dd3 + farcall Function115dd3 ld hl, wcd29 set 6, [hl] ret @@ -160,7 +160,7 @@ Function1000fa: ; 1000fa ld a, [wcd2b] and a jr nz, .asm_100117 - callba Function11619d + farcall Function11619d ld hl, wcd29 set 6, [hl] ret @@ -183,7 +183,7 @@ Function1000fa: ; 1000fa ld [wLinkMode], a ld a, $04 ld [wc314 + 5], a - callba Function11619d + farcall Function11619d ld hl, wcd29 set 6, [hl] pop af @@ -206,7 +206,7 @@ Function100144: ; 100144 ret z res 2, [hl] res 6, [hl] - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret ; 100163 @@ -318,8 +318,8 @@ Function10016f: ; 10016f Function10020b: ; 10020b xor a ld [wc303], a - callba FadeOutPalettes - callba Function106464 + farcall FadeOutPalettes + farcall Function106464 call HideSprites call DelayFrame @@ -328,7 +328,7 @@ Function10020b: ; 10020b ld a, $01 ld [rSVBK], a - callba DisplayMobileError + farcall DisplayMobileError pop af ld [rSVBK], a @@ -337,7 +337,7 @@ Function10020b: ; 10020b Function100232: ; 100232 push de - callba Function106464 + farcall Function106464 call Function3f20 call UpdateSprites hlcoord 1, 2 @@ -378,7 +378,7 @@ Function100276: ; 100276 ret .asm_100296 - callba Script_reloadmappart + farcall Script_reloadmappart ld c, $04 ret @@ -388,7 +388,7 @@ Function100276: ; 100276 ret .asm_1002a5 - callba Script_reloadmappart + farcall Script_reloadmappart call Function1002ed ld c, $03 ret @@ -412,15 +412,15 @@ Function1002c9: ; 1002c9 ld hl, wcd2a bit 0, [hl] ret z - callba CleanUpBattleRAM - callba LoadPokemonData + farcall CleanUpBattleRAM + farcall LoadPokemonData ret ; 1002dc Function1002dc: ; 1002dc ld a, MAPSETUP_LINKRETURN ld [hMapEntryMethod], a - callba RunMapSetupScript + farcall RunMapSetupScript xor a ld [hMapEntryMethod], a call LoadStandardFont @@ -428,8 +428,8 @@ Function1002dc: ; 1002dc ; 1002ed Function1002ed: ; 1002ed - callba LoadOW_BGPal7 - callba ApplyPals + farcall LoadOW_BGPal7 + farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a call DelayFrame @@ -440,21 +440,21 @@ Function100301: ; 100301 ld hl, wcd2a bit 1, [hl] ret z - callba Function106464 - callba Function10202c - callba Function115dd3 + farcall Function106464 + farcall Function10202c + farcall Function115dd3 call Function100320 call JoyWaitAorB ret ; 100320 Function100320: ; 100320 - callba Mobile_ReloadMapPart + farcall Mobile_ReloadMapPart ret ; 100327 Function100327: ; 100327 - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret ; 100327 @@ -858,7 +858,7 @@ Function100545: ; 100545 ; 10054d Function10054d: ; 10054d - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -1500,7 +1500,7 @@ Function100902: ; 100902 call PrintNum ld de, SFX_TWO_PC_BEEPS call PlaySFX - callba ReloadMapPart + farcall ReloadMapPart ld c, $3c call DelayFrames ret @@ -1511,7 +1511,7 @@ Function100902: ; 100902 call PlaceString ld de, SFX_4_NOTE_DITTY call PlaySFX - callba ReloadMapPart + farcall ReloadMapPart ld c, 120 call DelayFrames ret @@ -1541,7 +1541,7 @@ Function100989: ; 100989 decoord 0, 0 call Function1009a5 call Function1009ae - callba ReloadMapPart + farcall ReloadMapPart ld hl, w3_dd68 decoord 0, 0, AttrMap call Function1009a5 @@ -1628,14 +1628,14 @@ Function1009f3: ; 1009f3 _LinkBattleSendReceiveAction: ; 100a09 call .StageForSend ld [wd431], a - callba PlaceWaitingText + farcall PlaceWaitingText ld a, [wLinkMode] cp LINK_MOBILE jr nz, .not_mobile call .MobileBattle_SendReceiveAction call Function100da5 - callba FinishBattleAnim + farcall FinishBattleAnim jr .done .not_mobile @@ -1711,7 +1711,7 @@ _LinkBattleSendReceiveAction: ; 100a09 .asm_100a92 call DelayFrame call GetJoypad - callba Function100382 + farcall Function100382 ld c, $01 ld b, $03 push bc @@ -1810,7 +1810,7 @@ Function100b12: ; 100b12 ld [wMenuCursorBuffer], a call Function100e72 call Function100b45 - callba InitPartyMenuBGPal7 + farcall InitPartyMenuBGPal7 call Function100ed4 ld a, [wMenuCursorBuffer] ld [wBattleMenuCursorBuffer], a @@ -1822,16 +1822,16 @@ Function100b45: ; 100b45 call Function100b7a .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call Function100e2d pop bc jr c, .asm_100b6b ld a, [wMenuJoypadFilter] and c jr z, .loop - callba Mobile_GetMenuSelection + farcall Mobile_GetMenuSelection ret .asm_100b6b @@ -1848,11 +1848,11 @@ Function100b7a: ; 100b7a ld hl, CopyMenuData2 ld a, [wMenuData2_2DMenuItemStringsBank] rst FarCall - callba Draw2DMenu - callba MobileTextBorder + farcall Draw2DMenu + farcall MobileTextBorder call UpdateSprites call ApplyTilemap - callba Init2DMenuCursorPosition + farcall Init2DMenuCursorPosition ld hl, w2DMenuFlags1 set 7, [hl] ret @@ -1861,14 +1861,14 @@ Function100b7a: ; 100b7a MobileMoveSelectionScreen: ; 100b9f xor a ld [wMoveSwapBuffer], a - callba CheckPlayerHasUsableMoves + farcall CheckPlayerHasUsableMoves ret z call Function100dd8 jp c, xor_a_dec_a call Function100e72 call .GetMoveSelection push af - callba InitPartyMenuBGPal7 + farcall InitPartyMenuBGPal7 call Function100ed4 pop af ret @@ -1880,12 +1880,12 @@ MobileMoveSelectionScreen: ; 100b9f call Function100c74 call Function100c98 .master_loop - callba MoveInfoBox + farcall MoveInfoBox .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 call Function100e2d pop bc jr c, .b_button @@ -2016,10 +2016,10 @@ Mobile_PartyMenuSelect: ; 100cb5 res 6, [hl] .loop call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba PlaySpriteAnimations - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall HDMATransferTileMapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .done @@ -2070,10 +2070,10 @@ MobileBattleMonMenu: ; 100d22 res 6, [hl] .asm_100d30 call Mobile_SetOverworldDelay - callba MobileMenuJoypad + farcall MobileMenuJoypad push bc - callba PlaySpriteAnimations - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall HDMATransferTileMapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .asm_100d54 @@ -2181,13 +2181,13 @@ Mobile_SetOverworldDelay: ; 100dd2 Function100dd8: ; 100dd8 ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired jr c, .asm_100dfb ld c, $3c ld b, $01 call Function10079c jr c, .asm_100dfb - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_100dfb @@ -2207,7 +2207,7 @@ MobileComms_CheckInactivityTimer: ; 100dfd ld c, a ld b, 3 push bc - callba AdvanceMobileInactivityTimerAndCheckExpired ; useless to farcall + farcall AdvanceMobileInactivityTimerAndCheckExpired ; useless to farcall pop bc jr c, .quit ld b, 1 @@ -2215,7 +2215,7 @@ MobileComms_CheckInactivityTimer: ; 100dfd jr c, .quit call Function1009f3 jr c, .quit - callba Function10032e ; useless to farcall + farcall Function10032e ; useless to farcall ld a, [wcd2b] and a jr nz, .quit @@ -2235,7 +2235,7 @@ Function100e2d: ; 100e2d ld c, a ld b, 3 push bc - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired pop bc jr c, .asm_100e61 ld b, 1 @@ -2243,7 +2243,7 @@ Function100e2d: ; 100e2d jr c, .asm_100e61 call Function1009f3 jr c, .asm_100e61 - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_100e61 @@ -2340,13 +2340,13 @@ Function100ec5 ; 100eca Function100eca: ; 100eca - callba Mobile_InitPartyMenuBGPal7 + farcall Mobile_InitPartyMenuBGPal7 call Function100ed4 ret ; 100ed4 Function100ed4: ; 100ed4 - callba ApplyPals + farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a ret @@ -2884,7 +2884,7 @@ Function101265: ; 101265 Function10126c: ; 10126c call UpdateSprites - callba Script_reloadmappart + farcall Script_reloadmappart ld hl, UnknownText_0x1021f4 call Function1021e0 ret @@ -3042,7 +3042,7 @@ Jumptable_101297: ; 101297 ; 10138b Function10138b: ; 10138b - callba Function8adcc + farcall Function8adcc ld c, 0 jr c, .asm_101396 inc c @@ -3069,22 +3069,22 @@ Function1013aa: ; 1013aa call ClearBGPalettes call Call_ExitMenu call ReloadTilesetAndPalettes - callba Function106464 + farcall Function106464 call UpdateSprites call FinishExitMenu ret ; 1013c0 Function1013c0: ; 1013c0 - callba BlankScreen - callba MobileFunc_106462 - callba Function106464 + farcall BlankScreen + farcall MobileFunc_106462 + farcall Function106464 call FinishExitMenu ret ; 1013d6 Function1013d6: ; 1013d6 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 1013dd @@ -3177,7 +3177,7 @@ Function101418: ; 101418 Function10142c: ; 10142c ld a, $01 ld [wc305], a - callba Function115e18 + farcall Function115e18 ret ; 101438 @@ -3277,8 +3277,8 @@ Function1014b7: ; 1014b7 ; 1014ce Function1014ce: ; 1014ce - callba Function100720 - callba StartMobileInactivityTimer + farcall Function100720 + farcall StartMobileInactivityTimer ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -3297,7 +3297,7 @@ Function1014e2: ; 1014e2 ; 1014f4 Function1014f4: ; 1014f4 - callba EnableMobile + farcall EnableMobile ld hl, wcd29 set 6, [hl] ld a, [wMobileCommsJumptableIndex] @@ -3346,7 +3346,7 @@ Function101537: ; 101537 ; 101544 Function101544: ; 101544 - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld a, $12 call Function3e32 ld a, [wMobileCommsJumptableIndex] @@ -3356,7 +3356,7 @@ Function101544: ; 101544 ; 101557 Function101557: ; 101557 - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld hl, wcd53 ld a, $08 call Function3e32 @@ -3371,7 +3371,7 @@ Function10156d: ; 10156d ret c Function101571: ; 101571 - callba Function10032e + farcall Function10032e ret c ret z ld a, e @@ -3388,7 +3388,7 @@ Function101571: ; 101571 ; 10158a Function10158a: ; 10158a - callba IncrementMobileInactivityTimerBy1Frame + farcall IncrementMobileInactivityTimerBy1Frame ld a, [wMobileInactivityTimerMinutes] cp $0a jr c, Function10156d @@ -3399,7 +3399,7 @@ Function10158a: ; 10158a Function10159d: ; 10159d ld de, wc608 - callba Function100edf + farcall Function100edf ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3414,7 +3414,7 @@ Function10159d: ; 10159d Function1015be: ; 1015be ld de, wc608 - callba Function100eed + farcall Function100eed ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3429,7 +3429,7 @@ Function1015be: ; 1015be Function1015df: ; 1015df ld de, wc608 - callba Function100ef4 + farcall Function100ef4 ld de, wc608 ld a, $05 ld hl, w5_d800 @@ -3449,7 +3449,7 @@ Function101600: ; 101600 ld a, $05 call FarCopyWRAM ld de, wc608 - callba Function100ee6 + farcall Function100ee6 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -3536,11 +3536,11 @@ Function10168a: ; 10168a Function10168e: ; 10168e ld b, 0 ld c, $01 - callba Function10079c + farcall Function10079c ret c ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired ret c ld a, [wcd26] ld hl, Jumptable_1016c3 @@ -3604,7 +3604,7 @@ Function1016f8: ; 1016f8 ; 101705 Function101705: ; 101705 - callba Function100382 + farcall Function100382 ld a, [wcd27] bit 7, a ret z @@ -3769,13 +3769,13 @@ Function1017f1: ; 1017f1 Function1017f5: ; 1017f5 ld b, 0 ld c, $01 - callba Function10079c + farcall Function10079c ret c ld c, $01 ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired ret c - callba Function100382 + farcall Function100382 ld a, [wcd27] bit 7, a jr nz, .next @@ -3808,7 +3808,7 @@ Function101826: ; 101826 ret .asm_101844 - callba Function103654 + farcall Function103654 ld a, c ld hl, Unknown_101882 cp $01 @@ -3965,7 +3965,7 @@ Function101913: ; 101913 Function10194b: ; 10194b call DisableSpriteUpdates call ClearSprites - callba Function1021f9 + farcall Function1021f9 ld hl, wcd29 bit 3, [hl] jr nz, .asm_101967 @@ -3981,8 +3981,8 @@ Function10194b: ; 10194b ; 10196d _SelectMonsForMobileBattle: ; 10196d - callba BlankScreen - callba Mobile_CommunicationStandby + farcall BlankScreen + farcall Mobile_CommunicationStandby ld hl, wcd29 set 5, [hl] ld hl, wcd2a @@ -4008,16 +4008,16 @@ _SelectMonsForMobileBattle: ; 10196d _StartMobileBattle: ; 1019ab call CopyOtherPlayersBattleMonSelection - callba Function100754 + farcall Function100754 xor a ld [wdc5f], a ld [wdc60], a - callba BlankScreen + farcall BlankScreen call SpeechTextBox - callba Function100846 + farcall Function100846 ld c, 120 call DelayFrames - callba ClearTileMap + farcall ClearTileMap call .CopyOTDetails call StartMobileBattle ld a, [wcd2b] @@ -4040,7 +4040,7 @@ _StartMobileBattle: ; 1019ab ld bc, w5_dc0d ld de, w5_dc11 - callba GetMobileOTTrainerClass + farcall GetMobileOTTrainerClass pop af ld [rSVBK], a @@ -4071,9 +4071,9 @@ StartMobileBattle: ; 101a21 ld [hl], a ld a, 1 ld [wDisableTextAcceleration], a - callba BattleIntro - callba DoBattle - callba ShowLinkBattleParticipantsAfterEnd + farcall BattleIntro + farcall DoBattle + farcall ShowLinkBattleParticipantsAfterEnd xor a ld [wDisableTextAcceleration], a ld a, $ff @@ -4086,11 +4086,11 @@ StartMobileBattle: ; 101a21 Function101a4f: ; 101a4f ld a, 1 ld [wDisableTextAcceleration], a - callba DisplayLinkBattleResult + farcall DisplayLinkBattleResult xor a ld [wDisableTextAcceleration], a - callba CleanUpBattleRAM - callba LoadPokemonData + farcall CleanUpBattleRAM + farcall LoadPokemonData call Function1013c0 ld a, [wMobileCommsJumptableIndex] inc a @@ -4104,14 +4104,14 @@ CopyOtherPlayersBattleMonSelection: ; 101a75 ld bc, 3 call CopyBytes ld de, wcc64 - callba Function100772 - callba Function101050 - callba LoadSelectedPartiesForColosseum + farcall Function100772 + farcall Function101050 + farcall LoadSelectedPartiesForColosseum ret ; 101a97 Function101a97: ; 101a97 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4136,7 +4136,7 @@ Function101ab4: ; 101ab4 ; 101ac6 Function101ac6: ; 101ac6 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4154,7 +4154,7 @@ Function101ac6: ; 101ac6 ; 101aed Function101aed: ; 101aed - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4185,7 +4185,7 @@ Function101b0f: ; 101b0f ; 101b2b Function101b2b: ; 101b2b - callba Function100579 + farcall Function100579 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4238,7 +4238,7 @@ Function101b70: ; 101b70 ; 101b8f Function101b8f: ; 101b8f - callba Function1005c3 + farcall Function1005c3 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4282,7 +4282,7 @@ Function101bc8: ; 101bc8 ; 101be5 Function101be5: ; 101be5 - callba Function100579 + farcall Function100579 ld hl, wcd29 set 2, [hl] ld a, [wcd26] @@ -4352,7 +4352,7 @@ Function101c50: ; 101c50 ; 101c62 Function101c62: ; 101c62 - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $01 @@ -4374,7 +4374,7 @@ Function101c62: ; 101c62 ; 101c92 Function101c92: ; 101c92 - callba Function100675 + farcall Function100675 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -4520,7 +4520,7 @@ Function101d6b: ; 101d6b ; 101d7b Function101d7b: ; 101d7b - callba Function10138b + farcall Function10138b ld b, 0 ld hl, Unknown_101d8d add hl, bc @@ -4550,7 +4550,7 @@ Function101d95: ; 101d95 ; 101db2 Function101db2: ; 101db2 - callba Function103302 + farcall Function103302 call ExitMenu ld hl, wcd29 set 5, [hl] @@ -4701,7 +4701,7 @@ Function101e8d: ; 101e8d ; unreferenced Function101e98: ; 101e98 call ClearSprites - callba Function8adb3 + farcall Function8adb3 ret c ld hl, GameTimerPause set 7, [hl] @@ -4741,7 +4741,7 @@ Function101ecc: ; 101ecc Function101ed3: ; 101ed3 call Function1013aa - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ret @@ -4758,7 +4758,7 @@ Function101ee4: ; 101ee4 ld a, [hli] ld d, [hl] ld e, a - callba Function100504 + farcall Function100504 ret ; 101ef5 @@ -4835,7 +4835,7 @@ String_102014: ; 102014 ; 10202c Function10202c: ; 10202c - callba Function115d99 + farcall Function115d99 ld hl, wcd29 set 7, [hl] ld c, $02 @@ -4930,7 +4930,7 @@ Function1020a8: ; 1020a8 call Function10209c ld c, $01 ld de, wdc42 - callba Function17a68f + farcall Function17a68f ret c call Function10208e call Function102068 @@ -4940,7 +4940,7 @@ Function1020a8: ; 1020a8 Function1020bf: ; 1020bf call ClearSprites - callba Function8aba9 + farcall Function8aba9 ld a, c and a jr z, .asm_1020e8 @@ -5074,7 +5074,7 @@ Function10219f: ; 10219f call FadeToMenu call Function10218d ld de, wc608 + 1 - callba Function8ac4e + farcall Function8ac4e call JoyWaitAorB call PlayClickSFX call Function1013aa @@ -5085,7 +5085,7 @@ Function1021b8: ; 1021b8 call FadeToMenu call Function10218d ld de, wPlayerMoveStruct - callba Function8ac70 + farcall Function8ac70 ld a, c ld [StringBuffer1], a push af @@ -5191,7 +5191,7 @@ Function10224b: ; 10224b .asm_10225e res 1, [hl] res 2, [hl] - callba Mobile_ReloadMapPart + farcall Mobile_ReloadMapPart scf ret ; 10226a @@ -5267,7 +5267,7 @@ Function1022ca: ; 1022ca ; 1022d0 Function1022d0: ; 1022d0 - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .asm_1022f3 @@ -5278,7 +5278,7 @@ Function1022d0: ; 1022d0 sub c ld c, a ld b, $03 - callba AdvanceMobileInactivityTimerAndCheckExpired + farcall AdvanceMobileInactivityTimerAndCheckExpired jr c, .asm_1022f3 xor a ret @@ -5413,7 +5413,7 @@ Function1023c6: ; 1023c6 ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld hl, PartyCount inc [hl] ld a, [hli] @@ -5453,9 +5453,9 @@ Function102416: ; 102416 Function102423: ; 102423 call Function102921 ret nc - callba SaveAfterLinkTrade - callba TrainerRankings_Trades - callba BackupMobileEventIndex + farcall SaveAfterLinkTrade + farcall TrainerRankings_Trades + farcall BackupMobileEventIndex ld hl, wcd4b set 1, [hl] ld a, 0 @@ -5523,7 +5523,7 @@ Function102496: ; 102496 ; 1024a8 Function1024a8: ; 1024a8 - callba Function1009f3 + farcall Function1009f3 ret c Function1024af: ; 1024af @@ -5608,7 +5608,7 @@ Function10250c: ; 10250c call Function102b9c call Function102bdc jr c, .asm_10256d - callba Functionfb5dd + farcall Functionfb5dd jr c, .asm_102568 ld hl, wcd4b set 1, [hl] @@ -5726,9 +5726,9 @@ Function1025e9: ; 1025e9 Function1025ff: ; 1025ff ld hl, wcd4b set 2, [hl] - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, [wMenuJoypadFilter] and c ret z @@ -5788,9 +5788,9 @@ Function102652: ; 102652 Function10266b: ; 10266b ld hl, wcd4b set 2, [hl] - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, [wMenuJoypadFilter] and c ret z @@ -5840,7 +5840,7 @@ Function1026b7: ; 1026b7 Function1026c8: ; 1026c8 call GetJoypad - callba Function1009f3 + farcall Function1009f3 ret c ld a, [wcd4a] ld hl, Jumptable_1026da @@ -5920,7 +5920,7 @@ Function102738: ; 102738 Function102754: ; 102754 call GetJoypad - callba Function1009f3 + farcall Function1009f3 ret c ld a, [wcd4a] ld hl, Jumptable_102766 @@ -6017,7 +6017,7 @@ Function1027eb: ; 1027eb ld c, 18 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ld de, .Stats_Trade hlcoord 2, 16 call PlaceString @@ -6154,7 +6154,7 @@ Function1028e8: ; 1028e8 ld hl, wcd4b res 6, [hl] ld [wcd50], a - callba StartMobileInactivityTimer + farcall StartMobileInactivityTimer ld a, 0 ld [wcd4a], a ret @@ -6162,7 +6162,7 @@ Function1028e8: ; 1028e8 Function1028fc: ; 1028fc call GetJoypad - callba Function1009f3 + farcall Function1009f3 jr nc, .asm_102909 and a ret @@ -6238,7 +6238,7 @@ Function10295d: ; 10295d ; 10296e Function10296e: ; 10296e - callba Function100382 + farcall Function100382 and a ld a, [wcd27] bit 7, a @@ -6251,7 +6251,7 @@ Function10296e: ; 10296e ; 102984 Function102984: ; 102984 - callba Function100382 + farcall Function100382 and a ld a, [wcd27] bit 7, a @@ -6313,7 +6313,7 @@ Function1029cf: ; 1029cf ld c, 8 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ld de, String_102a26 hlcoord 12, 8 call PlaceString @@ -6329,9 +6329,9 @@ Function1029cf: ; 1029cf ; 1029fe Function1029fe: ; 1029fe - callba Function1009f3 + farcall Function1009f3 ret c - callba MobileMenuJoypad + farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter and [hl] @@ -6410,7 +6410,7 @@ Function102a3b: ; 102a3b call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a ld hl, OTPlayerName @@ -6455,7 +6455,7 @@ Function102a3b: ; 102a3b call GetPartyLocation ld b, h ld c, l - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a ret @@ -6469,11 +6469,11 @@ Function102b12: ; 102b12 ld a, [wcd2f] and a jr nz, .asm_102b2b - callba Function108026 + farcall Function108026 jr .asm_102b31 .asm_102b2b - callba Function10802a + farcall Function10802a .asm_102b31 ret @@ -6485,7 +6485,7 @@ Function102b32: ; 102b32 ld [CurPartyMon], a ld a, $01 ld [wForceEvolution], a - callba EvolvePokemon + farcall EvolvePokemon call Function102d9a call Function102dd3 call Function102dec @@ -6558,7 +6558,7 @@ Function102bac: ; 102bac ld [CurPartyMon], a call LowVolume call ClearSprites - callba _MobileStatsScreenInit + farcall _MobileStatsScreenInit ld a, [CurPartyMon] inc a ld [wMenuCursorY], a @@ -6645,7 +6645,7 @@ Function102c3b: ; 102c3b ; 102c48 Function102c48: ; 102c48 - callba Function10165a + farcall Function10165a ld a, 0 call GetSRAMBank ld hl, $a600 @@ -6797,7 +6797,7 @@ Function102d48: ; 102d48 ld hl, PartyMon1DVs call AddNTimes predef GetUnownLetter - callba UpdateUnownDex + farcall UpdateUnownDex ld a, [wFirstUnownSeen] and a jr nz, .asm_102d98 @@ -6818,7 +6818,7 @@ Function102d9a: ; 102d9a hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 102db7 @@ -6836,7 +6836,7 @@ Function102dc3: ; 102dc3 ld c, 18 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox ret ; 102dd3 @@ -6846,7 +6846,7 @@ Function102dd3: ; 102dd3 ld hl, VTiles0 lb bc, BANK(GFX_1032a2), 4 call Get2bpp - callba __LoadTradeScreenBorder + farcall __LoadTradeScreenBorder call EnableLCD ret ; 102dec @@ -6857,7 +6857,7 @@ Function102dec: ; 102dec ld bc, 4 palettes ld a, $05 call FarCopyWRAM - callba Function49742 + farcall Function49742 call SetPalettes call DelayFrame ret @@ -6880,7 +6880,7 @@ Function102e07: ; 102e07 ld c, 11 ld d, h ld e, l - callba _LinkTextbox + farcall _LinkTextbox .okay ld de, .waiting @@ -6905,8 +6905,8 @@ Function102e3e: ; 102e3e ; 102e4f Function102e4f: ; 102e4f - callba Function16d42e - callba _InitMG_Mobile_LinkTradePalMap + farcall Function16d42e + farcall _InitMG_Mobile_LinkTradePalMap ld de, PlayerName hlcoord 4, 0 call PlaceString @@ -7399,7 +7399,7 @@ Function103309: ; 103309 ld [wd1ee], a call Function1034be call UpdateSprites - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ld a, $01 ld [wd1f0], a call Function10339a @@ -7413,7 +7413,7 @@ Function103362: ; 103362 call Function1033af call Function10339a call Function10342c - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ld a, [Buffer2] bit 7, a jr z, .asm_103362 @@ -7707,7 +7707,7 @@ String_1035c1: db "けってい@" ; 1035c6 Function1035c6: ; 1035c6 - callba Function10138b + farcall Function10138b ld b, 0 ld hl, Unknown_1035d7 add hl, bc @@ -7799,7 +7799,7 @@ MenuData2_103648: ; 103648 ; 103654 Function103654: ; 103654 - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103666 ld hl, wcd2a @@ -7815,14 +7815,14 @@ Function103654: ; 103654 ; 10366e Mobile_SelectThreeMons: ; 10366e - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b ld hl, UnknownText_0x10375d call PrintText call YesNoBox jr c, .asm_103696 - callba CheckForMobileBattleRules + farcall CheckForMobileBattleRules jr nc, .asm_103690 call JoyWaitAorB jr .asm_103696 @@ -7867,7 +7867,7 @@ Mobile_SelectThreeMons: ; 10366e jr .asm_1036b5 .asm_1036d9 - callba CheckForMobileBattleRules + farcall CheckForMobileBattleRules jr nc, .asm_1036e6 call JoyWaitAorB jr .asm_1036f4 @@ -7899,7 +7899,7 @@ Function103700: ; 103700 ld hl, SwarmFlags bit 4, [hl] jr z, .asm_10370f - callba Function1008a6 + farcall Function1008a6 .asm_10370f ld a, c @@ -8003,7 +8003,7 @@ Function10378c: ; 10378c .already_set push bc - callba Link_SaveGame + farcall Link_SaveGame pop bc jr c, .failed_to_save ld a, $01 @@ -8011,7 +8011,7 @@ Function10378c: ; 10378c ld a, c and a ret z - callba Function1006fd + farcall Function1006fd ret .failed_to_save @@ -8089,10 +8089,10 @@ UnknownText_0x10381e: ; 0x10381e ; 0x103823 Function103823: ; 103823 - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103838 - callba Function1008a6 + farcall Function1008a6 ld a, c cp $01 jr c, .asm_10383a @@ -8117,8 +8117,8 @@ Function10383c: ; 10383c ld hl, UnknownText_0x103876 call PrintText call JoyWaitAorB - callba Script_reloadmappart - callba Function4a94e + farcall Script_reloadmappart + farcall Function4a94e jr c, .asm_103870 ld hl, wd002 ld de, wPlayerMonSelection @@ -8140,10 +8140,10 @@ UnknownText_0x103876: ; 0x103876 ; 0x10387b Function10387b: ; 10387b - callba Mobile_AlwaysReturnNotCarry + farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz - callba Function1008a6 + farcall Function1008a6 ld a, c ld [StringBuffer2], a ld hl, UnknownText_0x103898 diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 9ab9f7ed2..7e1d20db6 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1027,7 +1027,7 @@ Function106464:: ; 106464 ld hl, VTiles2 tile $6b ld b, $f ; XXX no graphics at 0f:40b0 call Get2bpp - callba LoadFrame + farcall LoadFrame ret ; 10649b diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 98bbcf485..6b9db7741 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -175,7 +175,7 @@ Function1080b7: ; 1080b7 ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims call DelayFrame @@ -237,7 +237,7 @@ Function108157: ; 108157 ld [hWX], a ld a, $90 ld [hWY], a - callba ClearSpriteAnims + farcall ClearSpriteAnims xor a ld hl, wSpriteAnimDict ld [hli], a @@ -361,8 +361,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld [hWY], a call LoadStandardFont call LoadFontsBattleExtra - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 scf ret ; 10827b @@ -433,7 +433,7 @@ EndMobileTradeAnim: ; 1082c6 WaitMobileTradeSpriteAnims: ; 1082cc .loop push bc - callba PlaySpriteAnimations + farcall PlaySpriteAnimations pop bc call DelayFrame dec c @@ -443,9 +443,9 @@ WaitMobileTradeSpriteAnims: ; 1082cc Function1082db: ; 1082db .loop - callba PlaySpriteAnimations - callba SetUpPokeAnim - callba HDMATransferTileMapToWRAMBank3 + farcall PlaySpriteAnimations + farcall SetUpPokeAnim + farcall HDMATransferTileMapToWRAMBank3 jr nc, .loop ret ; 1082f0 @@ -464,7 +464,7 @@ Function1082fa: ; 1082fa call Function108b78 push hl push bc - callba PlaySpriteAnimations + farcall PlaySpriteAnimations pop bc pop hl call DelayFrame @@ -552,7 +552,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites xor a ld [hSCX], a ld [hSCY], a @@ -687,7 +687,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -756,7 +756,7 @@ MobileTradeAnim_GetOddEgg: ; 108589 ld de, VTiles2 call Function108201 call EnableLCD - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call DelayFrame ld de, TradeBallGFX ld hl, VTiles0 @@ -813,7 +813,7 @@ MobileTradeAnim_GetOddEgg: ; 108589 ; 108638 MobileTradeAnim_02: ; 108638 - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -849,7 +849,7 @@ MobileTradeAnim_02: ; 108638 ; 108689 MobileTradeAnim_10: ; 108689 - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1097,7 +1097,7 @@ MobileTradeAnim_GetTrademon1: ; 108863 jr .loop .done - callba DeinitializeAllSprites + farcall DeinitializeAllSprites depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_25 call _InitSpriteAnimStruct @@ -1189,7 +1189,7 @@ MobileTradeAnim_GetTrademon3: ; 10890a MobileTradeAnim_0f: ; 108919 ld c, 40 call WaitMobileTradeSpriteAnims - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites call ClearTileMap @@ -1571,7 +1571,7 @@ Function108b98: ; 108b98 ; 108bbd MobileTradeAnim_DeleteSprites: ; 108bbd - callba DeinitializeAllSprites + farcall DeinitializeAllSprites call ClearSprites ret ; 108bc7 @@ -1590,7 +1590,7 @@ Function108bc7: ; 108bc7 (42:4bc7) ret .delete - callba DeinitializeSprite + farcall DeinitializeSprite ret Function108be0: ; 108be0 (42:4be0) diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 6c581de87..1c2adbfce 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -432,7 +432,7 @@ Function1143b7: ; 1143b7 pop hl push af ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -682,7 +682,7 @@ Function1144d1: ; 1144d1 .asm_11451c pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -699,7 +699,7 @@ Function1144d1: ; 1144d1 .asm_114537 ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc09 @@ -710,7 +710,7 @@ Function1144d1: ; 1144d1 ld a, d or e jr z, .asm_114559 - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1275,7 +1275,7 @@ Function114843: ; 114843 Function114867: ; 114867 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1303,7 +1303,7 @@ Function114867: ; 114867 inc e call z, Function1148b9 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1334,7 +1334,7 @@ Function114867: ; 114867 Function1148b9: ; 1148b9 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1344,7 +1344,7 @@ Function1148b9: ; 1148b9 Function1148c2: ; 1148c2 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1397,7 +1397,7 @@ Function1148c2: ; 1148c2 inc e call z, Function114944 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1436,7 +1436,7 @@ Function1148c2: ; 1148c2 Function114944: ; 114944 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1446,7 +1446,7 @@ Function114944: ; 114944 Function11494d: ; 11494d ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1491,7 +1491,7 @@ Function11494d: ; 11494d inc e call z, Function1149c3 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1530,7 +1530,7 @@ Function11494d: ; 11494d Function1149c3: ; 1149c3 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1540,7 +1540,7 @@ Function1149c3: ; 1149c3 Function1149cc: ; 1149cc ld hl, $dc06 ld a, [hl] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a push de @@ -1559,7 +1559,7 @@ Function1149cc: ; 1149cc ld [hl], d dec hl ld [hl], e - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] @@ -1572,7 +1572,7 @@ Function1149cc: ; 1149cc inc e call z, Function114a0f ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -1590,7 +1590,7 @@ Function1149cc: ; 1149cc Function114a0f: ; 114a0f push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -1903,7 +1903,7 @@ endr .asm_114b96 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1954,7 +1954,7 @@ Function114bbc: ; 114bbc jr z, .asm_114bff pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2187,7 +2187,7 @@ endr .asm_114d11 pop hl ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2497,7 +2497,7 @@ Function114e62: ; 114e62 Function114ea0: ; 114ea0 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2522,7 +2522,7 @@ Function114ea0: ; 114ea0 inc e call z, Function114ee0 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2544,7 +2544,7 @@ Function114ea0: ; 114ea0 Function114ee0: ; 114ee0 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -2787,7 +2787,7 @@ Function115020: ; 115020 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -2814,7 +2814,7 @@ Function115020: ; 115020 .asm_115046 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -2834,7 +2834,7 @@ Function115020: ; 115020 Function115059: ; 115059 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3003,7 +3003,7 @@ Function1150b3: ; 1150b3 Function115136: ; 115136 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3030,7 +3030,7 @@ Function115136: ; 115136 .asm_11515d ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3050,7 +3050,7 @@ Function115136: ; 115136 Function115170: ; 115170 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3060,7 +3060,7 @@ Function115170: ; 115170 Function115179: ; 115179 ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3155,7 +3155,7 @@ Function115179: ; 115179 inc e call z, Function11520e ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3171,7 +3171,7 @@ Function115179: ; 115179 Function11520e: ; 11520e push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3182,7 +3182,7 @@ Function115217: ; 115217 push hl ld hl, $dc06 ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] @@ -3221,7 +3221,7 @@ Function115217: ; 115217 .asm_115252 ld hl, $dc06 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -3267,7 +3267,7 @@ Function115217: ; 115217 Function115286: ; 115286 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -3672,7 +3672,7 @@ Function1153d2: ; 1153d2 ld [de], a ld hl, RightOrnament ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -3681,7 +3681,7 @@ Function1153d2: ; 1153d2 ld hl, $ddc8 call Function115d6a ld hl, RightOrnament - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hli], a ld [hl], e inc hl @@ -3911,7 +3911,7 @@ Function1155d1: ; 1155d1 Function11560a: ; 11560a ld a, [$dc06] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld a, [$dc17] ld [$dc00], a ld [hFF8C], a @@ -3986,16 +3986,16 @@ Function11560a: ; 11560a inc hl ld [hl], d pop bc - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld e, [hl] inc hl ld d, [hl] ld hl, $dc24 call Function115d6a - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld [hl], e inc hl ld [hl], d @@ -4008,7 +4008,7 @@ Function11560a: ; 11560a jr nz, .asm_11564d .asm_1156a9 - ld a, [wCurrentMapSignpostCount] + ld a, [wCurrMapBGEventCount] ld [$dc06], a xor a ret @@ -4354,9 +4354,9 @@ Function11581e: ; 11581e ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4364,8 +4364,8 @@ Function11581e: ; 11581e ld d, [hl] ld hl, PartyMon5Speed call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -4921,9 +4921,9 @@ Function115b00: ; 115b00 ld [wCurrMapCallbackHeaderPointer], a pop bc pop hl - ld hl, wCurrMapTriggerCount + ld hl, wCurrMapSceneScriptCount ld a, [hli] - ld [wCurrentMapSignpostCount], a + ld [wCurrMapBGEventCount], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4931,8 +4931,8 @@ Function115b00: ; 115b00 ld d, [hl] ld hl, $dc26 call Function115d6a - ld hl, wCurrMapTriggerCount - ld a, [wCurrentMapSignpostCount] + ld hl, wCurrMapSceneScriptCount + ld a, [wCurrMapBGEventCount] ld [hli], a ld a, e ld [hli], a @@ -5312,7 +5312,7 @@ Function115d6a: ; 115d6a Function115d77: ; 115d77 push bc - ld bc, wCurrentMapSignpostCount + ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret @@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 - callba GiveOddEgg + farcall GiveOddEgg ret ; 11765d @@ -6898,9 +6898,9 @@ Function117699: ; 117699 (45:7699) call ByteFill call ClearBGPalettes call ClearSprites - callba Function171c87 - callba ReloadMapPart - callba ClearSpriteAnims + farcall Function171c87 + farcall ReloadMapPart + farcall ClearSpriteAnims ret Function1176ee: ; 1176ee (45:76ee) @@ -6910,12 +6910,12 @@ Function1176ee: ; 1176ee (45:76ee) bit 7, a jr nz, .quit call Function117719 - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .quit - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearBGPalettes call ClearScreen call ClearSprites @@ -6945,7 +6945,7 @@ Jumptable_117728: ; 117728 (45:7728) Function117738: ; 117738 (45:7738) - callba Function171ccd + farcall Function171ccd depixel 6, 3 ld a, $1d call _InitSpriteAnimStruct @@ -7004,7 +7004,7 @@ Function117764: ; 117764 (45:7764) ret Function117764_select: ; 1177a5 (45:77a5) - callba Function171cf0 + farcall Function171cf0 ret Function117764_start: ; 1177ac (45:77ac) @@ -7176,7 +7176,7 @@ Function1178aa: ; 1178aa (45:78aa) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 16, 8 ld de, YessNoString_1179c5 call PlaceString @@ -7278,7 +7278,7 @@ Function117984: ; 117984 (45:7984) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 1, 14 ld de, NotAPokemonPasswordString call PlaceString @@ -7379,8 +7379,8 @@ Function117a94: ; 0x117a94 ld [wcf66], a call ClearBGPalettes call ClearSprites - callba Function172e78 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall Function172e78 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret ; 0x117ab4 @@ -7388,9 +7388,9 @@ Function117a94: ; 0x117a94 Function117ab4: ; 0x117ab4 call ClearBGPalettes call ClearSprites - callba Function172e78 - callba Function172eb9 - callba ReloadMapPart + farcall Function172e78 + farcall Function172eb9 + farcall ReloadMapPart ret ; 0x117acd @@ -7401,7 +7401,7 @@ Function117acd: ; 0x117acd bit 7, a jr nz, .asm_117ae2 call Function117ae9 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 jr Function117acd .asm_117ae2 @@ -7431,7 +7431,7 @@ Function117ae9: ; 0x117ae9 dw Function117c4a Function117b06: - callba Function172eb9 + farcall Function172eb9 ld a, $10 ld [wcf64], a jp MobileStudium_JumptableIncrement @@ -7508,13 +7508,13 @@ Function117b4f: jr nz, .b_button call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart jp MobileStudium_JumptableIncrement .b_button call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, $80 ld [wJumptableIndex], a ret @@ -7523,7 +7523,7 @@ Function117bb6: call Function117c89 ld a, $1 ld [hBGMapMode], a - callba Function118284 + farcall Function118284 call ClearSprites ld a, [wc300] and a @@ -7533,7 +7533,7 @@ Function117bb6: .asm_117bd0 ld a, $2 ld [wc303], a - callba DisplayMobileError + farcall DisplayMobileError ld a, $80 ld [wJumptableIndex], a ret @@ -7580,7 +7580,7 @@ Function117bb6: .asm_117c20 pop af ld [rSVBK], a - callba Function172eb9 + farcall Function172eb9 ld a, [rSVBK] push af ld a, $3 @@ -7601,7 +7601,7 @@ Function117c4a: call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart ld hl, MobileStadiumSuccessText call PrintText ld a, [rSVBK] diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 8493a3cf8..e2382fc38 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -491,7 +491,7 @@ Function1161d5: ; 1161d5 pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld de, MUSIC_MOBILE_ADAPTER @@ -515,7 +515,7 @@ MenuDataHeader_11628c: ; 11628c ; 116294 Function116294: ; 116294 - callba Function170d02 + farcall Function170d02 ld a, [$c319] inc a ld [$c319], a @@ -541,7 +541,7 @@ Function116294: ; 116294 ; 1162cb Function1162cb: ; 1162cb - callba Function170cc6 + farcall Function170cc6 ld a, [$c319] inc a ld [$c319], a @@ -676,7 +676,7 @@ Function11636e: ; 11636e call UpdateSprites pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld a, [wMapMusic] @@ -700,7 +700,7 @@ Function1163c0: ; 1163c0 ld bc, 16 * 4 call ByteFill call DelayFrame - callba Function14146 + farcall Function14146 ld b, SCGB_MAPPALS call GetSGBLayout ld a, [rSVBK] @@ -718,10 +718,10 @@ Function1163c0: ; 1163c0 ld a, $90 ld [hWY], a call UpdateSprites - callba Function14157 + farcall Function14157 pop af ld [rSVBK], a - callba ReloadMapPart + farcall ReloadMapPart ld a, [wLinkMode] cp $4 jr z, .asm_11642a @@ -750,10 +750,10 @@ Function1163c0: ; 1163c0 ; 116441 Function116441: ; 116441 - callba Function17d405 + farcall Function17d405 ld a, $90 ld [hWY], a - callba ReloadMapPart + farcall ReloadMapPart ld a, $8 ld [MusicFade], a ld a, [wMapMusic] diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 19b255c34..150f9baa7 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -33,8 +33,8 @@ asm_11800b .skip call Function1184a5 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -74,8 +74,8 @@ Function11805f: ; 11805f .asm_118090 call Function11857c call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -120,8 +120,8 @@ Function1180b8: ; 1180b8 .asm_1180f2 call Function1184ec call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -165,8 +165,8 @@ Function118125: ; 118125 .skip call BattleTowerRoomMenu_Jumptable call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -203,12 +203,12 @@ Function118180: ; 118180 ld de, w3_d202 ld c, $96 - callba CheckStringForErrors_IgnoreTerminator + farcall CheckStringForErrors_IgnoreTerminator jr c, .return_d3 ld de, w3_d202 lb bc, 1, $96 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr c, .return_d3 ld hl, w3_d202 @@ -254,8 +254,8 @@ Function1181da: ; 1181da .asm_11820b call Function1185c3 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -292,8 +292,8 @@ Function118233: ; 118233 .asm_11825f call Function118624 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -328,8 +328,8 @@ Function118284: ; 118284 .asm_1182b0 call Function1186f5 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -366,8 +366,8 @@ Function1182d5: ; 1182d5 .asm_118301 call Function118746 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -404,8 +404,8 @@ Function118329: ; 118329 .asm_118355 call Function118671 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -441,8 +441,8 @@ Function11837a: ; 11837a .asm_1183a6 call Function1186b2 call BattleTowerRoomMenu_WriteMessage - callba Function115dd3 - callba Function11619d + farcall Function115dd3 + farcall Function11619d call DelayFrame ld a, [wcf66] ld hl, wcd33 @@ -487,10 +487,10 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb ld [hMobileReceive], a ld [hMobile], a ei - callba MobileFunc_106462 - callba Function106464 - callba Function115d99 - callba Function11615a + farcall MobileFunc_106462 + farcall Function106464 + farcall Function115d99 + farcall Function11615a ld a, $5 call GetSRAMBank xor a @@ -1154,7 +1154,7 @@ Function118903: ; 118903 (46:4903) ld a, [wc3f0] ld [$c319], a ld c, $1 - callba Function115e18 + farcall Function115e18 ld a, $8 ld [wcd3c], a call BattleTowerRoomMenu2 @@ -1583,8 +1583,8 @@ Function118d35: ; 118d35 ld a, b ld [$b2fb], a call CloseSRAM - callba Function170be4 - callba Function1700c4 + farcall Function170be4 + farcall Function1700c4 jr .asm_118d78 .asm_118d6e @@ -1673,7 +1673,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - callba Function11b93b + farcall Function11b93b pop af ld [rSVBK], a @@ -3259,7 +3259,7 @@ Function119800: ; 119800 ld a, $1 ld [rSVBK], a call FadeToMenu - callba Function10803d + farcall Function10803d call Function11a9ce call RestartMapMusic ld a, $3 @@ -3272,7 +3272,7 @@ Function119800: ; 119800 ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable ; 11984e @@ -3283,7 +3283,7 @@ Function11984e: ; 11984e ld a, [wcd38] and a jr nz, .asm_1198a8 - callba Function170000 + farcall Function170000 ld a, [wJumptableIndex] push af ld a, [wcf64] @@ -3295,7 +3295,7 @@ Function11984e: ; 11984e ld a, $1 ld [rSVBK], a call FadeToMenu - callba MobileTradeAnimation_SendGivemonToGTS + farcall MobileTradeAnimation_SendGivemonToGTS call Function11a9ce call RestartMapMusic ld a, $3 @@ -3308,7 +3308,7 @@ Function11984e: ; 11984e ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a0 @@ -3317,7 +3317,7 @@ Function11984e: ; 11984e jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a8 - callba Function17005a + farcall Function17005a ld a, [wJumptableIndex] push af ld a, [wcf64] @@ -3329,7 +3329,7 @@ Function11984e: ; 11984e ld a, $1 ld [rSVBK], a call FadeToMenu - callba MobileTradeAnimation_RetrieveGivemonFromGTS + farcall MobileTradeAnimation_RetrieveGivemonFromGTS call Function11a9ce call RestartMapMusic ld a, $3 @@ -3342,7 +3342,7 @@ Function11984e: ; 11984e ld [wcf64], a pop af ld [wJumptableIndex], a - callba Function115dc3 + farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable ; 1198ee @@ -3386,7 +3386,7 @@ Function1198f7: ; 119937 Function119937: ; 119937 - callba Function1707f4 + farcall Function1707f4 jp BattleTowerRoomMenu_IncrementJumptable ; 119940 @@ -4366,8 +4366,8 @@ Function119f98: ; 119f98 and a jr z, .asm_119fd4 call ExitMenu - callba ReloadMapPart - callba Function115dc3 + farcall ReloadMapPart + farcall Function115dc3 ld a, [wcd33] ld [wcf66], a ld a, $a @@ -4383,17 +4383,17 @@ Function119f98: ; 119f98 ld [wc30d], a ld a, $1 ld [wc314], a - callba ReloadMapPart + farcall ReloadMapPart and a ret .asm_119fef call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a - callba Function115dc3 + farcall Function115dc3 ld a, $a ld [wc300], a scf @@ -4434,7 +4434,7 @@ Function11a00e: ; 11a00e ld a, $1 ld [rSVBK], a call FadeToMenu - callba Function11765d + farcall Function11765d call Function11a9ce ld a, $3 ld [rSVBK], a @@ -4444,9 +4444,9 @@ Function11a00e: ; 11a00e call CopyBytes ld a, $1 ld [rSVBK], a - callba Function115d99 + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4460,15 +4460,15 @@ Function11a00e: ; 11a00e ld a, $5 ld [wMenuBorderBottomCoord], a call PushWindow - callba Function11765d - callba Function117ab4 - callba MobileFunc_106462 - callba Function106464 + farcall Function11765d + farcall Function117ab4 + farcall MobileFunc_106462 + farcall Function106464 call ExitMenu - callba ReloadMapPart - callba Function115d99 + farcall ReloadMapPart + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4483,15 +4483,15 @@ Function11a0ca: ; 11a0ca ld a, $11 ld [wMenuBorderBottomCoord], a call PushWindow - callba Function11765d - callba Function17d3f6 - callba MobileFunc_106462 - callba Function106464 + farcall Function11765d + farcall Function17d3f6 + farcall MobileFunc_106462 + farcall Function106464 call ExitMenu - callba ReloadMapPart - callba Function115d99 + farcall ReloadMapPart + farcall Function115d99 ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -4500,7 +4500,7 @@ Function11a0ca: ; 11a0ca Function11a113: ; 11a113 call Function11a63c ld c, $1 - callba Function115e18 + farcall Function115e18 hlcoord 4, 2 ld de, String_11a6c8 call PlaceString @@ -4580,7 +4580,7 @@ Function11a192: ; 11a192 and a jr nz, .asm_11a1b6 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4590,7 +4590,7 @@ Function11a192: ; 11a192 .asm_11a1b6 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4721,7 +4721,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 and a jr nz, .exit_no_carry call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerFrames] cp $0 jr z, .asm_11a2b4 @@ -4743,7 +4743,7 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 .exit_no_carry call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart and a ret ; 11a2cf @@ -4775,7 +4775,7 @@ MenuDataHeader_11a2de: ; 11a2de Function11a2e6: ; 11a2e6 call Function11a63c ld c, $2 - callba Function115e18 + farcall Function115e18 hlcoord 4, 2 ld de, String_11a71e call PlaceString @@ -4822,8 +4822,8 @@ Function11a33a: ; 11a33a .asm_11a346 call ExitMenu - callba ReloadMapPart - callba Function115dc3 + farcall ReloadMapPart + farcall Function115dc3 and a ret ; 11a357 @@ -4866,7 +4866,7 @@ Function11a38d: ; 11a38d and a jr nz, .asm_11a3b1 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4876,7 +4876,7 @@ Function11a38d: ; 11a38d .asm_11a3b1 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -4941,7 +4941,7 @@ Function11a41b: ; 11a41b and a jr nz, .asm_11a43f call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -4951,7 +4951,7 @@ Function11a41b: ; 11a41b .asm_11a43f call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, $1c ld [wcf66], a ld [wcd80], a @@ -5012,7 +5012,7 @@ Function11a49e: ; 11a49e and a jr nz, .asm_11a4c7 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -5024,7 +5024,7 @@ Function11a49e: ; 11a49e .asm_11a4c7 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerFrames] ld [wcf66], a ld [wcd80], a @@ -5059,7 +5059,7 @@ Function11a4fe: ; 11a4fe and a jr nz, .asm_11a522 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart call Function11a63c hlcoord 4, 2 ld de, String_11a6d2 @@ -5069,7 +5069,7 @@ Function11a4fe: ; 11a4fe .asm_11a522 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ld a, [wMobileInactivityTimerSeconds] ld [wcf66], a ld [wcd80], a @@ -5098,7 +5098,7 @@ Function11a536: ; 11a536 call Function11a9f0 jr nz, .asm_11a562 call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart .asm_11a562 scf @@ -5174,10 +5174,10 @@ Function11a5b9: ; 11a5b9 ld b, $4 ld c, $12 call Function3eea - callba ReloadMapPart + farcall ReloadMapPart call UpdateSprites ld c, $0 - callba Function115e18 + farcall Function115e18 ld a, $1 ld [wc305], a ret @@ -5209,7 +5209,7 @@ Function11a5f5: ; 11a5f5 hlcoord 15, 7 ld a, $ed ld [hl], a - callba ReloadMapPart + farcall ReloadMapPart ret ; 11a63c @@ -5578,10 +5578,10 @@ Function11a9ce: ; 11a9ce call ClearBGPalettes call ReloadTilesetAndPalettes call Call_ExitMenu - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 call ret_d90 - callba FinishExitMenu + farcall FinishExitMenu call UpdateSprites ret ; 11a9f0 @@ -5733,7 +5733,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu - callab ClearSpriteAnims2 + callfar ClearSpriteAnims2 call Function11ac51 call CloseSubmenu ret @@ -5773,8 +5773,8 @@ Function11ac51: ; 11ac51 call Function11ad6e ld a, 30 * 4 ld [wCurrSpriteOAMAddr], a - callba DoNextFrameForAllSprites - callba ReloadMapPart + farcall DoNextFrameForAllSprites + farcall ReloadMapPart jr .loop .asm_11aca8 @@ -5845,7 +5845,7 @@ Function11ad1b: ; 11ad1b call ClearBGPalettes call ClearSprites call ClearTileMap - callba Function17c000 + farcall Function17c000 ld a, [wMenuCursorY] ld [wcd82], a dec a @@ -5872,7 +5872,7 @@ Function11ad1b: ; 11ad1b ld [wcd30], a ld a, $2 ld [wc7d4], a - callba Pokedex_OrderMonsByMode + farcall Pokedex_OrderMonsByMode ret ; 11ad6e @@ -5917,7 +5917,7 @@ Function11ad95: ; 11ad95 hlcoord 10, 10, AttrMap lb bc, 8, 8 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $1 ld [wMenuCursorY], a @@ -5996,7 +5996,7 @@ Function11adc4: .asm_11ae2e call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11ae38 @@ -6034,7 +6034,7 @@ Function11ae4e: ; 11ae4e hlcoord 9, 12, AttrMap lb bc, 6, 11 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $1 ld [wMenuCursorY], a @@ -6102,7 +6102,7 @@ Function11ae98: .asm_11aef7 call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11af04 @@ -6125,7 +6125,7 @@ Function11af04: ; 11af04 hlcoord 9, 12, AttrMap lb bc, 6, 11 call Function11afd6 - callba ReloadMapPart + farcall ReloadMapPart call Function11ad8a ld a, $2 ld [wMenuCursorY], a @@ -6193,7 +6193,7 @@ Function11af4e: .asm_11afaa call ExitMenu call ExitMenu - callba ReloadMapPart + farcall ReloadMapPart ret ; 11afb7 @@ -6697,7 +6697,7 @@ Function11b242: ; 11b242 call PlaceString xor a ld [MonType], a - callba GetGender + farcall GetGender hlcoord 1, 4 ld a, [CurPartySpecies] ld bc, wcd2f @@ -6771,7 +6771,7 @@ Function11b295: ; 11b295 ld hl, $0003 add hl, bc ld e, [hl] - callba FlyFunction_GetMonIcon + farcall FlyFunction_GetMonIcon hlcoord 4, 14 push hl call GetPokemonName @@ -7335,9 +7335,9 @@ Function11b5c0: ; 11b5c0 ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox - callba Function170807 - callba SaveAfterLinkTrade + farcall RemoveMonFromPartyOrBox + farcall Function170807 + farcall SaveAfterLinkTrade jp Function11ad8a ; 11b5e0 @@ -7425,7 +7425,7 @@ Function11b66d: ; 11b66d jr .asm_11b6b0 .asm_11b691 - callba Function17081d + farcall Function17081d ld a, [ScriptVar] and a jr z, .asm_11b6b0 @@ -7486,63 +7486,63 @@ Function11b6b4: ; 11b6b4 ld de, $c63d ld c, 5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_OT - callba Mobile_CopyDefaultOTName + farcall Mobile_CopyDefaultOTName .length_check_OT ld de, $c63d lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .error_check_nick - callba Mobile_CopyDefaultOTName + farcall Mobile_CopyDefaultOTName .error_check_nick ld de, $c642 ld c, 5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_nick - callba Mobile_CopyDefaultNickname + farcall Mobile_CopyDefaultNickname .length_check_nick ld de, $c642 lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .error_check_mail - callba Mobile_CopyDefaultNickname + farcall Mobile_CopyDefaultNickname .error_check_mail ld de, $c647 ld c, MAIL_MSG_LENGTH + 1 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_mail - callba Mobile_CopyDefaultMail + farcall Mobile_CopyDefaultMail .length_check_mail ld de, $c647 lb bc, 2, MAIL_MSG_LENGTH + 1 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr c, .fix_mail ld a, b cp $2 jr nz, .mail_ok .fix_mail - callba Mobile_CopyDefaultMail + farcall Mobile_CopyDefaultMail .mail_ok ld de, $c668 ld c, $5 - callba CheckStringForErrors + farcall CheckStringForErrors jr nc, .length_check_author - callba Mobile_CopyDefaultMailAuthor + farcall Mobile_CopyDefaultMailAuthor .length_check_author ld de, $c668 lb bc, 1, 5 - callba CheckStringContainsLessThanBNextCharacters + farcall CheckStringContainsLessThanBNextCharacters jr nc, .author_okay - callba Mobile_CopyDefaultMailAuthor + farcall Mobile_CopyDefaultMailAuthor .author_okay ld a, [$c60e] @@ -7608,21 +7608,21 @@ Function11b7e5: ; 11b7e5 ld a, [hl] ld [wOTTrademonDVs + 1], a ld bc, $c60d ; pokemon_data_start - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a call SpeechTextBox call FadeToMenu - callba MobileTradeAnimation_ReceiveGetmonFromGTS - callba Function17d1f1 + farcall MobileTradeAnimation_ReceiveGetmonFromGTS + farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a - callba EvolvePokemon + farcall EvolvePokemon xor a ld [wLinkMode], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ld a, $5 call GetSRAMBank ld a, $5 @@ -7632,7 +7632,7 @@ Function11b7e5: ; 11b7e5 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_11b872 @@ -7646,7 +7646,7 @@ Function11b7e5: ; 11b7e5 ; 11b879 Function11b879: ; 11b879 - callba BattleTower_CheckSaveFileExistsAndIsYours + farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z @@ -7787,7 +7787,7 @@ Function11b93b: ; 11b93b ld a, $c64b / $100 ld [wMobileMonMailPointerBuffer + 1], a call AddMobileMonToParty - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ret ; 11b98f @@ -7896,7 +7896,7 @@ AddMobileMonToParty: ; 11b98f ; 11ba38 Function11ba38: ; 11ba38 - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted ret c xor a ld [ScriptVar], a diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 041c071b4..08cb86426 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -15,10 +15,10 @@ Function16c000: ; 16c000 ld [wcfbe], a ; Do stuff call MobileSystemSplashScreen_InitGFX ; Load GFX - callba SetRAMStateForMobile - callba EnableMobile + farcall SetRAMStateForMobile + farcall EnableMobile call .RunJumptable - callba DisableMobile + farcall DisableMobile ; Prevent this routine from running again ; until the next time the syatem is turned on xor a @@ -37,7 +37,7 @@ Function16c000: ; 16c000 ld [wd003], a .loop call DelayFrame - callba Function10635c + farcall Function10635c ld a, [wd002] ld hl, .Jumptable rst JumpTable @@ -192,7 +192,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ld bc, 8 ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ret ; 16c145 @@ -331,7 +331,7 @@ Function16c943: ; 16c943 ld a, e cp $8 jr nz, .asm_16c969 - callba ApplyPals + farcall ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -361,7 +361,7 @@ Function16ca11: ; 16ca11 ld a, [wd003] and a jr nz, .asm_16ca1d - callba ApplyPals + farcall ApplyPals .asm_16ca1d ld a, [rSVBK] @@ -433,7 +433,7 @@ Function16ca11: ; 16ca11 ld a, e cp $8 jr nz, .asm_16ca28 - callba ApplyPals + farcall ApplyPals call SetPalettes ld a, [rSVBK] push af @@ -686,7 +686,7 @@ Function16cbd1: ; 16cbd1 ld bc, 2 ld a, $5 call FarCopyWRAM - callba ApplyPals + farcall ApplyPals ld a, $1 ld [hCGBPalUpdate], a ret diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 3294cc3dc..005bb1a1b 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -24,7 +24,7 @@ Function170000: ; 170000 ld a, [hl] ld [wPlayerTrademonID + 1], a ld bc, $c633 - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wPlayerTrademonCaughtData], a ld a, [wcd81] @@ -65,7 +65,7 @@ Function17005a: ; 17005a ld a, [hl] ld [wOTTrademonID + 1], a ld bc, $a82c - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a ld a, [wcd81] @@ -324,7 +324,7 @@ Function1719c8: ; 1719c8 (5c:59c8) ret Function1719d6: ; 1719d6 (5c:59d6) - callba BattleTowerRoomMenu_InitRAM + farcall BattleTowerRoomMenu_InitRAM call Function1719ed ld a, [rSVBK] push af @@ -343,9 +343,9 @@ Function1719ed: ; 1719ed (5c:59ed) ld [wcd4b], a call ClearBGPalettes call ClearSprites - callba Function171d2b - callba ReloadMapPart - callba ClearSpriteAnims + farcall Function171d2b + farcall ReloadMapPart + farcall ClearSpriteAnims ret Function171a11: ; 171a11 (5c:5a11) @@ -355,11 +355,11 @@ Function171a11: ; 171a11 (5c:5a11) bit 7, a jr nz, .done call Function171a36 - callba PlaySpriteAnimations - callba ReloadMapPart + farcall PlaySpriteAnimations + farcall ReloadMapPart jr .loop .done - callba ClearSpriteAnims + farcall ClearSpriteAnims call ClearSprites ret @@ -412,7 +412,7 @@ Function171a5d: ; 171a5d (5c:5a5d) push af ld a, $1 ld [rSVBK], a - callba BattleTowerRoomMenu_Cleanup + farcall BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a ld a, $a @@ -420,7 +420,7 @@ Function171a5d: ; 171a5d (5c:5a5d) ret Function171a95: ; 171a95 (5c:5a95) - callba Function171ccd + farcall Function171ccd hlcoord 2, 8 ld de, String_171aa7 call PlaceString @@ -457,7 +457,7 @@ Function171aec: ; 171aec (5c:5aec) push af ld a, $1 ld [rSVBK], a - callba BattleTowerRoomMenu_Cleanup + farcall BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a hlcoord 2, 6 @@ -619,7 +619,7 @@ Function171beb: ; 171beb (5c:5beb) call LoadMenuDataHeader call MenuBox call MenuBoxCoord2Tile - callba ReloadMapPart + farcall ReloadMapPart hlcoord 1, 14 ld de, String_171c73 call PlaceString @@ -654,11 +654,11 @@ Function171c41: ; 171c41 (5c:5c41) dec [hl] ret nz call ClearBGPalettes - callba MobileFunc_106462 - callba Function106464 + farcall MobileFunc_106462 + farcall Function106464 ld a, $2 ld [wc303], a - callba DisplayMobileError + farcall DisplayMobileError asm_171c60: ; 171c60 (5c:5c60) ld a, $80 ld [wcd49], a diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index baf247fe2..c8cae6654 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -39,12 +39,12 @@ Function17a6a8: ; 17a6a8 (5e:66a8) pop de call Function17a6f5 call Function17aba0 - callba Function106464 + farcall Function106464 call Function17ac0c - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 call Function17abcf - callba LoadOW_BGPal7 - callba Function49420 + farcall LoadOW_BGPal7 + farcall Function49420 call SetPalettes call DelayFrame ret @@ -163,11 +163,11 @@ Function17a78f: ; 17a78f (5e:678f) bit 7, [hl] res 7, [hl] jr nz, .asm_17a79f - callba HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTileMapToWRAMBank3 ret .asm_17a79f - callba ReloadMapPart + farcall ReloadMapPart ret ; 17a7a6 (5e:67a6) diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 9b0c5455b..ea485089c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -77,7 +77,7 @@ Function17c000: ; 17c000 ld [rVBK], a call EnableLCD - callba ReloadMapPart + farcall ReloadMapPart ret ; 17c083 @@ -290,21 +290,21 @@ Function17d0f3: ; 17d0f3 ld a, [hl] ld [wOTTrademonDVs + 1], a ld bc, $c608 + 5 - callba GetCaughtGender + farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a call SpeechTextBox call FadeToMenu - callba Function10804d - callba Function17d1f1 + farcall Function10804d + farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a - callba EvolvePokemon + farcall EvolvePokemon xor a ld [wLinkMode], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade ld a, $5 call GetSRAMBank ld a, $5 @@ -314,7 +314,7 @@ Function17d0f3: ; 17d0f3 ld b, a ld a, [MapNumber] ld c, a - call GetMapTrigger + call GetMapSceneID ld a, d or e jr z, .asm_17d180 @@ -413,7 +413,7 @@ Function17d1f1: ; 17d1f1 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes predef GetUnownLetter - callab UpdateUnownDex + callfar UpdateUnownDex ld a, [wFirstUnownSeen] and a jr nz, .asm_17d223 @@ -515,7 +515,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297 Function17d2b6: ; 17d2b6 call Function17d2c0 - callba Function1181da + farcall Function1181da ret ; 17d2c0 @@ -627,7 +627,7 @@ Function17d370: ; 17d370 call ClearBGPalettes call ClearSprites call ClearScreen - callba ReloadMapPart + farcall ReloadMapPart call DisableLCD ld hl, VTiles1 tile $6e ld de, $c608 @@ -673,7 +673,7 @@ Function17d3f6: ; 17d3f6 call ClearBGPalettes call ClearSprites call ClearScreen - callba ReloadMapPart + farcall ReloadMapPart Function17d405: call DisableLCD @@ -719,7 +719,7 @@ Function17d45a: ; 17d45a bit 7, a jr nz, .asm_17d46f call Function17d474 - callba ReloadMapPart + farcall ReloadMapPart jr .asm_17d45a .asm_17d46f @@ -921,7 +921,7 @@ Function17d48d: ; 17d48d call Function17e451 call Function17e55b call Function17e5af - callba ReloadMapPart + farcall ReloadMapPart jp Function17e438 ; 17d5be @@ -1330,7 +1330,7 @@ Function17d833: ; 17d833 add hl, de ld e, l ld d, h - callba Function11c08f + farcall Function11c08f call Function17e349 ret ; 17d85d @@ -1422,7 +1422,7 @@ Function17d85d: ; 17d85d ld [wcd3b], a xor a ld [wcf66], a - callba Function118329 + farcall Function118329 ld a, [wc300] and a jr z, .asm_17d8fe @@ -1457,7 +1457,7 @@ Function17d902: ; 17d902 jr nz, .asm_17d918 xor a ld [wcf66], a - callba Function11837a + farcall Function11837a ld a, [wc300] and a jr z, .asm_17d936 @@ -1488,7 +1488,7 @@ Function17d93a: ; 17d93a ld [CurPartySpecies], a ld a, [$c70c] ld e, a - callba LoadMonPaletteAsNthBGPal + farcall LoadMonPaletteAsNthBGPal call SetPalettes ld a, [$c708] ld l, a @@ -1500,7 +1500,7 @@ Function17d93a: ; 17d93a add hl, de ld e, l ld d, h - callba HOF_AnimateFrontpic + farcall HOF_AnimateFrontpic pop af ld [rSVBK], a call Function17e349 @@ -1524,7 +1524,7 @@ Function17d98b: ; 17d98b ld [TrainerClass], a ld a, [$c70b] ld e, a - callba LoadTrainerClassPaletteAsNthBGPal + farcall LoadTrainerClassPaletteAsNthBGPal call SetPalettes ld a, [$c708] ld e, a @@ -1532,7 +1532,7 @@ Function17d98b: ; 17d98b ld d, a push de ld de, VTiles2 - callba GetTrainerPic + farcall GetTrainerPic pop hl decoord 0, 0 add hl, de @@ -2340,7 +2340,7 @@ Function17ded9: ; 17ded9 push hl push bc predef TryAddMonToParty - callba SetCaughtData + farcall SetCaughtData pop bc pop hl bit 1, b @@ -2378,7 +2378,7 @@ Function17ded9: ; 17ded9 ld a, [hli] ld b, a push hl - callba SetGiftPartyMonCaughtData + farcall SetGiftPartyMonCaughtData pop hl pop bc jr .asm_17df5e @@ -2444,7 +2444,7 @@ Function17ded9: ; 17ded9 ld e, l push hl ld b, $0 - callba CalcPkmnStats + farcall CalcPkmnStats ld a, [PartyCount] dec a ld hl, PartyMon1HP @@ -2532,9 +2532,9 @@ Function17e026: ; 17e026 jp z, .asm_17e0ea push bc push hl - callba LoadEnemyMon - callba SentPkmnIntoBox - callba SetBoxMonCaughtData + farcall LoadEnemyMon + farcall SentPkmnIntoBox + farcall SetBoxMonCaughtData pop hl pop bc ld a, BANK(sBoxMonNicknames) @@ -2563,7 +2563,7 @@ Function17e026: ; 17e026 ld b, a push hl call CloseSRAM - callba SetGiftBoxMonCaughtData + farcall SetGiftBoxMonCaughtData ld a, $1 call GetSRAMBank pop hl @@ -2702,7 +2702,7 @@ Function17e133: ; 17e133 ld a, [hli] ld [ScriptVar], a push hl - callba MobileCheckOwnMonAnywhere + farcall MobileCheckOwnMonAnywhere pop hl jr c, .asm_17e159 inc hl @@ -2950,7 +2950,7 @@ Function17e2a7: ; 17e2a7 call Function17e32b xor a ld [wcf66], a - callba Function118233 + farcall Function118233 ld de, GFX_17eb7e ld hl, VTiles2 tile $60 lb bc, BANK(GFX_17eb7e), 1 @@ -2999,7 +2999,7 @@ Function17e309: ; 17e309 call ClearScreen call Function17e349 call Function17d5f6 - callba DisplayMobileError + farcall DisplayMobileError call Function17e349 call Function17dcaf xor a @@ -3042,7 +3042,7 @@ Function17e367: ; 17e367 push af ld a, $1 ld [rSVBK], a - callba SaveGameData_ + farcall SaveGameData_ pop af ld [rSVBK], a ret @@ -3055,7 +3055,7 @@ Function17e37e: ; 17e37e push af ld a, $1 ld [rSVBK], a - callba SaveAfterLinkTrade + farcall SaveAfterLinkTrade pop af ld [rSVBK], a ret @@ -3068,7 +3068,7 @@ Function17e395: ; 17e395 push af ld a, $1 ld [rSVBK], a - callba SaveBox + farcall SaveBox pop af ld [rSVBK], a ret @@ -3081,7 +3081,7 @@ Function17e3ac: ; 17e3ac push af ld a, $1 ld [rSVBK], a - callba SaveChecksum + farcall SaveChecksum pop af ld [rSVBK], a ret @@ -3094,8 +3094,8 @@ Function17e3c3: ; 17e3c3 push af ld a, $1 ld [rSVBK], a - callba UpdateTrainerRankingsChecksum2 - callba BackupMobileEventIndex + farcall UpdateTrainerRankingsChecksum2 + farcall BackupMobileEventIndex pop af ld [rSVBK], a ret @@ -3947,7 +3947,7 @@ Function17f154: ; 17f154 ld c, l ld b, h pop de - callba Function11c08f + farcall Function11c08f ld c, l ld b, h pop de @@ -3995,7 +3995,7 @@ Function17f181: ; 17f181 ld a, [hl] ld c, a ld de, $c608 - callba Function48c63 + farcall Function48c63 pop hl ld de, $c608 call PlaceString @@ -4279,7 +4279,7 @@ Function17f334: ; 17f334 ld c, a call CloseSRAM ld de, $c608 - callba Function48c63 + farcall Function48c63 pop hl ld de, $c608 call PlaceString @@ -4346,7 +4346,7 @@ Function17f3c9: ; 17f3c9 call CopyBytes pop de ld c, $0 - callba Function11c075 + farcall Function11c075 push hl ld hl, $c708 ld de, wcd36 @@ -4643,7 +4643,7 @@ DisplayMobileError: ; 17f555 ld a, [wc303] bit 7, a jr nz, .quit - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 jr .loop .quit @@ -4704,7 +4704,7 @@ DisplayMobileError: ; 17f555 Function17f5c3: ; 17f5c3 call Function17f5e4 - callba FinishExitMenu + farcall FinishExitMenu ld a, $1 ld [wc303], a ret @@ -4712,7 +4712,7 @@ Function17f5c3: ; 17f5c3 Function17f5d2: ; 17f5d2 call Function17f5e4 - callba HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrMapAndTileMapToWRAMBank3 call SetPalettes ld a, $1 ld [wc303], a diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 6a4e6cf61..468d77fff 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -172,7 +172,7 @@ Function4a098: ; 4a098 (12:6098) call PlaceHollowCursor call WaitBGMap call LoadStandardMenuDataHeader - callba Function89de0 + farcall Function89de0 call Call_ExitMenu call MG_Mobile_Layout_LoadPals call Function4a485 @@ -195,7 +195,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) ld bc, NAME_LENGTH_JAPANESE call CopyBytes call CloseSRAM - callba _LoadData + farcall _LoadData ld c, 2 call DelayFrames ld c, $1 @@ -205,7 +205,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) pop af and a jr nz, .skip_save - callba _SaveData + farcall _SaveData .skip_save ld c, 5 call DelayFrames @@ -280,7 +280,7 @@ Function4a149: ; 4a149 (12:6149) call ClearBox hlcoord 1, 14 call PlaceString - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call SetPalettes call StaticMenuJoypad ld hl, wMenuCursorY @@ -347,7 +347,7 @@ String_4a1ef: ; 4a1ef Function4a20e: ; 4a20e (12:620e) ld a, $1 call MenuClickSound - callba Function1719c8 + farcall Function1719c8 call ClearBGPalettes call DelayFrame jr Function4a239 @@ -403,7 +403,7 @@ Function4a28a: ; 4a28a (12:628a) hlcoord 14, 1 ld de, String_4a34b call PlaceString - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call Function4a118 call ScrollingMenuJoypad push af @@ -417,7 +417,7 @@ Function4a28a: ; 4a28a (12:628a) cp $3 jr z, .quit .asm_4a2df - callba Function11765d + farcall Function11765d call ClearBGPalettes call Call_ExitMenu call LoadFontsExtra @@ -432,7 +432,7 @@ Function4a28a: ; 4a28a (12:628a) ld b, 3 ld c, 4 call TextBox - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ld hl, DeletePassword_YesNo_MenuDataHeader call LoadMenuDataHeader call VerticalMenu @@ -455,7 +455,7 @@ Function4a28a: ; 4a28a (12:628a) call ExitMenu .quit call Call_ExitMenu - callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ret ; 4a346 (12:6346) @@ -649,7 +649,7 @@ MainMenu_MobileStudium: ; 4a496 ld e, a push bc push de - callba MobileStudium + farcall MobileStudium call ClearBGPalettes pop de pop bc @@ -847,7 +847,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call ClearBGPalettes ld b, SCGB_DIPLOMA call GetSGBLayout - callba Function11c1ab + farcall Function11c1ab pop bc call LoadFontsExtra jp Function4a4c4 diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index 0be18acae..612a1b78d 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -20,7 +20,7 @@ Mobile_PrintOpponentBattleMessage: ; 4ea0a ld bc, wMobileOpponentBattleMessage decoord 1, 14 - callba PrintEZChatBattleMessage + farcall PrintEZChatBattleMessage pop af ld [rSVBK], a |