summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-18 04:39:01 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-18 05:06:53 +0800
commitf7af77d22c84d9b8cba25145e26204a05ccf1455 (patch)
treeee1bf474be710622c92fb46690577b73cb655786 /asm
parentc7d3ad06b062abf6acb2eaa2b19da86a7acdab19 (diff)
sync documentation of CountAliveMonsInBattle()
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_controller_player.s2
-rw-r--r--asm/battle_script_commands.s4
2 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 2a2419a7b..e3db6d88e 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -1005,7 +1005,7 @@ _0802EB04:
cmp r0, 0
bne _0802EB3A
movs r0, 0
- bl CountAliveMons
+ bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index 747859147..42d1f653d 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -19745,7 +19745,7 @@ _0802753C:
cmp r0, 0
beq _080275AC
movs r0, 0x1
- bl CountAliveMons
+ bl CountAliveMonsInBattle
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x2
@@ -22207,7 +22207,7 @@ _0802887C:
cmp r0, 0
beq _080288EC
movs r0, 0x1
- bl CountAliveMons
+ bl CountAliveMonsInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2