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_wally.s | |
| parent | 3c63063831f7d26874dc49143e2d19f6acc1be18 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/battle_controller_wally.s')
| -rw-r--r-- | asm/battle_controller_wally.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index c00988ed2..ddb97f927 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -308,7 +308,7 @@ sub_8168610: @ 8168610 ands r0, r1 cmp r0, 0 bne _08168636 - ldr r0, =gUnknown_0203CE7C + ldr r0, =gScriptItemId ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -3037,7 +3037,7 @@ sub_8169EC8: @ 8169EC8 lsls r1, 24 lsrs r1, 24 movs r0, 0x6 - bl template_build_for_pokemon_or_trainer + bl sub_806A12C ldr r0, =gUnknown_0202499C ldr r1, =gUnknown_08305D2C ldrb r1, [r1, 0x18] @@ -3122,7 +3122,7 @@ dp01t_07_6_: @ 8169F94 lsls r1, 24 lsrs r1, 24 movs r0, 0x6 - bl template_build_for_pokemon_or_trainer + bl sub_806A12C ldr r0, =gUnknown_0202499C ldr r1, =gUnknown_08305D2C ldrb r1, [r1, 0x18] @@ -3803,7 +3803,7 @@ sub_816A57C: @ 816A57C adds r0, r1 ldr r1, =sub_81685D4 str r1, [r0] - ldr r1, =gUnknown_020244B8 + ldr r1, =gBankInMenu ldrb r0, [r2] strb r0, [r1] add sp, 0x4 @@ -4504,7 +4504,7 @@ sub_816AA80: @ 816AA80 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r6, r1 ldrb r1, [r6] bl StartSpriteAnim |