ref: 3241c9cfaa3c234f15c5c8d468c71556f9f00e2c
parent: 8c435054a0c5c8d3a0ad49f42790c492583caef5
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Sep 9 14:15:54 EDT 2018
Use 0/1/2/3 for palettes, and rgbds opt feature for battle transition graphic
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -294,19 +294,19 @@
ret
.pals
- db %11111001 ; 3321
- db %11111110 ; 3332
- db %11111111 ; 3333
- db %11111110 ; 3332
- db %11111001 ; 3321
- db %11100100 ; 3210
- db %10010000 ; 2100
- db %01000000 ; 1000
- db %00000000 ; 0000
- db %01000000 ; 1000
- db %10010000 ; 2100
- db %11100100 ; 3210
- db %00000001 ; 0001
+ dc 3, 3, 2, 1
+ dc 3, 3, 3, 2
+ dc 3, 3, 3, 3
+ dc 3, 3, 3, 2
+ dc 3, 3, 2, 1
+ dc 3, 2, 1, 0
+ dc 2, 1, 0, 0
+ dc 1, 0, 0, 0
+ dc 0, 0, 0, 0
+ dc 1, 0, 0, 0
+ dc 2, 1, 0, 0
+ dc 3, 2, 1, 0
+ dc 0, 0, 0, 1
StartTrainerBattle_SetUpForWavyOutro:
farcall Function5602
@@ -713,22 +713,28 @@
ret
PokeBallTransition:
- db %00000011, %11000000
- db %00001111, %11110000
- db %00111100, %00111100
- db %00110000, %00001100
- db %01100000, %00000110
- db %01100011, %11000110
- db %11000110, %01100011
- db %11111100, %00111111
- db %11111100, %00111111
- db %11000110, %01100011
- db %01100011, %11000110
- db %01100000, %00000110
- db %00110000, %00001100
- db %00111100, %00111100
- db %00001111, %11110000
- db %00000011, %11000000
+transition_row: MACRO
+ db HIGH(\1), LOW(\1)
+ENDM
+pusho
+opt b.X ; . = 0, X = 1
+ transition_row %......XXXX......
+ transition_row %....XXXXXXXX....
+ transition_row %..XXXX....XXXX..
+ transition_row %..XX........XX..
+ transition_row %.XX..........XX.
+ transition_row %.XX...XXXX...XX.
+ transition_row %XX...XX..XX...XX
+ transition_row %XXXXXX....XXXXXX
+ transition_row %XXXXXX....XXXXXX
+ transition_row %XX...XX..XX...XX
+ transition_row %.XX...XXXX...XX.
+ transition_row %.XX..........XX.
+ transition_row %..XX........XX..
+ transition_row %..XXXX....XXXX..
+ transition_row %....XXXXXXXX....
+ transition_row %......XXXX......
+popo
WipeLYOverrides:
ldh a, [rSVBK]
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -174,8 +174,8 @@
jp BattleBGEffect_FlashContinue
.inverted
- db %11100100 ; 3210
- db %00011011 ; 0123
+ dc 3, 2, 1, 0
+ dc 0, 1, 2, 3
BattleBGEffect_FlashWhite:
ld de, .white
@@ -182,8 +182,8 @@
jp BattleBGEffect_FlashContinue
.white
- db %11100100 ; 3210
- db %00000000 ; 0000
+ dc 3, 2, 1, 0
+ dc 0, 0, 0, 0
BattleBGEffect_FlashContinue:
; current timer, flash duration, number of flashes
@@ -235,9 +235,9 @@
ret
.Pals:
- db %11100100
- db %11100000
- db %11010000
+ dc 3, 2, 1, 0
+ dc 3, 2, 0, 0
+ dc 3, 1, 0, 0
db -1
BattleBGEffect_BlackHues:
@@ -252,9 +252,9 @@
ret
.Pals:
- db %11100100
- db %11110100
- db %11111000
+ dc 3, 2, 1, 0
+ dc 3, 3, 1, 0
+ dc 3, 3, 2, 0
db -1
BattleBGEffect_AlternateHues:
@@ -270,14 +270,14 @@
ret
.Pals:
- db %11100100
- db %11111000
- db %11111100
- db %11111000
- db %11100100
- db %10010000
- db %01000000
- db %10010000
+ dc 3, 2, 1, 0
+ dc 3, 3, 2, 0
+ dc 3, 3, 3, 0
+ dc 3, 3, 2, 0
+ dc 3, 2, 1, 0
+ dc 2, 1, 0, 0
+ dc 1, 0, 0, 0
+ dc 2, 1, 0, 0
db -2
BattleBGEffect_06:
@@ -294,13 +294,13 @@
ret
.PalsCGB:
- db %11100100
- db %10010000
+ dc 3, 2, 1, 0
+ dc 2, 1, 0, 0
db -2
.PalsSGB:
- db %11110000
- db %11000000
+ dc 3, 3, 0, 0
+ dc 3, 0, 0, 0
db -2
BattleBGEffect_07:
@@ -317,13 +317,13 @@
ret
.PalsCGB:
- db %11100100
- db %11011000
+ dc 3, 2, 1, 0
+ dc 3, 1, 2, 0
db -2
.PalsSGB:
- db %11110000
- db %11001100
+ dc 3, 3, 0, 0
+ dc 3, 0, 3, 0
db -2
BattleBGEffect_08:
@@ -333,9 +333,9 @@
ret
.Pals:
- db %00011011
- db %01100011
- db %10000111
+ dc 0, 1, 2, 3
+ dc 1, 2, 0, 3
+ dc 2, 0, 1, 3
db -2
BattleBGEffect_HideMon:
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -864,12 +864,12 @@
ret
IntroFadePalettes:
- db %01010100
- db %10101000
- db %11111100
- db %11111000
- db %11110100
- db %11100100
+ dc 1, 1, 1, 0
+ dc 2, 2, 2, 0
+ dc 3, 3, 3, 0
+ dc 3, 3, 2, 0
+ dc 3, 3, 1, 0
+ dc 3, 2, 1, 0
.End
Intro_WipeInFrontpic:
--- a/engine/tilesets/timeofday_pals.asm
+++ b/engine/tilesets/timeofday_pals.asm
@@ -346,46 +346,46 @@
dw .darkness
.morn
- db %11111111, %11111111, %11111111
- db %11111110, %11111110, %11111110
- db %11111001, %11100100, %11100100
- db %11100100, %11010000, %11010000
- db %10010000, %10000000, %10000000
- db %01000000, %01000000, %01000000
- db %00000000, %00000000, %00000000
+ dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+ dc 3,3,3,2, 3,3,3,2, 3,3,3,2
+ dc 3,3,2,1, 3,2,1,0, 3,2,1,0
+ dc 3,2,1,0, 3,1,0,0, 3,1,0,0
+ dc 2,1,0,0, 2,0,0,0, 2,0,0,0
+ dc 1,0,0,0, 1,0,0,0, 1,0,0,0
+ dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.day
- db %11111111, %11111111, %11111111
- db %11111110, %11111110, %11111110
- db %11111001, %11100100, %11100100
- db %11100100, %11010000, %11010000
- db %10010000, %10000000, %10000000
- db %01000000, %01000000, %01000000
- db %00000000, %00000000, %00000000
+ dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+ dc 3,3,3,2, 3,3,3,2, 3,3,3,2
+ dc 3,3,2,1, 3,2,1,0, 3,2,1,0
+ dc 3,2,1,0, 3,1,0,0, 3,1,0,0
+ dc 2,1,0,0, 2,0,0,0, 2,0,0,0
+ dc 1,0,0,0, 1,0,0,0, 1,0,0,0
+ dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.nite
- db %11111111, %11111111, %11111111
- db %11111110, %11111110, %11111110
- db %11111001, %11100100, %11100100
- db %11101001, %11010000, %11010000
- db %10010000, %10000000, %10000000
- db %01000000, %01000000, %01000000
- db %00000000, %00000000, %00000000
+ dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+ dc 3,3,3,2, 3,3,3,2, 3,3,3,2
+ dc 3,3,2,1, 3,2,1,0, 3,2,1,0
+ dc 3,2,2,1, 3,1,0,0, 3,1,0,0
+ dc 2,1,0,0, 2,0,0,0, 2,0,0,0
+ dc 1,0,0,0, 1,0,0,0, 1,0,0,0
+ dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.darkness
- db %11111111, %11111111, %11111111
- db %11111110, %11111110, %11111111
- db %11111110, %11100100, %11111111
- db %11111101, %11010000, %11111111
- db %11111101, %10000000, %11111111
- db %00000000, %01000000, %00000000
- db %00000000, %00000000, %00000000
+ dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+ dc 3,3,3,2, 3,3,3,2, 3,3,3,3
+ dc 3,3,3,2, 3,2,1,0, 3,3,3,3
+ dc 3,3,3,1, 3,1,0,0, 3,3,3,3
+ dc 3,3,3,1, 2,0,0,0, 3,3,3,3
+ dc 0,0,0,0, 1,0,0,0, 0,0,0,0
+ dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.cgbfade
- db %11111111, %11111111, %11111111
- db %11111110, %11111110, %11111110
- db %11111001, %11111001, %11111001
- db %11100100, %11100100, %11100100
- db %10010000, %10010000, %10010000
- db %01000000, %01000000, %01000000
- db %00000000, %00000000, %00000000
+ dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+ dc 3,3,3,2, 3,3,3,2, 3,3,3,2
+ dc 3,3,2,1, 3,3,2,1, 3,3,2,1
+ dc 3,2,1,0, 3,2,1,0, 3,2,1,0
+ dc 2,1,0,0, 2,1,0,0, 2,1,0,0
+ dc 1,0,0,0, 1,0,0,0, 1,0,0,0
+ dc 0,0,0,0, 0,0,0,0, 0,0,0,0
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -104,24 +104,24 @@
jr nz, RotatePalettesLeft
ret
-IncGradGBPalTable_00:: db %11111111, %11111111, %11111111
-IncGradGBPalTable_01:: db %11111110, %11111110, %11111110
-IncGradGBPalTable_02:: db %11111001, %11111001, %11111001
-IncGradGBPalTable_03:: db %11100100, %11100100, %11100100
+IncGradGBPalTable_00:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+IncGradGBPalTable_01:: dc 3,3,3,2, 3,3,3,2, 3,3,3,2
+IncGradGBPalTable_02:: dc 3,3,2,1, 3,3,2,1, 3,3,2,1
+IncGradGBPalTable_03:: dc 3,2,1,0, 3,2,1,0, 3,2,1,0
-IncGradGBPalTable_04:: db %11100100, %11100100, %11100100
-IncGradGBPalTable_05:: db %10010000, %10010000, %10010000
-IncGradGBPalTable_06:: db %01000000, %01000000, %01000000
+IncGradGBPalTable_04:: dc 3,2,1,0, 3,2,1,0, 3,2,1,0
+IncGradGBPalTable_05:: dc 2,1,0,0, 2,1,0,0, 2,1,0,0
+IncGradGBPalTable_06:: dc 1,0,0,0, 1,0,0,0, 1,0,0,0
-IncGradGBPalTable_07:: db %00000000, %00000000, %00000000
-; bgp obp1 obp2
-IncGradGBPalTable_08:: db %11111111, %11111111, %11111111
-IncGradGBPalTable_09:: db %11111110, %11111110, %11111000
-IncGradGBPalTable_10:: db %11111001, %11100100, %11100100
-IncGradGBPalTable_11:: db %11100100, %11010000, %11100000
+IncGradGBPalTable_07:: dc 0,0,0,0, 0,0,0,0, 0,0,0,0
+; bgp obp1 obp2
+IncGradGBPalTable_08:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3
+IncGradGBPalTable_09:: dc 3,3,3,2, 3,3,3,2, 3,3,2,0
+IncGradGBPalTable_10:: dc 3,3,2,1, 3,2,1,0, 3,2,1,0
+IncGradGBPalTable_11:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0
-IncGradGBPalTable_12:: db %11100100, %11010000, %11100000
-IncGradGBPalTable_13:: db %10010000, %10000000, %10010000
-IncGradGBPalTable_14:: db %01000000, %01000000, %01000000
+IncGradGBPalTable_12:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0
+IncGradGBPalTable_13:: dc 2,1,0,0, 2,0,0,0, 2,1,0,0
+IncGradGBPalTable_14:: dc 1,0,0,0, 1,0,0,0, 1,0,0,0
-IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
+IncGradGBPalTable_15:: dc 0,0,0,0, 0,0,0,0, 0,0,0,0