diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
| commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
| tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /asm/battle_controller_player.s | |
| parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
| parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 2 |
1 files changed, 1 insertions, 1 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 |