diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
commit | ee39862392cc263c3f3073c125cffcb449131643 (patch) | |
tree | 7687814cc368ea6a832eea9398307084bc94ceae /asm/battle_intro.s | |
parent | dcecc8aebfd2480d6e79f3c1f54b737ecbb319f8 (diff) | |
parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) |
Merge branch 'master' into battle_anim
Diffstat (limited to 'asm/battle_intro.s')
-rwxr-xr-x | asm/battle_intro.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 10b504a79..4bfcf42fb 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -1474,7 +1474,7 @@ sub_80E4EF8: @ 80E4EF8 lsls r5, 24 lsrs r5, 24 adds r0, r4, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 ldr r2, _080E4FCC @ =0x040000d4 |