dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into field_effect

Browse Source
This commit is contained in:
PikalaxALT
2020-03-02 10:15:07 -05:00
parent 2f8ac698c8 fc51c579d4
commit d758ae0dc2
23 changed files with 1164 additions and 2701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
-2528
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+3 -3
View File
@@ -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