diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
| commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
| tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /asm/link.s | |
| parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
| parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) | |
fix rom3 conflicts
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/link.s b/asm/link.s index 0c632ed9b..96f18bac4 100644 --- a/asm/link.s +++ b/asm/link.s @@ -1742,8 +1742,8 @@ _0800A298: .pool thumb_func_end sub_800A23C - thumb_func_start sub_800A2A4 -sub_800A2A4: @ 800A2A4 + thumb_func_start GetLinkPlayerTrainerId +GetLinkPlayerTrainerId: @ 800A2A4 lsls r0, 24 lsrs r0, 24 ldr r2, =gLinkPlayers @@ -1755,7 +1755,7 @@ sub_800A2A4: @ 800A2A4 ldr r0, [r1] bx lr .pool - thumb_func_end sub_800A2A4 + thumb_func_end GetLinkPlayerTrainerId thumb_func_start sub_800A2BC sub_800A2BC: @ 800A2BC |