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_flash.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/fldeff_flash.s')
| -rw-r--r-- | asm/fldeff_flash.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 6466c706e..c25978eb1 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -17,10 +17,10 @@ sub_80C9B2C: @ 80C9B2C lsls r0, 24 cmp r0, 0 bne _080C9B6C - ldr r1, _080C9B5C @ =gUnknown_3005024 - ldr r0, _080C9B60 @ =hm_add_c3_launch_phase_2 + ldr r1, _080C9B5C @ =gFieldCallback2 + ldr r0, _080C9B60 @ =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, _080C9B64 @ =gUnknown_203B0C4 + ldr r1, _080C9B64 @ =gPostMenuFieldCallback ldr r0, _080C9B68 @ =sub_80C9B74 str r0, [r1] movs r0, 0x1 @@ -28,9 +28,9 @@ sub_80C9B2C: @ 80C9B2C .align 2, 0 _080C9B54: .4byte gMapHeader _080C9B58: .4byte 0x00000806 -_080C9B5C: .4byte gUnknown_3005024 -_080C9B60: .4byte hm_add_c3_launch_phase_2 -_080C9B64: .4byte gUnknown_203B0C4 +_080C9B5C: .4byte gFieldCallback2 +_080C9B60: .4byte FieldCallback_PrepareFadeInFromMenu +_080C9B64: .4byte gPostMenuFieldCallback _080C9B68: .4byte sub_80C9B74 _080C9B6C: movs r0, 0 |