diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
| commit | 6c52f7ce04ea37ae6a1854521f0e312d39e86ecb (patch) | |
| tree | b7369c07f40081796b51fc52ca5f26faaa8b8723 /asm/oak_speech.s | |
| parent | e143072f961cfffc5e8e2cc5b2a6059c27124808 (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge branch 'master' into quest_log
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 a44f2fc37..5d3f74c41 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 |