diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-16 14:14:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 14:14:50 -0500 |
| commit | 19d2d73c7064375e6cef64ced734052170d4361b (patch) | |
| tree | a4589c9e09ef5f4a6cbbc8d9ee992e26a43f677e /asm/battle_controller_safari.s | |
| parent | 1220a139db46c41356f8f5edb6c5a5f55d6340e3 (diff) | |
| parent | 117f8a6abd8ba160409b0077920887ee0cff49f8 (diff) | |
Merge pull request #28 from DizzyEggg/decomp_pokemon
decompile pokemon1/2/3
Diffstat (limited to 'asm/battle_controller_safari.s')
| -rw-r--r-- | asm/battle_controller_safari.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 5f26cf4e7..1aff72176 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -578,7 +578,7 @@ sub_8159800: @ 8159800 lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 - bl template_build_for_pokemon_or_trainer + bl sub_806A12C ldr r0, =gUnknown_0202499C ldr r2, =gUnknown_08305D2C ldr r1, [r4] @@ -923,7 +923,7 @@ sub_8159B14: @ 8159B14 adds r0, r1 ldr r1, =sub_8159660 str r1, [r0] - ldr r1, =gUnknown_020244B8 + ldr r1, =gBankInMenu ldrb r0, [r2] strb r0, [r1] add sp, 0x4 |