Improve use of palette macro and use PAL_* constants (#1087)
* Improve use of palette macro and use PAL_* constants * Use proper constant for battle stats (#1088) * Add suggestions about function names and variables * Add colors macro --------- Co-authored-by: vulcandth <vulcandth@gmail.com>
This commit is contained in:
@@ -641,7 +641,7 @@ Function894dc:
|
||||
ld bc, 3 palettes
|
||||
call CopyBytes
|
||||
ld hl, .Pals345
|
||||
ld de, wBGPals1 + 3 palettes
|
||||
ld de, wBGPals1 palette 3
|
||||
ld bc, 3 palettes
|
||||
call CopyBytes
|
||||
|
||||
@@ -2056,7 +2056,7 @@ Function89d0d:
|
||||
jr nz, .loop
|
||||
|
||||
ld hl, .Palette2
|
||||
ld de, wBGPals1 + 2 palettes
|
||||
ld de, wBGPals1 palette 2
|
||||
ld bc, 1 palettes
|
||||
call CopyBytes
|
||||
|
||||
@@ -3232,7 +3232,7 @@ Function8a5b6:
|
||||
ld a, $5
|
||||
ldh [rSVBK], a
|
||||
ld hl, Palette_8a5e5
|
||||
ld de, wBGPals1 + 4 palettes
|
||||
ld de, wBGPals1 palette 4
|
||||
ld bc, 3 palettes
|
||||
call CopyBytes
|
||||
ld hl, Palette_8a5fd
|
||||
@@ -3240,7 +3240,7 @@ Function8a5b6:
|
||||
ld bc, 1 palettes
|
||||
call CopyBytes
|
||||
ld hl, Palette_8a605
|
||||
ld de, wOBPals1 + 1 palettes
|
||||
ld de, wOBPals1 palette 1
|
||||
ld bc, 1 palettes
|
||||
call CopyBytes
|
||||
pop af
|
||||
|
@@ -975,7 +975,7 @@ MobileTradeAnim_GiveTrademon1:
|
||||
|
||||
MobileTradeAnim_GiveTrademon2:
|
||||
ld c, 40
|
||||
ld hl, wBGPals2 + 1 palettes
|
||||
ld hl, wBGPals2 palette 1
|
||||
call Function1082f0
|
||||
call Function108af4
|
||||
call Function108b5a
|
||||
@@ -1069,12 +1069,12 @@ MobileTradeAnim_GetTrademon1:
|
||||
|
||||
MobileTradeAnim_GetTrademon2:
|
||||
ld c, 20
|
||||
ld hl, wBGPals2 + 1 palettes
|
||||
ld hl, wBGPals2 palette 1
|
||||
call Function1082fa
|
||||
ld de, SFX_GIVE_TRADEMON
|
||||
call PlaySFX
|
||||
ld c, 20
|
||||
ld hl, wBGPals2 + 1 palettes
|
||||
ld hl, wBGPals2 palette 1
|
||||
call Function1082fa
|
||||
call Function108af4
|
||||
.asm_1088ad
|
||||
@@ -1439,8 +1439,8 @@ Function108b5a:
|
||||
ld a, $5
|
||||
ldh [rSVBK], a
|
||||
ld de, palred 18 + palgreen 31 + palblue 15
|
||||
ld hl, wBGPals2 + 4 palettes
|
||||
ld c, $10
|
||||
ld hl, wBGPals2 palette 4
|
||||
ld c, 2 palettes
|
||||
.loop
|
||||
ld a, e
|
||||
ld [hli], a
|
||||
@@ -1491,13 +1491,13 @@ Function108b98:
|
||||
and $1
|
||||
xor d
|
||||
jr z, .asm_108bad
|
||||
ld hl, Palette_108b98 + 1 palettes
|
||||
ld hl, Palette_108b98 palette 1
|
||||
jr .asm_108bb0
|
||||
|
||||
.asm_108bad
|
||||
ld hl, Palette_108b98
|
||||
.asm_108bb0
|
||||
ld de, wBGPals1 + 7 palettes
|
||||
ld de, wBGPals1 palette 7
|
||||
ld bc, 8 palettes
|
||||
call CopyBytes
|
||||
pop af
|
||||
@@ -1724,7 +1724,7 @@ LoadMobileAdapterPalette:
|
||||
ld hl, MobileAdapterPalettes
|
||||
call AddNTimes
|
||||
ld a, BANK(wBGPals1)
|
||||
ld de, wBGPals1 + 4 palettes
|
||||
ld de, wBGPals1 palette 4
|
||||
ld bc, 1 palettes
|
||||
call FarCopyWRAM
|
||||
ret
|
||||
|
@@ -515,7 +515,7 @@ Function1162cb:
|
||||
ld a, $5
|
||||
ldh [rSVBK], a
|
||||
ld hl, PichuBorderMobileOBPalettes
|
||||
ld de, wOBPals1 + 2 palettes
|
||||
ld de, wOBPals1 palette 2
|
||||
ld bc, 6 palettes
|
||||
call CopyBytes
|
||||
call SetPalettes
|
||||
|
@@ -676,13 +676,13 @@ Function16cc18:
|
||||
|
||||
Function16cc25:
|
||||
ld hl, Unknown_16cfa9
|
||||
ld de, wBGPals1 + 1 palettes
|
||||
ld de, wBGPals1 palette 1
|
||||
call .CopyPal
|
||||
ld hl, Unknown_16cfb1
|
||||
ld de, wOBPals1
|
||||
call .CopyPal
|
||||
ld hl, Unknown_16cfb9
|
||||
ld de, wOBPals1 + 1 palettes
|
||||
ld de, wOBPals1 palette 1
|
||||
call .CopyPal
|
||||
ret
|
||||
|
||||
|
Reference in New Issue
Block a user