diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 10:13:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:13:06 -0500 |
| commit | fc51c579d4a422b168a4efb88b5f15164fbb7db0 (patch) | |
| tree | f2da1e7beaddf0579426a18519d7c331d7ff19e1 /asm/overworld.s | |
| parent | 43f66fce5574592ac1c37b9452fe858e482156bb (diff) | |
| parent | c36ef94a0dae1e60a8e641aced35ee2084c183eb (diff) | |
Merge pull request #277 from PikalaxALT/cable_club
Cable club
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index f18086650..e0fa1ffdd 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3741,7 +3741,7 @@ _08056880: .4byte gFieldCallback _08056884: .4byte FieldCB_ReturnToFieldWirelessLink _08056888: ldr r1, _080568A0 @ =gFieldCallback - ldr r0, _080568A4 @ =sub_807DDD0 + ldr r0, _080568A4 @ =FieldCB_ReturnToFieldWiredLink _0805688C: str r0, [r1] bl ScriptContext1_Init @@ -3751,7 +3751,7 @@ _0805688C: bx r0 .align 2, 0 _080568A0: .4byte gFieldCallback -_080568A4: .4byte sub_807DDD0 +_080568A4: .4byte FieldCB_ReturnToFieldWiredLink thumb_func_end c2_8056854 thumb_func_start CB2_ReturnToFieldWithOpenMenu @@ -6809,7 +6809,7 @@ _080580F4: .4byte gUnknown_3000E80 _080580F8: .4byte CableClub_EventScript_TooBusyToNotice _080580FC: adds r0, r2, 0 - bl sub_8081A34 + bl GetSeeingLinkPlayerCardMsg cmp r0, 0 bne _08058110 ldr r0, _0805810C @ =CableClub_EventScript_ReadTrainerCard |