summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 15:03:20 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 15:03:20 -0500
commit9973e43d5aaffeef9d68994a665d2b0231f56f41 (patch)
tree5a22379c74a3a7032422c10c9197823188d12931 /main.asm
parent4e5fd7a521085d10a05ef5e3b9bab623dc28577a (diff)
Fix issue #345:
- GetMonFrontpic → GetEnemyMonFrontpic - GetMonBackpic → GetBattleMonBackpic - FrontpicPredef → GetAnimatedFrontpicPredef - GetFrontpic → GetMonFrontpic - GetBackpic → GetMonBackpic - CutAndPasteMap → PadMapForHDMATransfer
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index dbb838066..cbeebac07 100644
--- a/main.asm
+++ b/main.asm
@@ -197,13 +197,13 @@ _ReturnToBattle_UseBall: ; 2715c
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic
- farcall GetMonBackpic
+ farcall GetBattleMonBackpic
jr .continue
.gettutorialbackpic
farcall GetTrainerBackpic
.continue
- farcall GetMonFrontpic
+ farcall GetEnemyMonFrontpic
farcall _LoadBattleFontsHPBar
call GetMemSGBLayout
call CloseWindow