Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 0/1/2/3 for palettes, and rgbds opt feature for battle transition graphic

This commit is contained in:
Rangi 2018-09-09 18:15:54 -04:00
parent 8c435054a0
commit 3241c9cfaa
5 changed files with 122 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
engine/battle/battle_transition.asm
View File

@ -294,19 +294,19 @@ StartTrainerBattle_Flash:
ret ret
.pals .pals
db %11111001 ; 3321 dc 3, 3, 2, 1
db %11111110 ; 3332 dc 3, 3, 3, 2
db %11111111 ; 3333 dc 3, 3, 3, 3
db %11111110 ; 3332 dc 3, 3, 3, 2
db %11111001 ; 3321 dc 3, 3, 2, 1
db %11100100 ; 3210 dc 3, 2, 1, 0
db %10010000 ; 2100 dc 2, 1, 0, 0
db %01000000 ; 1000 dc 1, 0, 0, 0
db %00000000 ; 0000 dc 0, 0, 0, 0
db %01000000 ; 1000 dc 1, 0, 0, 0
db %10010000 ; 2100 dc 2, 1, 0, 0
db %11100100 ; 3210 dc 3, 2, 1, 0
db %00000001 ; 0001 dc 0, 0, 0, 1
StartTrainerBattle_SetUpForWavyOutro: StartTrainerBattle_SetUpForWavyOutro:
farcall Function5602 farcall Function5602
@ -713,22 +713,28 @@ INCLUDE "gfx/overworld/trainer_battle_nite.pal"
ret ret
PokeBallTransition: PokeBallTransition:
db %00000011, %11000000 transition_row: MACRO
db %00001111, %11110000 db HIGH(\1), LOW(\1)
db %00111100, %00111100 ENDM
db %00110000, %00001100 pusho
db %01100000, %00000110 opt b.X ; . = 0, X = 1
db %01100011, %11000110 transition_row %......XXXX......
db %11000110, %01100011 transition_row %....XXXXXXXX....
db %11111100, %00111111 transition_row %..XXXX....XXXX..
db %11111100, %00111111 transition_row %..XX........XX..
db %11000110, %01100011 transition_row %.XX..........XX.
db %01100011, %11000110 transition_row %.XX...XXXX...XX.
db %01100000, %00000110 transition_row %XX...XX..XX...XX
db %00110000, %00001100 transition_row %XXXXXX....XXXXXX
db %00111100, %00111100 transition_row %XXXXXX....XXXXXX
db %00001111, %11110000 transition_row %XX...XX..XX...XX
db %00000011, %11000000 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: WipeLYOverrides:
ldh a, [rSVBK] ldh a, [rSVBK]

58
engine/battle_anims/bg_effects.asm
View File

@ -174,16 +174,16 @@ BattleBGEffect_FlashInverted:
jp BattleBGEffect_FlashContinue jp BattleBGEffect_FlashContinue
.inverted .inverted
db %11100100 ; 3210 dc 3, 2, 1, 0
db %00011011 ; 0123 dc 0, 1, 2, 3
BattleBGEffect_FlashWhite: BattleBGEffect_FlashWhite:
ld de, .white ld de, .white
jp BattleBGEffect_FlashContinue jp BattleBGEffect_FlashContinue
.white .white
db %11100100 ; 3210 dc 3, 2, 1, 0
db %00000000 ; 0000 dc 0, 0, 0, 0
BattleBGEffect_FlashContinue: BattleBGEffect_FlashContinue:
; current timer, flash duration, number of flashes ; current timer, flash duration, number of flashes
@ -235,9 +235,9 @@ BattleBGEffect_WhiteHues:
ret ret
.Pals: .Pals:
db %11100100 dc 3, 2, 1, 0
db %11100000 dc 3, 2, 0, 0
db %11010000 dc 3, 1, 0, 0
db -1 db -1
BattleBGEffect_BlackHues: BattleBGEffect_BlackHues:
@ -252,9 +252,9 @@ BattleBGEffect_BlackHues:
ret ret
.Pals: .Pals:
db %11100100 dc 3, 2, 1, 0
db %11110100 dc 3, 3, 1, 0
db %11111000 dc 3, 3, 2, 0
db -1 db -1
BattleBGEffect_AlternateHues: BattleBGEffect_AlternateHues:
@ -270,14 +270,14 @@ BattleBGEffect_AlternateHues:
ret ret
.Pals: .Pals:
db %11100100 dc 3, 2, 1, 0
db %11111000 dc 3, 3, 2, 0
db %11111100 dc 3, 3, 3, 0
db %11111000 dc 3, 3, 2, 0
db %11100100 dc 3, 2, 1, 0
db %10010000 dc 2, 1, 0, 0
db %01000000 dc 1, 0, 0, 0
db %10010000 dc 2, 1, 0, 0
db -2 db -2
BattleBGEffect_06: BattleBGEffect_06:
@ -294,13 +294,13 @@ BattleBGEffect_06:
ret ret
.PalsCGB: .PalsCGB:
db %11100100 dc 3, 2, 1, 0
db %10010000 dc 2, 1, 0, 0
db -2 db -2
.PalsSGB: .PalsSGB:
db %11110000 dc 3, 3, 0, 0
db %11000000 dc 3, 0, 0, 0
db -2 db -2
BattleBGEffect_07: BattleBGEffect_07:
@ -317,13 +317,13 @@ BattleBGEffect_07:
ret ret
.PalsCGB: .PalsCGB:
db %11100100 dc 3, 2, 1, 0
db %11011000 dc 3, 1, 2, 0
db -2 db -2
.PalsSGB: .PalsSGB:
db %11110000 dc 3, 3, 0, 0
db %11001100 dc 3, 0, 3, 0
db -2 db -2
BattleBGEffect_08: BattleBGEffect_08:
@ -333,9 +333,9 @@ BattleBGEffect_08:
ret ret
.Pals: .Pals:
db %00011011 dc 0, 1, 2, 3
db %01100011 dc 1, 2, 0, 3
db %10000111 dc 2, 0, 1, 3
db -2 db -2
BattleBGEffect_HideMon: BattleBGEffect_HideMon:

12
engine/menus/intro_menu.asm
View File

@ -864,12 +864,12 @@ Intro_RotatePalettesLeftFrontpic:
ret ret
IntroFadePalettes: IntroFadePalettes:
db %01010100 dc 1, 1, 1, 0
db %10101000 dc 2, 2, 2, 0
db %11111100 dc 3, 3, 3, 0
db %11111000 dc 3, 3, 2, 0
db %11110100 dc 3, 3, 1, 0
db %11100100 dc 3, 2, 1, 0
.End .End
Intro_WipeInFrontpic: Intro_WipeInFrontpic:

70
engine/tilesets/timeofday_pals.asm
View File

@ -346,46 +346,46 @@ GetTimePalFade:
dw .darkness dw .darkness
.morn .morn
db %11111111, %11111111, %11111111 dc 3,3,3,3, 3,3,3,3, 3,3,3,3
db %11111110, %11111110, %11111110 dc 3,3,3,2, 3,3,3,2, 3,3,3,2
db %11111001, %11100100, %11100100 dc 3,3,2,1, 3,2,1,0, 3,2,1,0
db %11100100, %11010000, %11010000 dc 3,2,1,0, 3,1,0,0, 3,1,0,0
db %10010000, %10000000, %10000000 dc 2,1,0,0, 2,0,0,0, 2,0,0,0
db %01000000, %01000000, %01000000 dc 1,0,0,0, 1,0,0,0, 1,0,0,0
db %00000000, %00000000, %00000000 dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.day .day
db %11111111, %11111111, %11111111 dc 3,3,3,3, 3,3,3,3, 3,3,3,3
db %11111110, %11111110, %11111110 dc 3,3,3,2, 3,3,3,2, 3,3,3,2
db %11111001, %11100100, %11100100 dc 3,3,2,1, 3,2,1,0, 3,2,1,0
db %11100100, %11010000, %11010000 dc 3,2,1,0, 3,1,0,0, 3,1,0,0
db %10010000, %10000000, %10000000 dc 2,1,0,0, 2,0,0,0, 2,0,0,0
db %01000000, %01000000, %01000000 dc 1,0,0,0, 1,0,0,0, 1,0,0,0
db %00000000, %00000000, %00000000 dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.nite .nite
db %11111111, %11111111, %11111111 dc 3,3,3,3, 3,3,3,3, 3,3,3,3
db %11111110, %11111110, %11111110 dc 3,3,3,2, 3,3,3,2, 3,3,3,2
db %11111001, %11100100, %11100100 dc 3,3,2,1, 3,2,1,0, 3,2,1,0
db %11101001, %11010000, %11010000 dc 3,2,2,1, 3,1,0,0, 3,1,0,0
db %10010000, %10000000, %10000000 dc 2,1,0,0, 2,0,0,0, 2,0,0,0
db %01000000, %01000000, %01000000 dc 1,0,0,0, 1,0,0,0, 1,0,0,0
db %00000000, %00000000, %00000000 dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.darkness .darkness
db %11111111, %11111111, %11111111 dc 3,3,3,3, 3,3,3,3, 3,3,3,3
db %11111110, %11111110, %11111111 dc 3,3,3,2, 3,3,3,2, 3,3,3,3
db %11111110, %11100100, %11111111 dc 3,3,3,2, 3,2,1,0, 3,3,3,3
db %11111101, %11010000, %11111111 dc 3,3,3,1, 3,1,0,0, 3,3,3,3
db %11111101, %10000000, %11111111 dc 3,3,3,1, 2,0,0,0, 3,3,3,3
db %00000000, %01000000, %00000000 dc 0,0,0,0, 1,0,0,0, 0,0,0,0
db %00000000, %00000000, %00000000 dc 0,0,0,0, 0,0,0,0, 0,0,0,0
.cgbfade .cgbfade
db %11111111, %11111111, %11111111 dc 3,3,3,3, 3,3,3,3, 3,3,3,3
db %11111110, %11111110, %11111110 dc 3,3,3,2, 3,3,3,2, 3,3,3,2
db %11111001, %11111001, %11111001 dc 3,3,2,1, 3,3,2,1, 3,3,2,1
db %11100100, %11100100, %11100100 dc 3,2,1,0, 3,2,1,0, 3,2,1,0
db %10010000, %10010000, %10010000 dc 2,1,0,0, 2,1,0,0, 2,1,0,0
db %01000000, %01000000, %01000000 dc 1,0,0,0, 1,0,0,0, 1,0,0,0
db %00000000, %00000000, %00000000 dc 0,0,0,0, 0,0,0,0, 0,0,0,0

34
home/fade.asm
View File

@ -104,24 +104,24 @@ RotatePalettesLeft::
jr nz, RotatePalettesLeft jr nz, RotatePalettesLeft
ret ret
IncGradGBPalTable_00:: db %11111111, %11111111, %11111111 IncGradGBPalTable_00:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3
IncGradGBPalTable_01:: db %11111110, %11111110, %11111110 IncGradGBPalTable_01:: dc 3,3,3,2, 3,3,3,2, 3,3,3,2
IncGradGBPalTable_02:: db %11111001, %11111001, %11111001 IncGradGBPalTable_02:: dc 3,3,2,1, 3,3,2,1, 3,3,2,1
IncGradGBPalTable_03:: db %11100100, %11100100, %11100100 IncGradGBPalTable_03:: dc 3,2,1,0, 3,2,1,0, 3,2,1,0
IncGradGBPalTable_04:: db %11100100, %11100100, %11100100 IncGradGBPalTable_04:: dc 3,2,1,0, 3,2,1,0, 3,2,1,0
IncGradGBPalTable_05:: db %10010000, %10010000, %10010000 IncGradGBPalTable_05:: dc 2,1,0,0, 2,1,0,0, 2,1,0,0
IncGradGBPalTable_06:: db %01000000, %01000000, %01000000 IncGradGBPalTable_06:: dc 1,0,0,0, 1,0,0,0, 1,0,0,0
IncGradGBPalTable_07:: db %00000000, %00000000, %00000000 IncGradGBPalTable_07:: dc 0,0,0,0, 0,0,0,0, 0,0,0,0
; bgp obp1 obp2 ; bgp obp1 obp2
IncGradGBPalTable_08:: db %11111111, %11111111, %11111111 IncGradGBPalTable_08:: dc 3,3,3,3, 3,3,3,3, 3,3,3,3
IncGradGBPalTable_09:: db %11111110, %11111110, %11111000 IncGradGBPalTable_09:: dc 3,3,3,2, 3,3,3,2, 3,3,2,0
IncGradGBPalTable_10:: db %11111001, %11100100, %11100100 IncGradGBPalTable_10:: dc 3,3,2,1, 3,2,1,0, 3,2,1,0
IncGradGBPalTable_11:: db %11100100, %11010000, %11100000 IncGradGBPalTable_11:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0
IncGradGBPalTable_12:: db %11100100, %11010000, %11100000 IncGradGBPalTable_12:: dc 3,2,1,0, 3,1,0,0, 3,2,0,0
IncGradGBPalTable_13:: db %10010000, %10000000, %10010000 IncGradGBPalTable_13:: dc 2,1,0,0, 2,0,0,0, 2,1,0,0
IncGradGBPalTable_14:: db %01000000, %01000000, %01000000 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