diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:41:34 -0400 |
| commit | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (patch) | |
| tree | 4346f5efdcea0f2adf207bc769488d3f129016fe /asm/battle_interface.s | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
| parent | 9054fa32a01e102e668d1668c4e3893f2faffde8 (diff) | |
Merge pull request #82 from jiangzhengwenjz/pokemon
pokemon
Diffstat (limited to 'asm/battle_interface.s')
| -rw-r--r-- | asm/battle_interface.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index acf228669..959e4e19d 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3610,7 +3610,7 @@ _08049734: lsls r1, 24 lsrs r1, 24 adds r0, r7, 0 - bl sub_80448F8 + bl CheckBattleTypeGhost lsls r0, 24 cmp r0, 0 beq _08049754 @@ -3755,7 +3755,7 @@ sub_804981C: @ 804981C ldr r6, _080498EC @ =gEnemyParty adds r0, r6 adds r1, r4, 0 - bl sub_80448F8 + bl CheckBattleTypeGhost lsls r0, 24 cmp r0, 0 bne _0804991C |