diff options
| author | who-knows-who <j.williams97@outlook.com> | 2021-02-27 15:29:36 +0000 |
|---|---|---|
| committer | who-knows-who <j.williams97@outlook.com> | 2021-02-27 15:29:36 +0000 |
| commit | aa968bb2de4d703376af43a0ef32a53ca46f489b (patch) | |
| tree | 699d89dda03b1b81b4a0a87b8694073a71157d1a /arm9/modules/14 | |
| parent | e13202e2f19c9f1673a021dbcc062d96b9f0f06c (diff) | |
| parent | 75dc81c75dc1dc86053303cdae9decdb2f05557d (diff) | |
Merge branch 'master' of github.com:pret/pokediamond
Diffstat (limited to 'arm9/modules/14')
| -rw-r--r-- | arm9/modules/14/asm/module_14.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index ae226da3..0bded4bf 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -9849,11 +9849,11 @@ MOD14_021DC3AC: ; 0x021DC3AC MOD14_021DC3B4: ; 0x021DC3B4 mov r1, #0x69 lsl r1, r1, #2 - ldr r3, _021DC3C0 ; =FUN_02025084 + ldr r3, _021DC3C0 ; =Options_GetFrame ldr r0, [r0, r1] bx r3 nop -_021DC3C0: .word FUN_02025084 +_021DC3C0: .word Options_GetFrame thumb_func_start MOD14_021DC3C4 MOD14_021DC3C4: ; 0x021DC3C4 |