Document intro graphics/data

This commit is contained in:
GriffinR
2022-09-06 19:13:57 -04:00
parent b3c7b9e09f
commit 27b2b0b24a
59 changed files with 498 additions and 568 deletions
+455 -419
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -206,7 +206,7 @@ static void InitMainCallbacks(void)
gMain.vblankCounter1 = 0;
gMain.vblankCounter2 = 0;
gMain.callback1 = NULL;
SetMainCallback2(c2_copyright_1);
SetMainCallback2(CB2_InitCopyrightScreenAfterBootup);
gSaveBlock2Ptr = &gSaveBlock2;
gSaveBlock1Ptr = &gSaveBlock1;
gSaveBlock2.encryptionKey = 0;
+3 -3
View File
@@ -8,6 +8,7 @@
#include "menu.h"
#include "new_menu_helpers.h"
#include "pokemon_special_anim_internal.h"
#include "random.h"
#include "strings.h"
#include "text_window.h"
#include "trig.h"
@@ -1303,7 +1304,7 @@ static void Task_UseItem_OutwardSpiralDots(u8 taskId)
static u16 PSAScene_RandomFromTask(u8 taskId)
{
u32 state = GetWordTaskArg(taskId, tOff_RngState);
state = state * 1103515245 + 24691;
state = ISO_RANDOMIZE1(state);
SetWordTaskArg(taskId, tOff_RngState, state);
return state >> 16;
}
@@ -1441,8 +1442,7 @@ static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data)
{
gSprites[spriteId].oam.priority = tPriority;
gSprites[spriteId].tsYsubpixel = 0;
// similar to the LCRNG in random.c, but seeding from data[2]
gSprites[spriteId].tsSpeed = ((tMadeSprCt * 1103515245 + 24691) & 0x3F) + 0x20;
gSprites[spriteId].tsSpeed = (ISO_RANDOMIZE1(tMadeSprCt) & 0x3F) + 0x20;
gSprites[spriteId].tsTaskId = taskId;
tActiveSprCt++;
}
+3 -2
View File
@@ -9,6 +9,7 @@
#include "intro.h"
#include "load_save.h"
#include "new_game.h"
#include "random.h"
#include "save.h"
#include "main_menu.h"
#include "clear_save_data_screen.h"
@@ -662,7 +663,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
case 4:
HelpSystem_Disable();
DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain));
SetMainCallback2(CB2_CopyrightScreen);
SetMainCallback2(CB2_InitCopyrightScreenAfterTitleScreen);
break;
}
}
@@ -1121,7 +1122,7 @@ static u16 TitleScreen_rand(u8 taskId, u8 field)
u32 rngval;
rngval = GetWordTaskArg(taskId, field);
rngval = rngval * 1103515245 + 24691;
rngval = ISO_RANDOMIZE1(rngval);
SetWordTaskArg(taskId, field, rngval);
return rngval >> 16;
}
+2 -2
View File
@@ -3,6 +3,7 @@
#include "wild_encounter.h"
#include "event_data.h"
#include "fieldmap.h"
#include "random.h"
#include "roamer.h"
#include "field_player_avatar.h"
#include "battle_setup.h"
@@ -668,8 +669,7 @@ void SeedWildEncounterRng(u16 seed)
static u16 WildEncounterRandom(void)
{
sWildEncounterData.rngState *= 1103515245;
sWildEncounterData.rngState += 12345;
sWildEncounterData.rngState = ISO_RANDOMIZE2(sWildEncounterData.rngState);
return sWildEncounterData.rngState >> 16;
}