lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load Alacroix character frames

This commit is contained in:
mazmazz 2019-11-03 06:26:39 -05:00
parent 96a80c51d3
commit 42835905ef
2 changed files with 176 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
src/f_finale.c
View File

@ -125,6 +125,22 @@ static patch_t *t1robo[TTMAX_ALACROIX];
static patch_t *t1twot[TTMAX_ALACROIX];
static patch_t *t1embl[TTMAX_ALACROIX];
static patch_t *t1rbtx[TTMAX_ALACROIX];
static patch_t *t1soib[TTMAX_ALACROIX];
static patch_t *t1soif[TTMAX_ALACROIX];
static patch_t *t1soba[TTMAX_ALACROIX];
static patch_t *t1sobk[TTMAX_ALACROIX];
static patch_t *t1sodh[TTMAX_ALACROIX];
static patch_t *t1taib[TTMAX_ALACROIX];
static patch_t *t1taif[TTMAX_ALACROIX];
static patch_t *t1taba[TTMAX_ALACROIX];
static patch_t *t1tabk[TTMAX_ALACROIX];
static patch_t *t1tabt[TTMAX_ALACROIX];
static patch_t *t1taft[TTMAX_ALACROIX];
static patch_t *t1knib[TTMAX_ALACROIX];
static patch_t *t1knif[TTMAX_ALACROIX];
static patch_t *t1knba[TTMAX_ALACROIX];
static patch_t *t1knbk[TTMAX_ALACROIX];
static patch_t *t1kndh[TTMAX_ALACROIX];
static patch_t *t2ribb[TTMAX_ALACROIX];
static patch_t *t2sont[TTMAX_ALACROIX];
@ -132,6 +148,22 @@ static patch_t *t2robo[TTMAX_ALACROIX];
static patch_t *t2twot[TTMAX_ALACROIX];
static patch_t *t2embl[TTMAX_ALACROIX];
static patch_t *t2rbtx[TTMAX_ALACROIX];
static patch_t *t2soib[TTMAX_ALACROIX];
static patch_t *t2soif[TTMAX_ALACROIX];
static patch_t *t2soba[TTMAX_ALACROIX];
static patch_t *t2sobk[TTMAX_ALACROIX];
static patch_t *t2sodh[TTMAX_ALACROIX];
static patch_t *t2taib[TTMAX_ALACROIX];
static patch_t *t2taif[TTMAX_ALACROIX];
static patch_t *t2taba[TTMAX_ALACROIX];
static patch_t *t2tabk[TTMAX_ALACROIX];
static patch_t *t2tabt[TTMAX_ALACROIX];
static patch_t *t2taft[TTMAX_ALACROIX];
static patch_t *t2knib[TTMAX_ALACROIX];
static patch_t *t2knif[TTMAX_ALACROIX];
static patch_t *t2knba[TTMAX_ALACROIX];
static patch_t *t2knbk[TTMAX_ALACROIX];
static patch_t *t2kndh[TTMAX_ALACROIX];
static patch_t *t4ribb[TTMAX_ALACROIX];
static patch_t *t4sont[TTMAX_ALACROIX];
@ -139,6 +171,22 @@ static patch_t *t4robo[TTMAX_ALACROIX];
static patch_t *t4twot[TTMAX_ALACROIX];
static patch_t *t4embl[TTMAX_ALACROIX];
static patch_t *t4rbtx[TTMAX_ALACROIX];
static patch_t *t4soib[TTMAX_ALACROIX];
static patch_t *t4soif[TTMAX_ALACROIX];
static patch_t *t4soba[TTMAX_ALACROIX];
static patch_t *t4sobk[TTMAX_ALACROIX];
static patch_t *t4sodh[TTMAX_ALACROIX];
static patch_t *t4taib[TTMAX_ALACROIX];
static patch_t *t4taif[TTMAX_ALACROIX];
static patch_t *t4taba[TTMAX_ALACROIX];
static patch_t *t4tabk[TTMAX_ALACROIX];
static patch_t *t4tabt[TTMAX_ALACROIX];
static patch_t *t4taft[TTMAX_ALACROIX];
static patch_t *t4knib[TTMAX_ALACROIX];
static patch_t *t4knif[TTMAX_ALACROIX];
static patch_t *t4knba[TTMAX_ALACROIX];
static patch_t *t4knbk[TTMAX_ALACROIX];
static patch_t *t4kndh[TTMAX_ALACROIX];
static patch_t *t6ribb[TTMAX_ALACROIX];
static patch_t *t6sont[TTMAX_ALACROIX];
@ -146,6 +194,22 @@ static patch_t *t6robo[TTMAX_ALACROIX];
static patch_t *t6twot[TTMAX_ALACROIX];
static patch_t *t6embl[TTMAX_ALACROIX];
static patch_t *t6rbtx[TTMAX_ALACROIX];
static patch_t *t6soib[TTMAX_ALACROIX];
static patch_t *t6soif[TTMAX_ALACROIX];
static patch_t *t6soba[TTMAX_ALACROIX];
static patch_t *t6sobk[TTMAX_ALACROIX];
static patch_t *t6sodh[TTMAX_ALACROIX];
static patch_t *t6taib[TTMAX_ALACROIX];
static patch_t *t6taif[TTMAX_ALACROIX];
static patch_t *t6taba[TTMAX_ALACROIX];
static patch_t *t6tabk[TTMAX_ALACROIX];
static patch_t *t6tabt[TTMAX_ALACROIX];
static patch_t *t6taft[TTMAX_ALACROIX];
static patch_t *t6knib[TTMAX_ALACROIX];
static patch_t *t6knif[TTMAX_ALACROIX];
static patch_t *t6knba[TTMAX_ALACROIX];
static patch_t *t6knbk[TTMAX_ALACROIX];
static patch_t *t6kndh[TTMAX_ALACROIX];
#define TTEMBL (presc == 6 ? t6embl : presc == 4 ? t4embl : presc == 2 ? t2embl : t1embl)
#define TTRIBB (presc == 6 ? t6ribb : presc == 4 ? t4ribb : presc == 2 ? t2ribb : t1ribb)
@ -153,6 +217,22 @@ static patch_t *t6rbtx[TTMAX_ALACROIX];
#define TTROBO (presc == 6 ? t6robo : presc == 4 ? t4robo : presc == 2 ? t2robo : t1robo)
#define TTTWOT (presc == 6 ? t6twot : presc == 4 ? t4twot : presc == 2 ? t2twot : t1twot)
#define TTRBTX (presc == 6 ? t6rbtx : presc == 4 ? t4rbtx : presc == 2 ? t2rbtx : t1rbtx)
#define TTSOIB (presc == 6 ? t6soib : presc == 4 ? t4soib : presc == 2 ? t2soib : t1soib)
#define TTSOIF (presc == 6 ? t6soif : presc == 4 ? t4soif : presc == 2 ? t2soif : t1soif)
#define TTSOBA (presc == 6 ? t6soba : presc == 4 ? t4soba : presc == 2 ? t2soba : t1soba)
#define TTSOBK (presc == 6 ? t6sobk : presc == 4 ? t4sobk : presc == 2 ? t2sobk : t1sobk)
#define TTSODH (presc == 6 ? t6sodh : presc == 4 ? t4sodh : presc == 2 ? t2sodh : t1sodh)
#define TTTAIB (presc == 6 ? t6taib : presc == 4 ? t4taib : presc == 2 ? t2taib : t1taib)
#define TTTAIF (presc == 6 ? t6taif : presc == 4 ? t4taif : presc == 2 ? t2taif : t1taif)
#define TTTABA (presc == 6 ? t6taba : presc == 4 ? t4taba : presc == 2 ? t2taba : t1taba)
#define TTTABK (presc == 6 ? t6tabk : presc == 4 ? t4tabk : presc == 2 ? t2tabk : t1tabk)
#define TTTABT (presc == 6 ? t6tabt : presc == 4 ? t4tabt : presc == 2 ? t2tabt : t1tabt)
#define TTTAFT (presc == 6 ? t6taft : presc == 4 ? t4taft : presc == 2 ? t2taft : t1taft)
#define TTKNIB (presc == 6 ? t6knib : presc == 4 ? t4knib : presc == 2 ? t2knib : t1knib)
#define TTKNIF (presc == 6 ? t6knif : presc == 4 ? t4knif : presc == 2 ? t2knif : t1knif)
#define TTKNBA (presc == 6 ? t6knba : presc == 4 ? t4knba : presc == 2 ? t2knba : t1knba)
#define TTKNBK (presc == 6 ? t6knbk : presc == 4 ? t4knbk : presc == 2 ? t2knbk : t1knbk)
#define TTKNDH (presc == 6 ? t6kndh : presc == 4 ? t4kndh : presc == 2 ? t2kndh : t1kndh)
// ttmode user
static patch_t *ttuser[TTMAX_USER];
@ -2389,6 +2469,22 @@ else \
LOADTTGFX(t1robo, "T1ROBO", TTMAX_ALACROIX)
LOADTTGFX(t1twot, "T1TWOT", TTMAX_ALACROIX)
LOADTTGFX(t1rbtx, "T1RBTX", TTMAX_ALACROIX)
LOADTTGFX(t1soib, "T1SOIB", TTMAX_ALACROIX)
LOADTTGFX(t1soif, "T1SOIF", TTMAX_ALACROIX)
LOADTTGFX(t1soba, "T1SOBA", TTMAX_ALACROIX)
LOADTTGFX(t1sobk, "T1SOBK", TTMAX_ALACROIX)
LOADTTGFX(t1sodh, "T1SODH", TTMAX_ALACROIX)
LOADTTGFX(t1taib, "T1TAIB", TTMAX_ALACROIX)
LOADTTGFX(t1taif, "T1TAIF", TTMAX_ALACROIX)
LOADTTGFX(t1taba, "T1TABA", TTMAX_ALACROIX)
LOADTTGFX(t1tabk, "T1TABK", TTMAX_ALACROIX)
LOADTTGFX(t1tabt, "T1TABT", TTMAX_ALACROIX)
LOADTTGFX(t1taft, "T1TAFT", TTMAX_ALACROIX)
LOADTTGFX(t1knib, "T1KNIB", TTMAX_ALACROIX)
LOADTTGFX(t1knif, "T1KNIF", TTMAX_ALACROIX)
LOADTTGFX(t1knba, "T1KNBA", TTMAX_ALACROIX)
LOADTTGFX(t1knbk, "T1KNBK", TTMAX_ALACROIX)
LOADTTGFX(t1kndh, "T1KNDH", TTMAX_ALACROIX)
LOADTTGFX(t2embl, "T2EMBL", TTMAX_ALACROIX)
LOADTTGFX(t2ribb, "T2RIBB", TTMAX_ALACROIX)
@ -2396,6 +2492,22 @@ else \
LOADTTGFX(t2robo, "T2ROBO", TTMAX_ALACROIX)
LOADTTGFX(t2twot, "T2TWOT", TTMAX_ALACROIX)
LOADTTGFX(t2rbtx, "T2RBTX", TTMAX_ALACROIX)
LOADTTGFX(t2soib, "T2SOIB", TTMAX_ALACROIX)
LOADTTGFX(t2soif, "T2SOIF", TTMAX_ALACROIX)
LOADTTGFX(t2soba, "T2SOBA", TTMAX_ALACROIX)
LOADTTGFX(t2sobk, "T2SOBK", TTMAX_ALACROIX)
LOADTTGFX(t2sodh, "T2SODH", TTMAX_ALACROIX)
LOADTTGFX(t2taib, "T2TAIB", TTMAX_ALACROIX)
LOADTTGFX(t2taif, "T2TAIF", TTMAX_ALACROIX)
LOADTTGFX(t2taba, "T2TABA", TTMAX_ALACROIX)
LOADTTGFX(t2tabk, "T2TABK", TTMAX_ALACROIX)
LOADTTGFX(t2tabt, "T2TABT", TTMAX_ALACROIX)
LOADTTGFX(t2taft, "T2TAFT", TTMAX_ALACROIX)
LOADTTGFX(t2knib, "T2KNIB", TTMAX_ALACROIX)
LOADTTGFX(t2knif, "T2KNIF", TTMAX_ALACROIX)
LOADTTGFX(t2knba, "T2KNBA", TTMAX_ALACROIX)
LOADTTGFX(t2knbk, "T2KNBK", TTMAX_ALACROIX)
LOADTTGFX(t2kndh, "T2KNDH", TTMAX_ALACROIX)
LOADTTGFX(t4embl, "T4EMBL", TTMAX_ALACROIX)
LOADTTGFX(t4ribb, "T4RIBB", TTMAX_ALACROIX)
@ -2403,6 +2515,22 @@ else \
LOADTTGFX(t4robo, "T4ROBO", TTMAX_ALACROIX)
LOADTTGFX(t4twot, "T4TWOT", TTMAX_ALACROIX)
LOADTTGFX(t4rbtx, "T4RBTX", TTMAX_ALACROIX)
LOADTTGFX(t4soib, "T4SOIB", TTMAX_ALACROIX)
LOADTTGFX(t4soif, "T4SOIF", TTMAX_ALACROIX)
LOADTTGFX(t4soba, "T4SOBA", TTMAX_ALACROIX)
LOADTTGFX(t4sobk, "T4SOBK", TTMAX_ALACROIX)
LOADTTGFX(t4sodh, "T4SODH", TTMAX_ALACROIX)
LOADTTGFX(t4taib, "T4TAIB", TTMAX_ALACROIX)
LOADTTGFX(t4taif, "T4TAIF", TTMAX_ALACROIX)
LOADTTGFX(t4taba, "T4TABA", TTMAX_ALACROIX)
LOADTTGFX(t4tabk, "T4TABK", TTMAX_ALACROIX)
LOADTTGFX(t4tabt, "T4TABT", TTMAX_ALACROIX)
LOADTTGFX(t4taft, "T4TAFT", TTMAX_ALACROIX)
LOADTTGFX(t4knib, "T4KNIB", TTMAX_ALACROIX)
LOADTTGFX(t4knif, "T4KNIF", TTMAX_ALACROIX)
LOADTTGFX(t4knba, "T4KNBA", TTMAX_ALACROIX)
LOADTTGFX(t4knbk, "T4KNBK", TTMAX_ALACROIX)
LOADTTGFX(t4kndh, "T4KNDH", TTMAX_ALACROIX)
LOADTTGFX(t6embl, "T6EMBL", TTMAX_ALACROIX)
LOADTTGFX(t6ribb, "T6RIBB", TTMAX_ALACROIX)
@ -2410,6 +2538,22 @@ else \
LOADTTGFX(t6robo, "T6ROBO", TTMAX_ALACROIX)
LOADTTGFX(t6twot, "T6TWOT", TTMAX_ALACROIX)
LOADTTGFX(t6rbtx, "T6RBTX", TTMAX_ALACROIX)
LOADTTGFX(t6soib, "T6SOIB", TTMAX_ALACROIX)
LOADTTGFX(t6soif, "T6SOIF", TTMAX_ALACROIX)
LOADTTGFX(t6soba, "T6SOBA", TTMAX_ALACROIX)
LOADTTGFX(t6sobk, "T6SOBK", TTMAX_ALACROIX)
LOADTTGFX(t6sodh, "T6SODH", TTMAX_ALACROIX)
LOADTTGFX(t6taib, "T6TAIB", TTMAX_ALACROIX)
LOADTTGFX(t6taif, "T6TAIF", TTMAX_ALACROIX)
LOADTTGFX(t6taba, "T6TABA", TTMAX_ALACROIX)
LOADTTGFX(t6tabk, "T6TABK", TTMAX_ALACROIX)
LOADTTGFX(t6tabt, "T6TABT", TTMAX_ALACROIX)
LOADTTGFX(t6taft, "T6TAFT", TTMAX_ALACROIX)
LOADTTGFX(t6knib, "T6KNIB", TTMAX_ALACROIX)
LOADTTGFX(t6knif, "T6KNIF", TTMAX_ALACROIX)
LOADTTGFX(t6knba, "T6KNBA", TTMAX_ALACROIX)
LOADTTGFX(t6knbk, "T6KNBK", TTMAX_ALACROIX)
LOADTTGFX(t6kndh, "T6KNDH", TTMAX_ALACROIX)
break;
}
@ -2555,15 +2699,44 @@ void F_TitleScreenDrawer(void)
}
//
// TODO: CHARACTERS GO HERE
// TODO: ALACROIX CHARACTER FRAMES
//
// Start all animation from tic 34 (or whenever the white flash begins to fade; see below.)
//
// NOTE: CHARACTER GFX COORDINATES:
// All frames share the same X/Y coord per character.
//
// Sonic: X 89, Y 13
// Tails: X 35, Y 19
// Knux : X 167, Y 17
//
//
// TODO: BACK TAIL GFX GO HERE
//
//
// TODO: FRONT TAIL GFX GO HERE
//
//
// TODO: BACK LAYER GFX GO HERE
//
//
// LOGO LAYER
//
// After tic 34, starting when the flash fades,
// draw the combined ribbon and SONIC ROBO BLAST 2 bake. Note the different Y value, because this
// draw the combined ribbon and SONIC ROBO BLAST 2 logo. Note the different Y value, because this
// graphic is cropped differently from the unfurling ribbon.
if (finalecount > 34)
V_DrawSciencePatch(40<<FRACBITS, 93<<FRACBITS, 0, TTRBTX[0], sc);
//
// TODO: FRONT LAYER GFX GO HERE
//
// Flash at tic 30, timed to O__TITLE percussion. Hold the flash until tic 34.
// After tic 34, fade the flash until tic 44.
if (finalecount > 29 && finalecount < 35)

2
src/f_finale.h
View File

@ -85,7 +85,7 @@ typedef enum
TTMODE_USER
} ttmode_enum;
#define TTMAX_ALACROIX 100
#define TTMAX_ALACROIX 29 // max frames for SONIC typeface
#define TTMAX_USER 100
extern ttmode_enum ttmode;