diff options
author | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
---|---|---|
committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
commit | caf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch) | |
tree | f0592fc84aeb433b0fb59d9ceabd025b5589f83b /asm/pokeblock_feed.s | |
parent | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff) | |
parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/pokeblock_feed.s')
-rw-r--r-- | asm/pokeblock_feed.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index 9830db888..9cbee2fb9 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 |