mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Call_LoadTempTileMapToTileMap → SafeLoadTempTileMapToTileMap
Stupid name is stupid smh tbh fam.
This commit is contained in:
parent
9f2c2627f5
commit
34ceaac71d
@ -51,7 +51,7 @@ DoBattle:
|
|||||||
ld a, d
|
ld a, d
|
||||||
and a
|
and a
|
||||||
jp z, LostBattle
|
jp z, LostBattle
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
ld a, [wBattleType]
|
ld a, [wBattleType]
|
||||||
cp BATTLETYPE_DEBUG
|
cp BATTLETYPE_DEBUG
|
||||||
jp z, .tutorial_debug
|
jp z, .tutorial_debug
|
||||||
@ -116,7 +116,7 @@ DoBattle:
|
|||||||
jp BattleMenu
|
jp BattleMenu
|
||||||
|
|
||||||
WildFled_EnemyFled_LinkBattleCanceled:
|
WildFled_EnemyFled_LinkBattleCanceled:
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
ld a, [wBattleResult]
|
ld a, [wBattleResult]
|
||||||
and BATTLERESULT_BITMASK
|
and BATTLERESULT_BITMASK
|
||||||
add DRAW
|
add DRAW
|
||||||
@ -624,7 +624,7 @@ ParsePlayerAction:
|
|||||||
ld [wFXAnimID], a
|
ld [wFXAnimID], a
|
||||||
call MoveSelectionScreen
|
call MoveSelectionScreen
|
||||||
push af
|
push af
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
call UpdateBattleHuds
|
call UpdateBattleHuds
|
||||||
ld a, [wCurPlayerMove]
|
ld a, [wCurPlayerMove]
|
||||||
cp STRUGGLE
|
cp STRUGGLE
|
||||||
@ -2303,7 +2303,7 @@ HandleEnemySwitch:
|
|||||||
cp BATTLEACTION_FORFEIT
|
cp BATTLEACTION_FORFEIT
|
||||||
ret z
|
ret z
|
||||||
|
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
|
|
||||||
.not_linked
|
.not_linked
|
||||||
ld hl, wBattleMonHP
|
ld hl, wBattleMonHP
|
||||||
@ -3726,7 +3726,7 @@ TryToRunAwayFromBattle:
|
|||||||
ldh [hEnemyMonSpeed + 0], a
|
ldh [hEnemyMonSpeed + 0], a
|
||||||
ld a, [de]
|
ld a, [de]
|
||||||
ldh [hEnemyMonSpeed + 1], a
|
ldh [hEnemyMonSpeed + 1], a
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
ld de, hMultiplicand + 1
|
ld de, hMultiplicand + 1
|
||||||
ld hl, hEnemyMonSpeed
|
ld hl, hEnemyMonSpeed
|
||||||
ld c, 2
|
ld c, 2
|
||||||
@ -3808,7 +3808,7 @@ TryToRunAwayFromBattle:
|
|||||||
xor a
|
xor a
|
||||||
ld [wCurPlayerMove], a
|
ld [wCurPlayerMove], a
|
||||||
call LinkBattleSendReceiveAction
|
call LinkBattleSendReceiveAction
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
call CheckMobileBattleError
|
call CheckMobileBattleError
|
||||||
jr c, .mobile
|
jr c, .mobile
|
||||||
|
|
||||||
@ -4907,7 +4907,7 @@ BattleMenu:
|
|||||||
BattleMenu_Fight:
|
BattleMenu_Fight:
|
||||||
xor a
|
xor a
|
||||||
ld [wNumFleeAttempts], a
|
ld [wNumFleeAttempts], a
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
and a
|
and a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -5283,7 +5283,7 @@ PassedBattleMonEntrance:
|
|||||||
jp SpikesDamage
|
jp SpikesDamage
|
||||||
|
|
||||||
BattleMenu_Run:
|
BattleMenu_Run:
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
ld a, $3
|
ld a, $3
|
||||||
ld [wMenuCursorY], a
|
ld [wMenuCursorY], a
|
||||||
ld hl, wBattleMonSpeed
|
ld hl, wBattleMonSpeed
|
||||||
@ -5508,7 +5508,7 @@ MoveSelectionScreen:
|
|||||||
|
|
||||||
.place_textbox_start_over
|
.place_textbox_start_over
|
||||||
call StdBattleTextbox
|
call StdBattleTextbox
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
jp MoveSelectionScreen
|
jp MoveSelectionScreen
|
||||||
|
|
||||||
.string_3e61c
|
.string_3e61c
|
||||||
@ -5775,7 +5775,7 @@ ParseEnemyAction:
|
|||||||
ld a, [wBattlePlayerAction]
|
ld a, [wBattlePlayerAction]
|
||||||
and a ; BATTLEPLAYERACTION_USEMOVE?
|
and a ; BATTLEPLAYERACTION_USEMOVE?
|
||||||
call z, LinkBattleSendReceiveAction
|
call z, LinkBattleSendReceiveAction
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
ld a, [wBattleAction]
|
ld a, [wBattleAction]
|
||||||
cp BATTLEACTION_STRUGGLE
|
cp BATTLEACTION_STRUGGLE
|
||||||
jp z, .struggle
|
jp z, .struggle
|
||||||
@ -7302,7 +7302,7 @@ GiveExperiencePoints:
|
|||||||
ld c, 30
|
ld c, 30
|
||||||
call DelayFrames
|
call DelayFrames
|
||||||
call WaitPressAorB_BlinkCursor
|
call WaitPressAorB_BlinkCursor
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
xor a ; PARTYMON
|
xor a ; PARTYMON
|
||||||
ld [wMonType], a
|
ld [wMonType], a
|
||||||
ld a, [wCurSpecies]
|
ld a, [wCurSpecies]
|
||||||
@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
|
|||||||
|
|
||||||
.finish
|
.finish
|
||||||
push hl
|
push hl
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
pop hl
|
pop hl
|
||||||
jp StdBattleTextbox
|
jp StdBattleTextbox
|
||||||
|
|
||||||
|
@ -1369,7 +1369,7 @@ Function28926:
|
|||||||
.b_button
|
.b_button
|
||||||
pop af
|
pop af
|
||||||
ld [wMenuCursorY], a
|
ld [wMenuCursorY], a
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
jp LinkTrade_PlayerPartyMenu
|
jp LinkTrade_PlayerPartyMenu
|
||||||
|
|
||||||
.d_right
|
.d_right
|
||||||
@ -1407,7 +1407,7 @@ Function28926:
|
|||||||
ld [wInitListType], a
|
ld [wInitListType], a
|
||||||
callfar InitList
|
callfar InitList
|
||||||
farcall LinkMonStatsScreen
|
farcall LinkMonStatsScreen
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
hlcoord 6, 1
|
hlcoord 6, 1
|
||||||
lb bc, 6, 1
|
lb bc, 6, 1
|
||||||
ld a, " "
|
ld a, " "
|
||||||
|
@ -166,7 +166,7 @@ ForgetMove:
|
|||||||
ld [w2DMenuCursorOffsets], a
|
ld [w2DMenuCursorOffsets], a
|
||||||
call StaticMenuJoypad
|
call StaticMenuJoypad
|
||||||
push af
|
push af
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
pop af
|
pop af
|
||||||
pop hl
|
pop hl
|
||||||
bit 1, a
|
bit 1, a
|
||||||
|
@ -231,7 +231,7 @@ PrintUnownStamp:
|
|||||||
farcall PlaceUnownPrinterFrontpic
|
farcall PlaceUnownPrinterFrontpic
|
||||||
ln a, 0, 0 ; to be loaded to wPrinterMargins
|
ln a, 0, 0 ; to be loaded to wPrinterMargins
|
||||||
call Printer_PrepareTileMapForPrint
|
call Printer_PrepareTileMapForPrint
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
call Printer_ResetJoypadRegisters
|
call Printer_ResetJoypadRegisters
|
||||||
ld a, 18 / 2
|
ld a, 18 / 2
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
@ -259,7 +259,7 @@ PrintUnownStamp:
|
|||||||
pop af
|
pop af
|
||||||
ldh [hVBlank], a
|
ldh [hVBlank], a
|
||||||
call Printer_CleanUpAfterSend
|
call Printer_CleanUpAfterSend
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
xor a
|
xor a
|
||||||
ldh [rIF], a
|
ldh [rIF], a
|
||||||
pop af
|
pop af
|
||||||
@ -418,7 +418,7 @@ _PrintDiploma:
|
|||||||
|
|
||||||
ln a, 0, 3 ; to be loaded to wPrinterMargins
|
ln a, 0, 3 ; to be loaded to wPrinterMargins
|
||||||
call Printer_PrepareTileMapForPrint
|
call Printer_PrepareTileMapForPrint
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
call Printer_ResetJoypadRegisters
|
call Printer_ResetJoypadRegisters
|
||||||
|
|
||||||
ld a, 18 / 2
|
ld a, 18 / 2
|
||||||
|
@ -12,7 +12,7 @@ LoadTileMapToTempTileMap::
|
|||||||
ldh [rSVBK], a
|
ldh [rSVBK], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Call_LoadTempTileMapToTileMap::
|
SafeLoadTempTileMapToTileMap::
|
||||||
xor a
|
xor a
|
||||||
ldh [hBGMapMode], a
|
ldh [hBGMapMode], a
|
||||||
call LoadTempTileMapToTileMap
|
call LoadTempTileMapToTileMap
|
||||||
|
@ -276,7 +276,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble::
|
|||||||
call LoadTileMapToTempTileMap
|
call LoadTileMapToTempTileMap
|
||||||
callfar PlaceWaitingText
|
callfar PlaceWaitingText
|
||||||
call WaitLinkTransfer
|
call WaitLinkTransfer
|
||||||
jp Call_LoadTempTileMapToTileMap
|
jp SafeLoadTempTileMapToTileMap
|
||||||
|
|
||||||
Serial_SyncAndExchangeNybble::
|
Serial_SyncAndExchangeNybble::
|
||||||
call LoadTileMapToTempTileMap
|
call LoadTileMapToTempTileMap
|
||||||
|
@ -1857,7 +1857,7 @@ MobileMoveSelectionScreen:
|
|||||||
|
|
||||||
.print_text
|
.print_text
|
||||||
call StdBattleTextbox
|
call StdBattleTextbox
|
||||||
call Call_LoadTempTileMapToTileMap
|
call SafeLoadTempTileMapToTileMap
|
||||||
jp .GetMoveSelection
|
jp .GetMoveSelection
|
||||||
|
|
||||||
Function100c74:
|
Function100c74:
|
||||||
|
Loading…
Reference in New Issue
Block a user