summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2017-11-19 11:54:34 +0100
committermid-kid <esteve.varela@gmail.com>2017-11-19 11:54:34 +0100
commit35a8e9da5de14aaf1ce407fdb47e33127f05ce20 (patch)
tree694575047e3abb963b884f3c42f9e6e975b03aff
parent671341a0fbcbdcbe41331a19f7863fef923c19c1 (diff)
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.
-rw-r--r--battle/core.asm4
-rw-r--r--misc/mobile_40.asm2
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