diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/script_pokemon_util_80BF8FC.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/script_pokemon_util_80BF8FC.s')
| -rw-r--r-- | asm/script_pokemon_util_80BF8FC.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 26c113dfd..b5ef5f090 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -269,7 +269,7 @@ sub_80BFAA8: @ 80BFAA8 mov r6, sp adds r6, 0x6 strb r0, [r6] - ldr r1, _080BFBA4 @ =gUnknown_825DEA1 + ldr r1, _080BFBA4 @ =gPPUpGetMask adds r0, r5, r1 ldrb r0, [r0] mov r9, r0 @@ -330,7 +330,7 @@ sub_80BFAA8: @ 80BFAA8 pop {r0} bx r0 .align 2, 0 -_080BFBA4: .4byte gUnknown_825DEA1 +_080BFBA4: .4byte gPPUpGetMask thumb_func_end sub_80BFAA8 thumb_func_start sub_80BFBA8 |