diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
| commit | 70743f4b951bb84ca33fd2151e55b2f5018eb6c5 (patch) | |
| tree | 7298959f4e81c88adeac0c26b9016b9d197da1fd /asm/pokeblock_feed.s | |
| parent | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (diff) | |
| parent | 54da96309186b98263b4434911e1c5b8d4b4e3ec (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/pokeblock_feed.s')
| -rw-r--r-- | asm/pokeblock_feed.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index 9830db888..aef726c16 100644 --- a/asm/pokeblock_feed.s +++ b/asm/pokeblock_feed.s @@ -704,7 +704,7 @@ sub_817A1C4: @ 817A1C4 lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 - bl sub_8136FE4 + bl PokeblockGetGain ldr r6, =gUnknown_0203BC9E strh r0, [r6] ldr r1, =gStringVar1 @@ -740,7 +740,7 @@ _0817A268: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - bl sav2_get_text_speed + bl GetPlayerTextSpeed adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 |