diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/trainer_see.s | |
parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/trainer_see.s')
-rw-r--r-- | asm/trainer_see.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 3efae71aa..71941b44f 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -1175,7 +1175,7 @@ sub_80B44C8: @ 80B44C8 adds r0, r4, 0 adds r0, 0xA mov r1, sp - bl sub_806F684 + bl LoadWordFromTwoHalfwords movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 @@ -1259,7 +1259,7 @@ sub_80B4578: @ 80B4578 adds r0, r1 adds r0, 0x2 adds r1, r4, 0 - bl sub_806F67C + bl StoreWordInTwoHalfwords pop {r4} pop {r0} bx r0 |