diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /battle/effect_commands.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 38a00bb73..506dc9746 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -8966,7 +8966,7 @@ BattleCommand_BatonPass: ; 379c9 hlcoord 1, 0 lb bc, 4, 10 call ClearBox - ld b, 1 + ld b, SCGB_01 call GetSGBLayout call SetPalettes call BatonPass_LinkPlayerSwitch @@ -9028,7 +9028,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ld [wd0ec], a call LoadStandardMenuDataHeader - ld hl, Function3e8e4 + ld hl, LinkBattleSendReceiveAction call CallBattleCore call WriteBackup @@ -9044,7 +9044,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 ret z call LoadStandardMenuDataHeader - ld hl, Function3e8e4 + ld hl, LinkBattleSendReceiveAction call CallBattleCore ld a, [OTPartyCount] |