diff options
Diffstat (limited to 'engine')
-rw-r--r-- | engine/battle_anims/bg_effects.asm | 8 | ||||
-rwxr-xr-x | engine/crystal_intro.asm | 8 | ||||
-rwxr-xr-x | engine/debug.asm | 8 | ||||
-rw-r--r-- | engine/events/poisonstep_pals.asm | 2 | ||||
-rw-r--r-- | engine/pokedex.asm | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index ffdce532e..537757b14 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -2588,8 +2588,8 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52) ld b, a ld c, $1 call CopyPals - ld hl, OBPals + 8 - ld de, UnknOBPals + 8 + ld hl, OBPals palette 1 + ld de, UnknOBPals palette 1 pop af ld b, a ld c, $1 @@ -2610,8 +2610,8 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f) ld a, h push bc push af - ld hl, BGPals + 8 - ld de, UnknBGPals + 8 + ld hl, BGPals palette 1 + ld de, UnknBGPals palette 1 ld b, a ld c, $1 call CopyPals diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 1c2a39ef2..449a5bf82 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -1532,7 +1532,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172) ld b, 8 ; number of BG pals .loop1 push hl - ld c, 8 ; number of bytes per pal + ld c, 1 palettes .loop2 ld a, [hli] ld [de], a @@ -1735,7 +1735,7 @@ Intro_Scene20_AppearUnown: ; e5348 (39:5348) adc d ld d, a - ld bc, 8 + ld bc, 1 palettes call CopyBytes pop bc @@ -1747,7 +1747,7 @@ Intro_Scene20_AppearUnown: ; e5348 (39:5348) adc d ld d, a - ld bc, 8 + ld bc, 1 palettes call CopyBytes pop af @@ -1950,7 +1950,7 @@ Intro_ClearBGPals: ; e54a3 (39:54a3) ld [rSVBK], a ld hl, BGPals - ld bc, 16 * 8 + ld bc, 16 palettes xor a call ByteFill diff --git a/engine/debug.asm b/engine/debug.asm index fda0d3e60..dee9b035d 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -1202,10 +1202,10 @@ Function82236: ; 82236 ld [rSVBK], a ld hl, BGPals ld a, [wcf64] - ld bc, 8 + ld bc, 1 palettes call AddNTimes ld de, wc608 - ld bc, 8 + ld bc, 1 palettes call CopyBytes pop af ld [rSVBK], a @@ -1232,12 +1232,12 @@ Function822a3: ; 822a3 ld [rSVBK], a ld hl, BGPals ld a, [wcf64] - ld bc, 8 + ld bc, 1 palettes call AddNTimes ld e, l ld d, h ld hl, wc608 - ld bc, 8 + ld bc, 1 palettes call CopyBytes hlcoord 1, 0 ld de, wc608 diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 088be8848..9562ecb67 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -29,7 +29,7 @@ LoadPoisonBGPals: ; cbcdd ld a, $5 ld [rSVBK], a ld hl, BGPals - ld c, $20 + ld c, 4 palettes .loop ; RGB 28, 21, 31 ld a, LOW(palred 28 + palgreen 21 + palblue 31) diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 0297cf840..aa540e9c6 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -2351,7 +2351,7 @@ Pokedex_BlackOutBG: ; 41401 (10:5401) ld a, $5 ld [rSVBK], a ld hl, UnknBGPals - ld bc, $40 + ld bc, 8 palettes xor a call ByteFill pop af |