diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
| commit | 3f0827128a6ba39577dbaa1ea28f8641e4a20780 (patch) | |
| tree | bb4cb2804a27325561a65e133f31a1e4d2671fbe /asm/help_system.s | |
| parent | 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics
Diffstat (limited to 'asm/help_system.s')
| -rw-r--r-- | asm/help_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/help_system.s b/asm/help_system.s index 9a447ebbe..21ae494aa 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -1322,7 +1322,7 @@ _0813C2D4: bl GetKeypadIconTileOffset lsls r0, 24 lsrs r0, 19 - ldr r1, _0813C344 @ =gUnknown_81EA700 + ldr r1, _0813C344 @ =gKeypadIconTiles adds r0, r1 str r0, [sp, 0x14] add r1, sp, 0x14 @@ -1365,7 +1365,7 @@ _0813C2D4: bl GetKeypadIconWidth b _0813C38E .align 2, 0 -_0813C344: .4byte gUnknown_81EA700 +_0813C344: .4byte gKeypadIconTiles _0813C348: mov r0, r9 ldrb r1, [r0] |