diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:38:22 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:38:22 +0100 |
| commit | c693d08b4c40c6d9da0be6a77e51c394270356ca (patch) | |
| tree | 4da16a2409e01d2c8d81a79c4336d7c26bff4b42 /src/engine/home.asm | |
| parent | 38ac7a22c3a4a0dc00a55db38330d1740492a7a5 (diff) | |
| parent | d4d63a97e41c40d9081a279e3f113177c8640767 (diff) | |
Merge https://github.com/pret/poketcg into temp
Diffstat (limited to 'src/engine/home.asm')
| -rw-r--r-- | src/engine/home.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index cdf9588..87deaaa 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2310,7 +2310,7 @@ SerialTimerHandler: ; 0c91 (0:0c91) ld [hl], $0 ret -Func_cc5: ; 0cc5 (0:0cc5) +Func_0cc5: ; 0cc5 (0:0cc5) ld hl, wSerialRecvCounter or a jr nz, .asm_cdc @@ -10706,7 +10706,7 @@ GameEvent_Duel: ; 38c0 (0:38c0) ld [wd112], a call EnableSRAM xor a - ld [sba44], a + ld [sPlayerInChallengeMachine], a call DisableSRAM call SaveGeneralSaveData bank1call StartDuel_VSAIOpp @@ -10719,10 +10719,10 @@ GameEvent_ChallengeMachine: ; 38db (0:38db) call PlayDefaultSong call EnableSRAM xor a - ld [sba44], a + ld [sPlayerInChallengeMachine], a call DisableSRAM .asm_38ed - farcall Func_131d3 + farcall ChallengeMachine_Start ld a, MUSIC_OVERWORLD ld [wDefaultSong], a call PlayDefaultSong @@ -10734,7 +10734,7 @@ GameEvent_ContinueDuel: ; 38fb (0:38fb) ld [wd112], a bank1call TryContinueDuel call EnableSRAM - ld a, [sba44] + ld a, [sPlayerInChallengeMachine] call DisableSRAM cp $ff jr z, GameEvent_ChallengeMachine.asm_38ed |