dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix rom3 conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-10-13 19:58:45 +02:00
parent 20d158cf4a 3040c1e1aa
commit 72ed861715
93 changed files with 13360 additions and 18899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/link.s
+3 -3
View File
@@ -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