summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-08 14:11:24 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-08 14:11:24 -0400
commite95d42e0af1921f516c1fd4269024aa3f586514f (patch)
tree3130d8d059dbeb247b24bd31eec28c6e358659d8 /battle
parentbb58230ca7a3f0f3c58af2b182051cf33ba609ac (diff)
All functions in main.asm have non-generic names
Diffstat (limited to 'battle')
-rw-r--r--battle/core.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/battle/core.asm b/battle/core.asm
index 6b755e4de..91c1fe509 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -183,7 +183,7 @@ BattleTurn: ; 3c12f
call IsMobileBattle
jr nz, .not_disconnected
callba Function100da5
- callba Function100641
+ callba StartMobileInactivityTimer
callba Function100dd8
jp c, .quit
.not_disconnected
@@ -2503,8 +2503,8 @@ WinTrainerBattle: ; 3cfa4
call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40
call DelayFrames
- ld c, $4
- callba Function4ea0a
+ ld c, $4 ; win
+ callba Mobile_PrintOpponentBattleMessage
ret
.battle_tower
@@ -3176,8 +3176,8 @@ LostBattle: ; 3d38e
ld c, 40
call DelayFrames
- ld c, $3
- callba Function4ea0a
+ ld c, $3 ; lost
+ callba Mobile_PrintOpponentBattleMessage
scf
ret
; 3d432
@@ -9621,8 +9621,8 @@ BattleStartMessage: ; 3fc8b
call IsMobileBattle2
ret nz
- ld c, $2
- callba Function4ea0a
+ ld c, $2 ; start
+ callba Mobile_PrintOpponentBattleMessage
ret
; 3fd26