diff options
Diffstat (limited to 'engine/battle/battle_transition.asm')
| -rw-r--r-- | engine/battle/battle_transition.asm | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index e4c99be6c..d96d1be81 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -294,19 +294,19 @@ StartTrainerBattle_Flash: 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 @@ INCLUDE "gfx/overworld/trainer_battle_nite.pal" 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] |