diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/roamer.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/roamer.s')
| -rw-r--r-- | asm/roamer.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/roamer.s b/asm/roamer.s index d44c91a55..d42b34293 100644 --- a/asm/roamer.s +++ b/asm/roamer.s @@ -364,43 +364,43 @@ CreateRoamerMonInstance: @ 8141EF8 adds r2, r0 adds r0, r5, 0 movs r1, 0x37 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r1, _08141F94 @ =0x000030da adds r2, r1 adds r0, r5, 0 movs r1, 0x39 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r0, _08141F98 @ =0x000030de adds r2, r0 adds r0, r5, 0 movs r1, 0x16 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r1, _08141F9C @ =0x000030df adds r2, r1 adds r0, r5, 0 movs r1, 0x17 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r0, _08141FA0 @ =0x000030e0 adds r2, r0 adds r0, r5, 0 movs r1, 0x18 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r1, _08141FA4 @ =0x000030e1 adds r2, r1 adds r0, r5, 0 movs r1, 0x21 - bl sub_804037C + bl SetMonData ldr r2, [r4] ldr r0, _08141FA8 @ =0x000030e2 adds r2, r0 adds r0, r5, 0 movs r1, 0x2F - bl sub_804037C + bl SetMonData add sp, 0x4 pop {r4,r5} pop {r0} |