diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
| commit | 2e0259fceb54edb68df7e7956418f3bbbe8c08da (patch) | |
| tree | 3598721e4aea16456820b3ef189ccd6f94607c46 /asm/help_system.s | |
| parent | 0335914719ef86def6999d50eefd8a342d696a6e (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
Merge branch 'master' into vs_seeker
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] |