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

battle_controller_link_opponent

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-22 14:21:56 +08:00
parent 08e8856f10
commit 5f6a55e4fd
14 changed files with 1711 additions and 6291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_controller_link_opponent.s
-6260
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_link_partner.s
+10 -10
View File
@@ -3838,7 +3838,7 @@ sub_80D61C8: @ 80D61C8
movs r7, 0x5A
_080D61E2:
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
ldr r5, _080D6244 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
@@ -3849,7 +3849,7 @@ _080D61E2:
cmp r0, 0x2
beq _080D6228
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3860,7 +3860,7 @@ _080D61E2:
cmp r0, 0x1
beq _080D6228
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3872,7 +3872,7 @@ _080D61E2:
_080D6228:
ldr r0, _080D6240 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
ldr r2, _080D6244 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
@@ -3886,7 +3886,7 @@ _080D6240: .4byte gActiveBattler
_080D6244: .4byte gLinkPlayers
_080D6248:
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5314,7 +5314,7 @@ sub_80D6CD4: @ 80D6CD4
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
ldr r4, _080D6DF8 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
@@ -5325,7 +5325,7 @@ sub_80D6CD4: @ 80D6CD4
cmp r0, 0x2
beq _080D6DC2
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5336,7 +5336,7 @@ sub_80D6CD4: @ 80D6CD4
cmp r0, 0x1
beq _080D6DC2
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5348,7 +5348,7 @@ sub_80D6CD4: @ 80D6CD4
_080D6DC2:
ldr r0, _080D6DE0 @ =gActiveBattler
ldrb r0, [r0]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
ldr r2, _080D6DF8 @ =gLinkPlayers
lsls r1, r0, 3
subs r1, r0
@@ -5368,7 +5368,7 @@ _080D6DF4: .4byte 0x0000d6f9
_080D6DF8: .4byte gLinkPlayers
_080D6DFC:
ldrb r0, [r6]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
asm/battle_message.s
+2 -2
View File
@@ -1871,7 +1871,7 @@ _080D819C:
movs r0, 0x3
_080D81AA:
eors r0, r1
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -1883,7 +1883,7 @@ _080D81BC: .4byte gLinkPlayers
_080D81C0:
ldr r0, _080D81D4 @ =gBattleScripting
ldrb r0, [r0, 0x17]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
_080D81C8:
lsls r1, r0, 3
subs r1, r0
asm/battle_script_commands.s
+3 -3
View File
@@ -13395,7 +13395,7 @@ _08024204:
_08024228:
movs r5, 0
ldrb r0, [r4]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r0, 24
lsrs r0, 24
bl GetLinkTrainerFlankId
@@ -21517,7 +21517,7 @@ _08028336:
movs r7, 0
movs r6, 0
ldrb r0, [r5]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r0, 24
lsrs r0, 24
bl GetLinkTrainerFlankId
@@ -21662,7 +21662,7 @@ _08028458:
lsrs r6, r0, 24
ldr r0, _08028490 @ =gBattlerTarget
ldrb r0, [r0]
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r0, 24
lsrs r0, 24
bl GetLinkTrainerFlankId
asm/pokeball.s
+1 -1
View File
@@ -132,7 +132,7 @@ _0804AA12:
beq _0804AA60
ldr r4, _0804AA5C @ =gLinkPlayers
adds r0, r6, 0
bl GetBankMultiplayerId
bl GetBattlerMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2