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_setup.s | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
| parent | 9054fa32a01e102e668d1668c4e3893f2faffde8 (diff) | |
Merge pull request #82 from jiangzhengwenjz/pokemon
pokemon
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 db8b366b4..99e4c3468 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2051,7 +2051,7 @@ sub_8080628: @ 8080628 beq _080806BE ldr r0, _08080668 @ =gTrainerBattleOpponent_A ldrh r0, [r0] - bl sub_804367C + bl GetTrainerEncounterMusicId lsls r0, 24 lsrs r0, 24 cmp r0, 0xD |