diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /asm/fldeff_sweetscent.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/fldeff_sweetscent.s')
| -rw-r--r-- | asm/fldeff_sweetscent.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index 47b9ef390..aead537d4 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -20,18 +20,18 @@ _080DE0C4: .4byte gUnknown_203B0A0 thumb_func_start sub_80DE0C8 sub_80DE0C8: @ 80DE0C8 - ldr r1, _080DE0D8 @ =gUnknown_3005024 - ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2 + ldr r1, _080DE0D8 @ =gFieldCallback2 + ldr r0, _080DE0DC @ =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, _080DE0E0 @ =gUnknown_203B0C4 + ldr r1, _080DE0E0 @ =gPostMenuFieldCallback ldr r0, _080DE0E4 @ =hm2_sweet_scent str r0, [r1] movs r0, 0x1 bx lr .align 2, 0 -_080DE0D8: .4byte gUnknown_3005024 -_080DE0DC: .4byte hm_add_c3_launch_phase_2 -_080DE0E0: .4byte gUnknown_203B0C4 +_080DE0D8: .4byte gFieldCallback2 +_080DE0DC: .4byte FieldCallback_PrepareFadeInFromMenu +_080DE0E0: .4byte gPostMenuFieldCallback _080DE0E4: .4byte hm2_sweet_scent thumb_func_end sub_80DE0C8 |