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/hof_pc.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/hof_pc.s')
| -rw-r--r-- | asm/hof_pc.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/hof_pc.s b/asm/hof_pc.s index b5a437662..80f7fc3f9 100644 --- a/asm/hof_pc.s +++ b/asm/hof_pc.s @@ -57,16 +57,16 @@ _080CA59C: .4byte sub_80CA53C thumb_func_start sub_80CA5A0 sub_80CA5A0: @ 80CA5A0 push {lr} - ldr r0, _080CA5B4 @ =c2_exit_to_overworld_2_switch + ldr r0, _080CA5B4 @ =CB2_ReturnToField bl SetMainCallback2 - ldr r1, _080CA5B8 @ =gUnknown_3005020 + ldr r1, _080CA5B8 @ =gFieldCallback ldr r0, _080CA5BC @ =sub_80CA5C0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080CA5B4: .4byte c2_exit_to_overworld_2_switch -_080CA5B8: .4byte gUnknown_3005020 +_080CA5B4: .4byte CB2_ReturnToField +_080CA5B8: .4byte gFieldCallback _080CA5BC: .4byte sub_80CA5C0 thumb_func_end sub_80CA5A0 |