diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
| commit | 5a74c0e91354276a92ea01152b76a85462d30d4e (patch) | |
| tree | 8bca428892e561dcca4c75be7a91fed1406d4890 /asm/battle_controller_recorded_player.s | |
| parent | 3c63063831f7d26874dc49143e2d19f6acc1be18 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/battle_controller_recorded_player.s')
| -rw-r--r-- | asm/battle_controller_recorded_player.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s index 7f2b918a4..b2769671c 100644 --- a/asm/battle_controller_recorded_player.s +++ b/asm/battle_controller_recorded_player.s @@ -3613,7 +3613,7 @@ sub_818B8E0: @ 818B8E0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r2, r1 ldrb r1, [r2] bl StartSpriteAnim @@ -3795,7 +3795,7 @@ sub_818BA6C: @ 818BA6C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r6, r1 ldrb r1, [r6] bl StartSpriteAnim @@ -4189,7 +4189,7 @@ _0818BEDC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl template_build_for_pokemon_or_trainer + bl sub_806A12C ldr r6, =gUnknown_0202499C mov r8, r9 lsls r4, r7, 16 |