diff options
| -rw-r--r-- | engine/battle/core.asm | 24 | ||||
| -rw-r--r-- | engine/link/link.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/learn.asm | 2 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 6 | ||||
| -rw-r--r-- | home/copy_tilemap.asm | 2 | ||||
| -rw-r--r-- | home/serial.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 2 |
7 files changed, 21 insertions, 21 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index dcf68fedc..ab73c4912 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -51,7 +51,7 @@ DoBattle: ld a, d and a jp z, LostBattle - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap ld a, [wBattleType] cp BATTLETYPE_DEBUG jp z, .tutorial_debug @@ -116,7 +116,7 @@ DoBattle: jp BattleMenu WildFled_EnemyFled_LinkBattleCanceled: - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap ld a, [wBattleResult] and BATTLERESULT_BITMASK add DRAW @@ -624,7 +624,7 @@ ParsePlayerAction: ld [wFXAnimID], a call MoveSelectionScreen push af - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap call UpdateBattleHuds ld a, [wCurPlayerMove] cp STRUGGLE @@ -2303,7 +2303,7 @@ HandleEnemySwitch: cp BATTLEACTION_FORFEIT ret z - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap .not_linked ld hl, wBattleMonHP @@ -3726,7 +3726,7 @@ TryToRunAwayFromBattle: ldh [hEnemyMonSpeed + 0], a ld a, [de] ldh [hEnemyMonSpeed + 1], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap ld de, hMultiplicand + 1 ld hl, hEnemyMonSpeed ld c, 2 @@ -3808,7 +3808,7 @@ TryToRunAwayFromBattle: xor a ld [wCurPlayerMove], a call LinkBattleSendReceiveAction - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap call CheckMobileBattleError jr c, .mobile @@ -4907,7 +4907,7 @@ BattleMenu: BattleMenu_Fight: xor a ld [wNumFleeAttempts], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap and a ret @@ -5283,7 +5283,7 @@ PassedBattleMonEntrance: jp SpikesDamage BattleMenu_Run: - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap ld a, $3 ld [wMenuCursorY], a ld hl, wBattleMonSpeed @@ -5508,7 +5508,7 @@ MoveSelectionScreen: .place_textbox_start_over call StdBattleTextbox - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap jp MoveSelectionScreen .string_3e61c @@ -5775,7 +5775,7 @@ ParseEnemyAction: ld a, [wBattlePlayerAction] and a ; BATTLEPLAYERACTION_USEMOVE? call z, LinkBattleSendReceiveAction - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap ld a, [wBattleAction] cp BATTLEACTION_STRUGGLE jp z, .struggle @@ -7302,7 +7302,7 @@ GiveExperiencePoints: ld c, 30 call DelayFrames call WaitPressAorB_BlinkCursor - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap xor a ; PARTYMON ld [wMonType], a ld a, [wCurSpecies] @@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus: .finish push hl - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap pop hl jp StdBattleTextbox diff --git a/engine/link/link.asm b/engine/link/link.asm index 077b3a9f0..a3585e349 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1369,7 +1369,7 @@ Function28926: .b_button pop af ld [wMenuCursorY], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap jp LinkTrade_PlayerPartyMenu .d_right @@ -1407,7 +1407,7 @@ Function28926: ld [wInitListType], a callfar InitList farcall LinkMonStatsScreen - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap hlcoord 6, 1 lb bc, 6, 1 ld a, " " diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 6722c4fe1..f371163c5 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -166,7 +166,7 @@ ForgetMove: ld [w2DMenuCursorOffsets], a call StaticMenuJoypad push af - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap pop af pop hl bit 1, a diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 588699863..2078ab1b3 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -231,7 +231,7 @@ PrintUnownStamp: farcall PlaceUnownPrinterFrontpic ln a, 0, 0 ; to be loaded to wPrinterMargins call Printer_PrepareTileMapForPrint - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap call Printer_ResetJoypadRegisters ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -259,7 +259,7 @@ PrintUnownStamp: pop af ldh [hVBlank], a call Printer_CleanUpAfterSend - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap xor a ldh [rIF], a pop af @@ -418,7 +418,7 @@ _PrintDiploma: ln a, 0, 3 ; to be loaded to wPrinterMargins call Printer_PrepareTileMapForPrint - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap call Printer_ResetJoypadRegisters ld a, 18 / 2 diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm index e5fbcc07e..b95348040 100644 --- a/home/copy_tilemap.asm +++ b/home/copy_tilemap.asm @@ -12,7 +12,7 @@ LoadTileMapToTempTileMap:: ldh [rSVBK], a ret -Call_LoadTempTileMapToTileMap:: +SafeLoadTempTileMapToTileMap:: xor a ldh [hBGMapMode], a call LoadTempTileMapToTileMap diff --git a/home/serial.asm b/home/serial.asm index d95d6ce49..e0b4e832b 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -276,7 +276,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble:: call LoadTileMapToTempTileMap callfar PlaceWaitingText call WaitLinkTransfer - jp Call_LoadTempTileMapToTileMap + jp SafeLoadTempTileMapToTileMap Serial_SyncAndExchangeNybble:: call LoadTileMapToTempTileMap diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1ae6ae625..759220151 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1857,7 +1857,7 @@ MobileMoveSelectionScreen: .print_text call StdBattleTextbox - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTileMapToTileMap jp .GetMoveSelection Function100c74: |