From 35a8e9da5de14aaf1ce407fdb47e33127f05ce20 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 19 Nov 2017 11:54:34 +0100 Subject: [PATCH] DetermineMobileBattleResult -> DisplayLinkBattleResult Changed this function's name, because it confusingly only calls DetermineLinkBattleResult when linked through mobile. It does absolutely nothing with determining the battle result in a regular link battle, and is only responsible for displaying the battle result and counting stats. --- battle/core.asm | 4 ++-- misc/mobile_40.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/battle/core.asm b/battle/core.asm index 18c06e848..9b644ca5b 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -8640,7 +8640,7 @@ ExitBattle: ; 3f69e call ShowLinkBattleParticipantsAfterEnd ld c, 150 call DelayFrames - call DetermineMobileBattleResult + call DisplayLinkBattleResult ret .not_linked @@ -8737,7 +8737,7 @@ ShowLinkBattleParticipantsAfterEnd: ; 3f759 ret ; 3f77c -DetermineMobileBattleResult: ; 3f77c +DisplayLinkBattleResult: ; 3f77c callba CheckMobileBattleError jp c, .Mobile_InvalidBattle call IsMobileBattle2 diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 9bece8265..33dbdb091 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -4084,7 +4084,7 @@ StartMobileBattle: ; 101a21 Function101a4f: ; 101a4f ld a, 1 ld [wDisableTextAcceleration], a - callba DetermineMobileBattleResult + callba DisplayLinkBattleResult xor a ld [wDisableTextAcceleration], a callba CleanUpBattleRAM