From 052fb54fb4c9a44451dd81fc139d7d1a614bdabd Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sat, 5 Jun 2021 17:43:51 +0100 Subject: Merge conflict correction --- src/engine/bank04.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index ff6ab11..78dc479 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -5386,7 +5386,7 @@ ChallengeMachine_Duel: ; 13320 (4:7320) xor a ld [wd112], a call SaveGeneralSaveData - bank1call StartDuel + bank1call StartDuel_VSAIOpp ret ChallengeMachine_SongIDs: ; 13345 (4:7345) -- cgit v1.2.3