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/oak_speech.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/oak_speech.s')
| -rw-r--r-- | asm/oak_speech.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/oak_speech.s b/asm/oak_speech.s index c5591fc0e..54451e618 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -4637,7 +4637,7 @@ sub_8130F2C: @ 8130F2C movs r0, 0x1D movs r1, 0 bl sub_803F7D4 - ldr r0, _08130FA8 @ =gUnknown_20244DC + ldr r0, _08130FA8 @ =gMultiuseSpriteTemplate movs r1, 0x60 movs r2, 0x60 movs r3, 0x1 @@ -4677,7 +4677,7 @@ sub_8130F2C: @ 8130F2C .align 2, 0 _08130FA0: .4byte gUnknown_8235194 _08130FA4: .4byte gUnknown_82373F4 -_08130FA8: .4byte gUnknown_20244DC +_08130FA8: .4byte gMultiuseSpriteTemplate _08130FAC: .4byte gSprites _08130FB0: .4byte SpriteCallbackDummy _08130FB4: .4byte gTasks |