diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:43:51 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:43:51 +0100 |
| commit | 052fb54fb4c9a44451dd81fc139d7d1a614bdabd (patch) | |
| tree | 15b069120074ea88775e92e6411ea1805819caca /src | |
| parent | c693d08b4c40c6d9da0be6a77e51c394270356ca (diff) | |
Merge conflict correction
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank04.asm | 2 |
1 files changed, 1 insertions, 1 deletions
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) |