diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-13 22:53:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-13 22:53:33 -0400 |
| commit | 4e2487c056c4dcddd3059a105e6ac89144137ab1 (patch) | |
| tree | 31fec08ba9384bc5baf3895a07fa8684ff84941c /engine/battle_start.asm | |
| parent | ca01a92880a5d71bce2bec6caa7714c8e1cf0f17 (diff) | |
hLCDCPointer and InitList
Diffstat (limited to 'engine/battle_start.asm')
| -rw-r--r-- | engine/battle_start.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm index ab4ab7742..627519daa 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -39,7 +39,7 @@ Predef_StartBattle: ; 8c20f call DmgToCgbBGPals call DelayFrame xor a - ld [hFFC6], a + ld [hLCDCPointer], a ld [hLYOverrideStart], a ld [hLYOverrideEnd], a ld [hSCY], a @@ -302,8 +302,8 @@ StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8) call StartTrainerBattle_NextScene - ld a, $43 - ld [hFFC6], a + ld a, rSCX - $ff00 + ld [hLCDCPointer], a xor a ld [hLYOverrideStart], a ld a, $90 |