From 2c1cb662c3c6bb857fa961b55632b6a810df6c3c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 29 May 2024 07:12:30 -0400 Subject: [PATCH 1/3] Remove unused asm includes --- asm/include/overlay_110.inc | 122 --------------------- asm/include/overlay_63.inc | 198 ----------------------------------- asm/include/unk_0200ACF0.inc | 49 --------- asm/include/unk_02013FDC.inc | 22 ---- 4 files changed, 391 deletions(-) delete mode 100644 asm/include/overlay_110.inc delete mode 100644 asm/include/overlay_63.inc delete mode 100644 asm/include/unk_0200ACF0.inc delete mode 100644 asm/include/unk_02013FDC.inc diff --git a/asm/include/overlay_110.inc b/asm/include/overlay_110.inc deleted file mode 100644 index 66f846e3dd..0000000000 --- a/asm/include/overlay_110.inc +++ /dev/null @@ -1,122 +0,0 @@ -#include -#pragma once -.public FontID_Alloc -.public FontID_Release -.public FontID_String_GetWidth -.public PaletteData_Init -.public PaletteData_Free -.public PaletteData_AllocBuffers -.public PaletteData_FreeBuffers -.public PaletteData_LoadNarc -.public sub_02003220 -.public sub_0200398C -.public sub_02003B50 -.public sub_02003E5C -.public sub_02004EC4 -.public PlaySE -.public OverlayManager_CreateAndGetData -.public OverlayManager_GetData -.public OverlayManager_FreeData -.public OverlayManager_GetArgs -.public NARC_New -.public NARC_Delete -.public GfGfxLoader_LoadCharDataFromOpenNarc -.public GfGfxLoader_LoadScrnDataFromOpenNarc -.public GfGfxLoader_GetScrnDataFromOpenNarc -.public sub_0200B2E0 -.public sub_0200B2E8 -.public NewMsgDataFromNarc -.public DestroyMsgData -.public NewString_ReadMsgData -.public MessageFormat_New_Custom -.public MessageFormat_Delete -.public SpriteRenderer_Create -.public SpriteRenderer_CreateGfxHandler -.public sub_0200CF70 -.public sub_0200CFF4 -.public sub_0200D020 -.public thunk_OamManager_ApplyAndResetBuffers -.public SpriteRenderer_RemoveGfxHandler -.public SpriteRenderer_Delete -.public sub_0200D2A4 -.public SpriteRenderer_CreateSprite -.public Sprite_SetPositionXY -.public Sprite_AddPositionXY -.public sub_0200E248 -.public CreateSysTask -.public DestroySysTask -.public LoadUserFrameGfx2 -.public DrawFrameAndWindow2 -.public ClearFrameAndWindow2 -.public BeginNormalPaletteFade -.public IsPaletteFadeFinished -.public sub_0200FBDC -.public sub_0200FBF4 -.public YesNoPrompt_Create -.public YesNoPrompt_Destroy -.public YesNoPrompt_InitFromTemplateWithPalette -.public YesNoPrompt_HandleInput -.public sub_020169C0 -.public sub_020169CC -.public sub_020183F0 -.public sub_02018410 -.public Main_SetVBlankIntrCB -.public HBlankInterruptDisable -.public CreateHeap -.public DestroyHeap -.public AllocFromHeapAtEnd -.public FreeToHeap -.public BgConfig_Alloc -.public SetBothScreensModesAndDisable -.public InitBgFromTemplate -.public FreeBgTilemapBuffer -.public BG_ClearCharDataRange -.public CopyToBgTilemapRect -.public FillBgTilemapRect -.public BgClearTilemapBufferAndCommit -.public AddWindow -.public RemoveWindow -.public ScheduleWindowCopyToVram -.public ClearWindowTilemapAndCopyToVram -.public FillWindowPixelBuffer -.public DoScheduledBgGpuUpdates -.public ScheduleBgTilemapBufferTransfer -.public TextPrinterCheckActive -.public AddTextPrinterParameterizedWithColor -.public GF_CreateVramTransferManager -.public GF_DestroyVramTransferManager -.public sub_020210BC -.public sub_02021148 -.public sub_02021238 -.public GfGfx_SetBanks -.public GfGfx_DisableEngineAPlanes -.public GfGfx_EngineATogglePlanes -.public GfGfx_DisableEngineBPlanes -.public Sprite_Delete -.public sub_02024818 -.public Set2dSpriteVisibleFlag -.public Set2dSpriteAnimActiveFlag -.public sub_02024868 -.public sub_0202487C -.public Set2dSpriteAnimSeqNo -.public Sprite_ResetAnimCtrlState -.public Sprite_SetPriority -.public Sprite_SetDrawPriority -.public Sprite_IsCellAnimationFinished -.public sub_02024B78 -.public TouchscreenHitbox_FindRectAtTouchNew -.public System_GetTouchHeld -.public System_GetTouchNew -.public String_New -.public String_Delete -.public Save_PlayerData_GetOptionsAddr -.public Options_GetTextFrameDelay -.public Options_GetFrame -.public Save_VarsFlags_Get -.public Save_VarsFlags_SetAlphPuzzleFlag -.public NNS_GfdDoVramTransfer -.public MI_CpuFill8 -.public gSystem -.public AlphPuzzle_Init -.public AlphPuzzle_Main -.public AlphPuzzle_Exit diff --git a/asm/include/overlay_63.inc b/asm/include/overlay_63.inc deleted file mode 100644 index 04befb8cc1..0000000000 --- a/asm/include/overlay_63.inc +++ /dev/null @@ -1,198 +0,0 @@ -#include -#pragma once -.public FontID_String_GetWidth -.public LoadFontPal0 -.public sub_02004EC4 -.public PlaySE -.public sub_020062E0 -.public sub_02006EA0 -.public OverlayManager_CreateAndGetData -.public OverlayManager_GetData -.public OverlayManager_FreeData -.public OverlayManager_GetArgs -.public ReadWholeNarcMemberByIdPair -.public AllocAndReadWholeNarcMemberByIdPair -.public NARC_New -.public NARC_Delete -.public GfGfxLoader_GXLoadPal -.public GfGfxLoader_LoadCharDataFromOpenNarc -.public GfGfxLoader_LoadScrnDataFromOpenNarc -.public GfGfxLoader_GXLoadPalFromOpenNarc -.public sub_02009264 -.public sub_02009284 -.public G2dRenderer_SetSubSurfaceCoords -.public NewMsgDataFromNarc -.public DestroyMsgData -.public ReadMsgDataIntoString -.public MessageFormat_New -.public MessageFormat_Delete -.public BufferPlayersName -.public BufferBoxMonSpeciesName -.public BufferBoxMonNickname -.public BufferBoxMonOTName -.public BufferIntegerAsString -.public BufferLandmarkName -.public StringExpandPlaceholders -.public SpriteRenderer_Create -.public SpriteRenderer_CreateGfxHandler -.public SpriteRenderer_GetG2dRendererPtr -.public sub_0200CF70 -.public sub_0200CFF4 -.public sub_0200D020 -.public thunk_OamManager_ApplyAndResetBuffers -.public SpriteRenderer_Delete -.public SpriteRenderer_Init2DGfxResManagersFromCountsArray -.public SpriteRenderer_LoadCharResObjFromOpenNarc -.public SpriteRenderer_LoadPlttResObjFromOpenNarc -.public SpriteRenderer_LoadCellResObjFromOpenNarc -.public SpriteRenderer_LoadAnimResObjFromOpenNarc -.public SpriteRenderer_LoadResourcesAndCreateSprite -.public SpriteGfxHandler_UnloadCharObjById -.public SpriteGfxHandler_UnloadPlttObjById -.public SpriteGfxHandler_UnloadCellObjById -.public SpriteGfxHandler_UnloadAnimObjById -.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler -.public UnkImageStruct_Delete -.public UnkImageStruct_TickSpriteAnimation1Frame -.public UnkImageStruct_SetSpriteAnimSeqNo -.public UnkImageStruct_SetSpriteAnimCtrlCurrentFrame -.public UnkImageStruct_SetSpriteVisibleFlag -.public UnkImageStruct_SetSpritePriority -.public UnkImageStruct_SetSpritePositionXY -.public UnkImageStruct_AddSpritePositionXY -.public sub_0200DF98 -.public sub_0200E024 -.public sub_0200E0FC -.public SysTask_CreateOnMainQueue -.public SysTask_CreateOnVBlankQueue -.public SysTask_Destroy -.public BeginNormalPaletteFade -.public IsPaletteFadeFinished -.public sub_020143E0 -.public sub_02014510 -.public sub_020145B4 -.public Main_SetVBlankIntrCB -.public HBlankInterruptDisable -.public CreateHeap -.public DestroyHeap -.public AllocFromHeap -.public FreeToHeap -.public BgConfig_Alloc -.public SetBothScreensModesAndDisable -.public InitBgFromTemplate -.public FreeBgTilemapBuffer -.public BG_ClearCharDataRange -.public BG_SetMaskColor -.public BgClearTilemapBufferAndCommit -.public AddWindow -.public RemoveWindow -.public CopyWindowToVram -.public ScheduleWindowCopyToVram -.public CopyWindowPixelsToVram_TextMode -.public FillWindowPixelBuffer -.public DoScheduledBgGpuUpdates -.public ScheduleBgTilemapBufferTransfer -.public ScheduleSetBgPosText -.public SysTask_GetData -.public GF_SinDegNoWrap -.public GF_CosDegNoWrap -.public SetLCRNGSeed -.public LCRandom -.public AddTextPrinterParameterizedWithColor -.public GfGfx_SetBanks -.public GfGfx_EngineATogglePlanes -.public GfGfx_EngineASetPlanes -.public GfGfx_EngineBSetPlanes -.public Camera_New -.public Camera_Delete -.public Camera_SetStaticPtr -.public Camera_SetLookAtCamUp -.public Camera_SetPerspectiveClippingPlane -.public Camera_Init_FromTargetDistanceAndAngle -.public Sprite_GetImageProxy -.public Sprite_GetPaletteProxy -.public System_GetTouchNew -.public GF_AssertFail -.public String_New -.public String_Delete -.public String_Compare -.public GetMainObjPlttAddr -.public GF_3DVramMan_InitFrameTexVramManager -.public GF_3DVramMan_InitFramePlttVramManager -.public PlayerName_FlatToString -.public PlayerProfile_GetTrainerID -.public PlayerProfile_GetTrainerID_VisibleHalf -.public PlayerProfile_GetTrainerGender -.public GetIGTHours -.public GetIGTMinutes -.public SpeciesToOverworldModelIndexOffset -.public OverworldModelLookupFormCount -.public OverworldModelLookupHasFemaleForm -.public MonIsInGameTradePoke -.public AcquireMonLock -.public ReleaseMonLock -.public GetMonData -.public MonIsShiny -.public GetPokemonSpriteCharAndPlttNarcIds -.public GetMonPicHeightBySpeciesGenderForme -.public sub_02070D84 -.public Mon_GetBoxMon -.public sub_02072914 -.public sub_020729A4 -.public Party_GetCount -.public Party_GetMonByIndex -.public NNS_G2dGetImageLocation -.public NNS_G2dGetImagePaletteLocation -.public NNS_G3dGeBufferOP_N -.public NNS_G3dInit -.public NNS_G3dGetTex -.public MTX_Identity44_ -.public MTX_TransApply44 -.public MTX_RotX44_ -.public MTX_RotY44_ -.public MTX_RotZ44_ -.public MTX_Concat44 -.public VEC_Fx16Add -.public VEC_Fx16Normalize -.public G2x_SetBlendAlpha_ -.public G3B_PushMtx -.public G3B_PopMtx -.public G3B_LoadMtx44 -.public G3B_Color -.public G3B_Normal -.public G3B_Vtx -.public G3B_PolygonAttr -.public G3B_MaterialColorDiffAmb -.public G3B_MaterialColorSpecEmi -.public G3B_LightVector -.public G3B_LightColor -.public G3B_Begin -.public G3B_End -.public G3X_Reset -.public G3X_InitMtxStack -.public G3X_SetClearColor -.public GX_LoadOBJPltt -.public GX_LoadOBJ -.public G3_BeginMakeDL -.public G3_EndMakeDL -.public DC_FlushRange -.public MI_CpuFill8 -.public MI_CpuCopy8 -.public abs -.public _dadd -.public _d2f -.public _fadd -.public _fdiv -.public _f2d -.public _ffltu -.public _fmul -.public _fsub -.public _ll_mul -.public _s32_div_f -.public _u32_div_f -.public FX_SinCosTable_ -.public gSystem -.public MI_SendGXCommand -.public RegisterHallOfFame_Init -.public RegisterHallOfFame_Exit -.public RegisterHallOfFame_Main diff --git a/asm/include/unk_0200ACF0.inc b/asm/include/unk_0200ACF0.inc deleted file mode 100644 index 6fef20da36..0000000000 --- a/asm/include/unk_0200ACF0.inc +++ /dev/null @@ -1,49 +0,0 @@ -#include -#pragma once -.public Add2DGfxResObjFromHeader -.public GF2DGfxResObj_GetResID -.public GF2DGfxResObj_GetCharDataPtr -.public GF2DGfxResObj_GetPlttDataPtr -.public GF2DGfxResObj_GetCellDataPtr -.public GF2DGfxResObj_GetResType -.public GF2DGfxResObj_GetLoadAddress -.public GF2DGfxResObj_GetPlttNum -.public sub_0200AA9C -.public sub_0200ACF0 -.public sub_0200AD30 -.public sub_0200AD64 -.public sub_0200ADA4 -.public sub_0200ADE4 -.public sub_0200AE18 -.public sub_0200AE58 -.public sub_0200AE8C -.public sub_0200AEB0 -.public sub_0200AED4 -.public sub_0200AF00 -.public sub_0200AF24 -.public sub_0200AF80 -.public sub_0200AF94 -.public sub_0200AFD8 -.public sub_0200B00C -.public sub_0200B050 -.public sub_0200B084 -.public sub_0200B0A8 -.public sub_0200B0CC -.public sub_0200B0F8 -.public sub_0200B12C -.public ObjCharTransfer_CreateTaskAndDoTransferFromTemplate -.public ObjCharTransfer_CreateTaskAndDoTransferFromTemplate_UpdateMappingTypeFromHW -.public ObjCharTransfer_ReplaceGraphicsFromChardataByResID -.public ObjCharTransfer_ResetTransferTasksByResID -.public ObjCharTransfer_GetProxyPtrByResID -.public ObjCharTransfer_ResizeTaskByResID_GetProxyPtr -.public ObjCharTransfer_CopyTransferTaskByProxyPtr -.public ObjCharTransfer_DeleteTaskCopyByProxyPtr -.public sub_02022660 -.public sub_020226A4 -.public sub_020226E4 -.public sub_02022744 -.public sub_020227AC -.public sub_020227D4 -.public GF_AssertFail -.public NNS_G2dGetImagePaletteLocation diff --git a/asm/include/unk_02013FDC.inc b/asm/include/unk_02013FDC.inc deleted file mode 100644 index 45b22f9790..0000000000 --- a/asm/include/unk_02013FDC.inc +++ /dev/null @@ -1,22 +0,0 @@ -#include -#pragma once -.public AllocAndReadWholeNarcMemberByIdPair -.public sub_02009B60 -.public sub_02009D28 -.public sub_020141C4 -.public sub_020143E0 -.public sub_02014400 -.public sub_0201442C -.public sub_02014450 -.public sub_02014494 -.public sub_02014510 -.public sub_02014540 -.public sub_0201457C -.public sub_020145B4 -.public AllocFromHeap -.public FreeToHeap -.public GF_AssertFail -.public NNS_G2dGetUnpackedCharacterData -.public NNS_G2dGetUnpackedPaletteData -.public MIi_CpuCopy16 -.public memcpy From 8b5b46b18375b6b509ba4e2d3c34dcee7ebd70d8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2024 12:20:25 -0400 Subject: [PATCH 2/3] address review comments --- include/pokemon_types_def.h | 4 +- src/register_hall_of_fame.c | 301 ++++++++++++++++++------------------ 2 files changed, 153 insertions(+), 152 deletions(-) diff --git a/include/pokemon_types_def.h b/include/pokemon_types_def.h index 05d239dc3a..0730f39308 100644 --- a/include/pokemon_types_def.h +++ b/include/pokemon_types_def.h @@ -252,14 +252,14 @@ struct UnkStruct_02069038 { struct Pokeanm anim; }; -struct UnkStruct_02070D3C { +typedef struct UnkStruct_02070D3C { NarcId narcId; s32 ncgr_id; s32 nclr_id; s32 ncer_id; s32 nanr_id; s32 ncbr_id; -}; +} UnkStruct_02070D3C; struct Evolution { u16 method; diff --git a/src/register_hall_of_fame.c b/src/register_hall_of_fame.c index 27b1dae9de..a650c0fec9 100644 --- a/src/register_hall_of_fame.c +++ b/src/register_hall_of_fame.c @@ -166,7 +166,7 @@ typedef struct RegisterHallOfFameData { RegisterHallOfFameArgs *args; // 00000 SysTask *vblankTask; // 00004 BOOL (*subprocCallback)(struct RegisterHallOfFameData *); - u16 subprocCounter; + u16 subprocTimer; u16 subprocStage; BgConfig *bgConfig; // 00010 Window windows[7]; @@ -174,7 +174,7 @@ typedef struct RegisterHallOfFameData { MessageFormat *msgFormat; // 00088 String *strbuf1; String *strbuf2; - NARC *narcA094; + NARC *narcA101; NARC *narcA180; SpriteRenderer *spriteRenderer; // 0009C SpriteGfxHandler *spriteGfxHandler; // 000A0 @@ -232,7 +232,7 @@ typedef struct RegHOFConfettiParticle { VecFx16 unk_08[4]; VecFx16 unk_20; VecFx16 unk_26; - MtxFx44 unk_2C; + MtxFx44 translationMat; u32 unk_6C; } RegHOFConfettiParticle; @@ -256,6 +256,18 @@ typedef struct RegHOFSpritePosScaleAnimParam { f32 scaleEnd; } RegHOFSpritePosScaleAnimParam; +typedef struct RegisterHofTaskData_IndivMonAnimAndCry { + RegisterHofMon *hofMon; + UnkStruct_02009264 unk_04; + NARC *narc; + u16 (*charbuf)[1600]; + u32 imageLocation; + u16 unk_24; + BOOL startCry; +} RegisterHofTaskData_IndivMonAnimAndCry; + +typedef BOOL (*RegisterHallOfFameSubprocCallback)(RegisterHallOfFameData *); + static void RegisterHallOfFame_SetGfxBanks(void); static void VBlankTask_RegisterHallOfFame_IndividualMonsCongrats(SysTask *task, void *taskData); static void RegisterHallOfFame_ReplaceSpriteChar(const void *pSrc, u32 offset, u32 size); @@ -266,11 +278,10 @@ static void RegisterHallOfFame_CreateSpriteGfxHandlers(RegisterHallOfFameData *d static void RegisterHallOfFame_DestroySpriteGfxHandlers(RegisterHallOfFameData *data); static void RegisterHallOfFame_DeletePicByIndex(RegisterHallOfFameData *data, u32 picIdx); static void RegisterHallOfFame_PicAnimationsTick(RegisterHallOfFameData *data); -static void RegisterHallOfFame_PicAnimationsTick(RegisterHallOfFameData *data); static void RegisterHallOfFame_StartPicAnimSeq(RegisterHallOfFameData *data, u32 picIdx, int animSeqNo); static RegisterHallOfFameScene RegisterHallOfFame_FadeFromBlack(RegisterHallOfFameData *data, RegisterHallOfFameScene nextScene); static RegisterHallOfFameScene RegisterHallOfFame_FadeToBlack(RegisterHallOfFameData *data, RegisterHallOfFameScene nextScene); -static BOOL RegisterHallOfFame_SetupSubproc(RegisterHallOfFameData *data, BOOL (*callback)(RegisterHallOfFameData *), RegisterHallOfFameScene nextScene); +static BOOL RegisterHallOfFame_SetupSubproc(RegisterHallOfFameData *data, RegisterHallOfFameSubprocCallback callback, RegisterHallOfFameScene nextScene); static RegisterHallOfFameScene RegisterHallOfFame_WaitFade(RegisterHallOfFameData *data); static RegisterHallOfFameScene RegisterHallOfFame_WaitSubproc(RegisterHallOfFameData *data); static RegisterHallOfFameScene RegisterHallOfFame_IndivMonsInit(RegisterHallOfFameData *data); @@ -1171,7 +1182,7 @@ static const UnkTemplate_0200D748 sPicTemplates[21] = { BOOL RegisterHallOfFame_Init(OVY_MANAGER *man, int *state) { Main_SetVBlankIntrCB(NULL, NULL); HBlankInterruptDisable(); - GfGfx_EngineASetPlanes(0); + GfGfx_EngineASetPlanes(GX_PLANEMASK_NONE); GfGfx_EngineBSetPlanes(0); G2_BlendNone(); G2S_BlendNone(); @@ -1184,7 +1195,7 @@ BOOL RegisterHallOfFame_Init(OVY_MANAGER *man, int *state) { data->msgFormat = MessageFormat_New(HEAP_ID_REGISTER_HALL_OF_FAME); data->strbuf1 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME); data->strbuf2 = String_New(500, HEAP_ID_REGISTER_HALL_OF_FAME); - data->narcA094 = NARC_New(NARC_a_1_0_1, HEAP_ID_REGISTER_HALL_OF_FAME); + data->narcA101 = NARC_New(NARC_a_1_0_1, HEAP_ID_REGISTER_HALL_OF_FAME); data->narcA180 = NARC_New(NARC_a_1_8_0, HEAP_ID_REGISTER_HALL_OF_FAME); RegisterHallOfFame_GetPartyDetails(data); RegisterHallOfFame_SetGfxBanks(); @@ -1202,7 +1213,7 @@ BOOL RegisterHallOfFame_Exit(OVY_MANAGER *man, int *state) { RegisterHallOfFame_DestroySpriteGfxHandlers(data); RegisterHallOfFame_DestroyBgConfig(data); NARC_Delete(data->narcA180); - NARC_Delete(data->narcA094); + NARC_Delete(data->narcA101); String_Delete(data->strbuf1); String_Delete(data->strbuf2); MessageFormat_Delete(data->msgFormat); @@ -1313,9 +1324,9 @@ static RegisterHallOfFameScene RegisterHallOfFame_FadeToBlack(RegisterHallOfFame return REGHOF_SCENE_WAIT_FADE; } -static BOOL RegisterHallOfFame_SetupSubproc(RegisterHallOfFameData *data, BOOL (*callback)(RegisterHallOfFameData *), RegisterHallOfFameScene nextScene) { +static BOOL RegisterHallOfFame_SetupSubproc(RegisterHallOfFameData *data, RegisterHallOfFameSubprocCallback callback, RegisterHallOfFameScene nextScene) { data->nextScene = nextScene; - data->subprocCounter = 0; + data->subprocTimer = 0; data->subprocStage = 0; data->subprocCallback = callback; return TRUE; @@ -1604,7 +1615,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadCharResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 12, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, @@ -1613,7 +1624,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadCellResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 13, TRUE, 55514 @@ -1621,7 +1632,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadAnimResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 14, TRUE, 55514 @@ -1630,7 +1641,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadCharResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 9, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, @@ -1639,7 +1650,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadCellResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 10, TRUE, 55514 @@ -1647,7 +1658,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadAnimResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 11, TRUE, 55514 @@ -1656,7 +1667,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadPlttResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 15, FALSE, 1, @@ -1666,7 +1677,7 @@ static void RegisterHallOfFame_IndivMonsScene_LoadMonOverworldSprite(RegisterHal SpriteRenderer_LoadPlttResObjFromOpenNarc( data->spriteRenderer, data->spriteGfxHandler, - data->narcA094, + data->narcA101, 15, FALSE, 1, @@ -1747,11 +1758,11 @@ static void RegisterHallOfFame_IndivMons_DeleteBgTilemapBuffers(RegisterHallOfFa } static void RegisterHallOfFames_IndivMons_LoadBgGfx(RegisterHallOfFameData *data) { - GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA094, 0, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA094, 1, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA094, 2, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_LoadCharDataFromOpenNarc(data->narcA094, 3, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_GXLoadPalFromOpenNarc(data->narcA094, 4, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)0, 0x20, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA101, 0, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA101, 1, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA101, 2, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadCharDataFromOpenNarc(data->narcA101, 3, data->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_GXLoadPalFromOpenNarc(data->narcA101, 4, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)0, 0x20, HEAP_ID_REGISTER_HALL_OF_FAME); } static void RegisterHallOfFame_IndivMonsScene_InitWindows(RegisterHallOfFameData *data) { @@ -1938,20 +1949,20 @@ static void RegisterHallOfFame_IndivMons_ResetBgAndSpritePos(RegisterHallOfFameD static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { switch (data->subprocStage) { case REGHOF_INDIV_SUBPROC_FLY_IN_BACKPIC: - if (data->subprocCounter == 10) { + if (data->subprocTimer == 10) { u8 yOffset = data->mons[data->curMonIndex].yOffset; ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, -72); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 72); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK], 48, yOffset + 152); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], 46, yOffset + 152); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SUB_X, 7); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_ADD_X, 7); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK], -24, 0); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], -25, 0); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_BACKPIC_CRY: @@ -1959,24 +1970,24 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_BACKPIC: - if (data->subprocCounter == 50) { - data->subprocCounter = 0; + if (data->subprocTimer == 50) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_IN_OVERWORLD_SPRITE: - if (data->subprocCounter == 6) { + if (data->subprocTimer == 6) { UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE], 32, 40); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], 31, 39); RegisterHallOfFame_IndivMonsScene_SetOverworldSpritePos(data, &data->mons[data->curMonIndex]); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE], 19, 7); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], 20, 7); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_ANIM_OVERWORLD_SPRITE: @@ -1990,11 +2001,11 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_OVERWORLD_SPRITE: - if (data->subprocCounter == 20) { - data->subprocCounter = 0; + if (data->subprocTimer == 20) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_SHOW_HEADER_WINDOW: @@ -2002,32 +2013,32 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_HEADER_WINDOW: - if (data->subprocCounter == 60) { + if (data->subprocTimer == 60) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, -16); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 256); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_BACK], 2); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], 2); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_IN_FRONTPIC: - if (data->subprocCounter == 8) { + if (data->subprocTimer == 8) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 112); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 192); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SET_Y, 256); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT], 88, 88); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 104, 72); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_ADD_X, 16); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SUB_Y, 8); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT], -21, 16); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], -24, 19); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_SILHOUETTE_BACKPIC_OVERWORLD_SPRITES: @@ -2039,11 +2050,11 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_FRONTPIC: - if (data->subprocCounter == 40) { - data->subprocCounter = 0; + if (data->subprocTimer == 40) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_PRINT_MON_SPECIES_LEVEL_GENDER_AND_CRY: @@ -2052,11 +2063,11 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_MON_SPECIES_LEVEL_GENDER: - if (data->subprocCounter == 20) { - data->subprocCounter = 0; + if (data->subprocTimer == 20) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_PRINT_MON_CAUGHT_DETAIL: @@ -2064,7 +2075,7 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_MON_CAUGHT_DETAIL: - if (data->subprocCounter == 240) { + if (data->subprocTimer == 240) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 72); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 0); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_FRONT], 3); @@ -2075,14 +2086,14 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], 3); data->unk_13058 = 1.0f; data->unk_1305C = 1.5f; - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_OUT: - if (data->subprocCounter == 10) { + if (data->subprocTimer == 10) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_SET_X, -80); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_SET_Y, -200); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0); @@ -2097,7 +2108,7 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 64, 112); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT], 1.8f, 1.8f); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 2.0f, 2.0f); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_SUB_X, 8); @@ -2116,14 +2127,14 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { data->unk_1305C += 0.05; sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT], data->unk_13058, data->unk_13058); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], data->unk_1305C, data->unk_1305C); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_TAIL_DELAY: - if (data->subprocCounter == 60) { + if (data->subprocTimer == 60) { return FALSE; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; } @@ -2134,20 +2145,20 @@ static BOOL RegisterHallOfFame_ShowMon_LeftSide(RegisterHallOfFameData *data) { static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { switch (data->subprocStage) { case REGHOF_INDIV_SUBPROC_FLY_IN_BACKPIC: - if (data->subprocCounter == 10) { + if (data->subprocTimer == 10) { u8 yOffset = data->mons[data->curMonIndex].yOffset; ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 72); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, -256); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK], 160, yOffset + 152); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], 158, yOffset + 152); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_ADD_X, 7); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SUB_X, 7); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK], 24, 0); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], 25, 0); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_BACKPIC_CRY: @@ -2155,24 +2166,24 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_BACKPIC: - if (data->subprocCounter == 50) { - data->subprocCounter = 0; + if (data->subprocTimer == 50) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_IN_OVERWORLD_SPRITE: - if (data->subprocCounter == 6) { + if (data->subprocTimer == 6) { UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE], 224, 40); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], 225, 39); RegisterHallOfFame_IndivMonsScene_SetOverworldSpritePos(data, &data->mons[data->curMonIndex]); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE], -19, 7); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], -20, 7); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_ANIM_OVERWORLD_SPRITE: @@ -2186,11 +2197,11 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_OVERWORLD_SPRITE: - if (data->subprocCounter == 20) { - data->subprocCounter = 0; + if (data->subprocTimer == 20) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_SHOW_HEADER_WINDOW: @@ -2198,32 +2209,32 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_HEADER_WINDOW: - if (data->subprocCounter == 60) { + if (data->subprocTimer == 60) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 272); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 256); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_BACK], 2); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_BACK_SHADOW], 2); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_IN_FRONTPIC: - if (data->subprocCounter == 8) { + if (data->subprocTimer == 8) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, 144); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 192); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SET_Y, 256); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT], 168, 88); UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 152, 72); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SUB_X, 16); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SUB_Y, 8); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT], 21, 16); UnkImageStruct_AddSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 24, 19); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_SILHOUETTE_BACKPIC_OVERWORLD_SPRITES: @@ -2235,11 +2246,11 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_FRONTPIC: - if (data->subprocCounter == 40) { - data->subprocCounter = 0; + if (data->subprocTimer == 40) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_PRINT_MON_SPECIES_LEVEL_GENDER_AND_CRY: @@ -2248,11 +2259,11 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_MON_SPECIES_LEVEL_GENDER: - if (data->subprocCounter == 20) { - data->subprocCounter = 0; + if (data->subprocTimer == 20) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_PRINT_MON_CAUGHT_DETAIL: @@ -2260,7 +2271,7 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { ++data->subprocStage; break; case REGHOF_INDIV_SUBPROC_HOLD_MON_CAUGHT_DETAIL: - if (data->subprocCounter == 240) { + if (data->subprocTimer == 240) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_X, -256); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_2, BG_POS_OP_SET_Y, 0); UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_FRONT], 3); @@ -2271,14 +2282,14 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { UnkImageStruct_SetSpritePriority(data->monPics[REGHOF_PIC_INDIV_OWSPRITE_SHADOW], 3); data->unk_13058 = 1.0f; data->unk_1305C = 1.5f; - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_FLY_OUT: - if (data->subprocCounter == 10) { + if (data->subprocTimer == 10) { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_SET_X, 80); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_SET_Y, -200); ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0); @@ -2293,7 +2304,7 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { UnkImageStruct_SetSpritePositionXY(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 192, 112); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT], 1.8f, 1.8f); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], 2.0f, 2.0f); - data->subprocCounter = 0; + data->subprocTimer = 0; ++data->subprocStage; } else { ScheduleSetBgPosText(data->bgConfig, GF_BG_LYR_MAIN_0, BG_POS_OP_ADD_X, 8); @@ -2312,14 +2323,14 @@ static BOOL RegisterHallOfFame_ShowMon_RightSide(RegisterHallOfFameData *data) { data->unk_1305C += 0.05; sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT], data->unk_13058, data->unk_13058); sub_0200E024(data->monPics[REGHOF_PIC_INDIV_FRONT_SHADOW], data->unk_1305C, data->unk_1305C); - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_INDIV_SUBPROC_TAIL_DELAY: - if (data->subprocCounter == 60) { + if (data->subprocTimer == 60) { return FALSE; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; } @@ -2430,16 +2441,6 @@ static int RegisterHallOfFame_GetMmodelBySpeciesFormGender(int species, u8 form, return ret; } -typedef struct RegisterHofTaskData_IndivMonAnimAndCry { - RegisterHofMon *hofMon; - UnkStruct_02009264 unk_04; - NARC *narc; - u16 (*charbuf)[1600]; - u32 imageLocation; - u16 unk_24; - BOOL startCry; -} RegisterHofTaskData_IndivMonAnimAndCry; - static void RegisterHallOfFame_CreateTask_IndivMonAnimAndCry(RegisterHallOfFameData *data, int monIdx, int picIdx, BOOL startCry, int facing) { RegisterHofTaskData_IndivMonAnimAndCry *taskData = AllocFromHeap(HEAP_ID_REGISTER_HALL_OF_FAME, sizeof(RegisterHofTaskData_IndivMonAnimAndCry)); taskData->hofMon = &data->mons[monIdx]; @@ -2507,33 +2508,33 @@ static BOOL RegisterHallOfFame_WholeMonsSceneSubproc(RegisterHallOfFameData *dat switch (data->subprocStage) { case REGHOF_WHOLE_SUBPROC_INITIAL_DELAY: - if (data->subprocCounter == 20) { - data->subprocCounter = 0; + if (data->subprocTimer == 20) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_WHOLE_SUBPROC_FLY_IN_MONS: - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[data->curMonIndex], &sPicPosScaleAnimParams[data->curMonIndex], 6, data->subprocCounter); - if (data->subprocCounter == 6) { + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[data->curMonIndex], &sPicPosScaleAnimParams[data->curMonIndex], 6, data->subprocTimer); + if (data->subprocTimer == 6) { sub_0200DF98(data->monPics[data->curMonIndex], 1); ++data->curMonIndex; - data->subprocCounter = 0; + data->subprocTimer = 0; if (data->curMonIndex == PARTY_SIZE) { data->curMonIndex = 0; ++data->subprocStage; } } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_WHOLE_SUBPROC_DELAY_AFTER_FLY_IN: - if (data->subprocCounter == 32) { - data->subprocCounter = 0; + if (data->subprocTimer == 32) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_WHOLE_SUBPROC_REQUEST_FIRST_PHOTO_FLASH: @@ -2546,16 +2547,16 @@ static BOOL RegisterHallOfFame_WholeMonsSceneSubproc(RegisterHallOfFameData *dat ++data->subprocStage; break; case REGHOF_WHOLE_SUBPROC_ANIMATE_MONS_SHADOWS: - RegisterHallOfFame_BlendAlphaFadeStep(data, 80, data->subprocCounter); + RegisterHallOfFame_BlendAlphaFadeStep(data, 80, data->subprocTimer); for (int i = 0; i < data->numMons; ++i) { - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON_SHADOW + i], &(sPicPosScaleAnimParams + 6)[i], 80, data->subprocCounter); + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON_SHADOW + i], &(sPicPosScaleAnimParams + 6)[i], 80, data->subprocTimer); } - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER_SHADOW], &sPicPosScaleAnimParams[12], 80, data->subprocCounter); - if (data->subprocCounter == 80) { - data->subprocCounter = 0; + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER_SHADOW], &sPicPosScaleAnimParams[12], 80, data->subprocTimer); + if (data->subprocTimer == 80) { + data->subprocTimer = 0; ++data->subprocStage; } else { - ++data->subprocCounter; + ++data->subprocTimer; } break; case REGHOF_WHOLE_SUBPROC_WAIT_BUTTON: @@ -2568,33 +2569,33 @@ static BOOL RegisterHallOfFame_WholeMonsSceneSubproc(RegisterHallOfFameData *dat } break; case REGHOF_WHOLE_SUBPROC_SECOND_PHOTO_FLASH: - RegisterHallOfFame_BlendAlphaFadeStep(data, 60, data->subprocCounter); - if (data->subprocCounter == 30) { + RegisterHallOfFame_BlendAlphaFadeStep(data, 60, data->subprocTimer); + if (data->subprocTimer == 30) { if (IsPaletteFadeFinished() == TRUE) { data->fadeDuration = 15; data->unk_13060_4 = TRUE; ++data->subprocStage; } } else { - ++data->subprocCounter; + ++data->subprocTimer; } // fallthrough case REGHOF_WHOLE_SUBPROC_WAIT_FINAL_FADEOUT: for (int i = 0; i < data->numMons; ++i) { - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON + i], &(sPicPosScaleAnimParams + 13)[i], 60, data->subprocCounter); - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON_SHADOW + i], &(sPicPosScaleAnimParams + 20)[i], 60, data->subprocCounter); + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON + i], &(sPicPosScaleAnimParams + 13)[i], 60, data->subprocTimer); + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_MON_SHADOW + i], &(sPicPosScaleAnimParams + 20)[i], 60, data->subprocTimer); } - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER], &sPicPosScaleAnimParams[19], 60, data->subprocCounter); - RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER_SHADOW], &sPicPosScaleAnimParams[26], 60, data->subprocCounter); + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER], &sPicPosScaleAnimParams[19], 60, data->subprocTimer); + RegisterHallOfFame_MonSpritePosScaleAnimStep(data->monPics[REGHOF_PIC_WHOLE_PLAYER_SHADOW], &sPicPosScaleAnimParams[26], 60, data->subprocTimer); if (data->subprocStage == REGHOF_WHOLE_SUBPROC_WAIT_FINAL_FADEOUT) { - if (data->subprocCounter == 60) { + if (data->subprocTimer == 60) { if (IsPaletteFadeFinished() == TRUE) { - data->subprocCounter = 0; + data->subprocTimer = 0; data->subprocStage = 0; return FALSE; } } else { - ++data->subprocCounter; + ++data->subprocTimer; } } break; @@ -2659,10 +2660,10 @@ static void RegisterHallOfFame_WholePartyScene_DeleteBgTilemapBuffers(RegisterHa } static void RegisterHallOfFame_WholePartyScene_LoadBgGfx(RegisterHallOfFameData *data) { - GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA094, 5, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA094, 6, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_LoadCharDataFromOpenNarc(data->narcA094, 7, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); - GfGfxLoader_GXLoadPalFromOpenNarc(data->narcA094, 8, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)0, 0x20, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA101, 5, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadScrnDataFromOpenNarc(data->narcA101, 6, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_LoadCharDataFromOpenNarc(data->narcA101, 7, data->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, TRUE, HEAP_ID_REGISTER_HALL_OF_FAME); + GfGfxLoader_GXLoadPalFromOpenNarc(data->narcA101, 8, GF_PAL_LOCATION_MAIN_BG, (enum GFPalSlotOffset)0, 0x20, HEAP_ID_REGISTER_HALL_OF_FAME); BG_SetMaskColor(GF_BG_LYR_MAIN_1, RGB_BLACK); } @@ -2695,7 +2696,7 @@ static void RegisterHallOfFame_WholePartyScene_DeleteWindows(RegisterHallOfFameD static void RegisterHallOfFame_WholePartyScene_CreateSprites(RegisterHallOfFameData *data) { - struct UnkStruct_02070D3C sp2C; + UnkStruct_02070D3C sp2C; UnkStruct_02014E30 sp1C = ov63_0221FAF0; NARC *narc = NARC_New(NARC_a_0_0_8, HEAP_ID_REGISTER_HALL_OF_FAME); u32 i; @@ -2714,10 +2715,10 @@ static void RegisterHallOfFame_WholePartyScene_CreateSprites(RegisterHallOfFameD SpriteRenderer_LoadPlttResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, narc, 75, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 55521); NARC_Delete(narc); - SpriteRenderer_LoadCellResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA094, 17, TRUE, 55515); - SpriteRenderer_LoadAnimResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA094, 18, TRUE, 55515); - SpriteRenderer_LoadCharResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA094, 16, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, 55520); - SpriteRenderer_LoadPlttResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA094, 19, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 55522); + SpriteRenderer_LoadCellResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA101, 17, TRUE, 55515); + SpriteRenderer_LoadAnimResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA101, 18, TRUE, 55515); + SpriteRenderer_LoadCharResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA101, 16, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, 55520); + SpriteRenderer_LoadPlttResObjFromOpenNarc(data->spriteRenderer, data->spriteGfxHandler, data->narcA101, 19, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 55522); for (i = 0; i < 6; ++i) { data->monPics[REGHOF_PIC_WHOLE_MON + i] = SpriteRenderer_LoadResourcesAndCreateSprite(data->spriteRenderer, data->spriteGfxHandler, &(sPicTemplates + 6)[i]); @@ -2973,7 +2974,7 @@ static SysTask *RegisterHallOfFame_CreateConfettiTask(RegisterHallOfFameData *da SetVec(confetti->particles[i].unk_08[j], sp8 + sConfettiCoords[j].x, sp4 + sConfettiCoords[j].y, sp0 + sConfettiCoords[j].z); SetVec(confetti->particles[i].unk_20, 0, 0, 0); SetVec(confetti->particles[i].unk_26, (LCRandom() % FX32_CONST(0.125)) + FX32_CONST(0.125), (LCRandom() % FX32_CONST(0.125)) + FX32_CONST(0.125), (LCRandom() % FX32_CONST(0.125)) + FX32_CONST(0.125)); - MTX_Identity44(&confetti->particles[i].unk_2C); + MTX_Identity44(&confetti->particles[i].translationMat); } j = LCRandom() & 7; @@ -3005,8 +3006,8 @@ static void RegisterHallOfFame_StartConfetti(SysTask *task) { } static void Task_RegisterHallOfFame_Confetti(SysTask *task, void *taskData) { - MtxFx44 sp28; - VecFx16 sp20; + MtxFx44 rotMatrix; + VecFx16 lightVector; RegisterHofConfettiEmitterTaskData *confetti = (RegisterHofConfettiEmitterTaskData *)taskData; if (confetti->active) { G3_BeginMakeDL(&confetti->gxDlInfo, confetti->gxCommand, sizeof(confetti->gxCommand)); @@ -3021,23 +3022,23 @@ static void Task_RegisterHallOfFame_Confetti(SysTask *task, void *taskData) { confetti->particles[i].unk_08[1].y = confetti->particles[i].unk_08[0].y; confetti->particles[i].unk_08[2].y = confetti->particles[i].unk_08[3].y; VEC_Fx16Add(&confetti->particles[i].unk_20, &confetti->particles[i].unk_26, &confetti->particles[i].unk_20); - MTX_Identity44(&confetti->particles[i].unk_2C); - MTX_TransApply44(&confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C, confetti->particles[i].unk_08[0].x, confetti->particles[i].unk_08[0].y, confetti->particles[i].unk_08[0].z); - G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_0, RGB(11, 11, 11)); G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_1, confetti->particles[i].color); SetVec(sp20, 0, FX16_ONE - 1, -FX16_ONE + 1); - VEC_Fx16Normalize(&sp20, &sp20); - G3B_LightVector(&confetti->gxDlInfo, GX_LIGHTID_0, sp20.x, sp20.y, sp20.z); - SetVec(sp20, 0, -FX16_ONE + 1, FX16_ONE - 1); - VEC_Fx16Normalize(&sp20, &sp20); - G3B_LightVector(&confetti->gxDlInfo, GX_LIGHTID_1, sp20.x, sp20.y, sp20.z); - MTX_RotX44(&sp28, FX_SinIdx((u16)confetti->particles[i].unk_20.x), FX_CosIdx((u16)confetti->particles[i].unk_20.x)); - MTX_Concat44(&sp28, &confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C); - MTX_RotY44(&sp28, FX_SinIdx((u16)confetti->particles[i].unk_20.y), FX_CosIdx((u16)confetti->particles[i].unk_20.y)); - MTX_Concat44(&sp28, &confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C); - MTX_RotZ44(&sp28, FX_SinIdx((u16)confetti->particles[i].unk_20.z), FX_CosIdx((u16)confetti->particles[i].unk_20.z)); - MTX_Concat44(&sp28, &confetti->particles[i].unk_2C, &confetti->particles[i].unk_2C); + MTX_Identity44(&confetti->particles[i].translationMat); + MTX_TransApply44(&confetti->particles[i].translationMat, &confetti->particles[i].translationMat, confetti->particles[i].unk_08[0].x, confetti->particles[i].unk_08[0].y, confetti->particles[i].unk_08[0].z); + G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_0, RGB(11, 11, 11)); G3B_LightColor(&confetti->gxDlInfo, GX_LIGHTID_1, confetti->particles[i].color); SetVec(lightVector, 0, FX16_ONE - 1, -FX16_ONE + 1); + VEC_Fx16Normalize(&lightVector, &lightVector); + G3B_LightVector(&confetti->gxDlInfo, GX_LIGHTID_0, lightVector.x, lightVector.y, lightVector.z); + SetVec(lightVector, 0, -FX16_ONE + 1, FX16_ONE - 1); + VEC_Fx16Normalize(&lightVector, &lightVector); + G3B_LightVector(&confetti->gxDlInfo, GX_LIGHTID_1, lightVector.x, lightVector.y, lightVector.z); + MTX_RotX44(&rotMatrix, FX_SinIdx((u16)confetti->particles[i].unk_20.x), FX_CosIdx((u16)confetti->particles[i].unk_20.x)); + MTX_Concat44(&rotMatrix, &confetti->particles[i].translationMat, &confetti->particles[i].translationMat); + MTX_RotY44(&rotMatrix, FX_SinIdx((u16)confetti->particles[i].unk_20.y), FX_CosIdx((u16)confetti->particles[i].unk_20.y)); + MTX_Concat44(&rotMatrix, &confetti->particles[i].translationMat, &confetti->particles[i].translationMat); + MTX_RotZ44(&rotMatrix, FX_SinIdx((u16)confetti->particles[i].unk_20.z), FX_CosIdx((u16)confetti->particles[i].unk_20.z)); + MTX_Concat44(&rotMatrix, &confetti->particles[i].translationMat, &confetti->particles[i].translationMat); G3B_MaterialColorSpecEmi(&confetti->gxDlInfo, RGB_WHITE, confetti->particles[i].color, FALSE); G3B_PushMtx(&confetti->gxDlInfo); - G3B_LoadMtx44(&confetti->gxDlInfo, &confetti->particles[i].unk_2C); + G3B_LoadMtx44(&confetti->gxDlInfo, &confetti->particles[i].translationMat); G3B_Begin(&confetti->gxDlInfo, GX_BEGIN_QUADS); G3B_Normal(&confetti->gxDlInfo, 0, 0, -FX16_ONE + 1); G3B_Vtx(&confetti->gxDlInfo, -FX16_CONST(0.038), -FX16_CONST(0.05), 0); From 8d277f5ff87f6906dfd423332b543395b5ae0c2e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Jun 2024 19:52:47 -0400 Subject: [PATCH 3/3] tabs to spaces in lib/include --- lib/include/nitro/card/common.h | 28 +++++----- lib/include/nitro/card/rom.h | 2 +- lib/include/nitro/dgt/common.h | 2 +- lib/include/nitro/fs/archive.h | 66 +++++++++++------------ lib/include/nitro/fs/overlay.h | 4 +- lib/include/nitro/fx/fx_mtx44.h | 14 ++--- lib/include/nitro/gx/g3.h | 48 ++++++++--------- lib/include/nitro/gx/g3imm.h | 6 +-- lib/include/nitro/gx/g3x.h | 2 +- lib/include/nitro/os/ARM9/vramExclusive.h | 22 ++++---- 10 files changed, 97 insertions(+), 97 deletions(-) diff --git a/lib/include/nitro/card/common.h b/lib/include/nitro/card/common.h index a22dfddb14..044294d5c0 100644 --- a/lib/include/nitro/card/common.h +++ b/lib/include/nitro/card/common.h @@ -11,20 +11,20 @@ #define CARD_PXI_COMMAND_PULLED_OUT 0x0011 #define CARD_PXI_COMMAND_TERMINATE 0x0001 -#define CARD_THREAD_PRIORITY_DEFAULT 4 - -#define CARD_BACKUP_TYPE_DEVICE_SHIFT 0 -#define CARD_BACKUP_TYPE_DEVICE_MASK 0xFF -#define CARD_BACKUP_TYPE_DEVICE_EEPROM 1 -#define CARD_BACKUP_TYPE_DEVICE_FLASH 2 -#define CARD_BACKUP_TYPE_DEVICE_FRAM 3 -#define CARD_BACKUP_TYPE_SIZEBIT_SHIFT 8 -#define CARD_BACKUP_TYPE_SIZEBIT_MASK 0xFF -#define CARD_BACKUP_TYPE_VENDER_SHIFT 16 -#define CARD_BACKUP_TYPE_DEFINE(type, size, vender) \ - (((CARD_BACKUP_TYPE_DEVICE_ ## type) << CARD_BACKUP_TYPE_DEVICE_SHIFT) | \ - ((size) << CARD_BACKUP_TYPE_SIZEBIT_SHIFT) | \ - ((vender) << CARD_BACKUP_TYPE_VENDER_SHIFT)) +#define CARD_THREAD_PRIORITY_DEFAULT 4 + +#define CARD_BACKUP_TYPE_DEVICE_SHIFT 0 +#define CARD_BACKUP_TYPE_DEVICE_MASK 0xFF +#define CARD_BACKUP_TYPE_DEVICE_EEPROM 1 +#define CARD_BACKUP_TYPE_DEVICE_FLASH 2 +#define CARD_BACKUP_TYPE_DEVICE_FRAM 3 +#define CARD_BACKUP_TYPE_SIZEBIT_SHIFT 8 +#define CARD_BACKUP_TYPE_SIZEBIT_MASK 0xFF +#define CARD_BACKUP_TYPE_VENDER_SHIFT 16 +#define CARD_BACKUP_TYPE_DEFINE(type, size, vender) \ + (((CARD_BACKUP_TYPE_DEVICE_ ## type) << CARD_BACKUP_TYPE_DEVICE_SHIFT) | \ + ((size) << CARD_BACKUP_TYPE_SIZEBIT_SHIFT) | \ + ((vender) << CARD_BACKUP_TYPE_VENDER_SHIFT)) #define ALIGN_MASK(a) ((a) - 1) #define CARD_ALIGN_HI_BIT(n) (((u32)(n)) & ~ALIGN_MASK(CARD_ROM_PAGE_SIZE)) diff --git a/lib/include/nitro/card/rom.h b/lib/include/nitro/card/rom.h index 49b0ef8118..4b8bd3e9e3 100644 --- a/lib/include/nitro/card/rom.h +++ b/lib/include/nitro/card/rom.h @@ -6,7 +6,7 @@ #include #include -#define CARD_ROM_PAGE_SIZE 512 +#define CARD_ROM_PAGE_SIZE 512 #define CARDMST_SEL_ROM 0x00 #define CARDMST_IF_ENABLE 0x40 diff --git a/lib/include/nitro/dgt/common.h b/lib/include/nitro/dgt/common.h index 08a49dc06d..da89e35aec 100644 --- a/lib/include/nitro/dgt/common.h +++ b/lib/include/nitro/dgt/common.h @@ -4,7 +4,7 @@ #define DGT_HASH1_DIGEST_SIZE (128/8) #define DGT_HASH2_DIGEST_SIZE (160/8) #define DGT_HASH_DIGEST_SIZE_MAX DGT_HASH2_DIGEST_SIZE -#define DGT_HASH_BLOCK_SIZE (512/8) +#define DGT_HASH_BLOCK_SIZE (512/8) diff --git a/lib/include/nitro/fs/archive.h b/lib/include/nitro/fs/archive.h index 84fad2691c..bbbb097bb2 100644 --- a/lib/include/nitro/fs/archive.h +++ b/lib/include/nitro/fs/archive.h @@ -8,16 +8,16 @@ struct FSArchive; #define FS_ARCHIVE_NAME_LEN_MAX 3 -#define FS_ARCHIVE_FLAG_REGISTER 0x00000001 -#define FS_ARCHIVE_FLAG_LOADED 0x00000002 -#define FS_ARCHIVE_FLAG_TABLE_LOAD 0x00000004 -#define FS_ARCHIVE_FLAG_SUSPEND 0x00000008 -#define FS_ARCHIVE_FLAG_RUNNING 0x00000010 -#define FS_ARCHIVE_FLAG_CANCELING 0x00000020 -#define FS_ARCHIVE_FLAG_SUSPENDING 0x00000040 -#define FS_ARCHIVE_FLAG_UNLOADING 0x00000080 -#define FS_ARCHIVE_FLAG_IS_ASYNC 0x00000100 -#define FS_ARCHIVE_FLAG_IS_SYNC 0x00000200 +#define FS_ARCHIVE_FLAG_REGISTER 0x00000001 +#define FS_ARCHIVE_FLAG_LOADED 0x00000002 +#define FS_ARCHIVE_FLAG_TABLE_LOAD 0x00000004 +#define FS_ARCHIVE_FLAG_SUSPEND 0x00000008 +#define FS_ARCHIVE_FLAG_RUNNING 0x00000010 +#define FS_ARCHIVE_FLAG_CANCELING 0x00000020 +#define FS_ARCHIVE_FLAG_SUSPENDING 0x00000040 +#define FS_ARCHIVE_FLAG_UNLOADING 0x00000080 +#define FS_ARCHIVE_FLAG_IS_ASYNC 0x00000100 +#define FS_ARCHIVE_FLAG_IS_SYNC 0x00000200 typedef enum { FS_COMMAND_ASYNC_BEGIN = 0, @@ -46,37 +46,37 @@ typedef enum { } FSCommandType; /* Asynchronous commands*/ -#define FS_ARCHIVE_PROC_READFILE (1 << FS_COMMAND_READFILE) -#define FS_ARCHIVE_PROC_WRITEFILE (1 << FS_COMMAND_WRITEFILE) +#define FS_ARCHIVE_PROC_READFILE (1 << FS_COMMAND_READFILE) +#define FS_ARCHIVE_PROC_WRITEFILE (1 << FS_COMMAND_WRITEFILE) /* All asynchronous commands*/ -#define FS_ARCHIVE_PROC_ASYNC \ - (FS_ARCHIVE_PROC_READFILE | FS_ARCHIVE_PROC_WRITEFILE) +#define FS_ARCHIVE_PROC_ASYNC \ + (FS_ARCHIVE_PROC_READFILE | FS_ARCHIVE_PROC_WRITEFILE) /* Synchronous commands*/ -#define FS_ARCHIVE_PROC_SEEKDIR (1 << FS_COMMAND_SEEKDIR) -#define FS_ARCHIVE_PROC_READDIR (1 << FS_COMMAND_READDIR) -#define FS_ARCHIVE_PROC_FINDPATH (1 << FS_COMMAND_FINDPATH) -#define FS_ARCHIVE_PROC_GETPATH (1 << FS_COMMAND_GETPATH) -#define FS_ARCHIVE_PROC_OPENFILEFAST (1 << FS_COMMAND_OPENFILEFAST) -#define FS_ARCHIVE_PROC_OPENFILEDIRECT (1 << FS_COMMAND_OPENFILEDIRECT) -#define FS_ARCHIVE_PROC_CLOSEFILE (1 << FS_COMMAND_CLOSEFILE) +#define FS_ARCHIVE_PROC_SEEKDIR (1 << FS_COMMAND_SEEKDIR) +#define FS_ARCHIVE_PROC_READDIR (1 << FS_COMMAND_READDIR) +#define FS_ARCHIVE_PROC_FINDPATH (1 << FS_COMMAND_FINDPATH) +#define FS_ARCHIVE_PROC_GETPATH (1 << FS_COMMAND_GETPATH) +#define FS_ARCHIVE_PROC_OPENFILEFAST (1 << FS_COMMAND_OPENFILEFAST) +#define FS_ARCHIVE_PROC_OPENFILEDIRECT (1 << FS_COMMAND_OPENFILEDIRECT) +#define FS_ARCHIVE_PROC_CLOSEFILE (1 << FS_COMMAND_CLOSEFILE) /* All synchronous commands*/ -#define FS_ARCHIVE_PROC_SYNC \ - (FS_ARCHIVE_PROC_SEEKDIR | FS_ARCHIVE_PROC_READDIR | \ - FS_ARCHIVE_PROC_FINDPATH | FS_ARCHIVE_PROC_GETPATH | \ - FS_ARCHIVE_PROC_OPENFILEFAST | FS_ARCHIVE_PROC_OPENFILEDIRECT | FS_ARCHIVE_PROC_CLOSEFILE) +#define FS_ARCHIVE_PROC_SYNC \ + (FS_ARCHIVE_PROC_SEEKDIR | FS_ARCHIVE_PROC_READDIR | \ + FS_ARCHIVE_PROC_FINDPATH | FS_ARCHIVE_PROC_GETPATH | \ + FS_ARCHIVE_PROC_OPENFILEFAST | FS_ARCHIVE_PROC_OPENFILEDIRECT | FS_ARCHIVE_PROC_CLOSEFILE) /* Messages when status changes*/ -#define FS_ARCHIVE_PROC_ACTIVATE (1 << FS_COMMAND_ACTIVATE) -#define FS_ARCHIVE_PROC_IDLE (1 << FS_COMMAND_IDLE) -#define FS_ARCHIVE_PROC_SUSPENDING (1 << FS_COMMAND_SUSPEND) -#define FS_ARCHIVE_PROC_RESUME (1 << FS_COMMAND_RESUME) +#define FS_ARCHIVE_PROC_ACTIVATE (1 << FS_COMMAND_ACTIVATE) +#define FS_ARCHIVE_PROC_IDLE (1 << FS_COMMAND_IDLE) +#define FS_ARCHIVE_PROC_SUSPENDING (1 << FS_COMMAND_SUSPEND) +#define FS_ARCHIVE_PROC_RESUME (1 << FS_COMMAND_RESUME) /* All messages when status changes*/ -#define FS_ARCHIVE_PROC_STATUS \ - (FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE | \ - FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME) +#define FS_ARCHIVE_PROC_STATUS \ + (FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE | \ + FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME) -#define FS_ARCHIVE_PROC_ALL (~0) +#define FS_ARCHIVE_PROC_ALL (~0) typedef enum { FS_RESULT_SUCCESS = 0, diff --git a/lib/include/nitro/fs/overlay.h b/lib/include/nitro/fs/overlay.h index 7bca17f628..6415e48c92 100644 --- a/lib/include/nitro/fs/overlay.h +++ b/lib/include/nitro/fs/overlay.h @@ -15,8 +15,8 @@ extern "C" { typedef u32 FSOverlayID; -#define FS_EXTERN_OVERLAY(name) extern u32 SDK_OVERLAY_ ## name ## _ID[1] -#define FS_OVERLAY_ID(name) ((u32)&(SDK_OVERLAY_ ## name ## _ID)) +#define FS_EXTERN_OVERLAY(name) extern u32 SDK_OVERLAY_ ## name ## _ID[1] +#define FS_OVERLAY_ID(name) ((u32)&(SDK_OVERLAY_ ## name ## _ID)) typedef void (*FSOverlayInitFunc)(void); diff --git a/lib/include/nitro/fx/fx_mtx44.h b/lib/include/nitro/fx/fx_mtx44.h index 8448a91e86..002ee7682c 100644 --- a/lib/include/nitro/fx/fx_mtx44.h +++ b/lib/include/nitro/fx/fx_mtx44.h @@ -35,19 +35,19 @@ static inline void MTX_Identity44 (MtxFx44 * pDst) { } static inline void MTX_Copy44 (const MtxFx44 * pSrc, MtxFx44 * pDst) { - MI_Copy64B(pSrc, pDst); + MI_Copy64B(pSrc, pDst); } static inline void MTX_Copy44To33 (const MtxFx44 * pSrc, MtxFx33 * pDst) { - MTX_Copy44To33_(pSrc, pDst); + MTX_Copy44To33_(pSrc, pDst); } static inline void MTX_Copy44To43 (const MtxFx44 * pSrc, MtxFx43 * pDst) { - MTX_Copy44To43_(pSrc, pDst); + MTX_Copy44To43_(pSrc, pDst); } static inline void MTX_Transpose44 (const MtxFx44 * pSrc, MtxFx44 * pDst) { - MTX_Transpose44_(pSrc, pDst); + MTX_Transpose44_(pSrc, pDst); } static inline void MTX_Scale44 (MtxFx44 * pDst, fx32 x, fx32 y, fx32 z) { @@ -67,16 +67,16 @@ static inline void MTX_RotZ44 (MtxFx44 * pDst, fx32 sinVal, fx32 cosVal) { } static inline void MTX_Frustum (fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f, MtxFx44 * mtx) { - MTX_FrustumW(t, b, l, r, n, f, FX32_ONE, mtx); + MTX_FrustumW(t, b, l, r, n, f, FX32_ONE, mtx); } static inline void MTX_Perspective (fx32 fovySin, fx32 fovyCos, fx32 aspect, fx32 n, fx32 f, MtxFx44 * mtx) { - MTX_PerspectiveW(fovySin, fovyCos, aspect, n, f, FX32_ONE, mtx); + MTX_PerspectiveW(fovySin, fovyCos, aspect, n, f, FX32_ONE, mtx); } static inline void MTX_Ortho (fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f, MtxFx44 * mtx) { - MTX_OrthoW(t, b, l, r, n, f, FX32_ONE, mtx); + MTX_OrthoW(t, b, l, r, n, f, FX32_ONE, mtx); } #endif //NITRO_FX_FX_MTX44_H_ diff --git a/lib/include/nitro/gx/g3.h b/lib/include/nitro/gx/g3.h index b0fd8c1db2..241ab9c48a 100644 --- a/lib/include/nitro/gx/g3.h +++ b/lib/include/nitro/gx/g3.h @@ -151,45 +151,45 @@ typedef enum { } GXMtxMode; typedef enum { - GX_TEXGEN_NONE = 0, - GX_TEXGEN_TEXCOORD = 1, - GX_TEXGEN_NORMAL = 2, - GX_TEXGEN_VERTEX = 3 + GX_TEXGEN_NONE = 0, + GX_TEXGEN_TEXCOORD = 1, + GX_TEXGEN_NORMAL = 2, + GX_TEXGEN_VERTEX = 3 } GXTexGen; typedef enum { - GX_TEXREPEAT_NONE = 0, - GX_TEXREPEAT_S = 1, - GX_TEXREPEAT_T = 2, - GX_TEXREPEAT_ST = 3 + GX_TEXREPEAT_NONE = 0, + GX_TEXREPEAT_S = 1, + GX_TEXREPEAT_T = 2, + GX_TEXREPEAT_ST = 3 } GXTexRepeat; typedef enum { - GX_TEXFLIP_NONE = 0, - GX_TEXFLIP_S = 1, - GX_TEXFLIP_T = 2, - GX_TEXFLIP_ST = 3 + GX_TEXFLIP_NONE = 0, + GX_TEXFLIP_S = 1, + GX_TEXFLIP_T = 2, + GX_TEXFLIP_ST = 3 } GXTexFlip; typedef enum { - GX_BEGIN_TRIANGLES = 0, - GX_BEGIN_QUADS = 1, - GX_BEGIN_TRIANGLE_STRIP = 2, - GX_BEGIN_QUAD_STRIP = 3 + GX_BEGIN_TRIANGLES = 0, + GX_BEGIN_QUADS = 1, + GX_BEGIN_TRIANGLE_STRIP = 2, + GX_BEGIN_QUAD_STRIP = 3 } GXBegin; typedef enum { - GX_POLYGONMODE_MODULATE = 0, - GX_POLYGONMODE_DECAL = 1, - GX_POLYGONMODE_TOON = 2, - GX_POLYGONMODE_SHADOW = 3 + GX_POLYGONMODE_MODULATE = 0, + GX_POLYGONMODE_DECAL = 1, + GX_POLYGONMODE_TOON = 2, + GX_POLYGONMODE_SHADOW = 3 } GXPolygonMode; typedef enum { - GX_CULL_ALL = 0, - GX_CULL_FRONT = 1, - GX_CULL_BACK = 2, - GX_CULL_NONE = 3 + GX_CULL_ALL = 0, + GX_CULL_FRONT = 1, + GX_CULL_BACK = 2, + GX_CULL_NONE = 3 } GXCull; #ifdef SDK_ADS diff --git a/lib/include/nitro/gx/g3imm.h b/lib/include/nitro/gx/g3imm.h index 99724f8fe2..da53181f97 100644 --- a/lib/include/nitro/gx/g3imm.h +++ b/lib/include/nitro/gx/g3imm.h @@ -33,15 +33,15 @@ static inline void G3_ViewPort(int x1, int y1, int x2, int y2) { } static inline void G3_MtxMode(GXMtxMode mode) { - reg_G3_MTX_MODE = GX_PACK_MTXMODE_PARAM(mode); + reg_G3_MTX_MODE = GX_PACK_MTXMODE_PARAM(mode); } static inline void G3_PushMtx() { - reg_G3_MTX_PUSH = 0; + reg_G3_MTX_PUSH = 0; } static inline void G3_PopMtx(int num) { - reg_G3_MTX_POP = GX_PACK_POPMTX_PARAM(num); + reg_G3_MTX_POP = GX_PACK_POPMTX_PARAM(num); } #endif //NITRO_GX_G3IMM_H_ diff --git a/lib/include/nitro/gx/g3x.h b/lib/include/nitro/gx/g3x.h index 76bd9a98ed..641779327a 100644 --- a/lib/include/nitro/gx/g3x.h +++ b/lib/include/nitro/gx/g3x.h @@ -90,7 +90,7 @@ void G3X_SetEdgeColorTable(const GXRgb *rgb_8); static inline s32 G3X_IsGeometryBusy (void) { - return (s32)(reg_G3X_GXSTAT & REG_G3X_GXSTAT_B_MASK); + return (s32)(reg_G3X_GXSTAT & REG_G3X_GXSTAT_B_MASK); } #endif //NITRO_GX_G3X_H_ diff --git a/lib/include/nitro/os/ARM9/vramExclusive.h b/lib/include/nitro/os/ARM9/vramExclusive.h index 6284fec569..1401eb48da 100644 --- a/lib/include/nitro/os/ARM9/vramExclusive.h +++ b/lib/include/nitro/os/ARM9/vramExclusive.h @@ -1,18 +1,18 @@ #ifndef NITRO_OS_VRAMEXCLUSIVE_H_ #define NITRO_OS_VRAMEXCLUSIVE_H_ -#define OS_VRAM_BANK_ID_A 0x0001 -#define OS_VRAM_BANK_ID_B 0x0002 -#define OS_VRAM_BANK_ID_C 0x0004 -#define OS_VRAM_BANK_ID_D 0x0008 -#define OS_VRAM_BANK_ID_E 0x0010 -#define OS_VRAM_BANK_ID_F 0x0020 -#define OS_VRAM_BANK_ID_G 0x0040 -#define OS_VRAM_BANK_ID_H 0x0080 -#define OS_VRAM_BANK_ID_I 0x0100 -#define OS_VRAM_BANK_ID_ALL 0x01ff +#define OS_VRAM_BANK_ID_A 0x0001 +#define OS_VRAM_BANK_ID_B 0x0002 +#define OS_VRAM_BANK_ID_C 0x0004 +#define OS_VRAM_BANK_ID_D 0x0008 +#define OS_VRAM_BANK_ID_E 0x0010 +#define OS_VRAM_BANK_ID_F 0x0020 +#define OS_VRAM_BANK_ID_G 0x0040 +#define OS_VRAM_BANK_ID_H 0x0080 +#define OS_VRAM_BANK_ID_I 0x0100 +#define OS_VRAM_BANK_ID_ALL 0x01ff -#define OS_VRAM_BANK_KINDS 9 +#define OS_VRAM_BANK_KINDS 9 u32 OsCountZeroBits(u32 bitmap); void OSi_InitVramExclusive(void);