diff options
Diffstat (limited to 'engine/battle_start.asm')
| -rw-r--r-- | engine/battle_start.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 845af9d2a..929ac04c1 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -1,11 +1,11 @@ Predef_StartBattle: ; 8c20f call Function8c26d ld a, [rBGP] - ld [wcfc7], a + ld [wBGP], a ld a, [rOBP0] - ld [wcfc8], a + ld [wOBP0], a ld a, [rOBP1] - ld [wcfc9], a + ld [wOBP1], a call DelayFrame ld hl, hVBlank ld a, [hl] @@ -35,7 +35,7 @@ Predef_StartBattle: ; 8c20f ld [rSVBK], a ld a, %11111111 - ld [wcfc7], a + ld [wBGP], a call DmgToCgbBGPals call DelayFrame xor a @@ -120,7 +120,7 @@ Function8c2cf: ; 8c2cf ld a, $6 ld [rSVBK], a push hl - ld hl, w6_d000 + ld hl, wDecompressScratch ld bc, $28 * $10 .loop @@ -132,7 +132,7 @@ Function8c2cf: ; 8c2cf jr nz, .loop pop hl - ld de, w6_d000 + ld de, wDecompressScratch ld b, BANK(Function8c2cf) ; BANK(@) ld c, $28 call Request2bpp @@ -264,8 +264,8 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab) ret .DoFlashAnimation: ; 8c3b3 (23:43b3) - ld a, [wd847] - cp -1 + ld a, [wTimeOfDayPalset] + cp %11111111 ; dark cave jr z, .done ld hl, wcf64 ld a, [hl] @@ -278,7 +278,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab) ld a, [hl] cp %00000001 jr z, .done - ld [wcfc7], a + ld [wBGP], a call DmgToCgbBGPals and a ret |