diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /asm/option_menu.s | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'asm/option_menu.s')
| -rw-r--r-- | asm/option_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/option_menu.s b/asm/option_menu.s index bf626caba..bb370f0ba 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -459,7 +459,7 @@ _0808870C: b _08088768 _08088716: ldrb r0, [r0, 0xA] - bl sub_8069788 + bl GetUserFrameGraphicsInfo ldr r1, [r0] movs r2, 0x90 lsls r2, 1 @@ -470,7 +470,7 @@ _08088716: b _0808876C _0808872E: ldrb r0, [r0, 0xA] - bl sub_8069788 + bl GetUserFrameGraphicsInfo ldr r0, [r0, 0x4] movs r1, 0x20 b _0808874C @@ -590,7 +590,7 @@ _08088824: ldr r4, _08088854 @ =gUnknown_2039620 ldr r0, [r4] ldrb r0, [r0, 0xA] - bl sub_8069788 + bl GetUserFrameGraphicsInfo ldr r1, [r0] movs r2, 0x90 lsls r2, 1 @@ -600,7 +600,7 @@ _08088824: bl LoadBgTiles ldr r0, [r4] ldrb r0, [r0, 0xA] - bl sub_8069788 + bl GetUserFrameGraphicsInfo ldr r0, [r0, 0x4] movs r1, 0x20 movs r2, 0x20 |