dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document showing pokemon in credits

Browse Source
This commit is contained in:
Tustin2121
2019-11-03 01:33:46 -04:00
committed by huderlem
parent 033c6cea3b
commit 2fe9d7a81f
1 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/credits.c
+70 -56
View File
@@ -128,16 +128,17 @@ enum
TDE_TASK_A_ID = 2, TDE_TASK_A_ID = 2,
}; };
struct Unk201C000 #define NUM_PKMN_SLIDES 71
struct CreditsData
{ {
u16 unk0[71]; u16 pkmnToShow[NUM_PKMN_SLIDES]; // List of Pokemon species ids that will show during the credits
u16 unk8E; u16 imgCounter; //how many mon images have been shown
u16 unk90; u16 nextImgPos; //if the next image spawns left/center/right
u16 unk92; u16 currShownPkmn; //index into pkmnToShow
u16 unk94; u16 numPkmnToShow; //number of pokemon to show, always NUM_PKMN_SLIDES after determine function
u16 unk96[NATIONAL_DEX_COUNT]; u16 caughtPkmnIds[NATIONAL_DEX_COUNT]; //temporary location to hold a condensed array of all caught pokemon
u16 unk39A; u16 numCaughtPkmn; //count of filled spaces in caughtPkmnIds
u16 unk39C[7]; u16 unk39C[7]; // unused padding?
}; };
struct CreditsEntry struct CreditsEntry
@@ -151,7 +152,7 @@ static EWRAM_DATA s16 gUnknown_0203BCE0 = 0;
static EWRAM_DATA u16 gUnknown_0203BCE2 = 0; // TASK A static EWRAM_DATA u16 gUnknown_0203BCE2 = 0; // TASK A
EWRAM_DATA bool8 gHasHallOfFameRecords = 0; EWRAM_DATA bool8 gHasHallOfFameRecords = 0;
static EWRAM_DATA u8 gUnknown_0203BCE5 = 0; static EWRAM_DATA u8 gUnknown_0203BCE5 = 0;
static EWRAM_DATA struct Unk201C000 *gUnknown_0203BCE8 = {0}; static EWRAM_DATA struct CreditsData *sCreditsData = {0};
static const u16 gUnknown_085E56F0[][16] = static const u16 gUnknown_085E56F0[][16] =
{ {
@@ -959,7 +960,7 @@ static const struct WindowTemplate sWindowTemplates[] =
}, },
DUMMY_WIN_TEMPLATE, DUMMY_WIN_TEMPLATE,
}; };
static const u8 gUnknown_085E6F7C[][2] = static const u8 sMonSpritePos[][2] =
{ {
{104, 36}, {104, 36},
{120, 36}, {120, 36},
@@ -1127,8 +1128,8 @@ static void LoadTheEndScreen(u16, u16, u16);
static void sub_8176E40(u16 arg0, u16 palette); static void sub_8176E40(u16 arg0, u16 palette);
static void sub_8176EE8(struct Sprite *sprite); static void sub_8176EE8(struct Sprite *sprite);
static void sub_8176F90(struct Sprite *sprite); static void sub_8176F90(struct Sprite *sprite);
static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position); static u8 MakeMonSprite(u16 species, s16 x, s16 y, u16 position);
static void sub_8177388(void); static void DeterminePokemonToShow(void);
static void CreditsVBlankCallback(void) static void CreditsVBlankCallback(void)
{ {
@@ -1241,13 +1242,13 @@ void CB2_StartCreditsSequence(void)
m4aSongNumStart(MUS_THANKFOR); m4aSongNumStart(MUS_THANKFOR);
SetMainCallback2(CB2_RunCreditsSequence); SetMainCallback2(CB2_RunCreditsSequence);
gUnknown_0203BCE5 = 0; gUnknown_0203BCE5 = 0;
gUnknown_0203BCE8 = AllocZeroed(sizeof(struct Unk201C000)); sCreditsData = AllocZeroed(sizeof(struct CreditsData));
sub_8177388(); DeterminePokemonToShow();
gUnknown_0203BCE8->unk8E = 0; sCreditsData->imgCounter = 0;
gUnknown_0203BCE8->unk90 = 0; sCreditsData->nextImgPos = 0;
gUnknown_0203BCE8->unk92 = 0; sCreditsData->currShownPkmn = 0;
gUnknown_0203BCE2 = taskIdA; gUnknown_0203BCE2 = taskIdA;
} }
@@ -1604,7 +1605,7 @@ static void sub_8175DA0(u8 taskIdB)
gTasks[gTasks[taskIdB].data[TDB_TASK_A_ID]].data[TDA_4] = 1; gTasks[gTasks[taskIdB].data[TDB_TASK_A_ID]].data[TDA_4] = 1;
DestroyTask(taskIdB); DestroyTask(taskIdB);
sub_81755A4(); sub_81755A4();
FREE_AND_SET_NULL(gUnknown_0203BCE8); FREE_AND_SET_NULL(sCreditsData);
return; return;
} }
} }
@@ -1683,29 +1684,29 @@ static void sub_81760FC(u8 taskIdD)
case 0: case 0:
break; break;
case 1: case 1:
if (gUnknown_0203BCE8->unk90 == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0) if (sCreditsData->nextImgPos == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0)
break; break;
gTasks[taskIdD].data[TDD_STATE]++; gTasks[taskIdD].data[TDD_STATE]++;
break; break;
case 2: case 2:
if (gUnknown_0203BCE8->unk8E == 71 || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks) if (sCreditsData->imgCounter == NUM_PKMN_SLIDES || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks)
break; break;
r2 = sub_8177224(gUnknown_0203BCE8->unk0[gUnknown_0203BCE8->unk92], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][0], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][1], gUnknown_0203BCE8->unk90); r2 = MakeMonSprite(sCreditsData->pkmnToShow[sCreditsData->currShownPkmn], sMonSpritePos[sCreditsData->nextImgPos][0], sMonSpritePos[sCreditsData->nextImgPos][1], sCreditsData->nextImgPos);
if (gUnknown_0203BCE8->unk92 < gUnknown_0203BCE8->unk94 - 1) if (sCreditsData->currShownPkmn < sCreditsData->numPkmnToShow - 1)
{ {
gUnknown_0203BCE8->unk92++; sCreditsData->currShownPkmn++;
gSprites[r2].data[3] = 50; gSprites[r2].data[3] = 50;
} }
else else
{ {
gUnknown_0203BCE8->unk92 = 0; sCreditsData->currShownPkmn = 0;
gSprites[r2].data[3] = 512; gSprites[r2].data[3] = 512;
} }
gUnknown_0203BCE8->unk8E++; sCreditsData->imgCounter++;
if (gUnknown_0203BCE8->unk90 == 2) if (sCreditsData->nextImgPos == 2)
gUnknown_0203BCE8->unk90 = 0; sCreditsData->nextImgPos = 0;
else else
gUnknown_0203BCE8->unk90++; sCreditsData->nextImgPos++;
gTasks[taskIdD].data[TDD_3] = 50; gTasks[taskIdD].data[TDD_3] = 50;
gTasks[taskIdD].data[TDD_STATE]++; gTasks[taskIdD].data[TDD_STATE]++;
break; break;
@@ -2256,7 +2257,7 @@ static void sub_8177050(struct Sprite *sprite)
} }
} }
static u8 sub_8177224(u16 nationalDexNum, s16 x, s16 y, u16 position) static u8 MakeMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
{ {
u8 spriteId; u8 spriteId;
u8 spriteId2; u8 spriteId2;
@@ -2292,73 +2293,86 @@ static void sub_81772B8(struct Sprite *sprite)
sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
} }
static void sub_8177388(void) static void DeterminePokemonToShow(void)
{ {
u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON))); u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON)));
u16 page; u16 page;
u16 dexNum; u16 dexNum;
u16 j; u16 j;
// Go through the Pokedex, and anything that has gotten caught we put into our massive array.
// This basically packs all of the caught pokemon into the front of the array
for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++) for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
{ {
if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT)) if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
{ {
gUnknown_0203BCE8->unk96[j] = dexNum; sCreditsData->caughtPkmnIds[j] = dexNum;
j++; j++;
} }
} }
// Fill the rest of the array with zeroes
for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++) for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++)
gUnknown_0203BCE8->unk96[dexNum] = 0; sCreditsData->caughtPkmnIds[dexNum] = 0;
gUnknown_0203BCE8->unk39A = j; // Cap the number of pokemon we care about to NUM_PKMN_SLIDES, the max we show in the credits scene (-1 for the starter)
if (gUnknown_0203BCE8->unk39A < 71) sCreditsData->numCaughtPkmn = j;
gUnknown_0203BCE8->unk94 = j; if (sCreditsData->numCaughtPkmn < NUM_PKMN_SLIDES)
sCreditsData->numPkmnToShow = j;
else else
gUnknown_0203BCE8->unk94 = 71; sCreditsData->numPkmnToShow = NUM_PKMN_SLIDES;
// Loop through our list of caught pokemon and select randomly from it to fill the images to show
j = 0; j = 0;
do do
{ {
page = Random() % gUnknown_0203BCE8->unk39A; // Select a random mon, insert into array
gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk96[page]; page = Random() % sCreditsData->numCaughtPkmn;
sCreditsData->pkmnToShow[j] = sCreditsData->caughtPkmnIds[page];
// Remove the select mon from the array, and condense array entries
j++; j++;
gUnknown_0203BCE8->unk96[page] = 0; sCreditsData->caughtPkmnIds[page] = 0;
gUnknown_0203BCE8->unk39A--; sCreditsData->numCaughtPkmn--;
if (page != gUnknown_0203BCE8->unk39A) if (page != sCreditsData->numCaughtPkmn)
{ {
gUnknown_0203BCE8->unk96[page] = gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A]; // Instead of looping through and moving everything down, just take from the end. Order doesn't matter after all.
gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A] = 0; sCreditsData->caughtPkmnIds[page] = sCreditsData->caughtPkmnIds[sCreditsData->numCaughtPkmn];
sCreditsData->caughtPkmnIds[sCreditsData->numCaughtPkmn] = 0;
} }
} }
while (gUnknown_0203BCE8->unk39A != 0 && j < 71); while (sCreditsData->numCaughtPkmn != 0 && j < NUM_PKMN_SLIDES);
if (gUnknown_0203BCE8->unk94 < 71) // If we don't have enough pokemon in the dex to fill everything, copy the selected mon into the end of the array, so it loops
if (sCreditsData->numPkmnToShow < NUM_PKMN_SLIDES)
{ {
for (j = gUnknown_0203BCE8->unk94, page = 0; j < 71; j++) for (j = sCreditsData->numPkmnToShow, page = 0; j < NUM_PKMN_SLIDES; j++)
{ {
gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk0[page]; sCreditsData->pkmnToShow[j] = sCreditsData->pkmnToShow[page];
page++; page++;
if (page == gUnknown_0203BCE8->unk94) if (page == sCreditsData->numPkmnToShow)
page = 0; page = 0;
} }
gUnknown_0203BCE8->unk0[70] = starter; // Ensure the last pokemon is our starter
sCreditsData->pkmnToShow[NUM_PKMN_SLIDES-1] = starter;
} }
else else
{ {
for (dexNum = 0; gUnknown_0203BCE8->unk0[dexNum] != starter && dexNum < 71; dexNum++); // Check to see if our starter has already appeared in this list, break if it has
for (dexNum = 0; sCreditsData->pkmnToShow[dexNum] != starter && dexNum < NUM_PKMN_SLIDES; dexNum++);
if (dexNum < gUnknown_0203BCE8->unk94 - 1) // If it has, swap it with the last pokemon, to ensure our starter is the last image
if (dexNum < sCreditsData->numPkmnToShow - 1)
{ {
gUnknown_0203BCE8->unk0[dexNum] = gUnknown_0203BCE8->unk0[70]; sCreditsData->pkmnToShow[dexNum] = sCreditsData->pkmnToShow[NUM_PKMN_SLIDES-1];
gUnknown_0203BCE8->unk0[70] = starter; sCreditsData->pkmnToShow[NUM_PKMN_SLIDES-1] = starter;
} }
else else
{ {
gUnknown_0203BCE8->unk0[70] = starter; // Ensure the last pokemon is our starter
sCreditsData->pkmnToShow[NUM_PKMN_SLIDES-1] = starter;
} }
} }
gUnknown_0203BCE8->unk94 = 71; sCreditsData->numPkmnToShow = NUM_PKMN_SLIDES;
} }