diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-01 21:45:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 21:45:36 -0400 |
| commit | 74d771ef90a3189bd2da1b35f6b42a1fa8f51e67 (patch) | |
| tree | 96c754aee40f16956fb0958ecb31bd806bd99642 /asm/battle_setup.s | |
| parent | 7f06718571de81609208a5fa402a93da63cfa8bf (diff) | |
| parent | 062238aa12cb4f54f70b73459ff5b5d775f69a54 (diff) | |
Merge pull request #76 from jiangzhengwenjz/misc
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 146e4a3c9..a13c1a418 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -25,7 +25,7 @@ sub_807F620: @ 807F620 .align 2, 0 _0807F640: .4byte gTasks+0x8 _0807F644: - bl c3_80A0DD8_is_running + bl FldEffPoison_IsActive cmp r0, 0 bne _0807F686 bl sub_812B478 |