diff --git a/include/pokemon_sprite.h b/include/pokemon_sprite.h index 27b36df15a..5fe9c1ac44 100644 --- a/include/pokemon_sprite.h +++ b/include/pokemon_sprite.h @@ -178,41 +178,41 @@ typedef struct PokemonSpriteManager { u32 hideShadows; // curiously, this field is treated like a bitmask, but it only ever uses a value of 0 or 1 } PokemonSpriteManager; -void *sub_0200762C(enum HeapId heapID); -void sub_02007768(PokemonSpriteManager *monSpriteMan); -void sub_02007B6C(PokemonSpriteManager *monSpriteMan); -void sub_02007B98(PokemonSprite *monSprite, int dummy); -void sub_02007C10(PokemonSprite *monSprite, SpriteAnimationFrame *animFrames); -BOOL sub_02007C24(PokemonSprite *monSprite); -PokemonSprite *sub_02007C34(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback); -PokemonSprite *sub_02007C7C(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, int index, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback); -void sub_02007DC8(PokemonSprite *monSprite); -void sub_02007DD4(PokemonSpriteManager *monSpriteMan); -void sub_02007DEC(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int value); -int sub_020080C0(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute); -void sub_02008274(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int delta); -void sub_020086D4(PokemonSprite *monSprite, int x, int y, int width, int height); -void sub_020086FC(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int delay, int color); -void sub_0200872C(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetAlpha, int delay, int color); -void sub_02008780(PokemonSprite *monSprite); -BOOL sub_020087B4(PokemonSprite *monSprite); -void sub_020087C8(PokemonSprite *param0, int param1); +void *PokemonSpriteManager_New(enum HeapId heapID); +void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan); +void PokemonSpriteManager_Free(PokemonSpriteManager *monSpriteMan); +void PokemonSprite_InitAnim(PokemonSprite *monSprite, int dummy); +void PokemonSprite_SetAnim(PokemonSprite *monSprite, SpriteAnimationFrame *animFrames); +BOOL PokemonSprite_IsAnimActive(PokemonSprite *monSprite); +PokemonSprite *PokemonSpriteManager_CreateSprite(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback); +PokemonSprite *PokemonSpriteManager_CreateSpriteAtIndex(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, int index, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback); +void PokemonSprite_Delete(PokemonSprite *monSprite); +void PokemonSpriteManager_DeleteAll(PokemonSpriteManager *monSpriteMan); +void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int value); +int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute); +void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int delta); +void PokemonSprite_SetVisible(PokemonSprite *monSprite, int x, int y, int width, int height); +void PokemonSprite_StartFade(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int delay, int color); +void PokemonSpriteManager_StartFadeAll(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetAlpha, int delay, int color); +void PokemonSprite_ClearFade(PokemonSprite *monSprite); +BOOL PokemonSprite_IsFadeActive(PokemonSprite *monSprite); +void PokemonSprite_CalcAffineYOffset(PokemonSprite *param0, int param1); void sub_020088E0(UnkStruct_02008900 *param0, const SpriteAnimationFrame *param1); int sub_02008900(UnkStruct_02008900 *param0); -void sub_020089A0(PokemonSprite *monSprite); -void sub_020089B0(PokemonSprite *monSprite); -void sub_02008A0C(PokemonSprite *monSprite); -void sub_02008A78(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size); -void sub_02008A84(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size); -PokemonSpriteTemplate *sub_02008A90(PokemonSprite *monSprite); -void sub_02008A94(PokemonSpriteManager *monSpriteMan); -void sub_02008B2C(PokemonSpriteManager *monSpriteMan, int value); -BOOL sub_02008B38(PokemonSprite *monSprite); -void sub_02008B54(PokemonSpriteManager *monSpriteMan, u32 value); -void sub_02008B60(PokemonSpriteManager *monSpriteMan, u32 value); -void sub_020091D8(u8 *rawCharData, u32 personality, BOOL isAnimated); +void PokemonSprite_ScheduleReloadFromNARC(PokemonSprite *monSprite); +void PokemonSprite_Push(PokemonSprite *monSprite); +void PokemonSprite_Pop(PokemonSprite *monSprite); +void PokemonSpriteManager_SetCharBaseAddrAndSize(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size); +void PokemonSpriteManager_SetPlttBaseAddrAndSize(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size); +PokemonSpriteTemplate *PokemonSprite_GetTemplate(PokemonSprite *monSprite); +void PokemonSpriteManager_UpdateCharAndPltt(PokemonSpriteManager *monSpriteMan); +void PokemonSpriteManager_SetExcludeG3Identity(PokemonSpriteManager *monSpriteMan, int value); +BOOL PokemonSprite_IsActive(PokemonSprite *monSprite); +void PokemonSpriteManager_SetHideShadows(PokemonSpriteManager *monSpriteMan, u32 value); +void PokemonSpriteManager_ClearHideShadows(PokemonSpriteManager *monSpriteMan, u32 value); +void PokemonSprite_DrawSpindaSpots(u8 *rawCharData, u32 personality, BOOL isAnimated); void PokemonSprite_DecryptPt(u8 *rawCharData); void PokemonSprite_DecryptDP(u8 *rawCharData); -void sub_020093A0(u8 *rawCharData, int narcID); +void PokemonSprite_Decrypt(u8 *rawCharData, int narcID); #endif // POKEPLATINUM_POKEMON_SPRITE_H diff --git a/src/applications/pokemon_summary_screen/3d_anim.c b/src/applications/pokemon_summary_screen/3d_anim.c index 2485ef3c01..20f5e10e10 100644 --- a/src/applications/pokemon_summary_screen/3d_anim.c +++ b/src/applications/pokemon_summary_screen/3d_anim.c @@ -174,7 +174,7 @@ void PokemonSummaryScreen_Update3DGfx(PokemonSummaryScreen *summaryScreen) } NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(summaryScreen->monSprite.spriteManager); + PokemonSpriteManager_DrawSprites(summaryScreen->monSprite.spriteManager); G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } @@ -184,7 +184,7 @@ void PokemonSummaryScreen_FreeCameraAndMonSprite(PokemonSummaryScreen *summarySc Camera_Delete(summaryScreen->monSprite.camera); sub_02016114(summaryScreen->monSprite.animationSys, 0); sub_02015FB8(summaryScreen->monSprite.animationSys); - sub_02007B6C(summaryScreen->monSprite.spriteManager); + PokemonSpriteManager_Free(summaryScreen->monSprite.spriteManager); } void PokemonSummaryScreen_SetupCamera(PokemonSummaryScreen *summaryScreen) @@ -342,7 +342,7 @@ void PokemonSummaryScreen_InitMaxAndDeltaConditionRects(PokemonSummaryScreen *su void PokemonSummaryScreen_LoadMonSprite(PokemonSummaryScreen *summaryScreen) { - summaryScreen->monSprite.spriteManager = sub_0200762C(HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->monSprite.spriteManager = PokemonSpriteManager_New(HEAP_ID_POKEMON_SUMMARY_SCREEN); void *monData = PokemonSummaryScreen_MonData(summaryScreen); @@ -357,9 +357,9 @@ void PokemonSummaryScreen_LoadMonSprite(PokemonSummaryScreen *summaryScreen) PokeSprite_LoadAnimationFrames(summaryScreen->narcPlPokeData, summaryScreen->monSprite.frames, summaryScreen->monData.species, 1); summaryScreen->monSprite.flip = SpeciesData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, SPECIES_DATA_FLIP_SPRITE) ^ 1; - summaryScreen->monSprite.sprite = sub_02007C34(summaryScreen->monSprite.spriteManager, &spriteTemplate, 52, 104, 0, 0, summaryScreen->monSprite.frames, NULL); + summaryScreen->monSprite.sprite = PokemonSpriteManager_CreateSprite(summaryScreen->monSprite.spriteManager, &spriteTemplate, 52, 104, 0, 0, summaryScreen->monSprite.frames, NULL); - sub_02007DEC(summaryScreen->monSprite.sprite, 35, summaryScreen->monSprite.flip); + PokemonSprite_SetAttribute(summaryScreen->monSprite.sprite, 35, summaryScreen->monSprite.flip); } void PokemonSummaryScreen_LoadMonAnimation(PokemonSummaryScreen *summaryScreen) @@ -367,7 +367,7 @@ void PokemonSummaryScreen_LoadMonAnimation(PokemonSummaryScreen *summaryScreen) if (summaryScreen->monData.isEgg != FALSE) { PokeSprite_LoadAnimation(summaryScreen->narcPlPokeData, summaryScreen->monSprite.animationSys, summaryScreen->monSprite.sprite, 0, 2, summaryScreen->monSprite.flip, 0); } else { - sub_02007B98(summaryScreen->monSprite.sprite, 1); + PokemonSprite_InitAnim(summaryScreen->monSprite.sprite, 1); PokeSprite_LoadAnimation(summaryScreen->narcPlPokeData, summaryScreen->monSprite.animationSys, summaryScreen->monSprite.sprite, summaryScreen->monData.species, 2, summaryScreen->monSprite.flip, 0); } } @@ -375,7 +375,7 @@ void PokemonSummaryScreen_LoadMonAnimation(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_ChangeMonSprite(PokemonSummaryScreen *summaryScreen) { sub_02016114(summaryScreen->monSprite.animationSys, 0); - sub_02007B6C(summaryScreen->monSprite.spriteManager); + PokemonSpriteManager_Free(summaryScreen->monSprite.spriteManager); PokemonSummaryScreen_LoadMonSprite(summaryScreen); PokemonSummaryScreen_LoadMonAnimation(summaryScreen); } diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index 754b702c65..58a1e5f8c7 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -370,7 +370,7 @@ static void PokemonSummaryScreenVBlank(void *data) PokemonSummaryScreen *summaryScreen = data; Bg_RunScheduledUpdates(summaryScreen->bgConfig); - sub_02008A94(summaryScreen->monSprite.spriteManager); + PokemonSpriteManager_UpdateCharAndPltt(summaryScreen->monSprite.spriteManager); VramTransfer_Process(); SpriteSystem_TransferOam(); diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 962523ac19..c9f2bb9df9 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -289,18 +289,18 @@ void ov16_0225CBDC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_ v4->unk_08 = param1->unk_20 = ov16_02263B30(battleSys, v2, &v1, Unk_ov12_0223B0B8[param1->battlerType][0], Unk_ov12_0223B0B8[param1->battlerType][1], Unk_ov12_0223B0B8[param1->battlerType][2], v6, v7, v8, v9, param1->battler, &v3[0], NULL); if (v4->unk_13 == 2) { - sub_020086FC(v4->unk_08, 8, 8, 0, 0x0); + PokemonSprite_StartFade(v4->unk_08, 8, 8, 0, 0x0); } if ((v4->unk_13 == 2) && (BattleSystem_BattleStatus(battleSys) & 0x40)) { int v10, v11; - v11 = sub_020080C0(v4->unk_08, 1); + v11 = PokemonSprite_GetAttribute(v4->unk_08, 1); v10 = ((24 * 8) - -80) / 2; - sub_02007DEC(v4->unk_08, 46, 0); - sub_02007DEC(v4->unk_08, 0, (256 - 64)); - sub_02007DEC(v4->unk_08, 1, v11 - v10); + PokemonSprite_SetAttribute(v4->unk_08, 46, 0); + PokemonSprite_SetAttribute(v4->unk_08, 0, (256 - 64)); + PokemonSprite_SetAttribute(v4->unk_08, 1, v11 - v10); v4->unk_14 = v11; } else { @@ -470,8 +470,8 @@ void ov16_0225D1C4(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_ v0->unk_0B = 0; v0->unk_0C = param2->unk_01; - sub_020086FC(v0->unk_04, 0, 16, 0, Unk_ov16_0226F1AE[param2->unk_02]); - sub_02007DEC(v0->unk_04, 45, 1); + PokemonSprite_StartFade(v0->unk_04, 0, 16, 0, Unk_ov16_0226F1AE[param2->unk_02]); + PokemonSprite_SetAttribute(v0->unk_04, 45, 1); SysTask_Start(ov16_0225FA00, v0, 0); } @@ -1485,24 +1485,24 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3); if (v0->unk_1C == 1) { - sub_02007DEC(v0->unk_08, 0, v2); + PokemonSprite_SetAttribute(v0->unk_08, 0, v2); } else if (v0->unk_1C == 3) { - v2 = sub_020080C0(v0->unk_08, 0) - v2; + v2 = PokemonSprite_GetAttribute(v0->unk_08, 0) - v2; v2 -= 24; - sub_02008274(v0->unk_08, 0, -v2); + PokemonSprite_AddAttribute(v0->unk_08, 0, -v2); } else if (v0->unk_1C == 5) { - v2 = v2 - sub_020080C0(v0->unk_08, 0); + v2 = v2 - PokemonSprite_GetAttribute(v0->unk_08, 0); v2 -= 16; - sub_02008274(v0->unk_08, 0, v2); + PokemonSprite_AddAttribute(v0->unk_08, 0, v2); } - if (sub_020080C0(v0->unk_08, 0) >= v0->unk_14) { - sub_02007B98(v0->unk_08, 1); - sub_02007DEC(v0->unk_08, 44, 0); - sub_02007DEC(v0->unk_08, 45, 0); - sub_02007DEC(v0->unk_08, 0, v0->unk_14); + if (PokemonSprite_GetAttribute(v0->unk_08, 0) >= v0->unk_14) { + PokemonSprite_InitAnim(v0->unk_08, 1); + PokemonSprite_SetAttribute(v0->unk_08, 44, 0); + PokemonSprite_SetAttribute(v0->unk_08, 45, 0); + PokemonSprite_SetAttribute(v0->unk_08, 0, v0->unk_14); PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { @@ -1515,7 +1515,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11)); } - sub_020086FC(v0->unk_08, 8, 0, 0, 0x0); + PokemonSprite_StartFade(v0->unk_08, 8, 0, 0, 0x0); v0->unk_12++; } } else { @@ -1532,19 +1532,19 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3); if (v0->unk_1C == 0) { - sub_02007DEC(v0->unk_08, 0, v2); + PokemonSprite_SetAttribute(v0->unk_08, 0, v2); } else if (v0->unk_1C == 2) { - v2 = v2 - sub_020080C0(v0->unk_08, 0); + v2 = v2 - PokemonSprite_GetAttribute(v0->unk_08, 0); v2 -= 24; - sub_02008274(v0->unk_08, 0, v2); + PokemonSprite_AddAttribute(v0->unk_08, 0, v2); } else if (v0->unk_1C == 4) { - v2 = sub_020080C0(v0->unk_08, 0) - v2; + v2 = PokemonSprite_GetAttribute(v0->unk_08, 0) - v2; v2 -= 16; - sub_02008274(v0->unk_08, 0, -v2); + PokemonSprite_AddAttribute(v0->unk_08, 0, -v2); } - if (sub_020080C0(v0->unk_08, 0) <= v0->unk_14) { - sub_02007DEC(v0->unk_08, 0, v0->unk_14); + if (PokemonSprite_GetAttribute(v0->unk_08, 0) <= v0->unk_14) { + PokemonSprite_SetAttribute(v0->unk_08, 0, v0->unk_14); PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { @@ -1563,7 +1563,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) } break; case 3: - if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (PokemonSprite_IsAnimActive(v0->unk_08) == 0)) { if (v0->unk_28) { { UnkStruct_ov16_02265BBC v6; @@ -1622,13 +1622,13 @@ static void ov16_0225E894(SysTask *param0, void *param1) } ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3); - sub_02008274(v0->unk_08, 1, 8 / 2); + PokemonSprite_AddAttribute(v0->unk_08, 1, 8 / 2); - if (sub_020080C0(v0->unk_08, 1) >= v0->unk_14) { - sub_02007B98(v0->unk_08, 1); - sub_02007DEC(v0->unk_08, 44, 0); - sub_02007DEC(v0->unk_08, 45, 0); - sub_02007DEC(v0->unk_08, 1, v0->unk_14); + if (PokemonSprite_GetAttribute(v0->unk_08, 1) >= v0->unk_14) { + PokemonSprite_InitAnim(v0->unk_08, 1); + PokemonSprite_SetAttribute(v0->unk_08, 44, 0); + PokemonSprite_SetAttribute(v0->unk_08, 45, 0); + PokemonSprite_SetAttribute(v0->unk_08, 1, v0->unk_14); PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { @@ -1639,13 +1639,13 @@ static void ov16_0225E894(SysTask *param0, void *param1) } ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11)); - sub_020086FC(v0->unk_08, 8, 0, 0, 0x0); + PokemonSprite_StartFade(v0->unk_08, 8, 0, 0, 0x0); v0->unk_12++; } break; case 3: - if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (PokemonSprite_IsAnimActive(v0->unk_08) == 0)) { if (v0->unk_28) { { UnkStruct_ov16_02265BBC v5; @@ -1756,14 +1756,14 @@ static void ov16_0225EA80(SysTask *param0, void *param1) PokeSprite_LoadAnimationFrames(v0->unk_04->unk_1A0, &v3[0], v0->unk_86, v0->unk_82); v0->unk_04->unk_20 = ov16_02263B30(v0->unk_00, v2, &v0->unk_14, Unk_ov12_0223B0A0[v0->unk_82][0], Unk_ov12_0223B0B8[v0->unk_82][1], Unk_ov12_0223B0B8[v0->unk_82][2], v0->unk_85, v0->unk_90, v0->unk_91, v0->unk_93, v0->unk_81, &v3[0], NULL); - sub_02007DEC(v0->unk_04->unk_20, 12, 0x0); - sub_02007DEC(v0->unk_04->unk_20, 13, 0x0); - sub_02007DEC(v0->unk_04->unk_20, 44, 0); - sub_02007DEC(v0->unk_04->unk_20, 6, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 12, 0x0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 13, 0x0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 44, 0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 6, 1); } - sub_020086FC(v0->unk_04->unk_20, 16, 16, 0, Unk_ov16_0226F1AE[v0->unk_8E]); - sub_02007DEC(v0->unk_04->unk_20, 6, 0); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 16, 0, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 6, 0); ov12_022363B4(v0->unk_08); @@ -1786,10 +1786,10 @@ static void ov16_0225EA80(SysTask *param0, void *param1) v0->unk_83++; } case 4: - if ((sub_020080C0(v0->unk_04->unk_20, 12) == 0x100) && (ov12_022363C4(v0->unk_08) == 0)) { + if ((PokemonSprite_GetAttribute(v0->unk_04->unk_20, 12) == 0x100) && (ov12_022363C4(v0->unk_08) == 0)) { if (v0->unk_84 == 2) { - sub_02007B98(v0->unk_04->unk_20, 1); - sub_02007DEC(v0->unk_04->unk_20, 45, 0); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 45, 0); { u8 v4; @@ -1798,7 +1798,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) Pokemon_PlayDelayedCry(BattleSystem_ChatotVoice(v0->unk_00, v0->unk_81), v0->unk_88, v0->unk_86, v0->unk_97, 117, 127, NULL, 5, v4); } } else { - sub_02007B98(v0->unk_04->unk_20, 1); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); { u8 v5; @@ -1809,16 +1809,16 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); - sub_020086FC(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; - } else if (sub_020080C0(v0->unk_04->unk_20, 12) >= 0x100) { - sub_02007DEC(v0->unk_04->unk_20, 12, 0x100); - sub_02007DEC(v0->unk_04->unk_20, 13, 0x100); + } else if (PokemonSprite_GetAttribute(v0->unk_04->unk_20, 12) >= 0x100) { + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 13, 0x100); if (v0->unk_84 == 2) { - sub_02007B98(v0->unk_04->unk_20, 1); - sub_02007DEC(v0->unk_04->unk_20, 45, 0); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 45, 0); { u8 v6; @@ -1827,7 +1827,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) Pokemon_PlayDelayedCry(BattleSystem_ChatotVoice(v0->unk_00, v0->unk_81), v0->unk_88, v0->unk_86, v0->unk_97, 117, 127, NULL, 5, v6); } } else { - sub_02007B98(v0->unk_04->unk_20, 1); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); { u8 v7; @@ -1838,13 +1838,13 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); - sub_020086FC(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; } else { - sub_02008274(v0->unk_04->unk_20, 12, 0x20); - sub_02008274(v0->unk_04->unk_20, 13, 0x20); - sub_020087C8(v0->unk_04->unk_20, v0->unk_90); + PokemonSprite_AddAttribute(v0->unk_04->unk_20, 12, 0x20); + PokemonSprite_AddAttribute(v0->unk_04->unk_20, 13, 0x20); + PokemonSprite_CalcAffineYOffset(v0->unk_04->unk_20, v0->unk_90); } break; case 5: @@ -1853,7 +1853,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } break; case 6: - if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (PokemonSprite_IsAnimActive(v0->unk_04->unk_20) == 0)) { ov12_0223783C(v0->unk_04->unk_84); v0->unk_04->unk_84 = NULL; ov12_02236428(v0->unk_08); @@ -1924,10 +1924,10 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) PokeSprite_LoadAnimationFrames(v0->unk_04->unk_1A0, &v4[0], v0->unk_86, v0->unk_82); v0->unk_04->unk_20 = ov16_02263B30(v0->unk_00, v3, &v0->unk_14, Unk_ov12_0223B0A0[v0->unk_82][0], Unk_ov12_0223B0B8[v0->unk_82][1], Unk_ov12_0223B0B8[v0->unk_82][2], v0->unk_85, v0->unk_90, v0->unk_91, v0->unk_93, v0->unk_81, &v4[0], NULL); - sub_02007DEC(v0->unk_04->unk_20, 12, 0x0); - sub_02007DEC(v0->unk_04->unk_20, 13, 0x0); - sub_02007DEC(v0->unk_04->unk_20, 44, 0); - sub_02007DEC(v0->unk_04->unk_20, 6, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 12, 0x0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 13, 0x0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 44, 0); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 6, 1); } { v0->unk_10 = NULL; @@ -1961,8 +1961,8 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) ov12_02223770(v0->unk_10); } - sub_020086FC(v0->unk_04->unk_20, 16, 16, 0, Unk_ov16_0226F1AE[v0->unk_8E]); - sub_02007DEC(v0->unk_04->unk_20, 6, 0); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 16, 0, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 6, 0); ov12_022363B4(v0->unk_08); @@ -1980,10 +1980,10 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) v0->unk_83++; } case 4: - if ((sub_020080C0(v0->unk_04->unk_20, 12) == 0x100) && (ov12_022363C4(v0->unk_08) == 0)) { + if ((PokemonSprite_GetAttribute(v0->unk_04->unk_20, 12) == 0x100) && (ov12_022363C4(v0->unk_08) == 0)) { if (v0->unk_84 == 2) { - sub_02007B98(v0->unk_04->unk_20, 1); - sub_02007DEC(v0->unk_04->unk_20, 45, 0); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 45, 0); { u8 v6; @@ -1992,7 +1992,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) Pokemon_PlayDelayedCry(BattleSystem_ChatotVoice(v0->unk_00, v0->unk_81), v0->unk_88, v0->unk_86, v0->unk_97, 117, 127, NULL, 5, v6); } } else { - sub_02007B98(v0->unk_04->unk_20, 1); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); { u8 v7; @@ -2003,15 +2003,15 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); - sub_020086FC(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; - } else if (sub_020080C0(v0->unk_04->unk_20, 12) >= 0x100) { - sub_02007DEC(v0->unk_04->unk_20, 12, 0x100); - sub_02007DEC(v0->unk_04->unk_20, 13, 0x100); + } else if (PokemonSprite_GetAttribute(v0->unk_04->unk_20, 12) >= 0x100) { + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 13, 0x100); if (v0->unk_84 == 2) { - sub_02007B98(v0->unk_04->unk_20, 1); - sub_02007DEC(v0->unk_04->unk_20, 45, 0); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 45, 0); { u8 v8; @@ -2020,7 +2020,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) Pokemon_PlayDelayedCry(BattleSystem_ChatotVoice(v0->unk_00, v0->unk_81), v0->unk_88, v0->unk_86, v0->unk_97, 117, 127, NULL, 5, v8); } } else { - sub_02007B98(v0->unk_04->unk_20, 1); + PokemonSprite_InitAnim(v0->unk_04->unk_20, 1); { u8 v9; @@ -2031,12 +2031,12 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); - sub_020086FC(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); + PokemonSprite_StartFade(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; } else { - sub_02008274(v0->unk_04->unk_20, 12, 0x20); - sub_02008274(v0->unk_04->unk_20, 13, 0x20); - sub_020087C8(v0->unk_04->unk_20, v0->unk_90); + PokemonSprite_AddAttribute(v0->unk_04->unk_20, 12, 0x20); + PokemonSprite_AddAttribute(v0->unk_04->unk_20, 13, 0x20); + PokemonSprite_CalcAffineYOffset(v0->unk_04->unk_20, v0->unk_90); } break; case 5: @@ -2045,7 +2045,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } break; case 6: - if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (PokemonSprite_IsAnimActive(v0->unk_04->unk_20) == 0)) { ov12_0223783C(v0->unk_0C); ov12_02236428(v0->unk_08); @@ -2181,7 +2181,7 @@ static void ov16_0225F764(SysTask *param0, void *param1) } v0->unk_6B = 5; - sub_020086FC(v0->unk_08, 0, 16, 0, Unk_ov16_0226F1AE[v0->unk_6E]); + PokemonSprite_StartFade(v0->unk_08, 0, 16, 0, Unk_ov16_0226F1AE[v0->unk_6E]); switch (v0->unk_6A) { case 0: @@ -2197,17 +2197,17 @@ static void ov16_0225F764(SysTask *param0, void *param1) } break; case 5: - if (sub_020087B4(v0->unk_08) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_08) == 0) { v0->unk_6B++; } break; case 6: - sub_02008274(v0->unk_08, 12, -0x20); - sub_02008274(v0->unk_08, 13, -0x20); - sub_020087C8(v0->unk_08, v0->unk_6C); + PokemonSprite_AddAttribute(v0->unk_08, 12, -0x20); + PokemonSprite_AddAttribute(v0->unk_08, 13, -0x20); + PokemonSprite_CalcAffineYOffset(v0->unk_08, v0->unk_6C); - if (sub_020080C0(v0->unk_08, 12) <= 0x0) { - sub_02007DC8(v0->unk_08); + if (PokemonSprite_GetAttribute(v0->unk_08, 12) <= 0x0) { + PokemonSprite_Delete(v0->unk_08); if (v0->unk_6A & 0x1) { v0->unk_6B = 7; @@ -2237,16 +2237,16 @@ static void ov16_0225FA00(SysTask *param0, void *param1) switch (v0->unk_0B) { case 0: - sub_02008274(v0->unk_04, 12, -0x20); - sub_02008274(v0->unk_04, 13, -0x20); + PokemonSprite_AddAttribute(v0->unk_04, 12, -0x20); + PokemonSprite_AddAttribute(v0->unk_04, 13, -0x20); if (v0->unk_0C) { v0->unk_0C--; - sub_02008274(v0->unk_04, 1, -1); + PokemonSprite_AddAttribute(v0->unk_04, 1, -1); } - if (sub_020080C0(v0->unk_04, 12) <= 0x0) { - sub_02007DC8(v0->unk_04); + if (PokemonSprite_GetAttribute(v0->unk_04, 12) <= 0x0) { + PokemonSprite_Delete(v0->unk_04); v0->unk_0B++; } break; @@ -4528,7 +4528,7 @@ static void ov16_022626C0(SysTask *param0, void *param1) switch (v0->unk_6A) { case 0: - if ((v0->unk_10.unk_0E_0) && (v0->unk_10.unk_4C == 0) && (sub_020080C0(v0->unk_08, 6) == 0)) { + if ((v0->unk_10.unk_0E_0) && (v0->unk_10.unk_4C == 0) && (PokemonSprite_GetAttribute(v0->unk_08, 6) == 0)) { { UnkStruct_ov16_02265BBC v1; @@ -4561,7 +4561,7 @@ static void ov16_022626C0(SysTask *param0, void *param1) } if (v0->unk_6C) { - sub_02008B54(ov16_0223E000(v0->unk_00), 0x1); + PokemonSpriteManager_SetHideShadows(ov16_0223E000(v0->unk_00), 0x1); } ov16_02264408(v0->unk_00, v0->unk_04, v0->unk_0C, &v0->unk_10); @@ -4575,10 +4575,10 @@ static void ov16_022626C0(SysTask *param0, void *param1) } if (v0->unk_6C) { - sub_02008B60(ov16_0223E000(v0->unk_00), 0x1); + PokemonSpriteManager_ClearHideShadows(ov16_0223E000(v0->unk_00), 0x1); } - if ((v0->unk_10.unk_0E_0) && (v0->unk_10.unk_4C == 0) && (sub_020080C0(v0->unk_08, 6) == 0)) { + if ((v0->unk_10.unk_0E_0) && (v0->unk_10.unk_4C == 0) && (PokemonSprite_GetAttribute(v0->unk_08, 6) == 0)) { { UnkStruct_ov16_02265BBC v4; @@ -4632,15 +4632,15 @@ static void ov16_0226292C(SysTask *param0, void *param1) if (v0->unk_0A == 0) { v0->unk_0A = 2; v0->unk_09++; - v1 = sub_020080C0(v0->unk_04, 6); + v1 = PokemonSprite_GetAttribute(v0->unk_04, 6); v1 ^= 1; - sub_02007DEC(v0->unk_04, 6, v1); + PokemonSprite_SetAttribute(v0->unk_04, 6, v1); } else { v0->unk_0A--; } } else { v1 = 0; - sub_02007DEC(v0->unk_04, 6, v1); + PokemonSprite_SetAttribute(v0->unk_04, 6, v1); ClearCommand(v0->unk_00, v0->unk_08, 23); Heap_FreeToHeap(param1); SysTask_Done(param0); @@ -4781,21 +4781,21 @@ static void ov16_02262A9C(SysTask *param0, void *param1) sub_02005728(1795, -117); } - if (sub_020080C0(v0->unk_08, 41) > 0) { + if (PokemonSprite_GetAttribute(v0->unk_08, 41) > 0) { v0->unk_66 = 7; } else { v0->unk_66 = 8; } break; case 7: - v3 = sub_020080C0(v0->unk_08, 41); + v3 = PokemonSprite_GetAttribute(v0->unk_08, 41); v3 -= 8; if (v3 < 0) { v3 = 0; } - sub_02007DEC(v0->unk_08, 41, v3); + PokemonSprite_SetAttribute(v0->unk_08, 41, v3); if (v3) { break; @@ -4805,24 +4805,24 @@ static void ov16_02262A9C(SysTask *param0, void *param1) case 8: v3 = LoadPokemonSpriteYOffset(v0->unk_68, v0->unk_6A, v0->unk_67, v0->unk_6B, v0->unk_6C); v3 = 80 - v3; - sub_020086D4(v0->unk_08, 0, 0, 80, v3); + PokemonSprite_SetVisible(v0->unk_08, 0, 0, 80, v3); v0->unk_66++; break; case 9: - v2 = sub_020080C0(v0->unk_08, 1); + v2 = PokemonSprite_GetAttribute(v0->unk_08, 1); v2 += 8; - sub_02007DEC(v0->unk_08, 1, v2); - v3 = sub_020080C0(v0->unk_08, 18); + PokemonSprite_SetAttribute(v0->unk_08, 1, v2); + v3 = PokemonSprite_GetAttribute(v0->unk_08, 18); v3 -= 8; if (v3 < 0) { v3 = 0; } - sub_02007DEC(v0->unk_08, 18, v3); + PokemonSprite_SetAttribute(v0->unk_08, 18, v3); if (v3 == 0) { - sub_02007DC8(v0->unk_08); + PokemonSprite_Delete(v0->unk_08); v0->unk_66++; } break; @@ -4847,7 +4847,7 @@ static void ov16_02262D28(SysTask *param0, void *param1) case 0: sub_02015738(ov16_0223E220(v0->unk_00), 1); PaletteData_StartFade(v1, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v2, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v2, 0, 16, 0, 0x0); sub_0200564C(0, 16); v0->unk_06++; case 1: @@ -4874,7 +4874,7 @@ static void ov16_02262DC4(SysTask *param0, void *param1) switch (v0->unk_62) { case 0: if (v0->unk_04->unk_20) { - sub_02007DEC(v0->unk_04->unk_20, 6, v0->unk_63); + PokemonSprite_SetAttribute(v0->unk_04->unk_20, 6, v0->unk_63); if (v0->unk_63 == 1) { v0->unk_62 = 0xff; @@ -5233,7 +5233,7 @@ static void ov16_022634DC(SysTask *param0, void *param1) case 0: if (v0->unk_0C == v0->unk_0D) { v0->unk_0C = 0; - v1 = sub_020080C0(v0->unk_04, 40); + v1 = PokemonSprite_GetAttribute(v0->unk_04, 40); if (v1 > v0->unk_0B) { v1--; @@ -5241,7 +5241,7 @@ static void ov16_022634DC(SysTask *param0, void *param1) v1++; } - sub_02007DEC(v0->unk_04, 40, v1); + PokemonSprite_SetAttribute(v0->unk_04, 40, v1); if (v1 == v0->unk_0B) { v0->unk_0A++; @@ -5655,19 +5655,19 @@ static PokemonSprite *ov16_02263B30(BattleSystem *battleSys, PokemonSpriteManage ov16_0223F2E4(ov16_0223E0C8(battleSys), param10, param2->palette); ov16_0223F2FC(ov16_0223E0C8(battleSys), param10, param6); - v0 = sub_02007C7C(param1, param2, param3, param4 + param6, param5, param10, param10, param11, param12); + v0 = PokemonSpriteManager_CreateSpriteAtIndex(param1, param2, param3, param4 + param6, param5, param10, param10, param11, param12); if (v2 & 0x1) { if (v2 > 1) { v2 = v2 >> 1; } - sub_02007DEC(v0, 42, v2); - sub_02007DEC(v0, 46, param9); - sub_02007DEC(v0, 20, (param4 + param6) + (36 - param6)); - sub_02007DEC(v0, 21, param8); - sub_02007DEC(v0, 22, 36 - param6); - sub_02007DEC(v0, 41, param7); + PokemonSprite_SetAttribute(v0, 42, v2); + PokemonSprite_SetAttribute(v0, 46, param9); + PokemonSprite_SetAttribute(v0, 20, (param4 + param6) + (36 - param6)); + PokemonSprite_SetAttribute(v0, 21, param8); + PokemonSprite_SetAttribute(v0, 22, 36 - param6); + PokemonSprite_SetAttribute(v0, 41, param7); } return v0; diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index c79581c520..e2cbee09fc 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -350,7 +350,7 @@ static void ov16_0225C1B8(BattleSystem *battleSys, BattlerData *param1) static void ov16_0225C1CC(BattleSystem *battleSys, BattlerData *param1) { - sub_02007DC8(param1->unk_20); + PokemonSprite_Delete(param1->unk_20); ClearCommand(battleSys, param1->battler, 7); ZeroDataBuffer(param1); } @@ -492,7 +492,7 @@ static void ov16_0225C314(BattleSystem *battleSys, BattlerData *param1) static void ov16_0225C328(BattleSystem *battleSys, BattlerData *param1) { - if (sub_020080C0(param1->unk_20, 6) == 1) { + if (PokemonSprite_GetAttribute(param1->unk_20, 6) == 1) { ClearCommand(battleSys, param1->battler, 23); } else { ov16_0225DA44(battleSys, param1); @@ -734,10 +734,10 @@ static void ov16_0225C684(BattleSystem *battleSys, BattlerData *param1) BuildPokemonSpriteTemplate(&v1, v0->unk_02, v0->unk_04, v4, v0->unk_05, v0->unk_01, v0->unk_08); - v2 = sub_02008A90(param1->unk_20); + v2 = PokemonSprite_GetTemplate(param1->unk_20); *v2 = v1; - sub_020089A0(param1->unk_20); + PokemonSprite_ScheduleReloadFromNARC(param1->unk_20); sub_02013750(v2->archive, v2->character, HEAP_ID_BATTLE, ov16_0223F2B8(ov16_0223E0C8(battleSys), param1->battler), v0->unk_08, 0, v4, v2->spindaSpots); ov16_0223F2CC(ov16_0223E0C8(battleSys), param1->battler, v2->archive); @@ -747,7 +747,7 @@ static void ov16_0225C684(BattleSystem *battleSys, BattlerData *param1) ov16_0223F2FC(ov16_0223E0C8(battleSys), param1->battler, v3); v3 = ov12_022384CC(param1->battlerType, 1) + v3; - sub_02007DEC(param1->unk_20, 1, v3); + PokemonSprite_SetAttribute(param1->unk_20, 1, v3); ClearCommand(battleSys, param1->battler, v0->unk_00); ZeroDataBuffer(param1); diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index a89a77386c..fd83b1fe4d 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -10711,12 +10711,12 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) BattleSystem_SetPokemonCatchData(v2->battleSys, v2->battleCtx, v3); sub_02015738(ov16_0223E220(v2->battleSys), 1); PaletteData_StartFade(v4, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); v2->seqNum = 32; } else if (BattleSystem_CaughtSpecies(v2->battleSys, Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL))) { sub_02015738(ov16_0223E220(v2->battleSys), 1); PaletteData_StartFade(v4, (0x1 | 0x4), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); v2->seqNum = 16; } else { { @@ -10740,7 +10740,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) if (--v2->tmpData[1] == 0) { v2->seqNum = 12; PaletteData_StartFade(v4, (0x1 | 0x4), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); sub_02015738(ov16_0223E220(v2->battleSys), 1); } } @@ -10751,7 +10751,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) UnkStruct_ov21_021E8E0C v12; ov12_0223783C(v2->ballRotation); - sub_02007DD4(v5); + PokemonSpriteManager_DeleteAll(v5); ov16_0223B53C(v2->battleSys); ov16_022686BC(ov16_0223E020(v2->battleSys, 0), 0); ov16_022686BC(ov16_0223E020(v2->battleSys, 1), 0); @@ -10788,10 +10788,10 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) PokemonSprite *v13; v13 = ov21_021E8E00(v2->tmpPtr[0]); - sub_02008274(v13, 0, 4); + PokemonSprite_AddAttribute(v13, 0, 4); - if (sub_020080C0(v13, 0) >= 128) { - sub_02007DEC(v13, 0, 128); + if (PokemonSprite_GetAttribute(v13, 0) >= 128) { + PokemonSprite_SetAttribute(v13, 0, 128); v2->seqNum = 15; } } break; @@ -10810,14 +10810,14 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) v3 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]); ov12_0223783C(v2->ballRotation); - sub_02007DD4(v5); + PokemonSpriteManager_DeleteAll(v5); ov16_02263B20(BattleSystem_BattlerData(v2->battleSys, 0), 0); ov16_0223B53C(v2->battleSys); ov16_0223B578(v2->battleSys); Pokemon_BuildSpriteTemplate(&v14, v3, 2); - sub_02007C34(v5, &v14, 128, 72, 0, 0, NULL, NULL); + PokemonSpriteManager_CreateSprite(v5, &v14, 128, 72, 0, 0, NULL, NULL); PaletteData_StartFade(v4, (0x1 | 0x4), 0xffff, 1, 16, 0, 0x0); - sub_0200872C(v5, 16, 0, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 16, 0, 0, 0x0); v2->seqNum = 17; } @@ -10847,7 +10847,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) } else { sub_02015738(ov16_0223E220(v2->battleSys), 1); PaletteData_StartFade(v4, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); v2->seqNum = 20; } } @@ -10940,7 +10940,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) if (v2->seqNum == 22) { sub_02015738(ov16_0223E220(v2->battleSys), 1); PaletteData_StartFade(v4, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); } v2->seqNum = 32; @@ -11001,7 +11001,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) { sub_02015738(ov16_0223E220(v2->battleSys), 1); PaletteData_StartFade(v4, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(v5, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v5, 0, 16, 0, 0x0); v2->seqNum = 32; } @@ -11085,7 +11085,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) if (PaletteData_GetSelectedBuffersMask(v4) == 0) { if (BattleSystem_BattleType(v2->battleSys) & (BATTLE_TYPE_PAL_PARK | BATTLE_TYPE_CATCH_TUTORIAL)) { ov12_0223783C(v2->ballRotation); - sub_02007DD4(v5); + PokemonSpriteManager_DeleteAll(v5); } v2->battleSys->resultMask = 0x4; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 531a94d392..a2247c7c4f 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -599,8 +599,8 @@ static void ov16_0223B790(OverlayManager *param0) NARC_dtor(v9); } - battleSys->unk_88 = sub_0200762C(HEAP_ID_BATTLE); - sub_02008A84(battleSys->unk_88, 0, (0x20 * 6)); + battleSys->unk_88 = PokemonSpriteManager_New(HEAP_ID_BATTLE); + PokemonSpriteManager_SetPlttBaseAddrAndSize(battleSys->unk_88, 0, (0x20 * 6)); ov16_0223F36C(battleSys); ov16_0223CE28(); @@ -769,7 +769,7 @@ static void ov16_0223BCB4(OverlayManager *param0) ov16_0225C104(battleSystem, battleSystem->battlers[battlerId], battleSystem->unk_23F9); } - sub_02007B6C(battleSystem->unk_88); + PokemonSpriteManager_Free(battleSystem->unk_88); if (battleSystem->unk_23F9 != 2) { ov16_0223B3E4(battleSystem); @@ -1514,7 +1514,7 @@ static void ov16_0223CE68(void *param0) } } - sub_02008A94(v0->unk_88); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_88); VramTransfer_Process(); SpriteSystem_TransferOam(); PaletteData_CommitFadedBuffers(v0->unk_28); @@ -1545,7 +1545,7 @@ static void ov16_0223CF48(SysTask *param0, void *param1) ov11_0221F8F0(); } - sub_02007768(v0->unk_88); + PokemonSpriteManager_DrawSprites(v0->unk_88); SpriteSystem_DrawSprites(v0->unk_94); SpriteSystem_UpdateTransfer(); G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); diff --git a/src/battle/ov16_02264798.c b/src/battle/ov16_02264798.c index 7bd6a30465..4f89fb56bd 100644 --- a/src/battle/ov16_02264798.c +++ b/src/battle/ov16_02264798.c @@ -41,7 +41,7 @@ void ov16_022647D8(BattlerData *param0) param0->unk_194 = NULL; param0->unk_198 = 0; - sub_02007DEC(param0->unk_20, 4, 0); + PokemonSprite_SetAttribute(param0->unk_20, 4, 0); } static void ov16_02264800(SysTask *param0, void *param1) @@ -56,5 +56,5 @@ static void ov16_02264800(SysTask *param0, void *param1) } v1 = FX_Mul(CalcSineDegrees(v0->unk_198), 0x1800) / FX32_ONE; - sub_02007DEC(v0->unk_20, 4, v1); + PokemonSprite_SetAttribute(v0->unk_20, 4, v1); } diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index acbf53765b..d49dca6dc5 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -471,7 +471,7 @@ static void ChooseStarterAppMainCallback(void *data) RenderOam_Transfer(); Bg_RunScheduledUpdates(app->bgl); - sub_02008A94(app->spriteManager); + PokemonSpriteManager_UpdateCharAndPltt(app->spriteManager); VramTransfer_Process(); } @@ -674,19 +674,19 @@ static void ov78_021D13A0(ChooseStarterApp *param0) static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID) { - app->spriteManager = sub_0200762C(heapID); + app->spriteManager = PokemonSpriteManager_New(heapID); NNSGfdTexKey texture = NNS_GfdAllocTexVram(POKEMON_SPRITE_CHAR_SIZE, FALSE, 0); NNSGfdPlttKey palette = NNS_GfdAllocPlttVram(POKEMON_SPRITE_PLTT_SIZE, FALSE, NNS_GFD_ALLOC_FROM_LOW); - sub_02008A78(app->spriteManager, NNS_GfdGetTexKeyAddr(texture), NNS_GfdGetTexKeySize(texture)); - sub_02008A84(app->spriteManager, NNS_GfdGetPlttKeyAddr(palette), NNS_GfdGetPlttKeySize(palette)); + PokemonSpriteManager_SetCharBaseAddrAndSize(app->spriteManager, NNS_GfdGetTexKeyAddr(texture), NNS_GfdGetTexKeySize(texture)); + PokemonSpriteManager_SetPlttBaseAddrAndSize(app->spriteManager, NNS_GfdGetPlttKeyAddr(palette), NNS_GfdGetPlttKeySize(palette)); MakePokemonSprite(&app->sprites[0], app, STARTER_OPTION_0); MakePokemonSprite(&app->sprites[1], app, STARTER_OPTION_1); MakePokemonSprite(&app->sprites[2], app, STARTER_OPTION_2); for (int i = 0; i < NUM_STARTER_OPTIONS; i++) { - sub_02007DEC(app->sprites[i], 6, 1); + PokemonSprite_SetAttribute(app->sprites[i], 6, 1); } } @@ -697,7 +697,7 @@ static void MakePokemonSprite(PokemonSprite **sprite, ChooseStarterApp *app, int PokemonSpriteTemplate spriteTemplate; BuildPokemonSpriteTemplate(&spriteTemplate, species, gender, FACE_FRONT, FALSE, NULL, NULL); - *sprite = sub_02007C34(app->spriteManager, + *sprite = PokemonSpriteManager_CreateSprite(app->spriteManager, &spriteTemplate, POKEMON_SPRITE_POS_X, POKEMON_SPRITE_POS_Y, @@ -713,11 +713,11 @@ static void ov78_021D14BC(ChooseStarterApp *param0) for (v0 = 0; v0 < 3; v0++) { if (param0->sprites[v0]) { - sub_02007DC8(param0->sprites[v0]); + PokemonSprite_Delete(param0->sprites[v0]); } } - sub_02007B6C(param0->spriteManager); + PokemonSpriteManager_Free(param0->spriteManager); } static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapId heapID) @@ -1020,7 +1020,7 @@ static void DrawScene(ChooseStarterApp *param0) NNS_G3dGeFlushBuffer(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(param0->spriteManager); + PokemonSpriteManager_DrawSprites(param0->spriteManager); sub_020150EC(param0->spriteDisplay); } @@ -1238,7 +1238,7 @@ static void ov78_021D1E44(ChooseStarterApp *param0, int param1) break; case 1: ov78_021D2508(¶m0->unk_6A8, 1); - sub_02007DEC(param0->sprites[param0->cursorPosition], 6, 0); + PokemonSprite_SetAttribute(param0->sprites[param0->cursorPosition], 6, 0); if (ov78_021D26A4(param0)) { sub_02005844(GetSelectedSpecies(param0->cursorPosition), 0); @@ -1272,7 +1272,7 @@ static void ov78_021D1E44(ChooseStarterApp *param0, int param1) ov78_021D1C98(param0, -1); param0->unk_04 = 7; ov78_021D2508(¶m0->unk_6A8, 0); - sub_02007DEC(param0->sprites[param0->cursorPosition], 6, 1); + PokemonSprite_SetAttribute(param0->sprites[param0->cursorPosition], 6, 1); param0->unk_708 = ov78_021D1FB4(param0->messageWindow, param1, 360, 7, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER); } break; @@ -1704,10 +1704,10 @@ static void ov78_021D2740(SysTask *param0, void *param1) v2 = FX_Mul(0x100 * FX32_ONE, v0->unk_04.unk_20.unk_00) >> FX32_SHIFT; - sub_02007DEC(v0->unk_00, 0, v0->unk_04.unk_00.unk_00 >> FX32_SHIFT); - sub_02007DEC(v0->unk_00, 1, v0->unk_04.unk_10.unk_00 >> FX32_SHIFT); - sub_02007DEC(v0->unk_00, 12, v2); - sub_02007DEC(v0->unk_00, 13, v2); + PokemonSprite_SetAttribute(v0->unk_00, 0, v0->unk_04.unk_00.unk_00 >> FX32_SHIFT); + PokemonSprite_SetAttribute(v0->unk_00, 1, v0->unk_04.unk_10.unk_00 >> FX32_SHIFT); + PokemonSprite_SetAttribute(v0->unk_00, 12, v2); + PokemonSprite_SetAttribute(v0->unk_00, 13, v2); if ((v1 == 1) || (v0->unk_04.unk_30 < 0)) { SysTask_Done(param0); diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 63ccd8f93a..2e61d2bc76 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -1927,9 +1927,9 @@ static void ov12_0222118C(SysTask *param0, void *param1) v0->unk_04.unk_00 = 0; } - v1 = sub_020080C0(v0->unk_04.unk_04, 0); - v2 = sub_020080C0(v0->unk_04.unk_04, 1); - v2 -= sub_020080C0(v0->unk_04.unk_04, 41); + v1 = PokemonSprite_GetAttribute(v0->unk_04.unk_04, 0); + v2 = PokemonSprite_GetAttribute(v0->unk_04.unk_04, 1); + v2 -= PokemonSprite_GetAttribute(v0->unk_04.unk_04, 41); ManagedSprite_SetPositionXY(v0->unk_00, v1, v2); } @@ -1950,9 +1950,9 @@ static void ov12_022211D8(SysTask *param0, void *param1) v0->unk_04.unk_00 = 0; } - v1 = sub_020080C0(v0->unk_04.unk_04, 0); - v2 = sub_020080C0(v0->unk_04.unk_04, 1); - v2 -= sub_020080C0(v0->unk_04.unk_04, 41); + v1 = PokemonSprite_GetAttribute(v0->unk_04.unk_04, 0); + v2 = PokemonSprite_GetAttribute(v0->unk_04.unk_04, 1); + v2 -= PokemonSprite_GetAttribute(v0->unk_04.unk_04, 41); Bg_SetOffset(v0->unk_00, 2, 0, -(v1 - 40)); Bg_SetOffset(v0->unk_00, 2, 3, -(v2 - 40)); @@ -2044,9 +2044,9 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) s16 v10; s16 v11; - v10 = sub_020080C0(ov12_022232FC(param0, v3), 0); - v11 = sub_020080C0(ov12_022232FC(param0, v3), 1); - v11 -= sub_020080C0(ov12_022232FC(param0, v3), 41); + v10 = PokemonSprite_GetAttribute(ov12_022232FC(param0, v3), 0); + v11 = PokemonSprite_GetAttribute(ov12_022232FC(param0, v3), 1); + v11 -= PokemonSprite_GetAttribute(ov12_022232FC(param0, v3), 41); Bg_SetOffset(param0->unk_C0, 2, 0, -(v10 - 40)); Bg_SetOffset(param0->unk_C0, 2, 3, -(v11 - 40)); @@ -2160,9 +2160,9 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0) s16 v16; if (v12 != NULL) { - v15 = sub_020080C0(v12, 0); - v16 = sub_020080C0(v12, 1); - v16 -= sub_020080C0(v12, 41); + v15 = PokemonSprite_GetAttribute(v12, 0); + v16 = PokemonSprite_GetAttribute(v12, 1); + v16 -= PokemonSprite_GetAttribute(v12, 41); } v11.x = v15; @@ -2184,7 +2184,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0) if (v12 == NULL) { ManagedSprite_SetDrawFlag(v1, 0); } else { - int v17 = sub_020080C0(v12, 6); + int v17 = PokemonSprite_GetAttribute(v12, 6); if (v17 == 1) { ManagedSprite_SetDrawFlag(v1, 0); @@ -2318,7 +2318,7 @@ static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0) v7 = ov12_022232FC(param0, v6); if (v7 != NULL) { - v5 = sub_020080C0(v7, 6); + v5 = PokemonSprite_GetAttribute(v7, 6); } else { v5 = 0; } @@ -3934,7 +3934,7 @@ PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1) return NULL; } - if (sub_02008B38(param0->unk_BC->unk_C4[param1])) { + if (PokemonSprite_IsActive(param0->unk_BC->unk_C4[param1])) { return param0->unk_BC->unk_C4[param1]; } else { return NULL; @@ -4233,9 +4233,9 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int v13 = v2->unk_48[v5]; if (v13 != NULL) { - v14 = sub_020080C0(v13, 0); - v15 = sub_020080C0(v13, 1); - v15 -= sub_020080C0(v13, 41); + v14 = PokemonSprite_GetAttribute(v13, 0); + v15 = PokemonSprite_GetAttribute(v13, 1); + v15 -= PokemonSprite_GetAttribute(v13, 41); } else { continue; } @@ -4260,10 +4260,10 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int if (v13 == NULL) { ManagedSprite_SetDrawFlag(v10, 0); - } else if (sub_02008B38(v13) == 0) { + } else if (PokemonSprite_IsActive(v13) == 0) { ManagedSprite_SetDrawFlag(v10, 0); } else { - int v16 = sub_020080C0(v13, 6); + int v16 = PokemonSprite_GetAttribute(v13, 6); if (v16 == 1) { ManagedSprite_SetDrawFlag(v10, 0); diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c index dcc758fac9..547fb11dd7 100644 --- a/src/overlay012/ov12_02225864.c +++ b/src/overlay012/ov12_02225864.c @@ -225,14 +225,14 @@ void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1) void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1, s16 param2, s16 param3) { - sub_02007DEC(param1, 0, param2 + param0->unk_00); - sub_02007DEC(param1, 1, param3 + param0->unk_02); + PokemonSprite_SetAttribute(param1, 0, param2 + param0->unk_00); + PokemonSprite_SetAttribute(param1, 1, param3 + param0->unk_02); } void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1) { - sub_02007DEC(param1, 12, param0->unk_00); - sub_02007DEC(param1, 13, param0->unk_02); + PokemonSprite_SetAttribute(param1, 12, param0->unk_00); + PokemonSprite_SetAttribute(param1, 13, param0->unk_02); } void ov12_02225A5C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7) @@ -595,7 +595,7 @@ void ov12_02226024(PokemonSprite *param0, s16 param1, s16 param2, fx32 param3, i v1 = param1 - param2; } - sub_02007DEC(param0, 1, v1 + v0); + PokemonSprite_SetAttribute(param0, 1, v1 + v0); } void ov12_0222605C(ManagedSprite *param0, s16 param1, s16 param2, fx32 param3, int param4) diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index 8395f6af59..2e4ac33207 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -431,8 +431,8 @@ static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1); static void ov12_02226B84(PokemonSprite *param0) { - sub_02007DEC(param0, 12, 0x100); - sub_02007DEC(param0, 13, 0x100); + PokemonSprite_SetAttribute(param0, 12, 0x100); + PokemonSprite_SetAttribute(param0, 13, 0x100); } static void ov12_02226BA0(SysTask *param0, void *param1) @@ -455,8 +455,8 @@ static void ov12_02226BA0(SysTask *param0, void *param1) continue; } - sub_02007DEC(v1->unk_2C[v0].unk_08, 0, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00); - sub_02007DEC(v1->unk_2C[v0].unk_08, 1, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02); + PokemonSprite_SetAttribute(v1->unk_2C[v0].unk_08, 0, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00); + PokemonSprite_SetAttribute(v1->unk_2C[v0].unk_08, 1, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02); } } else if (inline_ov12_02235998(v1->unk_20.unk_08, 0x200) == 1) { for (v0 = 0; v0 < v1->unk_00; v0++) { @@ -831,16 +831,16 @@ static void ov12_02227390(SysTask *param0, void *param1) case 0: case 1: if (ov12_02225DA0(&v0->unk_0C) == 1) { - sub_02007DEC(v0->unk_08, 9, (u16)v0->unk_0C.unk_00); + PokemonSprite_SetAttribute(v0->unk_08, 9, (u16)v0->unk_0C.unk_00); } else { ov12_02225D50(&v0->unk_0C, v0->unk_0C.unk_00, v0->unk_20, v0->unk_24); v0->unk_00++; } break; case 2: - sub_02007DEC(v0->unk_08, 10, 0); - sub_02007DEC(v0->unk_08, 11, 0); - sub_02007DEC(v0->unk_08, 9, 0); + PokemonSprite_SetAttribute(v0->unk_08, 10, 0); + PokemonSprite_SetAttribute(v0->unk_08, 11, 0); + PokemonSprite_SetAttribute(v0->unk_08, 9, 0); ov12_02220220(v0->unk_04, param0); Heap_FreeToHeap(v0); break; @@ -890,8 +890,8 @@ void ov12_02227408(UnkStruct_ov12_0221FCDC *param0) v0->unk_2A = (80 / 2); } - sub_02007DEC(v0->unk_08, 10, v0->unk_28); - sub_02007DEC(v0->unk_08, 11, v0->unk_2A); + PokemonSprite_SetAttribute(v0->unk_08, 10, v0->unk_28); + PokemonSprite_SetAttribute(v0->unk_08, 11, v0->unk_2A); ov12_022201E8(v0->unk_04, ov12_02227390, v0); } @@ -901,9 +901,9 @@ static void ov12_022274E4(SysTask *param0, void *param1) UnkStruct_ov12_022274E4 *v0 = param1; if (ov12_02225BA0(&v0->unk_04, v0->unk_2C, v0->unk_2E, v0->unk_28) == 0) { - sub_02007DEC(v0->unk_28, 0, v0->unk_2C); - sub_02007DEC(v0->unk_28, 1, v0->unk_2E + ((-8 * FX32_ONE) >> FX32_SHIFT)); - sub_02007DEC(v0->unk_28, 9, 0); + PokemonSprite_SetAttribute(v0->unk_28, 0, v0->unk_2C); + PokemonSprite_SetAttribute(v0->unk_28, 1, v0->unk_2E + ((-8 * FX32_ONE) >> FX32_SHIFT)); + PokemonSprite_SetAttribute(v0->unk_28, 9, 0); ov12_02220220(v0->unk_00, param0); Heap_FreeToHeap(v0); } @@ -936,8 +936,8 @@ void ov12_02227534(UnkStruct_ov12_0221FCDC *param0) break; } - v0->unk_2C = sub_020080C0(v0->unk_28, 0); - v0->unk_2E = sub_020080C0(v0->unk_28, 1); + v0->unk_2C = PokemonSprite_GetAttribute(v0->unk_28, 0); + v0->unk_2E = PokemonSprite_GetAttribute(v0->unk_28, 1); v0->unk_2E -= (-8 * FX32_ONE) >> FX32_SHIFT; ov12_022201E8(v0->unk_00, ov12_022274E4, v0); @@ -1043,8 +1043,8 @@ void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v1 = ov12_022232FC(v0->unk_00, ov12_02220248(param0)); - v0->unk_4C = sub_020080C0(v1, 0); - v0->unk_4E = sub_020080C0(v1, 1); + v0->unk_4C = PokemonSprite_GetAttribute(v1, 0); + v0->unk_4E = PokemonSprite_GetAttribute(v1, 1); ov12_022201E8(v0->unk_00, ov12_02227738, v0); } @@ -1094,11 +1094,11 @@ static void ov12_022278D0(SysTask *param0, void *param1) switch (v0->unk_08) { case 0: - sub_020086FC(v0->unk_04, 0, v0->unk_18, v0->unk_10, v0->unk_14); + PokemonSprite_StartFade(v0->unk_04, 0, v0->unk_18, v0->unk_10, v0->unk_14); v0->unk_08++; break; case 1: - if (sub_020087B4(v0->unk_04) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_04) == 0) { v0->unk_08++; } break; @@ -1110,11 +1110,11 @@ static void ov12_022278D0(SysTask *param0, void *param1) break; } case 3: - sub_020086FC(v0->unk_04, v0->unk_18, 0, v0->unk_10, v0->unk_14); + PokemonSprite_StartFade(v0->unk_04, v0->unk_18, 0, v0->unk_10, v0->unk_14); v0->unk_08++; break; case 4: - if (sub_020087B4(v0->unk_04) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_04) == 0) { v0->unk_0C--; if (v0->unk_0C <= 0) { @@ -1348,8 +1348,8 @@ void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0) v0->unk_0E = ov12_02223354(v0->unk_00, ov12_02220248(v0->unk_00)); } - v0->unk_0C = sub_020080C0(v1, 1); - v0->unk_0C -= sub_020080C0(v1, 41); + v0->unk_0C = PokemonSprite_GetAttribute(v1, 1); + v0->unk_0C -= PokemonSprite_GetAttribute(v1, 41); v0->unk_38 = ov12_02220280(param0, 1); v0->unk_3C = ov12_02220280(param0, 2); v0->unk_40 = ov12_02220280(param0, 3); @@ -1544,8 +1544,8 @@ void ov12_02227F30(UnkStruct_ov12_0221FCDC *param0) return; } - v0->unk_08 = sub_020080C0(v0->unk_0C, 1); - v0->unk_0A = sub_020080C0(v0->unk_0C, 41); + v0->unk_08 = PokemonSprite_GetAttribute(v0->unk_0C, 1); + v0->unk_0A = PokemonSprite_GetAttribute(v0->unk_0C, 41); v0->unk_0A += 16; v0->unk_34 = ov12_02220280(param0, 1); v0->unk_38 = ov12_02220280(param0, 2); @@ -1618,7 +1618,7 @@ void ov12_02228214(UnkStruct_ov12_0221FCDC *param0) continue; } - sub_02007DEC(v0.unk_08, 6, v3); + PokemonSprite_SetAttribute(v0.unk_08, 6, v3); } } @@ -1628,14 +1628,14 @@ static void ov12_02228268(SysTask *param0, void *param1) if (v0->unk_04 >= v0->unk_08) { if (v0->unk_00 == 0) { - sub_02007DEC(v0->unk_0C.unk_08, 6, 0); + PokemonSprite_SetAttribute(v0->unk_0C.unk_08, 6, 0); Heap_FreeToHeap(v0); ov12_02220220(v0->unk_3C, param0); } else { int v1; - v1 = sub_020080C0(v0->unk_0C.unk_08, 6); - sub_02007DEC(v0->unk_0C.unk_08, 6, v1 ^ 1); + v1 = PokemonSprite_GetAttribute(v0->unk_0C.unk_08, 6); + PokemonSprite_SetAttribute(v0->unk_0C.unk_08, 6, v1 ^ 1); v0->unk_00--; v0->unk_04 = 0; } @@ -1671,7 +1671,7 @@ static void ov12_0222830C(SysTask *param0, void *param1) v0->unk_24.unk_00++; } - sub_02007DEC(v0->unk_10.unk_08, 0, v0->unk_40.unk_00); + PokemonSprite_SetAttribute(v0->unk_10.unk_08, 0, v0->unk_40.unk_00); break; default: ov12_02220220(v0->unk_64, param0); @@ -1754,7 +1754,7 @@ static void ov12_02228488(SysTask *param0, void *param1) v0->unk_20.unk_00++; } - sub_02007DEC(v0->unk_0C.unk_08, 0, v0->unk_3C.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C.unk_08, 0, v0->unk_3C.unk_00); break; default: ov12_02220220(v0->unk_60, param0); @@ -1836,13 +1836,13 @@ static void ov12_0222862C(SysTask *param0, void *param1) if (ov12_02225EB8(&v0->unk_14) == 1) { ov12_02226138(&v0->unk_38); - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); - sub_02008274(v0->unk_10, 0, v0->unk_38.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_AddAttribute(v0->unk_10, 0, v0->unk_38.unk_00); { s16 v1 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v1); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v1); } } else { v0->unk_00++; @@ -1856,11 +1856,11 @@ static void ov12_0222862C(SysTask *param0, void *param1) break; case 2: if (ov12_02225EB8(&v0->unk_14) == 1) { - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); { s16 v2 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v2); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v2); } } else { v0->unk_00++; @@ -1868,18 +1868,18 @@ static void ov12_0222862C(SysTask *param0, void *param1) break; case 3: if (ov12_02225EB8(&v0->unk_14) == 1) { - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); { s16 v3 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v3); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v3); } } else { - sub_02007DEC(v0->unk_10, 12, 0x100); - sub_02007DEC(v0->unk_10, 13, 0x100); - sub_02007DEC(v0->unk_10, 1, v0->unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02); v0->unk_00++; } break; @@ -1900,7 +1900,7 @@ void ov12_022287CC(UnkStruct_ov12_0221FCDC *param0) v0->unk_10 = ov12_022232FC(v0->unk_0C, ov12_02220240(v0->unk_0C)); v0->unk_09 = 0; v0->unk_0A = ov12_02220280(param0, 4); - v0->unk_02 = sub_020080C0(v0->unk_10, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_10, 1); v0->unk_04 = ov12_02223354(v0->unk_0C, ov12_02220240(v0->unk_0C)); ov12_02225E68(&v0->unk_14, 100, 100, ov12_02220280(param0, 0), ov12_02220280(param0, 2)); @@ -1917,14 +1917,14 @@ static void ov12_02228868(SysTask *param0, void *param1) if (ov12_02225F6C(&v0->unk_20) == 1) { ov12_02226138(&v0->unk_44); - sub_02007DEC(v0->unk_1C, 12, v0->unk_20.unk_00); - sub_02007DEC(v0->unk_1C, 13, v0->unk_20.unk_02); - sub_02008274(v0->unk_1C, 0, v0->unk_44.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C, 12, v0->unk_20.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C, 13, v0->unk_20.unk_02); + PokemonSprite_AddAttribute(v0->unk_1C, 0, v0->unk_44.unk_00); { s16 v1 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_20.unk_04[4]); - sub_02007DEC(v0->unk_1C, 1, v0->unk_02 + v1); + PokemonSprite_SetAttribute(v0->unk_1C, 1, v0->unk_02 + v1); } } else { v0->unk_00++; @@ -1949,12 +1949,12 @@ static void ov12_02228868(SysTask *param0, void *param1) break; case 2: if (ov12_02225F6C(&v0->unk_20) == 1) { - sub_02007DEC(v0->unk_1C, 12, v0->unk_20.unk_00); - sub_02007DEC(v0->unk_1C, 13, v0->unk_20.unk_02); + PokemonSprite_SetAttribute(v0->unk_1C, 12, v0->unk_20.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C, 13, v0->unk_20.unk_02); { s16 v6 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_20.unk_04[4]); - sub_02007DEC(v0->unk_1C, 1, v0->unk_02 + v6); + PokemonSprite_SetAttribute(v0->unk_1C, 1, v0->unk_02 + v6); } } else { v0->unk_00++; @@ -1962,17 +1962,17 @@ static void ov12_02228868(SysTask *param0, void *param1) break; case 3: if (ov12_02225F6C(&v0->unk_20) == 1) { - sub_02007DEC(v0->unk_1C, 12, v0->unk_20.unk_00); - sub_02007DEC(v0->unk_1C, 13, v0->unk_20.unk_02); + PokemonSprite_SetAttribute(v0->unk_1C, 12, v0->unk_20.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C, 13, v0->unk_20.unk_02); { s16 v7 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_20.unk_04[4]); - sub_02007DEC(v0->unk_1C, 1, v0->unk_02 + v7); + PokemonSprite_SetAttribute(v0->unk_1C, 1, v0->unk_02 + v7); } } else { - sub_02007DEC(v0->unk_1C, 12, 0x100); - sub_02007DEC(v0->unk_1C, 13, 0x100); - sub_02007DEC(v0->unk_1C, 1, v0->unk_02); + PokemonSprite_SetAttribute(v0->unk_1C, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_1C, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_1C, 1, v0->unk_02); v0->unk_00++; } break; @@ -2073,8 +2073,8 @@ static void ov12_02228BD0(SysTask *param0, void *param1) v0->unk_20.unk_00++; } - sub_02007DEC(v0->unk_0C.unk_08, 0, v0->unk_3C.unk_00); - sub_02007DEC(v0->unk_0C.unk_08, 1, v0->unk_3C.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C.unk_08, 0, v0->unk_3C.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C.unk_08, 1, v0->unk_3C.unk_02); break; default: ov12_02220220(v0->unk_60, param0); @@ -2164,8 +2164,8 @@ static void ov12_02228DB8(SysTask *param0, void *param1) v0 = ov12_02225BA0(&v1->unk_30, v1->unk_1C.unk_04.unk_00, v1->unk_1C.unk_04.unk_02, v1->unk_1C.unk_08); if (v0 == 0) { - sub_02007DEC(v1->unk_1C.unk_08, 0, v1->unk_1C.unk_04.unk_00); - sub_02007DEC(v1->unk_1C.unk_08, 1, v1->unk_1C.unk_04.unk_02 + ((-8 * FX32_ONE) >> FX32_SHIFT)); + PokemonSprite_SetAttribute(v1->unk_1C.unk_08, 0, v1->unk_1C.unk_04.unk_00); + PokemonSprite_SetAttribute(v1->unk_1C.unk_08, 1, v1->unk_1C.unk_04.unk_02 + ((-8 * FX32_ONE) >> FX32_SHIFT)); ov12_02220220(v1->unk_00.unk_04, param0); Heap_FreeToHeap(v1); } @@ -2201,8 +2201,8 @@ static void ov12_02228E78(SysTask *param0, void *param1) v0->unk_00.unk_00++; } - sub_02007DEC(v0->unk_1C.unk_08, 0, v0->unk_30.unk_00); - sub_02007DEC(v0->unk_1C.unk_08, 1, v0->unk_30.unk_02); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 0, v0->unk_30.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 1, v0->unk_30.unk_02); break; default: ov12_02220220(v0->unk_00.unk_04, param0); @@ -2351,8 +2351,8 @@ void ov12_022290DC(UnkStruct_ov12_0221FCDC *param0) { s16 v5 = ov12_02223354(param0, v1); - sub_02007DEC(v4.unk_08, 0, v3.unk_00); - sub_02007DEC(v4.unk_08, 1, v3.unk_02 + v5); + PokemonSprite_SetAttribute(v4.unk_08, 0, v3.unk_00); + PokemonSprite_SetAttribute(v4.unk_08, 1, v3.unk_02 + v5); } } @@ -2422,8 +2422,8 @@ static void ov12_02229278(SysTask *param0, void *param1) } } - sub_02007DEC(v0->unk_1C.unk_08, 18, v0->unk_54); - sub_02007DEC(v0->unk_1C.unk_08, 1, v0->unk_50); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 18, v0->unk_54); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 1, v0->unk_50); v0->unk_50 -= v0->unk_42; v0->unk_54 += v0->unk_42; @@ -2470,14 +2470,14 @@ void ov12_02229304(UnkStruct_ov12_0221FCDC *param0) v0->unk_48 = ov12_02220280(param0, 1); if (v0->unk_48 == 0) { - v0->unk_50 = sub_020080C0(v0->unk_1C.unk_08, 1); - v0->unk_54 = 80 - sub_020080C0(v0->unk_1C.unk_08, 18); + v0->unk_50 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 1); + v0->unk_54 = 80 - PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 18); v0->unk_40 = ov12_02220280(param0, 2); v0->unk_42 = ov12_02220280(param0, 3); v0->unk_42 *= -1; } else { - v0->unk_50 = sub_020080C0(v0->unk_1C.unk_08, 1); - v0->unk_54 = sub_020080C0(v0->unk_1C.unk_08, 18); + v0->unk_50 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 1); + v0->unk_54 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 18); v0->unk_40 = ov12_02220280(param0, 2); v0->unk_42 = ov12_02220280(param0, 3); } @@ -2489,7 +2489,7 @@ void ov12_02229304(UnkStruct_ov12_0221FCDC *param0) v0->unk_44 = ov12_02220280(param0, 4); v0->unk_4C = 0; - sub_020086D4(v0->unk_1C.unk_08, v0->unk_30, v0->unk_34, v0->unk_38, v0->unk_3C); + PokemonSprite_SetVisible(v0->unk_1C.unk_08, v0->unk_30, v0->unk_34, v0->unk_38, v0->unk_3C); } ov12_022201E8(v0->unk_00.unk_04, ov12_02229278, v0); @@ -2532,7 +2532,7 @@ static void ov12_022294AC(SysTask *param0, void *param1) v0->unk_24 = 0; v0->unk_44 += v0->unk_1C; - sub_02007DEC(v0->unk_28.unk_08, 1, v0->unk_44); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_44); v0->unk_3C -= v0->unk_1C; if (v0->unk_3C > v0->unk_40) { @@ -2540,12 +2540,12 @@ static void ov12_022294AC(SysTask *param0, void *param1) v0->unk_00.unk_00++; } - sub_02007DEC(v0->unk_28.unk_08, 18, v0->unk_3C); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 18, v0->unk_3C); break; case 1: - sub_02007DEC(v0->unk_28.unk_08, 14, 0); - sub_02007DEC(v0->unk_28.unk_08, 1, v0->unk_48); - sub_02007DEC(v0->unk_28.unk_08, 18, v0->unk_40); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 14, 0); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_48); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 18, v0->unk_40); ov12_02226B84(v0->unk_28.unk_08); ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); @@ -2565,7 +2565,7 @@ static void ov12_02229538(SysTask *param0, void *param1) v0->unk_24 = 0; v0->unk_44 += v0->unk_1C; - sub_02007DEC(v0->unk_28.unk_08, 1, v0->unk_44); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_44); v0->unk_3C -= v0->unk_1C; if (v0->unk_3C < 0) { @@ -2573,12 +2573,12 @@ static void ov12_02229538(SysTask *param0, void *param1) v0->unk_00.unk_00++; } - sub_02007DEC(v0->unk_28.unk_08, 18, v0->unk_3C); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 18, v0->unk_3C); break; case 1: - sub_02007DEC(v0->unk_28.unk_08, 14, 0); - sub_02007DEC(v0->unk_28.unk_08, 1, v0->unk_48); - sub_02007DEC(v0->unk_28.unk_08, 18, v0->unk_40); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 14, 0); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_48); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 18, v0->unk_40); ov12_02226B84(v0->unk_28.unk_08); ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); @@ -2605,10 +2605,10 @@ static void ov12_022295C4(SysTask *param0, void *param1) v0->unk_00.unk_00++; } - sub_020086D4(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40); + PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40); break; case 1: - sub_02007DEC(v0->unk_28.unk_08, 14, 0); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 14, 0); ov12_02226B84(v0->unk_28.unk_08); ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); @@ -2641,26 +2641,26 @@ void ov12_02229638(UnkStruct_ov12_0221FCDC *param0) v0->unk_3C = 80 - v0->unk_3C; v0->unk_40 = 0; - sub_020086D4(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40); + PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40); ov12_022201E8(v0->unk_00.unk_04, ov12_022295C4, v0); return; } - v0->unk_44 = sub_020080C0(v0->unk_28.unk_08, 1); + v0->unk_44 = PokemonSprite_GetAttribute(v0->unk_28.unk_08, 1); v0->unk_48 = v0->unk_44; v0->unk_3C = ov12_02223354(param0, v1); v0->unk_3C = 80 - v0->unk_3C; v0->unk_40 = v0->unk_3C; if (v0->unk_1C > 0) { - sub_020086D4(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C); + PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C); ov12_022201E8(v0->unk_00.unk_04, ov12_02229538, v0); } else { v0->unk_3C = 0; v0->unk_44 += v0->unk_40; - sub_02007DEC(v0->unk_28.unk_08, 1, v0->unk_44); - sub_020086D4(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C); + PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_44); + PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C); ov12_022201E8(v0->unk_00.unk_04, ov12_022294AC, v0); } } diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index be95bcaa46..1077b5a93a 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -435,31 +435,31 @@ static void ov12_0222AFA0(SysTask *param0, void *param1) if (ov12_02225EB8(&v0->unk_14) == 1) { ov12_02226138(&v0->unk_38); - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); - sub_02008274(v0->unk_10, 0, v0->unk_38.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_AddAttribute(v0->unk_10, 0, v0->unk_38.unk_00); { s16 v1 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v1); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v1); } } else { v0->unk_00++; } break; case 1: - sub_020086FC(v0->unk_10, 0, 10, 0, 0x1F); + PokemonSprite_StartFade(v0->unk_10, 0, 10, 0, 0x1F); v0->unk_00++; break; case 2: - if (sub_020087B4(v0->unk_10) == 0) { - sub_020086FC(v0->unk_10, 10, 0, 0, 0x1F); + if (PokemonSprite_IsFadeActive(v0->unk_10) == 0) { + PokemonSprite_StartFade(v0->unk_10, 10, 0, 0, 0x1F); v0->unk_00++; } break; case 3: - if (sub_020087B4(v0->unk_10) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_10) == 0) { v0->unk_08++; if (v0->unk_08 >= 3) { @@ -472,11 +472,11 @@ static void ov12_0222AFA0(SysTask *param0, void *param1) break; case 4: if (ov12_02225EB8(&v0->unk_14) == 1) { - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); { s16 v2 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v2); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v2); } } else { v0->unk_00++; @@ -484,16 +484,16 @@ static void ov12_0222AFA0(SysTask *param0, void *param1) break; case 5: if (ov12_02225EB8(&v0->unk_14) == 1) { - sub_02007DEC(v0->unk_10, 12, v0->unk_14.unk_00); - sub_02007DEC(v0->unk_10, 13, v0->unk_14.unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_10, 13, v0->unk_14.unk_02); { s16 v3 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_14.unk_04[4]); - sub_02007DEC(v0->unk_10, 1, v0->unk_02 + v3); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02 + v3); } } else { - sub_02007DEC(v0->unk_10, 12, 0x100); - sub_02007DEC(v0->unk_10, 13, 0x100); - sub_02007DEC(v0->unk_10, 1, v0->unk_02); + PokemonSprite_SetAttribute(v0->unk_10, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_02); v0->unk_00++; } break; @@ -512,7 +512,7 @@ void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = 0; v0->unk_0C = param0; v0->unk_10 = ov12_022232FC(v0->unk_0C, ov12_02220240(v0->unk_0C)); - v0->unk_02 = sub_020080C0(v0->unk_10, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_10, 1); v0->unk_04 = ov12_02223354(v0->unk_0C, ov12_02220240(v0->unk_0C)); ov12_02225E68(&v0->unk_14, 100, 100, ov12_02220280(param0, 0), ov12_02220280(param0, 2)); @@ -527,11 +527,11 @@ static void ov12_0222B220(SysTask *param0, void *param1) switch (v0->unk_00) { case 0: if (ov12_02225F6C(&v0->unk_10) == 1) { - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v1 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v1); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v1); } } else { ov12_02225EF0(&v0->unk_10, 150, 50, 50, 150, 100, 10); @@ -540,11 +540,11 @@ static void ov12_0222B220(SysTask *param0, void *param1) break; case 1: if (ov12_02225F6C(&v0->unk_10) == 1) { - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v2 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v2); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v2); } } else { ov12_02225EF0(&v0->unk_10, 50, 100, 150, 100, 100, 5); @@ -553,11 +553,11 @@ static void ov12_0222B220(SysTask *param0, void *param1) break; case 2: if (ov12_02225F6C(&v0->unk_10) == 1) { - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v3 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v3); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v3); } } else { ov12_02225EF0(&v0->unk_10, 100, 150, 100, 150, 100, 5); @@ -566,11 +566,11 @@ static void ov12_0222B220(SysTask *param0, void *param1) break; case 3: if (ov12_02225F6C(&v0->unk_10) == 1) { - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v4 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v4); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v4); } } else { ov12_02225EF0(&v0->unk_10, 150, 100, 150, 100, 100, 5); @@ -579,16 +579,16 @@ static void ov12_0222B220(SysTask *param0, void *param1) break; case 4: if (ov12_02225F6C(&v0->unk_10) == 1) { - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v5 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v5); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v5); } } else { - sub_02007DEC(v0->unk_0C, 12, 0x100); - sub_02007DEC(v0->unk_0C, 13, 0x100); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_0C, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02); v0->unk_00++; } break; @@ -606,7 +606,7 @@ void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = 0; v0->unk_08 = param0; v0->unk_0C = ov12_022232FC(v0->unk_08, ov12_02220240(v0->unk_08)); - v0->unk_02 = sub_020080C0(v0->unk_0C, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_04 = ov12_02223354(v0->unk_08, ov12_02220240(v0->unk_08)); ov12_02225EF0(&v0->unk_10, 100, 150, 100, 50, 100, 10); @@ -691,9 +691,9 @@ void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = 0; v0->unk_0C = param0; v0->unk_10 = ov12_022232FC(v0->unk_0C, ov12_02220240(v0->unk_0C)); - v0->unk_08 = sub_020080C0(v0->unk_10, 0); - v0->unk_0A = sub_020080C0(v0->unk_10, 1); - v0->unk_0A -= sub_020080C0(v0->unk_10, 41); + v0->unk_08 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v0->unk_0A = PokemonSprite_GetAttribute(v0->unk_10, 1); + v0->unk_0A -= PokemonSprite_GetAttribute(v0->unk_10, 41); v0->unk_14 = ov12_022202EC(v0->unk_0C); v0->unk_04 = 8; v0->unk_05 = 6; @@ -767,9 +767,9 @@ static void ov12_0222B914(SysTask *param0, void *param1) ov12_02225E68(&v0->unk_0C, Unk_ov12_0223A098[v0->unk_02][0], 100, Unk_ov12_0223A098[v0->unk_02][1], Unk_ov12_0223A098[v0->unk_02][2]); if (v0->unk_02 == 0) { - sub_020086FC(v0->unk_08, 0, 6, 0, 0x7FFF); + PokemonSprite_StartFade(v0->unk_08, 0, 6, 0, 0x7FFF); } else { - sub_020086FC(v0->unk_08, 6, 0, 0, 0x7FFF); + PokemonSprite_StartFade(v0->unk_08, 6, 0, 0, 0x7FFF); } v0->unk_02 ^= 1; @@ -777,7 +777,7 @@ static void ov12_0222B914(SysTask *param0, void *param1) v0->unk_00++; break; case 1: - if ((ov12_02225EB8(&v0->unk_0C) == 0) && (sub_020087B4(v0->unk_08) == 0)) { + if ((ov12_02225EB8(&v0->unk_0C) == 0) && (PokemonSprite_IsFadeActive(v0->unk_08) == 0)) { if (v0->unk_01 < 4) { v0->unk_00--; } else { @@ -785,8 +785,8 @@ static void ov12_0222B914(SysTask *param0, void *param1) } } - sub_02007DEC(v0->unk_08, 12, v0->unk_0C.unk_00); - sub_02007DEC(v0->unk_08, 13, v0->unk_0C.unk_02); + PokemonSprite_SetAttribute(v0->unk_08, 12, v0->unk_0C.unk_00); + PokemonSprite_SetAttribute(v0->unk_08, 13, v0->unk_0C.unk_02); break; default: ov12_02220220(v0->unk_04, param0); @@ -833,12 +833,12 @@ static void ov12_0222BA18(SysTask *param0, void *param1) } } - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); { s16 v1 = ov12_02225FD4(v0->unk_02, v0->unk_04, v0->unk_10.unk_04[4]); - sub_02007DEC(v0->unk_0C, 1, v0->unk_02 + v1); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_02 + v1); } break; default: @@ -856,7 +856,7 @@ void ov12_0222BAE4(UnkStruct_ov12_0221FCDC *param0) v0->unk_01 = 0; v0->unk_08 = param0; v0->unk_0C = ov12_022232FC(v0->unk_08, ov12_02220240(v0->unk_08)); - v0->unk_02 = sub_020080C0(v0->unk_0C, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_04 = ov12_02223354(v0->unk_08, ov12_02220240(v0->unk_08)); ov12_022201E8(v0->unk_08, ov12_0222BA18, v0); @@ -882,12 +882,12 @@ static void ov12_0222BB30(SysTask *param0, void *param1) v0->unk_00++; } - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); ov12_02226024(v0->unk_0C, v0->unk_02, v0->unk_06, v0->unk_10.unk_04[4], 0); break; case 2: - ov12_02225BC8(&v0->unk_10, 0, 0, sub_020080C0(v0->unk_0C, 1), 0, 5); + ov12_02225BC8(&v0->unk_10, 0, 0, PokemonSprite_GetAttribute(v0->unk_0C, 1), 0, 5); v0->unk_00++; break; case 3: @@ -895,11 +895,11 @@ static void ov12_0222BB30(SysTask *param0, void *param1) v0->unk_00++; } - sub_02007DEC(v0->unk_0C, 1, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_10.unk_02); break; case 4: ov12_02225EF0(&v0->unk_10, Unk_ov12_0223A0B7[v0->unk_01][0], Unk_ov12_0223A0B7[v0->unk_01][1], Unk_ov12_0223A0B7[v0->unk_01][2], Unk_ov12_0223A0B7[v0->unk_01][3], 100, Unk_ov12_0223A0B7[v0->unk_01][4]); - v0->unk_02 = sub_020080C0(v0->unk_0C, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_00++; break; case 5: @@ -907,15 +907,15 @@ static void ov12_0222BB30(SysTask *param0, void *param1) v0->unk_00++; } - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); ov12_02226024(v0->unk_0C, v0->unk_02, v0->unk_06, v0->unk_10.unk_04[4], 1); break; default: - sub_02007DEC(v0->unk_0C, 1, v0->unk_04); - sub_02007DEC(v0->unk_0C, 6, 1); - sub_02007DEC(v0->unk_0C, 12, 0x100); - sub_02007DEC(v0->unk_0C, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_04); + PokemonSprite_SetAttribute(v0->unk_0C, 6, 1); + PokemonSprite_SetAttribute(v0->unk_0C, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_0C, 13, 0x100); ov12_02220220(v0->unk_08, param0); Heap_FreeToHeap(v0); break; @@ -930,7 +930,7 @@ void ov12_0222BCF4(UnkStruct_ov12_0221FCDC *param0) v0->unk_01 = 0; v0->unk_08 = param0; v0->unk_0C = ov12_022232FC(v0->unk_08, ov12_02220240(v0->unk_08)); - v0->unk_02 = sub_020080C0(v0->unk_0C, 1); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_04 = v0->unk_02; v0->unk_06 = ov12_02223354(v0->unk_08, ov12_02220240(v0->unk_08)); @@ -944,11 +944,11 @@ static void ov12_0222BD48(SysTask *param0, void *param1) switch (v0->unk_00) { case 0: PaletteData_StartFade(v0->unk_04, 0x1, ov12_02222354(v0->unk_08), -2, 0, 16, 0x7FFF); - sub_020086FC(v0->unk_10, 0, 16, 0, 0x0); + PokemonSprite_StartFade(v0->unk_10, 0, 16, 0, 0x0); v0->unk_00++; break; case 1: - if ((PaletteData_GetSelectedBuffersMask(v0->unk_04) == 0) && (sub_020087B4(v0->unk_10) == 0)) { + if ((PaletteData_GetSelectedBuffersMask(v0->unk_04) == 0) && (PokemonSprite_IsFadeActive(v0->unk_10) == 0)) { v0->unk_00++; } break; @@ -959,11 +959,11 @@ static void ov12_0222BD48(SysTask *param0, void *param1) break; case 3: PaletteData_StartFade(v0->unk_04, 0x1, ov12_02222354(v0->unk_08), -2, 16, 0, 0x7FFF); - sub_020086FC(v0->unk_10, 16, 0, 0, 0x0); + PokemonSprite_StartFade(v0->unk_10, 16, 0, 0, 0x0); v0->unk_00++; break; case 4: - if ((PaletteData_GetSelectedBuffersMask(v0->unk_04) == 0) && (sub_020087B4(v0->unk_10) == 0)) { + if ((PaletteData_GetSelectedBuffersMask(v0->unk_04) == 0) && (PokemonSprite_IsFadeActive(v0->unk_10) == 0)) { v0->unk_00++; } break; @@ -1032,8 +1032,8 @@ static void ov12_0222BE80(SysTask *param0, void *param1) } } - sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); - sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); + PokemonSprite_SetAttribute(v0->unk_0C, 12, v0->unk_10.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 13, v0->unk_10.unk_02); ov12_02226024(v0->unk_0C, v0->unk_34.unk_02, v0->unk_06, v0->unk_10.unk_04[4], 0); } break; default: @@ -1051,7 +1051,7 @@ void ov12_0222BFA8(UnkStruct_ov12_0221FCDC *param0) v0->unk_01 = 0; v0->unk_08 = param0; v0->unk_0C = ov12_022232FC(v0->unk_08, ov12_02220240(v0->unk_08)); - v0->unk_04 = sub_020080C0(v0->unk_0C, 1); + v0->unk_04 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_06 = ov12_02223354(v0->unk_08, ov12_02220240(v0->unk_08)); ov12_022201E8(v0->unk_08, ov12_0222BE80, v0); @@ -1138,7 +1138,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1) switch (v2->unk_00) { case 0: - sub_02007DEC(v2->unk_0C, 14, 1); + PokemonSprite_SetAttribute(v2->unk_0C, 14, 1); v2->unk_00++; break; case 1: @@ -1222,7 +1222,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1) } break; default: - sub_02007DEC(v2->unk_0C, 14, 0); + PokemonSprite_SetAttribute(v2->unk_0C, 14, 0); ov12_02220220(v2->unk_10, param0); Heap_FreeToHeap(v2); return; @@ -1240,8 +1240,8 @@ void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0) v0->unk_10 = param0; v0->unk_14 = ov12_022202EC(v0->unk_10); v0->unk_0C = ov12_022232FC(v0->unk_10, ov12_02220240(v0->unk_10)); - v0->unk_02 = sub_020080C0(v0->unk_0C, 1); - v0->unk_02 -= sub_020080C0(v0->unk_0C, 41); + v0->unk_02 = PokemonSprite_GetAttribute(v0->unk_0C, 1); + v0->unk_02 -= PokemonSprite_GetAttribute(v0->unk_0C, 41); v0->unk_04 = ov12_02223354(v0->unk_10, ov12_02220240(v0->unk_10)); ov12_02235780(v0->unk_10, 0xffffffff, 0xffffffff); @@ -1340,7 +1340,7 @@ static void ov12_0222C4A8(SysTask *param0, void *param1) continue; } - sub_02007DEC(v1->unk_14[v0].unk_08, 0, v1->unk_14[v0].unk_00.unk_00 + v1->unk_B4.unk_00); + PokemonSprite_SetAttribute(v1->unk_14[v0].unk_08, 0, v1->unk_14[v0].unk_00.unk_00 + v1->unk_B4.unk_00); } Bg_SetOffset(v1->unk_08, 3, 0, v1->unk_B4.unk_00); @@ -1379,8 +1379,8 @@ void ov12_0222C5FC(UnkStruct_ov12_0221FCDC *param0) } for (v0 = 0; v0 < v1->unk_04; v0++) { - v1->unk_14[v0].unk_00.unk_00 = sub_020080C0(v1->unk_14[v0].unk_08, 0); - v1->unk_14[v0].unk_00.unk_02 = sub_020080C0(v1->unk_14[v0].unk_08, 1); + v1->unk_14[v0].unk_00.unk_00 = PokemonSprite_GetAttribute(v1->unk_14[v0].unk_08, 0); + v1->unk_14[v0].unk_00.unk_02 = PokemonSprite_GetAttribute(v1->unk_14[v0].unk_08, 1); } ov12_022201E8(v1->unk_0C, ov12_0222C4A8, v1); @@ -1432,7 +1432,7 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0) v0->unk_14 = ov12_022232FC(v0->unk_0C, v1); ov12_02235918(v0->unk_14, &v0->unk_04); - v0->unk_04.unk_02 -= sub_020080C0(v0->unk_14, 41); + v0->unk_04.unk_02 -= PokemonSprite_GetAttribute(v0->unk_14, 41); { int v2 = ov12_02225964(v0->unk_0C, v1); @@ -1484,7 +1484,7 @@ static void ov12_0222C7E0(SysTask *param0, void *param1) v0->unk_00.unk_00++; case 1: if (ov12_02225DA0(&v0->unk_5C) == 1) { - sub_02007DEC(v0->unk_28[0], 9, (u16)v0->unk_5C.unk_00); + PokemonSprite_SetAttribute(v0->unk_28[0], 9, (u16)v0->unk_5C.unk_00); } else { if (v0->unk_00.unk_02 >= 5) { v0->unk_00.unk_00++; @@ -1494,7 +1494,7 @@ static void ov12_0222C7E0(SysTask *param0, void *param1) } break; default: - sub_02007DEC(v0->unk_28[0], 9, 0); + PokemonSprite_SetAttribute(v0->unk_28[0], 9, 0); ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); break; @@ -1537,7 +1537,7 @@ void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0) v0->unk_28[0] = ov12_022232FC(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); v0->unk_28[1] = ov12_022232FC(v0->unk_00.unk_04, ov12_02220248(v0->unk_00.unk_04)); - sub_02007DEC(v0->unk_28[0], 11, 100); + PokemonSprite_SetAttribute(v0->unk_28[0], 11, 100); v1 = ov12_02220280(param0, 0); @@ -1573,7 +1573,7 @@ static void ov12_0222C994(SysTask *param0, void *param1) continue; } - sub_02007DEC(v1->unk_38[v0], 0, v1->unk_28[v0].unk_00 + v1->unk_4C.unk_00); + PokemonSprite_SetAttribute(v1->unk_38[v0], 0, v1->unk_28[v0].unk_00 + v1->unk_4C.unk_00); } Bg_SetOffset(v1->unk_00.unk_14, 3, 0, v1->unk_4C.unk_00); @@ -1916,11 +1916,11 @@ static void ov12_0222D128(SysTask *param0, void *param1) break; case 1: if (ov12_02225F6C(&v1->unk_CC) == 1) { - sub_02007DEC(v1->unk_1C, 12, v1->unk_CC.unk_00); - sub_02007DEC(v1->unk_1C, 13, v1->unk_CC.unk_02); + PokemonSprite_SetAttribute(v1->unk_1C, 12, v1->unk_CC.unk_00); + PokemonSprite_SetAttribute(v1->unk_1C, 13, v1->unk_CC.unk_02); { s16 v2 = ov12_02225FD4(v1->unk_20, v1->unk_24, v1->unk_CC.unk_04[4]); - sub_02007DEC(v1->unk_1C, 1, v1->unk_20 + v2); + PokemonSprite_SetAttribute(v1->unk_1C, 1, v1->unk_20 + v2); } } else { if (v1->unk_0C >= 3) { @@ -2109,7 +2109,7 @@ void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v1->unk_04 = 0; v1->unk_08 = 16; v1->unk_1C = ov12_022232FC(v1->unk_10, ov12_02220240(v1->unk_10)); - v1->unk_20 = sub_020080C0(v1->unk_1C, 1); + v1->unk_20 = PokemonSprite_GetAttribute(v1->unk_1C, 1); v1->unk_24 = ov12_02223354(v1->unk_10, ov12_02220240(v1->unk_10)); ov12_022357BC(v1->unk_10, (1 << ov12_022233EC(param0, 2)) | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0, 0xffffffff, 0xffffffff); diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c index 3f8ec998b9..fc69063602 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/overlay012/ov12_0222D6B0.c @@ -691,7 +691,7 @@ static void ov12_0222E080(SysTask *param0, void *param1) PokemonSprite *v1; v1 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04)); - sub_02007DEC(v1, 6, 1); + PokemonSprite_SetAttribute(v1, 6, 1); } v0->unk_04.unk_00++; break; @@ -724,7 +724,7 @@ static void ov12_0222E080(SysTask *param0, void *param1) PokemonSprite *v2; v2 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04)); - sub_02007DEC(v2, 6, 0); + PokemonSprite_SetAttribute(v2, 6, 0); } v0->unk_04.unk_00++; break; @@ -987,9 +987,9 @@ void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v7 = ov12_02220240(param0); v8 = ov12_022232FC(param0, v7); - v5 = sub_020080C0(v8, 0); - v6 = sub_020080C0(v8, 1); - v6 += sub_020080C0(v8, 41); + v5 = PokemonSprite_GetAttribute(v8, 0); + v6 = PokemonSprite_GetAttribute(v8, 1); + v6 += PokemonSprite_GetAttribute(v8, 41); if (ov12_0223525C(param0, ov12_02220240(param0)) == 0x3) { v6 = 140; diff --git a/src/overlay012/ov12_0222E784.c b/src/overlay012/ov12_0222E784.c index de2725cbda..eb597d83df 100644 --- a/src/overlay012/ov12_0222E784.c +++ b/src/overlay012/ov12_0222E784.c @@ -68,7 +68,7 @@ void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0) ov12_0223595C(param0, &v0->unk_00); v0->unk_1C.unk_08 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220248(v0->unk_00.unk_04)); - v0->unk_58 = sub_020080C0(v0->unk_1C.unk_08, 1); + v0->unk_58 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 1); v0->unk_5C = v0->unk_58; v0->unk_5A = ov12_02223354(v0->unk_00.unk_04, ov12_02220248(v0->unk_00.unk_04)); v0->unk_1C.unk_0C = ov12_022202C0(param0, 0); diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index ad38d40c6f..d1a0d87ebb 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -154,11 +154,11 @@ void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0) G2_ChangeBlendAlpha(v0->unk_A2, v0->unk_A3); v0->unk_1C.unk_08 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); - v0->unk_1C.unk_04.unk_00 = sub_020080C0(v0->unk_1C.unk_08, 0); - v0->unk_1C.unk_04.unk_02 = sub_020080C0(v0->unk_1C.unk_08, 1); + v0->unk_1C.unk_04.unk_00 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 0); + v0->unk_1C.unk_04.unk_02 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 1); v0->unk_1C.unk_0C = ov12_022202C0(v0->unk_00.unk_04, 0); v0->unk_30 = ov12_022202C0(v0->unk_00.unk_04, 1); - v0->unk_A4 = -sub_020080C0(v0->unk_1C.unk_08, 41); + v0->unk_A4 = -PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 41); { ManagedSprite *v1; @@ -254,11 +254,11 @@ void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite s16 v6, v7, v8, v9; v5 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); - v6 = sub_020080C0(v5, 0); - v8 = sub_020080C0(v5, 1); + v6 = PokemonSprite_GetAttribute(v5, 0); + v8 = PokemonSprite_GetAttribute(v5, 1); v5 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220248(v0->unk_00.unk_04)); - v7 = sub_020080C0(v5, 0); - v9 = sub_020080C0(v5, 1); + v7 = PokemonSprite_GetAttribute(v5, 0); + v9 = PokemonSprite_GetAttribute(v5, 1); ov12_02225BC8(&v0->unk_50, v6, v7, v8, v9, (8 + 2) * 2); } @@ -482,8 +482,8 @@ static void ov12_0222F208(SysTask *param0, void *param1) switch (v0->unk_00.unk_00) { case 0: ov12_02225BC8(&v0->unk_30, v0->unk_1C.unk_04.unk_00, v0->unk_6C[v0->unk_68], v0->unk_78[v0->unk_68], v0->unk_78[v0->unk_68], 15); - sub_02007DEC(v0->unk_1C.unk_08, 2, v0->unk_84[v0->unk_68]); - sub_02007DEC(v0->unk_1C.unk_08, 44, 1); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 2, v0->unk_84[v0->unk_68]); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 44, 1); v0->unk_00.unk_00++; case 1: if (ov12_02225C14(&v0->unk_30) == 0) { @@ -509,14 +509,14 @@ static void ov12_0222F208(SysTask *param0, void *param1) v0->unk_00.unk_00 = 0; } - v0->unk_1C.unk_04.unk_00 = sub_020080C0(v0->unk_1C.unk_08, 0); + v0->unk_1C.unk_04.unk_00 = PokemonSprite_GetAttribute(v0->unk_1C.unk_08, 0); } - sub_02007DEC(v0->unk_1C.unk_08, 0, v0->unk_30.unk_00); - sub_02007DEC(v0->unk_1C.unk_08, 1, v0->unk_30.unk_02); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 0, v0->unk_30.unk_00); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 1, v0->unk_30.unk_02); break; default: - sub_02007DEC(v0->unk_1C.unk_08, 44, 0); + PokemonSprite_SetAttribute(v0->unk_1C.unk_08, 44, 0); ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); break; @@ -560,7 +560,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) ov12_02235998(param0, ov12_02220280(param0, 0), &(v1->unk_1C), &v5); } - v0 = sub_020080C0(v1->unk_1C.unk_08, 1) - v1->unk_5C[0].unk_02; + v0 = PokemonSprite_GetAttribute(v1->unk_1C.unk_08, 1) - v1->unk_5C[0].unk_02; if (v1->unk_54 > 0) { v1->unk_6C[0] = 255 + 80; @@ -571,7 +571,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) v1->unk_78[2] = v1->unk_5C[0].unk_02 + v0; v1->unk_84[0] = 0 + 10; v1->unk_84[1] = -0x280 - 10; - v1->unk_84[2] = sub_020080C0(v1->unk_1C.unk_08, 2); + v1->unk_84[2] = PokemonSprite_GetAttribute(v1->unk_1C.unk_08, 2); } else { v1->unk_6C[0] = 0 - 80; v1->unk_6C[1] = 255 + 80; @@ -581,7 +581,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) v1->unk_78[2] = v1->unk_5C[0].unk_02 + v0; v1->unk_84[0] = -0x280 - 10; v1->unk_84[1] = 0 + 10; - v1->unk_84[2] = sub_020080C0(v1->unk_1C.unk_08, 2); + v1->unk_84[2] = PokemonSprite_GetAttribute(v1->unk_1C.unk_08, 2); } ov12_022201E8(v1->unk_00.unk_04, ov12_0222F208, v1); @@ -589,7 +589,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) static void ov12_0222F44C(PokemonSprite *param0, int param1, int param2, int param3, int param4) { - sub_020086D4(param0, param1, 80 - param3, param2, param4); + PokemonSprite_SetVisible(param0, param1, 80 - param3, param2, param4); } static void ov12_0222F464(SysTask *param0, void *param1) @@ -631,7 +631,7 @@ static void ov12_0222F464(SysTask *param0, void *param1) } break; case 3: - sub_02007DEC(v0->unk_1C, 14, 0); + PokemonSprite_SetAttribute(v0->unk_1C, 14, 0); v0->unk_20.unk_00++; break; default: @@ -640,7 +640,7 @@ static void ov12_0222F464(SysTask *param0, void *param1) G2_SetWndOutsidePlane(GX_WND_PLANEMASK_NONE, 0); G2_SetWnd0Position(0, 0, 0, 0); ov12_02220220(v0->unk_20.unk_04, param0); - sub_02007DEC(v0->unk_1C, 23, v0->unk_18); + PokemonSprite_SetAttribute(v0->unk_1C, 23, v0->unk_18); Heap_FreeToHeap(v0); break; } @@ -670,12 +670,12 @@ void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0) { s16 v2, v3; - v2 = sub_020080C0(v0->unk_1C, 0); - v3 = sub_020080C0(v0->unk_1C, 1); - v3 -= sub_020080C0(v0->unk_1C, 41); + v2 = PokemonSprite_GetAttribute(v0->unk_1C, 0); + v3 = PokemonSprite_GetAttribute(v0->unk_1C, 1); + v3 -= PokemonSprite_GetAttribute(v0->unk_1C, 41); - v0->unk_18 = sub_020080C0(v0->unk_1C, 23); - sub_02007DEC(v0->unk_1C, 23, 8); + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_1C, 23); + PokemonSprite_SetAttribute(v0->unk_1C, 23, 8); v0->unk_08 = v2 - 40; v0->unk_04 = v3 + 40; diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index b867defeae..c243f686bb 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -515,8 +515,8 @@ static void ov12_0222F700(SysTask *param0, void *param1) } } - sub_02007DEC(v0->unk_08, 0, v0->unk_E8); - sub_02007DEC(v0->unk_08, 1, v0->unk_EA + ((-8 * FX32_ONE) >> FX32_SHIFT)); + PokemonSprite_SetAttribute(v0->unk_08, 0, v0->unk_E8); + PokemonSprite_SetAttribute(v0->unk_08, 1, v0->unk_EA + ((-8 * FX32_ONE) >> FX32_SHIFT)); ov12_02220220(v0->unk_00, param0); Heap_FreeToHeap(v0); } @@ -533,9 +533,9 @@ void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = param0; v0->unk_04 = ov12_022202EC(v0->unk_00); v0->unk_08 = ov12_022232FC(v0->unk_00, ov12_02220240(v0->unk_00)); - v0->unk_E8 = sub_020080C0(v0->unk_08, 0); - v0->unk_EA = sub_020080C0(v0->unk_08, 1); - v0->unk_EC = sub_020080C0(v0->unk_08, 41); + v0->unk_E8 = PokemonSprite_GetAttribute(v0->unk_08, 0); + v0->unk_EA = PokemonSprite_GetAttribute(v0->unk_08, 1); + v0->unk_EC = PokemonSprite_GetAttribute(v0->unk_08, 41); v0->unk_EA -= (-8 * FX32_ONE) >> FX32_SHIFT; ov12_022263A4(&v0->unk_0C, 1, 8); @@ -573,7 +573,7 @@ static void ov12_0222F888(SysTask *param0, void *param1) break; case 1: if (ov12_02225DA0(&v0->unk_34)) { - sub_02007DEC(v0->unk_0C, 9, v0->unk_34.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 9, v0->unk_34.unk_00); } else { ov12_02225D50(&v0->unk_34, v0->unk_34.unk_00, 0, 4); v0->unk_04++; @@ -604,15 +604,15 @@ static void ov12_0222F888(SysTask *param0, void *param1) break; case 5: if (ov12_02225DA0(&v0->unk_34)) { - sub_02007DEC(v0->unk_0C, 9, v0->unk_34.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 9, v0->unk_34.unk_00); } else { v0->unk_04++; } break; case 6: - sub_02007DEC(v0->unk_0C, 0, v0->unk_48); - sub_02007DEC(v0->unk_0C, 1, v0->unk_4A); - sub_02007DEC(v0->unk_0C, 9, 0); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_48); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_4A); + PokemonSprite_SetAttribute(v0->unk_0C, 9, 0); ov12_02220220(v0->unk_00, param0); Heap_FreeToHeap(v0); break; @@ -631,8 +631,8 @@ void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = param0; v0->unk_04 = 0; v0->unk_0C = ov12_022232FC(v0->unk_00, ov12_02220240(v0->unk_00)); - v0->unk_48 = sub_020080C0(v0->unk_0C, 0); - v0->unk_4A = sub_020080C0(v0->unk_0C, 1); + v0->unk_48 = PokemonSprite_GetAttribute(v0->unk_0C, 0); + v0->unk_4A = PokemonSprite_GetAttribute(v0->unk_0C, 1); ov12_02225BC8(&v0->unk_10, 0, -32, 0, 0, 3); ov12_02225D50(&v0->unk_34, 0, ((20 * 0xffff) / 360), 8); @@ -649,14 +649,14 @@ void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0) int v5 = ov12_0223525C(param0, ov12_02220248(v0->unk_00)); if ((v4 == 0x3) && (v5 == 0x3)) { - sub_02007DEC(v0->unk_0C, 10, (80 / 2) * -1); - sub_02007DEC(v0->unk_0C, 11, 80 / 2); + PokemonSprite_SetAttribute(v0->unk_0C, 10, (80 / 2) * -1); + PokemonSprite_SetAttribute(v0->unk_0C, 11, 80 / 2); } else if ((v4 == 0x4) && (v5 == 0x4)) { - sub_02007DEC(v0->unk_0C, 10, (80 / 2) * +1); - sub_02007DEC(v0->unk_0C, 11, 80 / 2); + PokemonSprite_SetAttribute(v0->unk_0C, 10, (80 / 2) * +1); + PokemonSprite_SetAttribute(v0->unk_0C, 11, 80 / 2); } else { - sub_02007DEC(v0->unk_0C, 10, (80 / 2) * v3); - sub_02007DEC(v0->unk_0C, 11, 80 / 2); + PokemonSprite_SetAttribute(v0->unk_0C, 10, (80 / 2) * v3); + PokemonSprite_SetAttribute(v0->unk_0C, 11, 80 / 2); } } @@ -866,8 +866,8 @@ static void ov12_0222FF80(UnkStruct_ov12_0222FF80 *param0) { f32 v0, v1; - sub_02007DEC(param0->unk_5C, 0, param0->unk_60 + param0->unk_10.unk_00); - sub_02007DEC(param0->unk_5C, 1, param0->unk_62 + param0->unk_10.unk_02); + PokemonSprite_SetAttribute(param0->unk_5C, 0, param0->unk_60 + param0->unk_10.unk_00); + PokemonSprite_SetAttribute(param0->unk_5C, 1, param0->unk_62 + param0->unk_10.unk_02); ManagedSprite_SetPositionXY(param0->unk_58, param0->unk_60 + param0->unk_10.unk_00, param0->unk_62 + param0->unk_10.unk_02 - param0->unk_66); ov12_02225FA4(¶m0->unk_34, &v0, &v1); @@ -901,8 +901,8 @@ static void ov12_02230018(SysTask *param0, void *param1) ov12_0222FF80(v0); if (v1 == 0) { - sub_02007DEC(v0->unk_5C, 0, v0->unk_60); - sub_02007DEC(v0->unk_5C, 1, v0->unk_62); + PokemonSprite_SetAttribute(v0->unk_5C, 0, v0->unk_60); + PokemonSprite_SetAttribute(v0->unk_5C, 1, v0->unk_62); v0->unk_08++; } break; @@ -924,9 +924,9 @@ void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0) v0->unk_08 = 0; v0->unk_0C = 0; v0->unk_5C = ov12_022232FC(v0->unk_00, ov12_02220248(v0->unk_00)); - v0->unk_60 = sub_020080C0(v0->unk_5C, 0); - v0->unk_62 = sub_020080C0(v0->unk_5C, 1); - v0->unk_66 = sub_020080C0(v0->unk_5C, 41); + v0->unk_60 = PokemonSprite_GetAttribute(v0->unk_5C, 0); + v0->unk_62 = PokemonSprite_GetAttribute(v0->unk_5C, 1); + v0->unk_66 = PokemonSprite_GetAttribute(v0->unk_5C, 41); ov12_02226108(&v0->unk_10, 2, 0, 1, 6); v0->unk_58 = ov12_022202C0(v0->unk_00, 0); @@ -1014,7 +1014,7 @@ static void ov12_0223025C(SysTask *param0, void *param1) break; case 3: if (ov12_02226454(&v0->unk_40)) { - sub_02007DEC(v0->unk_0C, 6, 0); + PokemonSprite_SetAttribute(v0->unk_0C, 6, 0); v0->unk_04++; } break; @@ -1050,13 +1050,13 @@ void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0) v2 = ov12_022201E8(v0->unk_00, ov12_0223025C, v0); v0->unk_0C = ov12_022232FC(v0->unk_00, ov12_02220240(v0->unk_00)); - v0->unk_10 = sub_020080C0(v0->unk_0C, 0); - v0->unk_12 = sub_020080C0(v0->unk_0C, 1); - v0->unk_12 -= sub_020080C0(v0->unk_0C, 41); + v0->unk_10 = PokemonSprite_GetAttribute(v0->unk_0C, 0); + v0->unk_12 = PokemonSprite_GetAttribute(v0->unk_0C, 1); + v0->unk_12 -= PokemonSprite_GetAttribute(v0->unk_0C, 41); v0->unk_10 -= 80 / 2; v0->unk_12 -= 80 / 2; - sub_02007DEC(v0->unk_0C, 6, 1); + PokemonSprite_SetAttribute(v0->unk_0C, 6, 1); v1 = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00)); @@ -1146,8 +1146,8 @@ static void ov12_02230600(SysTask *param0, void *param1) ov12_022259DC(&v0->unk_14, v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C); } - if (sub_020087B4(v0->unk_08) == 0) { - sub_020086FC(v0->unk_08, 16, 0, 0, 0); + if (PokemonSprite_IsFadeActive(v0->unk_08) == 0) { + PokemonSprite_StartFade(v0->unk_08, 16, 0, 0, 0); if (v0->unk_10 == 1) { int v2; @@ -1167,13 +1167,13 @@ static void ov12_02230600(SysTask *param0, void *param1) ov12_022259DC(&v0->unk_14, v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C); } - if (sub_020087B4(v0->unk_08) == 0) { - sub_02007DEC(v0->unk_08, 0, v0->unk_38); - sub_02007DEC(v0->unk_08, 1, v0->unk_3A); + if (PokemonSprite_IsFadeActive(v0->unk_08) == 0) { + PokemonSprite_SetAttribute(v0->unk_08, 0, v0->unk_38); + PokemonSprite_SetAttribute(v0->unk_08, 1, v0->unk_3A); if (v0->unk_10 == 1) { if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_08, 6, 0); + PokemonSprite_SetAttribute(v0->unk_08, 6, 0); } ManagedSprite_SetPositionXY(v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C); @@ -1233,16 +1233,16 @@ void ov12_02230804(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = param0; v0->unk_08 = ov12_022232FC(v0->unk_00, ov12_02220248(v0->unk_00)); - v0->unk_38 = sub_020080C0(v0->unk_08, 0); - v0->unk_3A = sub_020080C0(v0->unk_08, 1); - v0->unk_3C = sub_020080C0(v0->unk_08, 41); + v0->unk_38 = PokemonSprite_GetAttribute(v0->unk_08, 0); + v0->unk_3A = PokemonSprite_GetAttribute(v0->unk_08, 1); + v0->unk_3C = PokemonSprite_GetAttribute(v0->unk_08, 41); ov12_02226108(&v0->unk_14, 4, 0, 1, 4); v1 = ov12_02225964(v0->unk_00, ov12_02220248(v0->unk_00)); v0->unk_14.unk_00 += v1; - sub_020086FC(v0->unk_08, 0, 16, 0, 0); + PokemonSprite_StartFade(v0->unk_08, 0, 16, 0, 0); v0->unk_0C = ov12_022202C0(v0->unk_00, 1); v2 = ov12_02235254(v0->unk_00, ov12_02220240(v0->unk_00)); @@ -1256,7 +1256,7 @@ void ov12_02230804(UnkStruct_ov12_0221FCDC *param0) v0->unk_10 = 1; if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_08, 6, 1); + PokemonSprite_SetAttribute(v0->unk_08, 6, 1); } } @@ -1308,7 +1308,7 @@ static void ov12_02230994(SysTask *param0, void *param1) if (ManagedSprite_GetDrawFlag(v0->unk_48) == 1) { if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_10, 6, 1); + PokemonSprite_SetAttribute(v0->unk_10, 6, 1); } } @@ -1326,7 +1326,7 @@ static void ov12_02230994(SysTask *param0, void *param1) Bg_SetPriority(0, ov12_0222339C(v0->unk_00)); if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_10, 6, 0); + PokemonSprite_SetAttribute(v0->unk_10, 6, 0); } Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00)); @@ -1356,9 +1356,9 @@ void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0) v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220248(v0->unk_00)); - v2 = sub_020080C0(v0->unk_10, 0); - v3 = sub_020080C0(v0->unk_10, 1); - v3 -= sub_020080C0(v0->unk_10, 41); + v2 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v3 = PokemonSprite_GetAttribute(v0->unk_10, 1); + v3 -= PokemonSprite_GetAttribute(v0->unk_10, 41); v2 -= (80 / 2); v3 -= (80 / 2); @@ -1597,8 +1597,8 @@ static void ov12_02230F3C(SysTask *param0, void *param1) } break; case 3: - sub_02007DEC(v0->unk_18, 0, v0->unk_1C); - sub_02007DEC(v0->unk_18, 1, v0->unk_1E); + PokemonSprite_SetAttribute(v0->unk_18, 0, v0->unk_1C); + PokemonSprite_SetAttribute(v0->unk_18, 1, v0->unk_1E); for (v1 = 0; v1 < 4; v1++) { ov12_02230E9C(v0->unk_44 + v1); @@ -1629,8 +1629,8 @@ void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v2 = ov12_02220248(param0); v0->unk_18 = ov12_022232FC(v0->unk_00, v2); - v0->unk_1C = sub_020080C0(v0->unk_18, 0); - v0->unk_1E = sub_020080C0(v0->unk_18, 1); + v0->unk_1C = PokemonSprite_GetAttribute(v0->unk_18, 0); + v0->unk_1E = PokemonSprite_GetAttribute(v0->unk_18, 1); ov12_02226108(&v0->unk_20, 4, 0, 1, 1); @@ -1671,8 +1671,8 @@ static void ov12_022310D4(SysTask *param0, void *param1) if (ov12_02225C14(&v0->unk_18)) { ov12_02225A18(&v0->unk_18, v0->unk_10, v0->unk_14, v0->unk_16); } else { - sub_02007DEC(v0->unk_10, 0, v0->unk_14); - sub_02007DEC(v0->unk_10, 1, v0->unk_16); + PokemonSprite_SetAttribute(v0->unk_10, 0, v0->unk_14); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_16); ov12_02225BC8(&v0->unk_18, 0, -32 * v0->unk_3C, 0, 0, 4); v0->unk_0C++; } @@ -1702,8 +1702,8 @@ static void ov12_022310D4(SysTask *param0, void *param1) if (ov12_02225C14(&v0->unk_18)) { ov12_02225A18(&v0->unk_18, v0->unk_10, v0->unk_14, v0->unk_16); } else { - sub_02007DEC(v0->unk_10, 0, v0->unk_14); - sub_02007DEC(v0->unk_10, 1, v0->unk_16); + PokemonSprite_SetAttribute(v0->unk_10, 0, v0->unk_14); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_16); v0->unk_0C++; } @@ -1727,14 +1727,14 @@ void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_08 = param2; v0->unk_3C = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00)); v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v0->unk_14 = sub_020080C0(v0->unk_10, 0); - v0->unk_16 = sub_020080C0(v0->unk_10, 1); + v0->unk_14 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v0->unk_16 = PokemonSprite_GetAttribute(v0->unk_10, 1); ov12_02225BC8(&v0->unk_18, 0, -16 * v0->unk_3C, 0, 0, 4); v0->unk_40 = ov12_022232FC(v0->unk_00, ov12_02220248(param0)); - v0->unk_44 = sub_020080C0(v0->unk_40, 0); - v0->unk_46 = sub_020080C0(v0->unk_40, 1); + v0->unk_44 = PokemonSprite_GetAttribute(v0->unk_40, 0); + v0->unk_46 = PokemonSprite_GetAttribute(v0->unk_40, 1); v0->unk_48 = param3; ManagedSprite_SetAnimateFlag(v0->unk_48, 1); @@ -1769,7 +1769,7 @@ static void ov12_02231390(SysTask *param0, void *param1) case 2: if (ov12_02226454(&v0->unk_40)) { ManagedSprite_SetDrawFlag(v0->unk_14, 1); - sub_02007DEC(v0->unk_10, 6, 0); + PokemonSprite_SetAttribute(v0->unk_10, 6, 0); v0->unk_08++; } break; @@ -1795,14 +1795,14 @@ void ov12_02231444(UnkStruct_ov12_0221FCDC *param0) v1 = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00)); v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v0->unk_18 = sub_020080C0(v0->unk_10, 0); - v0->unk_1A = sub_020080C0(v0->unk_10, 1); - v0->unk_68 = sub_020080C0(v0->unk_10, 41); + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v0->unk_1A = PokemonSprite_GetAttribute(v0->unk_10, 1); + v0->unk_68 = PokemonSprite_GetAttribute(v0->unk_10, 41); v0->unk_1A -= -8; v0->unk_14 = ov12_022202C0(v0->unk_00, 0); ManagedSprite_SetExplicitOamMode(v0->unk_14, GX_OAM_MODE_XLU); - sub_02007DEC(v0->unk_10, 6, 1); + PokemonSprite_SetAttribute(v0->unk_10, 6, 1); ov12_022263A4(&v0->unk_1C, 2, 16); ov12_02235780(v0->unk_00, 16, 16 - 16); @@ -1821,7 +1821,7 @@ static BOOL ov12_02231508(UnkStruct_ov12_02231508 *param0) switch (param0->unk_38) { case 0: if (ov12_02225EB8(¶m0->unk_14)) { - sub_02007DEC(param0->unk_10, 13, param0->unk_14.unk_02); + PokemonSprite_SetAttribute(param0->unk_10, 13, param0->unk_14.unk_02); } else { param0->unk_38++; ov12_02225E68( @@ -1830,9 +1830,9 @@ static BOOL ov12_02231508(UnkStruct_ov12_02231508 *param0) break; case 1: if (ov12_02225EB8(¶m0->unk_14)) { - sub_02007DEC(param0->unk_10, 13, param0->unk_14.unk_02); + PokemonSprite_SetAttribute(param0->unk_10, 13, param0->unk_14.unk_02); } else { - sub_02007DEC(param0->unk_10, 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_10, 13, 0x100); param0->unk_38++; } break; @@ -1917,8 +1917,8 @@ void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v3 = sub_020080C0(v0->unk_10, 0); - v4 = sub_020080C0(v0->unk_10, 1); + v3 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v4 = PokemonSprite_GetAttribute(v0->unk_10, 1); ov12_02225E68(&v0->unk_14, 10, 10, 15, 12); v0->unk_3C = param3; @@ -2003,7 +2003,7 @@ static void ov12_0223181C(SysTask *param0, void *param1) ov12_02226424( &v0->unk_3C, 16, 0, 0, 16, 16); - sub_020086FC(v0->unk_10, 0, 10, 0, (GX_RGB(31, 31, 31))); + PokemonSprite_StartFade(v0->unk_10, 0, 10, 0, (GX_RGB(31, 31, 31))); } } break; @@ -2012,13 +2012,13 @@ static void ov12_0223181C(SysTask *param0, void *param1) ManagedSprite_SetDrawFlag(v0->unk_14, 0); } - if (sub_020087B4(v0->unk_10) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_10) == 0) { v0->unk_0C++; - sub_020086FC(v0->unk_10, 10, 0, 0, (GX_RGB(31, 31, 31))); + PokemonSprite_StartFade(v0->unk_10, 10, 0, 0, (GX_RGB(31, 31, 31))); } break; case 3: - if (sub_020087B4(v0->unk_10) == 0) { + if (PokemonSprite_IsFadeActive(v0->unk_10) == 0) { v0->unk_0C++; } break; @@ -2114,7 +2114,7 @@ static void ov12_02231A38(SysTask *param0, void *param1) for (v1 = 0; v1 < 4; v1++) { if (v0->unk_14[v1]) { - sub_020086FC(v0->unk_14[v1], 14, 16, 0, 0xffff); + PokemonSprite_StartFade(v0->unk_14[v1], 14, 16, 0, 0xffff); } } } @@ -2126,7 +2126,7 @@ static void ov12_02231A38(SysTask *param0, void *param1) for (v1 = 0; v1 < 4; v1++) { if (v0->unk_14[v1]) { - sub_020086FC(v0->unk_14[v1], 2, 0, 0, 0xffff); + PokemonSprite_StartFade(v0->unk_14[v1], 2, 0, 0, 0xffff); } } } @@ -2206,9 +2206,9 @@ static void ov12_02231CD4(UnkStruct_ov12_02231CD4 *param0, BOOL param1) if (param1) { param0->unk_10.unk_04[1] *= -1; - sub_02007DEC(param0->unk_08, 10, 16); + PokemonSprite_SetAttribute(param0->unk_08, 10, 16); } else { - sub_02007DEC(param0->unk_08, 10, -16); + PokemonSprite_SetAttribute(param0->unk_08, 10, -16); } param0->unk_4C = 0; @@ -2222,7 +2222,7 @@ static BOOL ov12_02231D18(UnkStruct_ov12_02231CD4 *param0) switch (param0->unk_4C) { case 0: ov12_02225DC8(¶m0->unk_10); - sub_02007DEC(param0->unk_08, 9, param0->unk_10.unk_00); + PokemonSprite_SetAttribute(param0->unk_08, 9, param0->unk_10.unk_00); param0->unk_50--; @@ -2234,7 +2234,7 @@ static BOOL ov12_02231D18(UnkStruct_ov12_02231CD4 *param0) break; case 1: if (ov12_02225DC8(¶m0->unk_10)) { - sub_02007DEC(param0->unk_08, 9, param0->unk_10.unk_00); + PokemonSprite_SetAttribute(param0->unk_08, 9, param0->unk_10.unk_00); } if (ov12_02225C74(¶m0->unk_24, param0->unk_08) == 0) { @@ -2247,11 +2247,11 @@ static BOOL ov12_02231D18(UnkStruct_ov12_02231CD4 *param0) ov12_02225C74(¶m0->unk_24, param0->unk_08); if (ov12_02225DC8(¶m0->unk_10)) { - sub_02007DEC(param0->unk_08, 9, param0->unk_10.unk_00); + PokemonSprite_SetAttribute(param0->unk_08, 9, param0->unk_10.unk_00); } else { - sub_02007DEC(param0->unk_08, 0, param0->unk_0C); - sub_02007DEC(param0->unk_08, 1, param0->unk_0E); - sub_02007DEC(param0->unk_08, 9, 0); + PokemonSprite_SetAttribute(param0->unk_08, 0, param0->unk_0C); + PokemonSprite_SetAttribute(param0->unk_08, 1, param0->unk_0E); + PokemonSprite_SetAttribute(param0->unk_08, 9, 0); param0->unk_4C++; } break; @@ -2300,15 +2300,15 @@ void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0) if (ov12_02220280(param0, 0) == 0) { v0->unk_08 = ov12_022232FC(v0->unk_04, ov12_02220240(param0)); - v0->unk_0C = sub_020080C0(v0->unk_08, 0); - v0->unk_0E = sub_020080C0(v0->unk_08, 1); + v0->unk_0C = PokemonSprite_GetAttribute(v0->unk_08, 0); + v0->unk_0E = PokemonSprite_GetAttribute(v0->unk_08, 1); } else { v0->unk_08 = ov12_022232FC(v0->unk_04, ov12_02220248(param0)); - v0->unk_0C = sub_020080C0(v0->unk_08, 0); - v0->unk_0E = sub_020080C0(v0->unk_08, 1); + v0->unk_0C = PokemonSprite_GetAttribute(v0->unk_08, 0); + v0->unk_0E = PokemonSprite_GetAttribute(v0->unk_08, 1); } - sub_02007DEC(v0->unk_08, 11, 50); + PokemonSprite_SetAttribute(v0->unk_08, 11, 50); if (v1 == 1) { v0->unk_54 = 0; @@ -2348,8 +2348,8 @@ static BOOL ov12_02231F18(UnkStruct_ov12_02231F18 *param0) } break; case 3: - sub_02007DEC(param0->unk_0C, 12, 0x100); - sub_02007DEC(param0->unk_0C, 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_0C, 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_0C, 13, 0x100); v0 = 1; break; } @@ -2396,7 +2396,7 @@ void ov12_02232024(UnkStruct_ov12_0221FCDC *param0) v0->unk_34 = 4; v0->unk_40 = ov12_02223354(v0->unk_00, ov12_02220240(v0->unk_00)); - v0->unk_3C = sub_020080C0(v0->unk_0C, 1); + v0->unk_3C = PokemonSprite_GetAttribute(v0->unk_0C, 1); ov12_022201E8(v0->unk_00, ov12_02231FD8, v0); } @@ -2618,8 +2618,8 @@ void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0) v0->unk_04 = param0; v0->unk_08 = ov12_022232FC(v0->unk_04, ov12_02220240(param0)); - v0->unk_0C = sub_020080C0(v0->unk_08, 0); - v0->unk_0E = sub_020080C0(v0->unk_08, 1); + v0->unk_0C = PokemonSprite_GetAttribute(v0->unk_08, 0); + v0->unk_0E = PokemonSprite_GetAttribute(v0->unk_08, 1); v0->unk_34 = 0; ov12_022201E8(v0->unk_04, ov12_02232430, v0); @@ -2637,8 +2637,8 @@ static void ov12_022324E0(SysTask *param0, void *param1) break; case 1: if (ov12_02225BA0(&v0->unk_14, v0->unk_10, v0->unk_12 - -8, v0->unk_0C) == 0) { - sub_02007DEC(v0->unk_0C, 0, v0->unk_10); - sub_02007DEC(v0->unk_0C, 1, v0->unk_12); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_10); + PokemonSprite_SetAttribute(v0->unk_0C, 1, v0->unk_12); ov12_02225BC8(&v0->unk_14, v0->unk_10, v0->unk_10 + 32, 0, 0, 2); @@ -2646,12 +2646,12 @@ static void ov12_022324E0(SysTask *param0, void *param1) v0->unk_00++; ov12_02225C14(&v0->unk_14); - sub_02007DEC(v0->unk_0C, 0, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_14.unk_00); } break; case 2: if (ov12_02225C14(&v0->unk_14)) { - sub_02007DEC(v0->unk_0C, 0, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_14.unk_00); } else { ov12_02225BC8(&v0->unk_40, v0->unk_3C, v0->unk_3C + (32 * v0->unk_08), 0, 0, 2); v0->unk_00++; @@ -2659,7 +2659,7 @@ static void ov12_022324E0(SysTask *param0, void *param1) break; case 3: if (ov12_02225C14(&v0->unk_40)) { - sub_02007DEC(v0->unk_38, 0, v0->unk_40.unk_00); + PokemonSprite_SetAttribute(v0->unk_38, 0, v0->unk_40.unk_00); } else { ov12_02225BC8(&v0->unk_14, v0->unk_14.unk_00, v0->unk_10, 0, 0, 8); v0->unk_00++; @@ -2667,18 +2667,18 @@ static void ov12_022324E0(SysTask *param0, void *param1) break; case 4: if (ov12_02225C14(&v0->unk_14)) { - sub_02007DEC(v0->unk_0C, 0, v0->unk_14.unk_00); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_14.unk_00); } else { - sub_02007DEC(v0->unk_0C, 0, v0->unk_10); + PokemonSprite_SetAttribute(v0->unk_0C, 0, v0->unk_10); ov12_02225BC8(&v0->unk_40, v0->unk_40.unk_00, v0->unk_3C, 0, 0, 8); v0->unk_00++; } break; case 5: if (ov12_02225C14(&v0->unk_40)) { - sub_02007DEC(v0->unk_38, 0, v0->unk_40.unk_00); + PokemonSprite_SetAttribute(v0->unk_38, 0, v0->unk_40.unk_00); } else { - sub_02007DEC(v0->unk_38, 0, v0->unk_3C); + PokemonSprite_SetAttribute(v0->unk_38, 0, v0->unk_3C); v0->unk_00++; } break; @@ -2696,11 +2696,11 @@ void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0) v0->unk_04 = param0; v0->unk_08 = ov12_02225964(v0->unk_04, ov12_02220240(v0->unk_04)); v0->unk_0C = ov12_022232FC(v0->unk_04, ov12_02220240(param0)); - v0->unk_10 = sub_020080C0(v0->unk_0C, 0); - v0->unk_12 = sub_020080C0(v0->unk_0C, 1); + v0->unk_10 = PokemonSprite_GetAttribute(v0->unk_0C, 0); + v0->unk_12 = PokemonSprite_GetAttribute(v0->unk_0C, 1); v0->unk_38 = ov12_022232FC(v0->unk_04, ov12_02220248(param0)); - v0->unk_3C = sub_020080C0(v0->unk_38, 0); - v0->unk_3E = sub_020080C0(v0->unk_38, 1); + v0->unk_3C = PokemonSprite_GetAttribute(v0->unk_38, 0); + v0->unk_3E = PokemonSprite_GetAttribute(v0->unk_38, 1); ov12_022201E8(v0->unk_04, ov12_022324E0, v0); } @@ -2736,8 +2736,8 @@ static BOOL ov12_02232744(UnkStruct_ov12_02232720 *param0) if (ov12_022260E8(¶m0->unk_1C, param0->unk_18)) { ov12_02226024(param0->unk_18, param0->unk_44, param0->unk_46, param0->unk_1C.unk_04[4], 0); } else { - sub_02007DEC(param0->unk_18, 12, 0x100); - sub_02007DEC(param0->unk_18, 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_18, 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_18, 13, 0x100); param0->unk_40++; v0 = 1; } @@ -2866,8 +2866,8 @@ void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_08 = param2; v0->unk_18 = ov12_022232FC(v0->unk_00, ov12_02220240(v0->unk_00)); - v3 = sub_020080C0(v0->unk_18, 0); - v4 = sub_020080C0(v0->unk_18, 1); + v3 = PokemonSprite_GetAttribute(v0->unk_18, 0); + v4 = PokemonSprite_GetAttribute(v0->unk_18, 1); v0->unk_44 = v4; v0->unk_46 = ov12_02223354(v0->unk_00, ov12_02220240(v0->unk_00)); @@ -2921,8 +2921,8 @@ static void ov12_02232B40(SysTask *param0, void *param1) ManagedSprite_SetAnimateFlag(v0->unk_5C, 0); v0->unk_0C++; ov12_02225E68(&v0->unk_14, 10, 10, 0, 8); - v1 = sub_020080C0(v0->unk_10, 0); - v2 = sub_020080C0(v0->unk_10, 1); + v1 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v2 = PokemonSprite_GetAttribute(v0->unk_10, 1); ov12_02225BC8(&v0->unk_38, v1, v0->unk_88, v2, v0->unk_8A, 8); } break; @@ -2930,9 +2930,9 @@ static void ov12_02232B40(SysTask *param0, void *param1) ov12_02225C74(&v0->unk_38, v0->unk_10); if (ov12_022260C8(&v0->unk_14, v0->unk_10) == 0) { - sub_02007DEC(v0->unk_10, 6, 1); - sub_02007DEC(v0->unk_10, 12, 0x100); - sub_02007DEC(v0->unk_10, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 6, 1); + PokemonSprite_SetAttribute(v0->unk_10, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 13, 0x100); ManagedSprite_SetAnim(v0->unk_5C, 1); ManagedSprite_SetAnimationSpeed(v0->unk_5C, FX32_ONE); ManagedSprite_SetAnimateFlag(v0->unk_5C, 1); @@ -2974,7 +2974,7 @@ void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_08 = param2; v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - sub_02007DEC(v0->unk_10, 6, 0); + PokemonSprite_SetAttribute(v0->unk_10, 6, 0); v0->unk_88 = ov12_022258E0(param0, ov12_02220240(param0), 0); v0->unk_8A = ov12_022258E0(param0, ov12_02220240(param0), 1); @@ -3215,14 +3215,14 @@ void ov12_02233178(UnkStruct_ov12_0221FCDC *param0) v0->unk_C4 = ov12_0222332C(v0->unk_00); v1 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v2 = sub_020080C0(v1, 0); - v3 = sub_020080C0(v1, 1); - v3 -= sub_020080C0(v1, 41); + v2 = PokemonSprite_GetAttribute(v1, 0); + v3 = PokemonSprite_GetAttribute(v1, 1); + v3 -= PokemonSprite_GetAttribute(v1, 41); v1 = ov12_022232FC(v0->unk_00, ov12_02220248(param0)); - v4 = sub_020080C0(v1, 0); - v5 = sub_020080C0(v1, 1); - v5 -= sub_020080C0(v1, 41); + v4 = PokemonSprite_GetAttribute(v1, 0); + v5 = PokemonSprite_GetAttribute(v1, 1); + v5 -= PokemonSprite_GetAttribute(v1, 41); v0->unk_14 = v3; v0->unk_10 = ov12_02223354(v0->unk_00, ov12_02220240(v0->unk_00)); @@ -3322,9 +3322,9 @@ void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_04 = param1; v0->unk_08 = param2; v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220248(param0)); - v0->unk_38 = sub_020080C0(v0->unk_10, 0); - v0->unk_3A = sub_020080C0(v0->unk_10, 1); - v0->unk_3A -= sub_020080C0(v0->unk_10, 41); + v0->unk_38 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v0->unk_3A = PokemonSprite_GetAttribute(v0->unk_10, 1); + v0->unk_3A -= PokemonSprite_GetAttribute(v0->unk_10, 41); v2 = ov12_0222329C(param0); @@ -3446,8 +3446,8 @@ void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v2 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v0->unk_130 = sub_020080C0(v2, 0); - v0->unk_132 = sub_020080C0(v2, 1); + v0->unk_130 = PokemonSprite_GetAttribute(v2, 0); + v0->unk_132 = PokemonSprite_GetAttribute(v2, 1); v3 = ov12_0222329C(param0); @@ -3564,8 +3564,8 @@ void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v0->unk_08 = param2; v4 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v2 = sub_020080C0(v4, 0); - v3 = sub_020080C0(v4, 1); + v2 = PokemonSprite_GetAttribute(v4, 0); + v3 = PokemonSprite_GetAttribute(v4, 1); v5 = ov12_0222329C(param0); for (v1 = 0; v1 < 15; v1++) { @@ -3685,7 +3685,7 @@ static void ov12_02233BD8(SysTask *param0, void *param1) break; case 2: if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_0C, 6, 0); + PokemonSprite_SetAttribute(v0->unk_0C, 6, 0); } ov12_022265F8(v0->unk_04); @@ -3715,12 +3715,12 @@ void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = param0; v0->unk_0C = ov12_022232FC(v0->unk_00, ov12_02220248(param0)); - v2 = sub_020080C0(v0->unk_0C, 0); - v3 = sub_020080C0(v0->unk_0C, 1); - v3 -= sub_020080C0(v0->unk_0C, 41); + v2 = PokemonSprite_GetAttribute(v0->unk_0C, 0); + v3 = PokemonSprite_GetAttribute(v0->unk_0C, 1); + v3 -= PokemonSprite_GetAttribute(v0->unk_0C, 41); if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) { - sub_02007DEC(v0->unk_0C, 6, 1); + PokemonSprite_SetAttribute(v0->unk_0C, 6, 1); } v0->unk_14 = v3; @@ -3892,11 +3892,11 @@ static void ov12_02234044(SysTask *param0, void *param1) } break; case 4: - sub_02007DEC(v0->unk_10, 0, v0->unk_0A); - sub_02007DEC(v0->unk_10, 1, v0->unk_08); + PokemonSprite_SetAttribute(v0->unk_10, 0, v0->unk_0A); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_08); - sub_02007DEC(v0->unk_10, 12, 0x100); - sub_02007DEC(v0->unk_10, 13, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 12, 0x100); + PokemonSprite_SetAttribute(v0->unk_10, 13, 0x100); Heap_FreeToHeap(v0); ov12_02220220(v0->unk_00, param0); @@ -3911,8 +3911,8 @@ void ov12_02234214(UnkStruct_ov12_0221FCDC *param0) v0->unk_00 = param0; v0->unk_0C = ov12_02223354(v0->unk_00, ov12_02220248(v0->unk_00)); v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220248(v0->unk_00)); - v0->unk_08 = sub_020080C0(v0->unk_10, 1); - v0->unk_0A = sub_020080C0(v0->unk_10, 0); + v0->unk_08 = PokemonSprite_GetAttribute(v0->unk_10, 1); + v0->unk_0A = PokemonSprite_GetAttribute(v0->unk_10, 0); v0->unk_5C = 10; v0->unk_60 = 7; v0->unk_64 = 10; @@ -4010,8 +4010,8 @@ static void ov12_022343A0(SysTask *param0, void *param1) } break; case 5: - sub_02007DEC(v0->unk_14, 0, v0->unk_18); - sub_02007DEC(v0->unk_14, 1, v0->unk_1A); + PokemonSprite_SetAttribute(v0->unk_14, 0, v0->unk_18); + PokemonSprite_SetAttribute(v0->unk_14, 1, v0->unk_1A); Heap_FreeToHeap(v0); ov12_02220220(v0->unk_00, param0); break; @@ -4029,8 +4029,8 @@ void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0) v1 = ov12_02220240(param0); v0->unk_14 = ov12_022232FC(param0, v1); - v0->unk_18 = sub_020080C0(v0->unk_14, 0); - v0->unk_1A = sub_020080C0(v0->unk_14, 1); + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_14, 0); + v0->unk_1A = PokemonSprite_GetAttribute(v0->unk_14, 1); v0->unk_0C = ov12_02225964(param0, v1); v0->unk_10 = ov12_0222598C(param0, v1); @@ -4054,8 +4054,8 @@ static void ov12_02234528(SysTask *param0, void *param1) } break; case 2: - v1 = sub_020080C0(v0->unk_10, 0); - v2 = sub_020080C0(v0->unk_10, 1); + v1 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v2 = PokemonSprite_GetAttribute(v0->unk_10, 1); if (ov12_0222619C(&v0->unk_3C, v1, v2, v0->unk_10) == 0) { v0->unk_04++; @@ -4068,8 +4068,8 @@ static void ov12_02234528(SysTask *param0, void *param1) } break; case 4: - sub_02007DEC(v0->unk_10, 0, v0->unk_14); - sub_02007DEC(v0->unk_10, 1, v0->unk_16); + PokemonSprite_SetAttribute(v0->unk_10, 0, v0->unk_14); + PokemonSprite_SetAttribute(v0->unk_10, 1, v0->unk_16); Heap_FreeToHeap(v0); ov12_02220220(v0->unk_00, param0); break; @@ -4087,8 +4087,8 @@ void ov12_0223464C(UnkStruct_ov12_0221FCDC *param0) v1 = ov12_02220248(param0); v0->unk_10 = ov12_022232FC(param0, v1); - v0->unk_14 = sub_020080C0(v0->unk_10, 0); - v0->unk_16 = sub_020080C0(v0->unk_10, 1); + v0->unk_14 = PokemonSprite_GetAttribute(v0->unk_10, 0); + v0->unk_16 = PokemonSprite_GetAttribute(v0->unk_10, 1); v0->unk_08 = ov12_02225964(param0, v1); v0->unk_0C = ov12_0222598C(param0, v1); diff --git a/src/overlay012/ov12_022346A4.c b/src/overlay012/ov12_022346A4.c index 19e81376bc..14236b1420 100644 --- a/src/overlay012/ov12_022346A4.c +++ b/src/overlay012/ov12_022346A4.c @@ -444,8 +444,8 @@ void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite v2 = ov12_022232FC(v0->unk_00, ov12_02220240(param0)); - v0->unk_130 = sub_020080C0(v2, 0); - v0->unk_132 = sub_020080C0(v2, 1); + v0->unk_130 = PokemonSprite_GetAttribute(v2, 0); + v0->unk_132 = PokemonSprite_GetAttribute(v2, 1); v3 = ov12_0222329C(param0); diff --git a/src/overlay012/ov12_02235254.c b/src/overlay012/ov12_02235254.c index caa508a14c..e84ecb2528 100644 --- a/src/overlay012/ov12_02235254.c +++ b/src/overlay012/ov12_02235254.c @@ -706,14 +706,14 @@ void ov12_02235918(PokemonSprite *param0, UnkStruct_ov12_02235350 *param1) param1->unk_00 = 0; param1->unk_02 = 0; return; - } else if (sub_02008B38(param0) == 0) { + } else if (PokemonSprite_IsActive(param0) == 0) { param1->unk_00 = 0; param1->unk_02 = 0; return; } - param1->unk_00 = sub_020080C0(param0, 0); - param1->unk_02 = sub_020080C0(param0, 1); + param1->unk_00 = PokemonSprite_GetAttribute(param0, 0); + param1->unk_02 = PokemonSprite_GetAttribute(param0, 1); } void ov12_02235950(ManagedSprite *param0, UnkStruct_ov12_02235350 *param1) diff --git a/src/overlay012/ov12_022380BC.c b/src/overlay012/ov12_022380BC.c index 19f6ad18a2..77c607486b 100644 --- a/src/overlay012/ov12_022380BC.c +++ b/src/overlay012/ov12_022380BC.c @@ -68,7 +68,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param s8 v11; u8 v12; - sub_020089B0(param0->unk_18[param0->unk_00]); + PokemonSprite_Push(param0->unk_18[param0->unk_00]); v2 = param0->unk_28[param0->unk_04]; v3 = param0->unk_30[param0->unk_04]; @@ -92,10 +92,10 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param BuildPokemonSpriteTemplate(&v0, v2, v3, v4, v5, v6, v7); - v1 = sub_02008A90(param0->unk_18[param0->unk_00]); + v1 = PokemonSprite_GetTemplate(param0->unk_18[param0->unk_00]); *v1 = v0; - sub_020089A0(param0->unk_18[param0->unk_00]); + PokemonSprite_ScheduleReloadFromNARC(param0->unk_18[param0->unk_00]); sub_02013750(v1->archive, v1->character, heapID, param0->unk_08[param0->unk_00]->unk_00, v7, 0, v4, v1->spindaSpots); param0->unk_08[param0->unk_00]->unk_04 = v1->archive; @@ -104,7 +104,7 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param v11 = param0->unk_08[param0->unk_00]->unk_0C = LoadPokemonSpriteYOffset(v2, v3, v4, v6, v7); v8 = ov12_022384CC(param0->unk_4C[param0->unk_00], 1); - sub_02007DEC(param0->unk_18[param0->unk_00], 1, v8 + v11); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 1, v8 + v11); if (v4 == 2) { NARC *v13 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, heapID); @@ -114,11 +114,11 @@ static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param PokeSprite_LoadShadowSize(v13, &v12, v2); NARC_dtor(v13); - sub_02007DEC(param0->unk_18[param0->unk_00], 46, v12); - sub_02007DEC(param0->unk_18[param0->unk_00], 20, (v8 + v11) + (36 - v11)); - sub_02007DEC(param0->unk_18[param0->unk_00], 21, v10); - sub_02007DEC(param0->unk_18[param0->unk_00], 22, 36 - v11); - sub_02007DEC(param0->unk_18[param0->unk_00], 41, v9); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 46, v12); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 20, (v8 + v11) + (36 - v11)); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 21, v10); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 22, 36 - v11); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 41, v9); } } @@ -132,9 +132,9 @@ void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID) u32 v5; int v6; - sub_02008A0C(param0->unk_18[param0->unk_00]); + PokemonSprite_Pop(param0->unk_18[param0->unk_00]); - v0 = sub_02008A90(param0->unk_18[param0->unk_00]); + v0 = PokemonSprite_GetTemplate(param0->unk_18[param0->unk_00]); v1 = param0->unk_28[param0->unk_00]; v2 = param0->unk_30[param0->unk_00]; v4 = param0->unk_38[param0->unk_00]; @@ -154,7 +154,7 @@ void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int heapID) v6 = ov12_022384CC(param0->unk_4C[param0->unk_00], 1) + param0->unk_08[param0->unk_00]->unk_0C; - sub_02007DEC(param0->unk_18[param0->unk_00], 1, v6); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 1, v6); } void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID) @@ -165,7 +165,7 @@ void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID) int v3; u8 v4; - sub_020089B0(param0->unk_18[param0->unk_00]); + PokemonSprite_Push(param0->unk_18[param0->unk_00]); v0.archive = 117; v0.palette = 250; @@ -181,10 +181,10 @@ void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID) v3 = 134; } - v1 = sub_02008A90(param0->unk_18[param0->unk_00]); + v1 = PokemonSprite_GetTemplate(param0->unk_18[param0->unk_00]); *v1 = v0; - sub_020089A0(param0->unk_18[param0->unk_00]); + PokemonSprite_ScheduleReloadFromNARC(param0->unk_18[param0->unk_00]); sub_02013610(v1->archive, v1->character, heapID, param0->unk_08[param0->unk_00]->unk_00); param0->unk_08[param0->unk_00]->unk_04 = v0.archive; @@ -194,14 +194,14 @@ void ov12_02238390(UnkStruct_ov12_022380DC *param0, int heapID) param0->unk_08[param0->unk_00]->unk_0C = v4; v2 = ov12_022384CC(param0->unk_4C[param0->unk_00], 1) + param0->unk_08[param0->unk_00]->unk_0C; - sub_02007DEC(param0->unk_18[param0->unk_00], 1, v2); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 1, v2); if (param0->unk_4C[param0->unk_00] & 0x1) { - sub_02007DEC(param0->unk_18[param0->unk_00], 46, 1); - sub_02007DEC(param0->unk_18[param0->unk_00], 20, v2 + (36 - v4)); - sub_02007DEC(param0->unk_18[param0->unk_00], 21, 0); - sub_02007DEC(param0->unk_18[param0->unk_00], 22, 36 - v4); - sub_02007DEC(param0->unk_18[param0->unk_00], 41, 0); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 46, 1); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 20, v2 + (36 - v4)); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 21, 0); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 22, 36 - v4); + PokemonSprite_SetAttribute(param0->unk_18[param0->unk_00], 41, 0); } } diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 0af6c36e6c..e354dd7e21 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -197,7 +197,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1) SpriteSystem_InitManagerWithCapacities(v0->unk_0C.unk_18, v0->unk_0C.unk_1C, &Unk_ov17_02252DB0); SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_0C.unk_18), 0, ((192 + 80) << FX32_SHIFT)); - v0->unk_0C.unk_04 = sub_0200762C(HEAP_ID_21); + v0->unk_0C.unk_04 = PokemonSpriteManager_New(HEAP_ID_21); ov17_0223B884(); v0->unk_0C.unk_20 = ov12_0221FCDC(HEAP_ID_21); @@ -345,7 +345,7 @@ int ov17_0223B580(OverlayManager *param0, int *param1) ov17_022416E4(&v0->unk_0C); - sub_02007B6C(v0->unk_0C.unk_04); + PokemonSpriteManager_Free(v0->unk_0C.unk_04); Font_Free(FONT_SUBSCREEN); sub_020127BC(v0->unk_0C.unk_54); @@ -385,7 +385,7 @@ static void ov17_0223B6BC(void *param0) { UnkStruct_ov17_02246F24 *v0 = param0; - sub_02008A94(v0->unk_0C.unk_04); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_0C.unk_04); VramTransfer_Process(); SpriteSystem_TransferOam(); PaletteData_CommitFadedBuffers(v0->unk_0C.unk_50); @@ -399,7 +399,7 @@ static void ov17_0223B6F0(SysTask *param0, void *param1) UnkStruct_ov17_02246F24 *v0 = param1; if (v0->unk_7EC == 1) { - sub_02007768(v0->unk_0C.unk_04); + PokemonSpriteManager_DrawSprites(v0->unk_0C.unk_04); ov11_0221F8F0(); SpriteSystem_DrawSprites(v0->unk_0C.unk_1C); SpriteSystem_UpdateTransfer(); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 96bd8c4abb..acbe4483c9 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -176,7 +176,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1) SpriteSystem_InitManagerWithCapacities(v0->unk_0C.unk_1C, v0->unk_0C.unk_20, &Unk_ov17_02252EC8); SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_0C.unk_1C), 0, (256 * FX32_ONE)); - v0->unk_0C.unk_04 = sub_0200762C(HEAP_ID_22); + v0->unk_0C.unk_04 = PokemonSpriteManager_New(HEAP_ID_22); ov17_0223D350(); v0->unk_0C.unk_38 = MessageLoader_Init(0, 26, 209, HEAP_ID_22); @@ -317,7 +317,7 @@ int ov17_0223CF8C(OverlayManager *param0, int *param1) ov17_02247734(&v0->unk_0C); ov17_02247918(v0); - sub_02007B6C(v0->unk_0C.unk_04); + PokemonSpriteManager_Free(v0->unk_0C.unk_04); Font_Free(FONT_SUBSCREEN); PaletteData_FreeBuffer(v0->unk_0C.unk_44, 0); PaletteData_FreeBuffer(v0->unk_0C.unk_44, 1); @@ -355,7 +355,7 @@ static void ov17_0223D0C8(void *param0) G2_SetWnd1Position(v0->unk_F5C, v0->unk_F5D, v0->unk_F5E, v0->unk_F5F); } - sub_02008A94(v0->unk_0C.unk_04); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_0C.unk_04); { int v1; @@ -380,7 +380,7 @@ static void ov17_0223D164(SysTask *param0, void *param1) UnkStruct_ov17_02247A48 *v0 = param1; if (v0->unk_4F6 == 1) { - sub_02007768(v0->unk_0C.unk_04); + PokemonSpriteManager_DrawSprites(v0->unk_0C.unk_04); { int v1; diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index f24c710b66..de7e5a9064 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -278,7 +278,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1) SpriteSystem_InitManagerWithCapacities(v0->unk_14.unk_58, v0->unk_14.unk_5C, &Unk_ov17_02252FF0); SetSubScreenViewRect(SpriteSystem_GetRenderer(v0->unk_14.unk_58), 0, (256 * FX32_ONE)); - v0->unk_14.unk_44 = sub_0200762C(HEAP_ID_23); + v0->unk_14.unk_44 = PokemonSpriteManager_New(HEAP_ID_23); ov17_0223E450(); v0->unk_14.unk_84 = MessageLoader_Init(0, 26, 206, HEAP_ID_23); @@ -422,7 +422,7 @@ int ov17_0223DF0C(OverlayManager *param0, int *param1) ov17_0224A1EC(&v0->unk_14); - sub_02007B6C(v0->unk_14.unk_44); + PokemonSpriteManager_Free(v0->unk_14.unk_44); sub_020127BC(v0->unk_14.unk_94); Font_Free(FONT_SUBSCREEN); Heap_FreeToHeap(v0->unk_1050.unk_00); @@ -480,7 +480,7 @@ static void ov17_0223E09C(void *param0) } } - sub_02008A94(v0->unk_14.unk_44); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_14.unk_44); { int v3; @@ -541,7 +541,7 @@ static void ov17_0223E1FC(SysTask *param0, void *param1) ov17_0223E18C(v0); if (v0->unk_1098 == 1) { - sub_02007768(v0->unk_14.unk_44); + PokemonSpriteManager_DrawSprites(v0->unk_14.unk_44); { int v1; diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index e4d612a194..3b0fd0fd89 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -468,15 +468,15 @@ static void ov17_022414C0(SysTask *param0, void *param1) void ov17_02241524(UnkStruct_ov17_0223F88C *param0, int param1) { - sub_02007DC8(param0->unk_08[param1]); + PokemonSprite_Delete(param0->unk_08[param1]); GF_ASSERT(param0->unk_58[param1].unk_00 != NULL); MI_CpuClear8(param0->unk_58[param1].unk_00, (32 * 10 * 10)); param0->unk_08[param1] = sub_02095484(param0->unk_04, param1, param0->unk_00->unk_00[param1], 0, ¶m0->unk_58[param1], HEAP_ID_21, (256 - 40) - 32 * param1, (104 + 8) - 32 * param1, -0x200); - sub_02007DEC(param0->unk_08[param1], 6, 1); - sub_02007DEC(param0->unk_08[param1], 37, 1); + PokemonSprite_SetAttribute(param0->unk_08[param1], 6, 1); + PokemonSprite_SetAttribute(param0->unk_08[param1], 37, 1); { u32 v0, v1; @@ -485,7 +485,7 @@ void ov17_02241524(UnkStruct_ov17_0223F88C *param0, int param1) v1 = Pokemon_GetValue(param0->unk_00->unk_00[param1], MON_DATA_FORM, NULL); if (IsFormSymmetrical(v0, v1) == 1) { - sub_02007DEC(param0->unk_08[param1], 35, 1); + PokemonSprite_SetAttribute(param0->unk_08[param1], 35, 1); } } } @@ -500,8 +500,8 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C *param0) param0->unk_58[v0].unk_00 = Heap_AllocFromHeap(HEAP_ID_21, (32 * 10 * 10)); param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, ¶m0->unk_58[v0], HEAP_ID_21, (256 - 40) - 32 * v0, (104 + 8) - 32 * v0, -0x200); - sub_02007DEC(param0->unk_08[v0], 6, 1); - sub_02007DEC(param0->unk_08[v0], 37, 1); + PokemonSprite_SetAttribute(param0->unk_08[v0], 6, 1); + PokemonSprite_SetAttribute(param0->unk_08[v0], 37, 1); { u32 v1, v2; @@ -510,7 +510,7 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C *param0) v2 = Pokemon_GetValue(param0->unk_00->unk_00[v0], MON_DATA_FORM, NULL); if (IsFormSymmetrical(v1, v2) == 1) { - sub_02007DEC(param0->unk_08[v0], 35, 1); + PokemonSprite_SetAttribute(param0->unk_08[v0], 35, 1); } } } @@ -529,7 +529,7 @@ void ov17_022416E4(UnkStruct_ov17_0223F88C *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - sub_02007DC8(param0->unk_08[v0]); + PokemonSprite_Delete(param0->unk_08[v0]); Heap_FreeToHeap(param0->unk_58[v0].unk_00); param0->unk_58[v0].unk_00 = NULL; } diff --git a/src/overlay017/ov17_02243C28.c b/src/overlay017/ov17_02243C28.c index 0adfcee2a5..5a03bfe635 100644 --- a/src/overlay017/ov17_02243C28.c +++ b/src/overlay017/ov17_02243C28.c @@ -336,10 +336,10 @@ static void ov17_02243F68(SysTask *param0, void *param1) v3 = v0->unk_15; v4 = Pokemon_SpriteYOffset(v0->unk_00->unk_0C.unk_00->unk_00[v3], 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 37, 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 6, 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 0, ((256 - 40) + 40)); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 1, ((104 + 8) + 60) + v4); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v3], 37, 0); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v3], 6, 0); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v3], 0, ((256 - 40) + 40)); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v3], 1, ((104 + 8) + 60) + v4); v0->unk_0C = ((256 - 40) + 40) << 8; v0->unk_10 = ((104 + 8) + 60) << 8; @@ -364,8 +364,8 @@ static void ov17_02243F68(SysTask *param0, void *param1) v0->unk_14++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_15], 0, v0->unk_0C >> 8); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_15], 1, (v0->unk_10 >> 8) + v2); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_15], 0, v0->unk_0C >> 8); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_15], 1, (v0->unk_10 >> 8) + v2); break; default: if (v0->unk_16 == 1) { @@ -422,13 +422,13 @@ static void ov17_0224413C(SysTask *param0, void *param1) v0->unk_10 += (((((104 + 8) + 60) - (104 + 8)) << 8) / 7); if (((v0->unk_0C >> 8) >= ((256 - 40) + 40)) || ((v0->unk_10 >> 8) >= ((104 + 8) + 60))) { - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 37, 1); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 6, 1); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v1], 37, 1); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v1], 6, 1); v0->unk_14++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_15], 0, v0->unk_0C >> 8); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_15], 1, (v0->unk_10 >> 8) + v2); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_15], 0, v0->unk_0C >> 8); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_15], 1, (v0->unk_10 >> 8) + v2); break; case 1: if (v0->unk_00->unk_1616[v0->unk_15] == 1) { @@ -727,16 +727,16 @@ static void ov17_022444BC(SysTask *param0, void *param1) v17 = Pokemon_SpriteYOffset(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 0); if (v0->unk_104.unk_00 != ((0x40 ^ 0xffffffff) & (0x80 ^ 0xffffffff) & (0x40000 ^ 0xffffffff) & (0x20000000 ^ 0xffffffff))) { - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 6, 0); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 6, 0); } - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 37, 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 0, (256 - 40)); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 1, (104 + 8) + v17); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 37, 0); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 0, (256 - 40)); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 1, (104 + 8) + v17); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 37, 1); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 0, 80); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 1, (50 - 8)); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v1], 37, 1); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v1], 0, 80); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v1], 1, (50 - 8)); } v0->unk_0C++; diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 663b6faae2..ea33a14e94 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -75,7 +75,7 @@ void ov17_022476F8(UnkStruct_ov17_022476F8 *param0, int param1) return; } - sub_02007DC8(param0->unk_08[param1]); + PokemonSprite_Delete(param0->unk_08[param1]); Heap_FreeToHeap(param0->unk_48[param1].unk_00); param0->unk_08[param1] = NULL; @@ -163,7 +163,7 @@ void ov17_022478D0(UnkStruct_ov17_02247A48 *param0, int param1) GF_ASSERT(param0->unk_0C.unk_18 == NULL); sub_0207697C(&v0, param0->unk_00->unk_00.unk_10[param1].unk_0A); - param0->unk_0C.unk_18 = sub_02007C34(param0->unk_0C.unk_04, &v0, 320, 32, (-0x200 - 0x40), 3, NULL, NULL); + param0->unk_0C.unk_18 = PokemonSpriteManager_CreateSprite(param0->unk_0C.unk_04, &v0, 320, 32, (-0x200 - 0x40), 3, NULL, NULL); } void ov17_02247918(UnkStruct_ov17_02247A48 *param0) @@ -172,7 +172,7 @@ void ov17_02247918(UnkStruct_ov17_02247A48 *param0) return; } - sub_02007DC8(param0->unk_0C.unk_18); + PokemonSprite_Delete(param0->unk_0C.unk_18); param0->unk_0C.unk_18 = NULL; } diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index b910731840..4b0a713b85 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -328,8 +328,8 @@ static void ov17_02247DC8(SysTask *param0, void *param1) switch (v0->unk_10) { case 0: - v0->unk_14 = sub_020080C0(v0->unk_00->unk_0C.unk_08[v0->unk_11], 0) << 8; - v0->unk_18 = sub_020080C0(v0->unk_00->unk_0C.unk_08[v0->unk_11], 1) << 8; + v0->unk_14 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_11], 0) << 8; + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_11], 1) << 8; v0->unk_10++; break; case 1: @@ -341,8 +341,8 @@ static void ov17_02247DC8(SysTask *param0, void *param1) v0->unk_10++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_11], 0, v0->unk_14 >> 8); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_11], 1, v0->unk_18 >> 8); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_11], 0, v0->unk_14 >> 8); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_08[v0->unk_11], 1, v0->unk_18 >> 8); break; default: ov17_0224F26C(v0->unk_0C, &v0->unk_04, NULL, 0); @@ -784,8 +784,8 @@ static void ov17_02248648(SysTask *param0, void *param1) switch (v0->unk_10) { case 0: ov17_022478D0(v0->unk_00, v0->unk_11); - v0->unk_14 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 0) * 0x100; - v0->unk_18 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 1) * 0x100; + v0->unk_14 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 0) * 0x100; + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 1) * 0x100; v0->unk_10++; case 1: v0->unk_14 -= 0x400; @@ -795,8 +795,8 @@ static void ov17_02248648(SysTask *param0, void *param1) v0->unk_10++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 0, v0->unk_14 / 0x100); - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 1, v0->unk_18 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 0, v0->unk_14 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 1, v0->unk_18 / 0x100); break; default: ov17_0224F26C(v0->unk_0C, &v0->unk_04, NULL, 0); @@ -835,8 +835,8 @@ static void ov17_02248744(SysTask *param0, void *param1) switch (v0->unk_10) { case 0: GF_ASSERT(v0->unk_00->unk_0C.unk_18 != NULL); - v0->unk_14 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 0) * 0x100; - v0->unk_18 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 1) * 0x100; + v0->unk_14 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 0) * 0x100; + v0->unk_18 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 1) * 0x100; v0->unk_10++; case 1: v0->unk_14 += 0x400; @@ -846,8 +846,8 @@ static void ov17_02248744(SysTask *param0, void *param1) v0->unk_10++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 0, v0->unk_14 / 0x100); - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 1, v0->unk_18 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 0, v0->unk_14 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 1, v0->unk_18 / 0x100); break; default: ov17_02247918(v0->unk_00); @@ -1067,16 +1067,16 @@ static void ov17_02248BE0(SysTask *param0, void *param1) } break; case 1: - v0->unk_04 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 0) * 0x100; - v0->unk_08 = sub_020080C0(v0->unk_00->unk_0C.unk_18, 1) * 0x100; + v0->unk_04 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 0) * 0x100; + v0->unk_08 = PokemonSprite_GetAttribute(v0->unk_00->unk_0C.unk_18, 1) * 0x100; v0->unk_0C++; case 2: if (v0->unk_0E & 1) { - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100); } else { - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100 - 3); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100 - 3); } v0->unk_0E++; @@ -1101,8 +1101,8 @@ static void ov17_02248BE0(SysTask *param0, void *param1) v0->unk_0C++; } - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); - sub_02007DEC(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 0, v0->unk_04 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00->unk_0C.unk_18, 1, v0->unk_08 / 0x100); break; default: ov17_02247918(v0->unk_00); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 4ad2e59d9a..7a3e696a4d 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -185,7 +185,7 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) v0->unk_10.unk_1C = SpriteManager_New(v0->unk_10.unk_18); SpriteSystem_InitSprites(v0->unk_10.unk_18, v0->unk_10.unk_1C, (64 + 64)); SpriteSystem_InitManagerWithCapacities(v0->unk_10.unk_18, v0->unk_10.unk_1C, &Unk_ov17_02254AD8); - v0->unk_10.unk_04 = sub_0200762C(HEAP_ID_24); + v0->unk_10.unk_04 = PokemonSpriteManager_New(HEAP_ID_24); ov17_0224FDDC(); @@ -301,7 +301,7 @@ int ov17_0224F86C(OverlayManager *param0, int *param1) ov17_022507C4(&v0->unk_10); - sub_02007B6C(v0->unk_10.unk_04); + PokemonSpriteManager_Free(v0->unk_10.unk_04); sub_020127BC(v0->unk_10.unk_C4); Font_Free(FONT_SUBSCREEN); @@ -355,7 +355,7 @@ static void ov17_0224FA24(void *param0) G2_SetWnd1Position(v0->unk_855, v0->unk_856, v0->unk_857, v0->unk_858); } - sub_02008A94(v0->unk_10.unk_04); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_10.unk_04); VramTransfer_Process(); SpriteSystem_TransferOam(); PaletteData_CommitFadedBuffers(v0->unk_10.unk_C0); @@ -394,7 +394,7 @@ static void ov17_0224FAFC(SysTask *param0, void *param1) UnkStruct_ov17_0224FCA0 *v0 = param1; if (v0->unk_850 == 1) { - sub_02007768(v0->unk_10.unk_04); + PokemonSpriteManager_DrawSprites(v0->unk_10.unk_04); ov11_0221F8F0(); SpriteSystem_DrawSprites(v0->unk_10.unk_1C); SpriteSystem_UpdateTransfer(); diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 02cf21dd2b..8e11d5c57b 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -199,7 +199,7 @@ void ov17_022507C4(UnkStruct_ov17_022507C4 *param0) int v0; for (v0 = 0; v0 < 4; v0++) { - sub_02007DC8(param0->unk_08[v0]); + PokemonSprite_Delete(param0->unk_08[v0]); Heap_FreeToHeap(param0->unk_C8[v0].unk_00); param0->unk_C8[v0].unk_00 = NULL; } @@ -819,7 +819,7 @@ static void ov17_02251784(SysTask *param0, void *param1) switch (v0->unk_10) { case 0: - sub_02007DEC(v0->unk_00, 6, 0); + PokemonSprite_SetAttribute(v0->unk_00, 6, 0); v0->unk_10++; case 1: v0->unk_08 -= 0x800; @@ -829,8 +829,8 @@ static void ov17_02251784(SysTask *param0, void *param1) v0->unk_10++; } - sub_02007DEC(v0->unk_00, 0, v0->unk_08 >> 8); - sub_02007DEC(v0->unk_00, 1, v0->unk_0C >> 8); + PokemonSprite_SetAttribute(v0->unk_00, 0, v0->unk_08 >> 8); + PokemonSprite_SetAttribute(v0->unk_00, 1, v0->unk_0C >> 8); break; default: *(v0->unk_04) = 1; @@ -854,11 +854,11 @@ static void ov17_022517F0(SysTask *param0, void *param1) v0->unk_10++; } - sub_02007DEC(v0->unk_00, 0, v0->unk_08 / 0x100); - sub_02007DEC(v0->unk_00, 1, v0->unk_0C >> 8); + PokemonSprite_SetAttribute(v0->unk_00, 0, v0->unk_08 / 0x100); + PokemonSprite_SetAttribute(v0->unk_00, 1, v0->unk_0C >> 8); break; default: - sub_02007DEC(v0->unk_00, 6, 1); + PokemonSprite_SetAttribute(v0->unk_00, 6, 1); *(v0->unk_04) = 1; Heap_FreeToHeap(param1); SysTask_Done(param0); diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c index 541dfe53b0..0299fd6fd1 100644 --- a/src/overlay017/ov17_02251D6C.c +++ b/src/overlay017/ov17_02251D6C.c @@ -507,7 +507,7 @@ static void ov17_022523AC(SysTask *param0, void *param1) int v1; for (v1 = 0; v1 < 4; v1++) { - sub_02007DEC(v0->unk_00->unk_10.unk_08[v1], 6, 1); + PokemonSprite_SetAttribute(v0->unk_00->unk_10.unk_08[v1], 6, 1); } } diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 820f40654b..e07f735340 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -182,7 +182,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D Graphics_LoadPartialPaletteFromOpenNARC(v3, 26, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 10, &(v0->unk_1A8)); Font_UseImmediateGlyphAccess(FONT_SYSTEM, 10); - v0->unk_1BC = sub_0200762C(HEAP_ID_10); + v0->unk_1BC = PokemonSpriteManager_New(HEAP_ID_10); for (v1 = 0; v1 < 4; v1++) { v0->unk_08[v1] = NULL; @@ -226,7 +226,7 @@ static void ov19_021D6474(SysTask *param0, void *param1) G3X_ResetMtxStack(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(v0->unk_1BC); + PokemonSpriteManager_DrawSprites(v0->unk_1BC); G3_SwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); } @@ -254,7 +254,7 @@ void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0) Bg_FreeTilemapBuffer(param0->unk_1C0, 2); Bg_FreeTilemapBuffer(param0->unk_1C0, 1); Bg_FreeTilemapBuffer(param0->unk_1C0, 4); - sub_02007B6C(param0->unk_1BC); + PokemonSpriteManager_Free(param0->unk_1BC); Font_UseLazyGlyphAccess(FONT_SYSTEM); Heap_FreeToHeap(param0->unk_1C0); Heap_FreeToHeap(param0); diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index a5f1c43466..d52a10cb39 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -121,7 +121,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0) } if (param0->unk_24) { - sub_02007DC8(param0->unk_24); + PokemonSprite_Delete(param0->unk_24); param0->unk_24 = NULL; } @@ -149,7 +149,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0) void ov19_021DAA80(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00) { - sub_02008A94(param0->unk_20); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_20); } } @@ -158,13 +158,13 @@ void ov19_021DAA90(UnkStruct_ov19_021DA9E0 *param0) PokemonSpriteTemplate v0; BuildPokemonSpriteTemplate(&v0, 1, 0, 0, 0, 0, 0); - param0->unk_24 = sub_02007C34(param0->unk_20, &v0, 44, 84, 0, 0, NULL, NULL); + param0->unk_24 = PokemonSpriteManager_CreateSprite(param0->unk_20, &v0, 44, 84, 0, 0, NULL, NULL); } BOOL ov19_021DAAC4(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_24) { - sub_02007DC8(param0->unk_24); + PokemonSprite_Delete(param0->unk_24); param0->unk_24 = NULL; return 0; } @@ -472,7 +472,7 @@ void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0) Window_FillTilemap(¶m0->unk_04[3], 0); if (param0->unk_24) { - sub_02007DC8(param0->unk_24); + PokemonSprite_Delete(param0->unk_24); param0->unk_24 = NULL; } @@ -502,7 +502,7 @@ void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0) Window_FillTilemap(¶m0->unk_04[3], 0); if (param0->unk_24) { - sub_02007DC8(param0->unk_24); + PokemonSprite_Delete(param0->unk_24); param0->unk_24 = NULL; } @@ -545,7 +545,7 @@ static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 *param0) } BoxPokemon_BuildSpriteTemplate(&v0, preview->mon, 2, 0); - param0->unk_24 = sub_02007C34(param0->unk_20, &v0, 44, 84, 0, 0, NULL, NULL); + param0->unk_24 = PokemonSpriteManager_CreateSprite(param0->unk_20, &v0, 44, 84, 0, 0, NULL, NULL); ov19_021DB24C(param0, preview->markings); } diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index f4aae9bcf7..7f473ebe88 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -128,14 +128,14 @@ void ov21_021D2124(PokedexGraphicData *param0) NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(param0->unk_150); + PokemonSpriteManager_DrawSprites(param0->unk_150); sub_020150EC(param0->unk_164); } void ov21_021D214C(PokedexGraphicData *param0) { Bg_RunScheduledUpdates(param0->bgConfig); - sub_02008A94(param0->unk_150); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_150); } void ov21_021D2164(PokedexGraphicData *param0, int param1, int param2) @@ -159,7 +159,7 @@ void Pokedex_LoadPokemonSprite(PokedexGraphicData *param0, int species, int gend s16 yOffset; if (param0->pokemonSprite[param9]) { - sub_02007DC8(param0->pokemonSprite[param9]); + PokemonSprite_Delete(param0->pokemonSprite[param9]); } if (gender == -1) { @@ -175,19 +175,19 @@ void Pokedex_LoadPokemonSprite(PokedexGraphicData *param0, int species, int gend yOffset = 0; } - param0->pokemonSprite[param9] = sub_02007C34(param0->unk_150, &spriteTemplate, param7, param8 + yOffset, 0, 0, NULL, NULL); + param0->pokemonSprite[param9] = PokemonSpriteManager_CreateSprite(param0->unk_150, &spriteTemplate, param7, param8 + yOffset, 0, 0, NULL, NULL); } void ov21_021D222C(PokedexGraphicData *param0, int param1, int param2, int param3) { - sub_02007DEC(param0->pokemonSprite[param3], 0, param1); - sub_02007DEC(param0->pokemonSprite[param3], 1, param2); + PokemonSprite_SetAttribute(param0->pokemonSprite[param3], 0, param1); + PokemonSprite_SetAttribute(param0->pokemonSprite[param3], 1, param2); } void ov21_021D2250(PokedexGraphicData *param0, int *param1, int *param2, int param3) { - *param1 = sub_020080C0(param0->pokemonSprite[param3], 0); - *param2 = sub_020080C0(param0->pokemonSprite[param3], 1); + *param1 = PokemonSprite_GetAttribute(param0->pokemonSprite[param3], 0); + *param2 = PokemonSprite_GetAttribute(param0->pokemonSprite[param3], 1); } PokemonSprite *ov21_021D2274(const PokedexGraphicData *param0, int param1) @@ -202,9 +202,9 @@ void ov21_021D2280(const PokedexGraphicData *param0, BOOL param1, int param2) } if (param1 == 1) { - sub_02007DEC(param0->pokemonSprite[param2], 6, 0); + PokemonSprite_SetAttribute(param0->pokemonSprite[param2], 6, 0); } else { - sub_02007DEC(param0->pokemonSprite[param2], 6, 1); + PokemonSprite_SetAttribute(param0->pokemonSprite[param2], 6, 1); } } @@ -349,7 +349,7 @@ void ov21_021D24FC(const PokedexGraphicData *param0, UnkStruct_ov21_021D23F8 *pa int v1 = -ov21_021D24B8(param1); v0 = ov21_021D2170(param0); - sub_020086FC(v0, v1, v1, 0, 0); + PokemonSprite_StartFade(v0, v1, v1, 0, 0); } void ov21_021D251C(const PokedexGraphicData *param0, UnkStruct_ov21_021D23F8 *param1, int param2) @@ -358,7 +358,7 @@ void ov21_021D251C(const PokedexGraphicData *param0, UnkStruct_ov21_021D23F8 *pa int v1 = -ov21_021D24B8(param1); v0 = ov21_021D2274(param0, param2); - sub_020086FC(v0, v1, v1, 0, 0); + PokemonSprite_StartFade(v0, v1, v1, 0, 0); } void ov21_021D2544(const UnkStruct_ov21_021D4EE4 *param0, PokedexGraphicData *param1) @@ -743,13 +743,13 @@ static void ov21_021D2A0C(PokedexGraphicData *param0, int heapID) NNSGfdPlttKey v1; int v2; - param0->unk_150 = sub_0200762C(heapID); + param0->unk_150 = PokemonSpriteManager_New(heapID); v0 = NNS_GfdAllocTexVram(0x8000, 0, 0); v1 = NNS_GfdAllocPlttVram(0x80, 0, NNS_GFD_ALLOC_FROM_LOW); - sub_02008A78(param0->unk_150, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); - sub_02008A84(param0->unk_150, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); + PokemonSpriteManager_SetCharBaseAddrAndSize(param0->unk_150, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); + PokemonSpriteManager_SetPlttBaseAddrAndSize(param0->unk_150, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); for (v2 = 0; v2 < 4; v2++) { param0->pokemonSprite[v2] = NULL; @@ -774,11 +774,11 @@ static void ov21_021D2AB4(PokedexGraphicData *param0) for (v0 = 0; v0 < 4; v0++) { if (param0->pokemonSprite[v0]) { - sub_02007DC8(param0->pokemonSprite[v0]); + PokemonSprite_Delete(param0->pokemonSprite[v0]); } } - sub_02007B6C(param0->unk_150); + PokemonSpriteManager_Free(param0->unk_150); sub_020150A8(param0->unk_164); } diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index a4654552fe..d1b8d69f1d 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -1344,13 +1344,13 @@ static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p v1 = v0 >> FX32_SHIFT; v2 = ov21_021D2170(param1); - sub_02007DEC(v2, 23, v1); + PokemonSprite_SetAttribute(v2, 23, v1); } static void ov21_021D6F64(PokedexGraphicData *param0, const UnkStruct_ov21_021D5B68 *param1) { PokemonSprite *v0 = ov21_021D2170(param0); - sub_02007DEC(v0, 23, 31); + PokemonSprite_SetAttribute(v0, 23, 31); } static void ov21_021D6F74(const UnkStruct_ov21_021D5B68 *param0) diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index de12a9a332..08cb94ba11 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -1267,5 +1267,5 @@ static void ov21_021DDCF4(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_ int species = PokedexSort_CurrentSpecies(param1->unk_00); PokedexMain_DisplayPokemonSprite(param0->unk_00, param1->unk_00, species, 2, 40, 120); - sub_02007DEC(v0, 6, 0); + PokemonSprite_SetAttribute(v0, 6, 0); } diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index a98bccb869..72d221d82c 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -581,15 +581,15 @@ static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_ int species = PokedexSort_CurrentSpecies(param1->unk_04); PokedexMain_DisplayPokemonSprite(param0->unk_00, param1->unk_04, species, 2, 48, 72); - sub_02007DEC(v0, 6, 0); + PokemonSprite_SetAttribute(v0, 6, 0); } static void ov21_021DEF8C(UnkStruct_ov21_021DE760 *param0) { PokemonSprite *v0 = ov21_021D2170(param0->unk_00); - sub_02007DEC(v0, 6, 1); - sub_02008780(v0); + PokemonSprite_SetAttribute(v0, 6, 1); + PokemonSprite_ClearFade(v0); } static void ov21_021DEFA8(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2) diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 0343f3c68d..39c81fcc03 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -473,15 +473,15 @@ static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_ int species = PokedexSort_CurrentSpecies(param1->unk_04); PokedexMain_DisplayPokemonSprite(param0->unk_00, param1->unk_04, species, 2, 48, 72); - sub_02007DEC(v0, 6, 0); + PokemonSprite_SetAttribute(v0, 6, 0); } static void ov21_021E1260(UnkStruct_ov21_021E0D7C *param0) { PokemonSprite *v0 = ov21_021D2170(param0->unk_00); - sub_02007DEC(v0, 6, 1); - sub_02008780(v0); + PokemonSprite_SetAttribute(v0, 6, 1); + PokemonSprite_ClearFade(v0); } static void ov21_021E127C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, int param2) diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c index cddf0dca0b..007c5a2a70 100644 --- a/src/overlay021/ov21_021E3FFC.c +++ b/src/overlay021/ov21_021E3FFC.c @@ -373,7 +373,7 @@ static void ov21_021E4328(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_ int species = PokedexSort_CurrentSpecies(param1->unk_04); PokedexMain_DisplayPokemonSprite(param0->unk_00, param1->unk_04, species, 2, 48, 64); - sub_02007DEC(v0, 6, 0); + PokemonSprite_SetAttribute(v0, 6, 0); } static void ov21_021E4360(UnkStruct_ov21_021E4360 *param0) diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index bc131b5b93..15a4bf37fd 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -712,7 +712,7 @@ static void ov21_021E98D8(PaletteData *param0, PokemonSprite *param1) static void ov21_021E98F8(PaletteData *param0, PokemonSprite *param1, int param2, int param3, int param4, int param5, int param6) { - sub_020086FC(param1, param2, param4, param5, param6); + PokemonSprite_StartFade(param1, param2, param4, param5, param6); PaletteData_StartFade(param0, 0x1 | 0x4, 0xffff, param5, param3, param4, param6); PaletteData_SetAutoTransparent(param0, 0); } @@ -722,7 +722,7 @@ static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1) BOOL v0[2]; v0[0] = PaletteData_GetSelectedBuffersMask(param0); - v0[1] = sub_020087B4(param1); + v0[1] = PokemonSprite_IsFadeActive(param1); if ((v0[0] == 0) && (v0[1] == 0)) { return 1; @@ -754,7 +754,7 @@ static PokemonSprite *ov21_021E99E0(PokemonSpriteManager *param0, Pokemon *param PokemonSpriteTemplate v0; Pokemon_BuildSpriteTemplate(&v0, param1, 2); - return sub_02007C34(param0, &v0, param2, param3, 0, 0, NULL, NULL); + return PokemonSpriteManager_CreateSprite(param0, &v0, param2, param3, 0, 0, NULL, NULL); } static void ov21_021E9A0C(int param0) diff --git a/src/overlay021/pokedex_height_check.c b/src/overlay021/pokedex_height_check.c index 9b11a89245..9330b56497 100644 --- a/src/overlay021/pokedex_height_check.c +++ b/src/overlay021/pokedex_height_check.c @@ -488,8 +488,8 @@ static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruc PokedexMain_DisplayPokemonSprite(param0->unk_00, param1->unk_04, species, 2, 88, 88 + pokemonPos); - sub_02007DEC(speciesSprite, 6, 0); - sub_020086FC(speciesSprite, 15, 15, 0, 0); + PokemonSprite_SetAttribute(speciesSprite, 6, 0); + PokemonSprite_StartFade(speciesSprite, 15, 15, 0, 0); SetSpeciesPosition(speciesSprite, pokemonPos); SetSpeciesScale(speciesSprite, pokemonScale); @@ -499,8 +499,8 @@ static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0) { PokemonSprite *speciesSprite = ov21_021D2170(param0->unk_00); - sub_02007DEC(speciesSprite, 6, 1); - sub_02008780(speciesSprite); + PokemonSprite_SetAttribute(speciesSprite, 6, 1); + PokemonSprite_ClearFade(speciesSprite); } static void SetTrainerPosition(Sprite *trainerHeightSprite, short trainerPos) @@ -515,7 +515,7 @@ static void SetTrainerPosition(Sprite *trainerHeightSprite, short trainerPos) static void SetSpeciesPosition(PokemonSprite *speciesSprite, short pokemonPos) { - sub_02007DEC(speciesSprite, 1, 88 + pokemonPos); + PokemonSprite_SetAttribute(speciesSprite, 1, 88 + pokemonPos); } static void SetTrainerScale(Sprite *trainerHeightSprite, short trainerScale) @@ -533,6 +533,6 @@ static void SetSpeciesScale(PokemonSprite *speciesSprite, short pokemonScale) fx32 scale = FX_Div(0x100 << FX32_SHIFT, pokemonScale << FX32_SHIFT); pokemonScale = FX_Mul(scale, 0x100 << FX32_SHIFT) >> FX32_SHIFT; - sub_02007DEC(speciesSprite, 12, pokemonScale); - sub_02007DEC(speciesSprite, 13, pokemonScale); + PokemonSprite_SetAttribute(speciesSprite, 12, pokemonScale); + PokemonSprite_SetAttribute(speciesSprite, 13, pokemonScale); } diff --git a/src/overlay021/pokedex_search.c b/src/overlay021/pokedex_search.c index 87100d7b70..1c02854706 100644 --- a/src/overlay021/pokedex_search.c +++ b/src/overlay021/pokedex_search.c @@ -587,8 +587,8 @@ static void ov21_021D8C00(UnkStruct_ov21_021D879C *param0) { PokemonSprite *v0 = ov21_021D2170(param0->unk_00); - sub_02007DEC(v0, 6, 1); - sub_02008780(v0); + PokemonSprite_SetAttribute(v0, 6, 1); + PokemonSprite_ClearFade(v0); } static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_021D879C *param1, enum HeapId heapID) diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index d8f0d6288c..d8536e455b 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -133,7 +133,7 @@ void ov22_02255180(UnkStruct_ov22_0225A0E4 *param0) } if (param0->unk_2C) { - sub_02007768(param0->unk_20); + PokemonSpriteManager_DrawSprites(param0->unk_20); } G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); @@ -257,7 +257,7 @@ void ov22_02255390(void) void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0) { Bg_RunScheduledUpdates(param0->unk_40); - sub_02008A94(param0->unk_20); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_20); RenderOam_Transfer(); } @@ -298,7 +298,7 @@ void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D { ov22_02255748(param0, param1); ov22_02255C24(param0, heapID, 0x2800, 0x20); - sub_02008B2C(param0->unk_20, 1); + PokemonSpriteManager_SetExcludeG3Identity(param0->unk_20, 1); ov22_02255BF4(param0, heapID); } @@ -350,7 +350,7 @@ void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0) void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0) { - sub_02008A94(param0->unk_20); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_20); } void ov22_0225553C(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, u16 param3, const VecFx32 *param4) @@ -376,7 +376,7 @@ void ov22_0225553C(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, u16 } if (param0->unk_2C) { - sub_02007768(param0->unk_20); + PokemonSpriteManager_DrawSprites(param0->unk_20); } } G3_PopMtx(1); @@ -794,19 +794,19 @@ static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0) static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int heapID, int param2, int param3) { - param0->unk_20 = sub_0200762C(heapID); + param0->unk_20 = PokemonSpriteManager_New(heapID); param0->unk_24 = NNS_GfdAllocTexVram(param2, 0, 0); param0->unk_28 = NNS_GfdAllocPlttVram(param3, 0, NNS_GFD_ALLOC_FROM_LOW); - sub_02008A78(param0->unk_20, NNS_GfdGetTexKeyAddr(param0->unk_24), NNS_GfdGetTexKeySize(param0->unk_24)); - sub_02008A84(param0->unk_20, NNS_GfdGetPlttKeyAddr(param0->unk_28), NNS_GfdGetPlttKeySize(param0->unk_28)); + PokemonSpriteManager_SetCharBaseAddrAndSize(param0->unk_20, NNS_GfdGetTexKeyAddr(param0->unk_24), NNS_GfdGetTexKeySize(param0->unk_24)); + PokemonSpriteManager_SetPlttBaseAddrAndSize(param0->unk_20, NNS_GfdGetPlttKeyAddr(param0->unk_28), NNS_GfdGetPlttKeySize(param0->unk_28)); param0->unk_2C = 1; } static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0) { - sub_02007B6C(param0->unk_20); + PokemonSpriteManager_Free(param0->unk_20); NNS_GfdFreeTexVram(param0->unk_24); NNS_GfdFreePlttVram(param0->unk_28); diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index cffd327fcd..23b7ce6643 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -328,8 +328,8 @@ void ov22_02257CD4(UnkStruct_ov22_02257964 *param0) void ov22_02257CE0(UnkStruct_ov22_02257964 *param0, int *param1, int *param2) { - *param1 = sub_020080C0(param0->unk_2C.unk_4C.unk_00, 0); - *param2 = sub_020080C0(param0->unk_2C.unk_4C.unk_00, 1); + *param1 = PokemonSprite_GetAttribute(param0->unk_2C.unk_4C.unk_00, 0); + *param2 = PokemonSprite_GetAttribute(param0->unk_2C.unk_4C.unk_00, 1); } int ov22_02257D00(UnkStruct_ov22_02257964 *param0) @@ -377,9 +377,9 @@ void ov22_02257D70(UnkStruct_ov22_02257964 *param0, GXRgb param1) } else { UnkStruct_020298D8 *v2 = v0->unk_00; - sub_02007DEC(v2->unk_00, 24, (param1 >> 10) & 0x1f); - sub_02007DEC(v2->unk_00, 25, (param1 >> 5) & 0x1f); - sub_02007DEC(v2->unk_00, 26, (param1 >> 0) & 0x1f); + PokemonSprite_SetAttribute(v2->unk_00, 24, (param1 >> 10) & 0x1f); + PokemonSprite_SetAttribute(v2->unk_00, 25, (param1 >> 5) & 0x1f); + PokemonSprite_SetAttribute(v2->unk_00, 26, (param1 >> 0) & 0x1f); } v0 = v0->unk_08; diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 97ce07fee1..6835c4647c 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -28,7 +28,7 @@ void ov22_02259098(UnkStruct_ov22_0225A0E4 *param0, PokemonSpriteTemplate *param v0 = LoadMemberFromNARC(param1->archive, param1->character, 0, 14, 0); v1 = ov22_02255340(param0, v0, (100 + 18)); - sub_020093A0((u8 *)v1->pRawData, param1->archive); + PokemonSprite_Decrypt((u8 *)v1->pRawData, param1->archive); } void ov22_022590C0(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pokemon *param2, PokemonSpriteTemplate *param3, int param4) @@ -41,7 +41,7 @@ void ov22_022590D4(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pok int v0 = Pokemon_GetValue(param2, MON_DATA_SPECIES, NULL); Pokemon_BuildSpriteTemplateDP(param3, param2, 2); - param0->unk_00 = sub_02007C34(param1, param3, 192, 56, 0, 0, NULL, NULL); + param0->unk_00 = PokemonSpriteManager_CreateSprite(param1, param3, 192, 56, 0, 0, NULL, NULL); { int v1, v2; @@ -67,7 +67,7 @@ void ov22_022590D4(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pok v4 = LoadMemberFromNARC(param3->archive, param3->character, 0, param4, 0); NNS_G2dGetUnpackedCharacterData(v4, &v5); - sub_020093A0((u8 *)v5->pRawData, param3->archive); + PokemonSprite_Decrypt((u8 *)v5->pRawData, param3->archive); if (param5 == 0) { ov22_022593B8(v5->pRawData, v5->W * 8, v5->H * 8, ¶m0->unk_08); @@ -86,18 +86,18 @@ void ov22_022590D4(UnkStruct_020298D8 *param0, PokemonSpriteManager *param1, Pok void ov22_022591B8(UnkStruct_020298D8 *param0) { - sub_02007DC8(param0->unk_00); + PokemonSprite_Delete(param0->unk_00); memset(param0, 0, sizeof(UnkStruct_020298D8)); } void ov22_022591D0(UnkStruct_020298D8 *param0, int param1) { - sub_02007DEC(param0->unk_00, 2, param1); + PokemonSprite_SetAttribute(param0->unk_00, 2, param1); } int ov22_022591E0(UnkStruct_020298D8 *param0) { - return sub_020080C0(param0->unk_00, 2); + return PokemonSprite_GetAttribute(param0->unk_00, 2); } void ov22_022591EC(UnkStruct_020298D8 *param0, int param1, int param2) @@ -105,8 +105,8 @@ void ov22_022591EC(UnkStruct_020298D8 *param0, int param1, int param2) int v0, v1; ov22_02259270(param0, &v0, &v1); - sub_02007DEC(param0->unk_00, 0, param1); - sub_02007DEC(param0->unk_00, 1, param2); + PokemonSprite_SetAttribute(param0->unk_00, 0, param1); + PokemonSprite_SetAttribute(param0->unk_00, 1, param2); v1 /= 2; v0 /= 2; @@ -126,8 +126,8 @@ BOOL ov22_02259244(UnkStruct_020298D8 *param0, int param1, int param2) void ov22_02259250(UnkStruct_020298D8 *param0, int *param1, int *param2) { - *param1 = sub_020080C0(param0->unk_00, 0); - *param2 = sub_020080C0(param0->unk_00, 1); + *param1 = PokemonSprite_GetAttribute(param0->unk_00, 0); + *param2 = PokemonSprite_GetAttribute(param0->unk_00, 1); } void ov22_02259270(UnkStruct_020298D8 *param0, int *param1, int *param2) diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 003ff6d8b4..24f713181f 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -56,7 +56,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0) param0->unk_14.unk_10 = BgConfig_New(HEAP_ID_102); param0->unk_14.unk_14 = PaletteData_New(HEAP_ID_102); param0->unk_14.unk_4C = sub_02024220(HEAP_ID_102, 0, 1, 0, 4, NULL); - param0->unk_14.unk_50 = sub_0200762C(HEAP_ID_102); + param0->unk_14.unk_50 = PokemonSpriteManager_New(HEAP_ID_102); NNS_G2dSetupSoftwareSpriteCamera(); @@ -200,7 +200,7 @@ void ov62_0222F514(UnkStruct_0208C06C *param0) } sub_020242C4(param0->unk_14.unk_4C); - sub_02007B6C(param0->unk_14.unk_50); + PokemonSpriteManager_Free(param0->unk_14.unk_50); ov62_022411EC(param0); @@ -451,7 +451,7 @@ BOOL ov62_0222F910(UnkStruct_0208C06C *param0, int *param1) } sub_020241B4(); - sub_02007768(param0->unk_14.unk_50); + PokemonSpriteManager_DrawSprites(param0->unk_14.unk_50); G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); ov62_022411D4(param0); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 26e9fd4512..bb00ebca97 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -2023,7 +2023,7 @@ static void ov62_02233798(SysTask *param0, void *param1) v0->unk_14.unk_510 = 1; - sub_02008A94(v0->unk_14.unk_50); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_14.unk_50); SpriteSystem_DrawSprites(v0->unk_14.unk_08); SpriteSystem_TransferOam(); diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index c451487818..d9b737eb54 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -1201,7 +1201,7 @@ static void ov62_0223B050(UnkStruct_0208C06C *param0) v9 = 0; BuildPokemonSpriteTemplate(&v2, v7, v3, v10, v4, v6, v8); - v0->unk_32C = sub_02007C34(param0->unk_14.unk_50, &v2, 42, 91 + v9, 0, 0, NULL, NULL); + v0->unk_32C = PokemonSpriteManager_CreateSprite(param0->unk_14.unk_50, &v2, 42, 91 + v9, 0, 0, NULL, NULL); SpeciesData_Free(v1); } @@ -1210,7 +1210,7 @@ static void ov62_0223B124(UnkStruct_0208C06C *param0, int param1) UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (v0->unk_32C) { - sub_02007DEC(v0->unk_32C, 6, param1); + PokemonSprite_SetAttribute(v0->unk_32C, 6, param1); } } @@ -1219,7 +1219,7 @@ static void ov62_0223B140(UnkStruct_0208C06C *param0) UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (v0->unk_32C) { - sub_02007DC8(v0->unk_32C); + PokemonSprite_Delete(v0->unk_32C); } } diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 09d34df5f3..5ad5051fc5 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -701,7 +701,7 @@ void ov76_0223DD88(UnkStruct_ov76_0223DE00 *param0) param0->unk_D4.unk_D8 = v3; PokeSprite_LoadAnimationFrames(param0->unk_42C, &v1[0], v2, 1); - param0->unk_D4.unk_D4 = sub_02007C34(param0->unk_D4.unk_D0, &v0, (256 - 64), 48 + v3, -0x280, 0, &v1[0], NULL); + param0->unk_D4.unk_D4 = PokemonSpriteManager_CreateSprite(param0->unk_D4.unk_D0, &v0, (256 - 64), 48 + v3, -0x280, 0, &v1[0], NULL); } static void ov76_0223DE00(UnkStruct_ov76_0223DE00 *param0) @@ -712,28 +712,28 @@ static void ov76_0223DE00(UnkStruct_ov76_0223DE00 *param0) v0 = Pokemon_GetValue(param0->unk_428, MON_DATA_SPECIES, NULL); v1 = Pokemon_GetNature(param0->unk_428); - sub_02007B98(param0->unk_D4.unk_D4, 1); + PokemonSprite_InitAnim(param0->unk_D4.unk_D4, 1); PokeSprite_LoadAnimation(param0->unk_42C, param0->unk_D4.unk_188, param0->unk_D4.unk_D4, v0, 2, 0, 0); } static void ov76_0223DE54(UnkStruct_ov76_0223DE00 *param0) { - sub_02007DEC(param0->unk_D4.unk_D4, 12, 0x0); - sub_02007DEC(param0->unk_D4.unk_D4, 13, 0x0); + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 12, 0x0); + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 13, 0x0); } static BOOL ov76_0223DE78(UnkStruct_ov76_0223DE00 *param0) { - if (sub_020080C0(param0->unk_D4.unk_D4, 12) == 0x100) { + if (PokemonSprite_GetAttribute(param0->unk_D4.unk_D4, 12) == 0x100) { return 0; - } else if (sub_020080C0(param0->unk_D4.unk_D4, 12) >= 0x100) { - sub_02007DEC(param0->unk_D4.unk_D4, 12, 0x100); - sub_02007DEC(param0->unk_D4.unk_D4, 13, 0x100); + } else if (PokemonSprite_GetAttribute(param0->unk_D4.unk_D4, 12) >= 0x100) { + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 13, 0x100); return 0; } else { - sub_02008274(param0->unk_D4.unk_D4, 12, 0x20); - sub_02008274(param0->unk_D4.unk_D4, 13, 0x20); - sub_020087C8(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8); + PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 12, 0x20); + PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 13, 0x20); + PokemonSprite_CalcAffineYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8); } return 1; @@ -741,16 +741,16 @@ static BOOL ov76_0223DE78(UnkStruct_ov76_0223DE00 *param0) static BOOL ov76_0223DEF4(UnkStruct_ov76_0223DE00 *param0) { - if (sub_020080C0(param0->unk_D4.unk_D4, 12) == 0x0) { + if (PokemonSprite_GetAttribute(param0->unk_D4.unk_D4, 12) == 0x0) { return 0; - } else if (sub_020080C0(param0->unk_D4.unk_D4, 12) <= 0x0) { - sub_02007DEC(param0->unk_D4.unk_D4, 12, 0x0); - sub_02007DEC(param0->unk_D4.unk_D4, 13, 0x0); + } else if (PokemonSprite_GetAttribute(param0->unk_D4.unk_D4, 12) <= 0x0) { + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 12, 0x0); + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 13, 0x0); return 0; } else { - sub_02008274(param0->unk_D4.unk_D4, 12, -0x20); - sub_02008274(param0->unk_D4.unk_D4, 13, -0x20); - sub_020087C8(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8); + PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 12, -0x20); + PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 13, -0x20); + PokemonSprite_CalcAffineYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8); } return 1; @@ -758,12 +758,12 @@ static BOOL ov76_0223DEF4(UnkStruct_ov76_0223DE00 *param0) void ov76_0223DF70(UnkStruct_ov76_0223DE00 *param0, int param1) { - sub_02007DEC(param0->unk_D4.unk_D4, 6, param1); + PokemonSprite_SetAttribute(param0->unk_D4.unk_D4, 6, param1); } void ov76_0223DF84(UnkStruct_ov76_0223DE00 *param0) { - sub_02007DC8(param0->unk_D4.unk_D4); + PokemonSprite_Delete(param0->unk_D4.unk_D4); } static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) @@ -905,7 +905,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) break; } - if (sub_02007C24(param0->unk_D4.unk_D4) != 0) { + if (PokemonSprite_IsAnimActive(param0->unk_D4.unk_D4) != 0) { break; } @@ -1494,7 +1494,7 @@ void ov76_0223ECB0(void *param0) { UnkStruct_ov76_0223DE00 *v0 = param0; - sub_02008A94(v0->unk_D4.unk_D0); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_D4.unk_D0); VramTransfer_Process(); SpriteSystem_TransferOam(); PaletteData_CommitFadedBuffers(v0->unk_D4.unk_14); diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c index 32d2f33d3f..ea8f6d1e57 100644 --- a/src/overlay077/ov77_021D6C70.c +++ b/src/overlay077/ov77_021D6C70.c @@ -137,12 +137,12 @@ void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0) } } - param0->unk_00 = sub_0200762C(HEAP_ID_76); + param0->unk_00 = PokemonSpriteManager_New(HEAP_ID_76); for (v0 = 0; v0 < 3; v0++) { BuildPokemonSpriteTemplate(&v1, v5[v0], 0, 2, 0, NULL, NULL); - param0->unk_04[v0] = sub_02007C34(param0->unk_00, &v1, Unk_ov77_021D7958[param0->unk_1C[v0]].unk_00, Unk_ov77_021D7958[param0->unk_1C[v0]].unk_04, 1023, v0, NULL, NULL); - sub_02007DEC(param0->unk_04[v0], 6, 1); + param0->unk_04[v0] = PokemonSpriteManager_CreateSprite(param0->unk_00, &v1, Unk_ov77_021D7958[param0->unk_1C[v0]].unk_00, Unk_ov77_021D7958[param0->unk_1C[v0]].unk_04, 1023, v0, NULL, NULL); + PokemonSprite_SetAttribute(param0->unk_04[v0], 6, 1); } param0->unk_10 = 1; @@ -163,13 +163,13 @@ void ov77_021D6E28(UnkStruct_ov77_021D6CFC *param0) { sub_0201411C(param0->unk_18); Heap_FreeToHeap(param0->unk_14); - sub_02007B6C(param0->unk_00); + PokemonSpriteManager_Free(param0->unk_00); } void ov77_021D6E40(UnkStruct_ov77_021D6CFC *param0) { if (param0 != NULL) { - sub_02008A94(param0->unk_00); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_00); } } @@ -179,7 +179,7 @@ void ov77_021D6E50(UnkStruct_ov77_021D6CFC *param0) NNS_G3dGeFlushBuffer(); sub_020241B4(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(param0->unk_00); + PokemonSpriteManager_DrawSprites(param0->unk_00); ov77_021D725C(); G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } @@ -204,9 +204,9 @@ BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC *param0, const u8 param1, const int p switch (*v0) { case 0: G2_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, 1); - sub_02007DEC(param0->unk_04[param1], 12, 0x400); - sub_02007DEC(param0->unk_04[param1], 13, 0x400); - sub_02007DEC(param0->unk_04[param1], 6, 0); + PokemonSprite_SetAttribute(param0->unk_04[param1], 12, 0x400); + PokemonSprite_SetAttribute(param0->unk_04[param1], 13, 0x400); + PokemonSprite_SetAttribute(param0->unk_04[param1], 6, 0); (*v0)++; case 1: if (Unk_ov77_021D7940[param0->unk_1C[param1]].unk_00(param0, param1)) { @@ -229,7 +229,7 @@ BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC *param0, const u8 param1, const int p break; case 4: if (Unk_ov77_021D7940[param0->unk_1C[param1]].unk_04(param0, param1)) { - sub_02007DEC(param0->unk_04[param1], 6, 1); + PokemonSprite_SetAttribute(param0->unk_04[param1], 6, 1); param0->unk_29 = 0; (*v0)++; } @@ -251,17 +251,17 @@ static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, 6); - sub_02008274(v0, 1, -16); + PokemonSprite_AddAttribute(v0, 0, 6); + PokemonSprite_AddAttribute(v0, 1, -16); - sub_02008274(v0, 12, -0x80); - sub_02008274(v0, 13, -0x80); + PokemonSprite_AddAttribute(v0, 12, -0x80); + PokemonSprite_AddAttribute(v0, 13, -0x80); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -272,14 +272,14 @@ static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, -3); - sub_02008274(v0, 1, -18); + PokemonSprite_AddAttribute(v0, 0, -3); + PokemonSprite_AddAttribute(v0, 1, -18); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -290,17 +290,17 @@ static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, -16); - sub_02008274(v0, 1, -16); + PokemonSprite_AddAttribute(v0, 0, -16); + PokemonSprite_AddAttribute(v0, 1, -16); - sub_02008274(v0, 12, -0x80); - sub_02008274(v0, 13, -0x80); + PokemonSprite_AddAttribute(v0, 12, -0x80); + PokemonSprite_AddAttribute(v0, 13, -0x80); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -311,14 +311,14 @@ static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, -6); - sub_02008274(v0, 1, -16); + PokemonSprite_AddAttribute(v0, 0, -6); + PokemonSprite_AddAttribute(v0, 1, -16); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -329,17 +329,17 @@ static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, 8); - sub_02008274(v0, 1, -16); + PokemonSprite_AddAttribute(v0, 0, 8); + PokemonSprite_AddAttribute(v0, 1, -16); - sub_02008274(v0, 12, -0x80); - sub_02008274(v0, 13, -0x80); + PokemonSprite_AddAttribute(v0, 12, -0x80); + PokemonSprite_AddAttribute(v0, 13, -0x80); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -350,14 +350,14 @@ static BOOL ov77_021D7204(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { PokemonSprite *v0 = param0->unk_04[param1]; - sub_02008274(v0, 0, 6); - sub_02008274(v0, 1, -20); + PokemonSprite_AddAttribute(v0, 0, 6); + PokemonSprite_AddAttribute(v0, 1, -20); param0->unk_29++; if (param0->unk_29 >= 6) { - sub_02007DEC(v0, 12, 0x100); - sub_02007DEC(v0, 13, 0x100); + PokemonSprite_SetAttribute(v0, 12, 0x100); + PokemonSprite_SetAttribute(v0, 13, 0x100); return 1; } @@ -376,8 +376,8 @@ static void ov77_021D7268(SPLEmitter *param0) PokemonSprite *v0 = sub_02014764(); VecFx32 v1 = { 0, 0, 0 }; - v1.x = 172 * (sub_020080C0(v0, 0) - 128); - v1.y = 172 * (sub_020080C0(v0, 1) - 96); + v1.x = 172 * (PokemonSprite_GetAttribute(v0, 0) - 128); + v1.y = 172 * (PokemonSprite_GetAttribute(v0, 1) - 96); v1.z = 0x40; SPLEmitter_SetPos(param0, &v1); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 969dbcbc3f..b489326447 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -324,7 +324,7 @@ static void ov79_021D252C(void *param0) UnkStruct_ov79_021D2928 *v0 = param0; Bg_RunScheduledUpdates(v0->unk_68); - sub_02008A94(v0->unk_40.unk_04); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_40.unk_04); SpriteSystem_TransferOam(); VramTransfer_Process(); @@ -863,8 +863,8 @@ static void ov79_021D2F4C(SysTask *param0, void *param1) VEC_Subtract(&v2->unk_30, &v2->unk_24, &v3); ov79_021D2268(&v2->unk_3C, &v3, FX32_CONST(v0->unk_04)); - sub_02007DEC(v1->unk_C8, 12, 0x1000 >> 4); - sub_02007DEC(v1->unk_C8, 13, 0x1000 >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 12, 0x1000 >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 13, 0x1000 >> 4); SysTask_SetCallback(param0, ov79_021D2FE0); } @@ -878,15 +878,15 @@ static void ov79_021D2FE0(SysTask *param0, void *param1) v3.x = v2->unk_24.x + FX_Mul(v2->unk_3C.x, v0->unk_0C); v3.y = v2->unk_24.y + FX_Mul(v2->unk_3C.y, v0->unk_0C); - sub_02007DEC(v1->unk_C8, 12, v3.x >> 4); - sub_02007DEC(v1->unk_C8, 13, v3.y >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 12, v3.x >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 13, v3.y >> 4); v0->unk_0C += FX32_ONE; v0->unk_04--; if (v0->unk_04 == 0) { - sub_02007DEC(v1->unk_C8, 0, 128); - sub_02007DEC(v1->unk_C8, 1, 96); + PokemonSprite_SetAttribute(v1->unk_C8, 0, 128); + PokemonSprite_SetAttribute(v1->unk_C8, 1, 96); ov79_021D29E4(v0); } } @@ -908,8 +908,8 @@ static void ov79_021D3094(SysTask *param0, void *param1) VEC_Subtract(&v2->unk_0C, &v2->unk_00, &v3); ov79_021D2268(&v2->unk_18, &v3, FX32_CONST(v0->unk_04)); - sub_02007DEC(v1->unk_C8, 0, v2->unk_00.x >> 12); - sub_02007DEC(v1->unk_C8, 1, v2->unk_00.y >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 0, v2->unk_00.x >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 1, v2->unk_00.y >> 12); SysTask_SetCallback(param0, ov79_021D312C); } @@ -925,15 +925,15 @@ static void ov79_021D312C(SysTask *param0, void *param1) v3.x = v2->unk_00.x + FX_Mul(v2->unk_18.x, v0->unk_0C); v3.y = v2->unk_00.y + FX_Mul(v2->unk_18.y, v0->unk_0C); - sub_02007DEC(v1->unk_C8, 0, v3.x >> 12); - sub_02007DEC(v1->unk_C8, 1, v3.y >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 0, v3.x >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 1, v3.y >> 12); v5 = v2->unk_50 - 4; v5 = -(v5 * v5) + 16; v4 = FX32_CONST(-v5); v4 = FX_Mul(v4, FX32_CONST(1.4)); - sub_02007DEC(v1->unk_C8, 4, v4 >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 4, v4 >> 12); v2->unk_50++; @@ -947,7 +947,7 @@ static void ov79_021D312C(SysTask *param0, void *param1) return; } - sub_02007DEC(v1->unk_C8, 4, 0); + PokemonSprite_SetAttribute(v1->unk_C8, 4, 0); v2->unk_50 = 0; SysTask_SetCallback(param0, ov79_021D326C); @@ -983,8 +983,8 @@ static void ov79_021D3290(SysTask *param0, void *param1) VEC_Subtract(&v2->unk_30, &v2->unk_24, &v3); ov79_021D2268(&v2->unk_3C, &v3, FX32_CONST(v0->unk_04)); - sub_02007DEC(v1->unk_C8, 12, 0x1800 >> 4); - sub_02007DEC(v1->unk_C8, 13, 0x1800 >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 12, 0x1800 >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 13, 0x1800 >> 4); SysTask_SetCallback(param0, ov79_021D3324); } @@ -998,8 +998,8 @@ static void ov79_021D3324(SysTask *param0, void *param1) v3.x = v2->unk_24.x + FX_Mul(v2->unk_3C.x, v0->unk_0C); v3.y = v2->unk_24.y + FX_Mul(v2->unk_3C.y, v0->unk_0C); - sub_02007DEC(v1->unk_C8, 12, v3.x >> 4); - sub_02007DEC(v1->unk_C8, 13, v3.y >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 12, v3.x >> 4); + PokemonSprite_SetAttribute(v1->unk_C8, 13, v3.y >> 4); v0->unk_0C += FX32_ONE; v0->unk_04--; @@ -1008,8 +1008,8 @@ static void ov79_021D3324(SysTask *param0, void *param1) return; } - sub_02007DEC(v1->unk_C8, 12, 0x100); - sub_02007DEC(v1->unk_C8, 13, 0x100); + PokemonSprite_SetAttribute(v1->unk_C8, 12, 0x100); + PokemonSprite_SetAttribute(v1->unk_C8, 13, 0x100); ov79_021D29E4(v0); } @@ -1032,8 +1032,8 @@ static void ov79_021D33DC(SysTask *param0, void *param1) v2->unk_48 = FX_Div(FX32_CONST(180), FX32_CONST(v0->unk_04)); - sub_02007DEC(v1->unk_C8, 0, v2->unk_00.x >> 12); - sub_02007DEC(v1->unk_C8, 1, v2->unk_00.y >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 0, v2->unk_00.x >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 1, v2->unk_00.y >> 12); SysTask_SetCallback(param0, ov79_021D34A8); } @@ -1049,13 +1049,13 @@ static void ov79_021D34A8(SysTask *param0, void *param1) v3.x = v2->unk_00.x + FX_Mul(v2->unk_18.x, v0->unk_0C); v3.y = v2->unk_00.y + FX_Mul(v2->unk_18.y, v0->unk_0C); - sub_02007DEC(v1->unk_C8, 0, v3.x >> 12); - sub_02007DEC(v1->unk_C8, 1, v3.y >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 0, v3.x >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 1, v3.y >> 12); v4 = FX_Mul(v2->unk_48, v0->unk_0C); v4 = FX_Mul(CalcSineDegrees_Wraparound(v4 >> 12), FX32_CONST(-6)); - sub_02007DEC(v1->unk_C8, 4, v4 >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 4, v4 >> 12); v0->unk_0C += FX32_ONE; v0->unk_04--; @@ -1064,7 +1064,7 @@ static void ov79_021D34A8(SysTask *param0, void *param1) return; } - sub_02007DEC(v1->unk_C8, 4, 0); + PokemonSprite_SetAttribute(v1->unk_C8, 4, 0); SysTask_SetCallback(param0, ov79_021D35B0); } @@ -1113,7 +1113,7 @@ static void ov79_021D3610(SysTask *param0, void *param1) v4 = FX32_CONST(-v6); v4 = FX_Mul(v4, FX32_CONST(1.4)); - sub_02007DEC(v1->unk_C8, 4, v4 >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 4, v4 >> 12); v2->unk_52 = 0; v2->unk_50++; @@ -1124,7 +1124,7 @@ static void ov79_021D3610(SysTask *param0, void *param1) } if (v0->unk_04 == 0) { - sub_02007DEC(v1->unk_C8, 4, 0); + PokemonSprite_SetAttribute(v1->unk_C8, 4, 0); ov79_021D29E4(v0); } } @@ -1158,12 +1158,12 @@ static void ov79_021D36F0(SysTask *param0, void *param1) v2->unk_50 += 90; } - sub_02007DEC(v1->unk_C8, 3, v5 >> 12); + PokemonSprite_SetAttribute(v1->unk_C8, 3, v5 >> 12); v0->unk_04--; if (v0->unk_04 == 0) { - sub_02007DEC(v1->unk_C8, 3, 0); + PokemonSprite_SetAttribute(v1->unk_C8, 3, 0); ov79_021D29E4(v0); } } diff --git a/src/overlay079/ov79_021D3768.c b/src/overlay079/ov79_021D3768.c index 603ae5a545..8a5b26ebfa 100644 --- a/src/overlay079/ov79_021D3768.c +++ b/src/overlay079/ov79_021D3768.c @@ -52,7 +52,7 @@ void ov79_021D3820(UnkStruct_ov79_021D3820 *param0) NNS_G3dGlbFlush(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(param0->unk_04); + PokemonSpriteManager_DrawSprites(param0->unk_04); G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } @@ -60,7 +60,7 @@ void ov79_021D3820(UnkStruct_ov79_021D3820 *param0) void ov79_021D385C(UnkStruct_ov79_021D3820 *param0) { Camera_Delete(param0->camera); - sub_02007B6C(param0->unk_04); + PokemonSpriteManager_Free(param0->unk_04); } static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1) @@ -83,12 +83,12 @@ static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38 PokemonSpriteTemplate v0; PokemonSprite *v1; - param0->unk_04 = sub_0200762C(heapID); + param0->unk_04 = PokemonSpriteManager_New(heapID); Pokemon_BuildSpriteTemplate(&v0, param1->unk_00, 2); - v1 = sub_02007C34(param0->unk_04, &v0, 128, 96, 0, 0, NULL, NULL); - sub_02007DEC(v1, 35, param1->unk_08); + v1 = PokemonSpriteManager_CreateSprite(param0->unk_04, &v0, 128, 96, 0, 0, NULL, NULL); + PokemonSprite_SetAttribute(v1, 35, param1->unk_08); param0->unk_18 = v1; } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 5b5faa1bce..1c6a9363e5 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -102,7 +102,7 @@ void *ov95_02247B6C(UnkStruct_ov95_02247628 *param0) v0->unk_00 = param0; v0->unk_04 = 0; v0->unk_54 = ov95_02247628(param0); - v0->unk_0C = sub_0200762C(HEAP_ID_58); + v0->unk_0C = PokemonSpriteManager_New(HEAP_ID_58); v0->unk_10 = NULL; v0->unk_68 = Strbuf_Init(300, HEAP_ID_58); v0->unk_6C = Strbuf_Init(300, HEAP_ID_58); @@ -137,10 +137,10 @@ void ov95_02247BC8(void *param0) NARC_dtor(v0->unk_80); if (v0->unk_10) { - sub_02007DC8(v0->unk_10); + PokemonSprite_Delete(v0->unk_10); } - sub_02007B6C(v0->unk_0C); + PokemonSpriteManager_Free(v0->unk_0C); Heap_FreeToHeap(v0); } } @@ -179,8 +179,8 @@ static void ov95_02247C6C(UnkStruct_ov95_02247C6C *param0) NNS_G3dGeFlushBuffer(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02008A94(param0->unk_0C); - sub_02007768(param0->unk_0C); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_0C); + PokemonSpriteManager_DrawSprites(param0->unk_0C); } NNS_G3dGePopMtx(1); @@ -349,7 +349,7 @@ static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1) if (BoxPokemon_GetValue((BoxPokemon *)v6, MON_DATA_IS_EGG, NULL) == 0) { u8 delay; - sub_02007B98(param0->unk_10, 1); + PokemonSprite_InitAnim(param0->unk_10, 1); PokeSprite_LoadCryDelay(param0->unk_80, &delay, ov95_0224764C(param0->unk_00), 1); sub_0200590C(ov95_0224764C(param0->unk_00), delay, ov95_02247654(param0->unk_00)); } @@ -389,7 +389,7 @@ static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1) break; case 1: if (ov95_022483B4(param0)) { - sub_02007DC8(param0->unk_10); + PokemonSprite_Delete(param0->unk_10); Sprite_SetAnim(param0->unk_3C[1], 0); Sprite_SetDrawFlag(param0->unk_3C[1], 1); (*param1)++; @@ -444,8 +444,8 @@ static void ov95_02248174(UnkStruct_ov95_02247C6C *param0) v0 = NNS_GfdAllocTexVram(0x4000, 0, 0); v1 = NNS_GfdAllocPlttVram(0x80, 0, NNS_GFD_ALLOC_FROM_LOW); - sub_02008A78(param0->unk_0C, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); - sub_02008A84(param0->unk_0C, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); + PokemonSpriteManager_SetCharBaseAddrAndSize(param0->unk_0C, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); + PokemonSpriteManager_SetPlttBaseAddrAndSize(param0->unk_0C, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); } static PokemonSprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0) @@ -461,7 +461,7 @@ static PokemonSprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0) v2 = (100 - 20) + BoxPokemon_SpriteYOffset(v1, 2, 0); - return sub_02007C34(param0->unk_0C, &v0, 128, v2, 0, 0, param0->unk_14, NULL); + return PokemonSpriteManager_CreateSprite(param0->unk_0C, &v0, 128, v2, 0, 0, param0->unk_14, NULL); } static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0) diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 8a8418fb04..e516d0b4c0 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -126,7 +126,7 @@ void *ov95_0224B3D8(UnkStruct_ov95_02247628 *param0) v0->unk_00 = param0; v0->unk_04 = 0; v0->unk_58 = ov95_02247628(param0); - v0->unk_10 = sub_0200762C(HEAP_ID_58); + v0->unk_10 = PokemonSpriteManager_New(HEAP_ID_58); v0->unk_14 = NULL; v0->unk_6C = Strbuf_Init(300, HEAP_ID_58); v0->unk_70 = Strbuf_Init(300, HEAP_ID_58); @@ -161,11 +161,11 @@ void ov95_0224B438(void *param0) Window_Remove(&(v0->unk_5C)); if (v0->unk_14) { - sub_02007DC8(v0->unk_14); + PokemonSprite_Delete(v0->unk_14); } NARC_dtor(v0->unk_84); - sub_02007B6C(v0->unk_10); + PokemonSpriteManager_Free(v0->unk_10); Heap_FreeToHeap(v0); } } @@ -205,8 +205,8 @@ static void ov95_0224B4D4(UnkStruct_ov95_0224B4D4 *param0) NNS_G3dGeFlushBuffer(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02008A94(param0->unk_10); - sub_02007768(param0->unk_10); + PokemonSpriteManager_UpdateCharAndPltt(param0->unk_10); + PokemonSpriteManager_DrawSprites(param0->unk_10); } NNS_G3dGePopMtx(1); @@ -297,7 +297,7 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) param0->unk_74 = ov95_022476F0(1, 0, 0, 0); param0->unk_14 = ov95_0224BA8C(param0); - sub_02007DEC(param0->unk_14, 6, 1); + PokemonSprite_SetAttribute(param0->unk_14, 6, 1); param0->unk_78 = ov95_022478B4(param0->unk_74, 0, 93, 27, 0, UnkEnum_ov95_0224B520_00, 491520, 0); @@ -349,7 +349,7 @@ static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1) break; case 2: if (++(param0->unk_08) > 10) { - sub_02007DEC(param0->unk_14, 6, 0); + PokemonSprite_SetAttribute(param0->unk_14, 6, 0); ov95_0224BBB0(param0, 16, 0, 12); param0->unk_04++; } @@ -363,7 +363,7 @@ static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1) PokeSprite_LoadCryDelay(param0->unk_84, &delay, ov95_02247660(param0->unk_00), 1); sub_0200590C(ov95_02247660(param0->unk_00), delay, ov95_02247668(param0->unk_00)); - sub_02007B98(param0->unk_14, 1); + PokemonSprite_InitAnim(param0->unk_14, 1); } param0->unk_08 = 0; @@ -487,8 +487,8 @@ static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 *param0) v0 = NNS_GfdAllocTexVram(0x4000, 0, 0); v1 = NNS_GfdAllocPlttVram(0x80, 0, NNS_GFD_ALLOC_FROM_LOW); - sub_02008A78(param0->unk_10, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); - sub_02008A84(param0->unk_10, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); + PokemonSpriteManager_SetCharBaseAddrAndSize(param0->unk_10, NNS_GfdGetTexKeyAddr(v0), NNS_GfdGetTexKeySize(v0)); + PokemonSpriteManager_SetPlttBaseAddrAndSize(param0->unk_10, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); } static PokemonSprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0) @@ -503,7 +503,7 @@ static PokemonSprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0) PokeSprite_LoadAnimationFrames(param0->unk_84, param0->unk_18, ov95_02247660(param0->unk_00), 1); v2 = (100 - 20) + BoxPokemon_SpriteYOffset(v1, 2, 0); - return sub_02007C34(param0->unk_10, &v0, 128, v2, 0, 0, param0->unk_18, NULL); + return PokemonSpriteManager_CreateSprite(param0->unk_10, &v0, 128, v2, 0, 0, param0->unk_18, NULL); } static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0) diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 6e80eb5db7..5f4c231edf 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -636,7 +636,7 @@ static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 *param0) } Bg_SetOffset(param0->unk_4C, 2, 0, (33 * 8)); - sub_02007DEC(param0->unk_12C[0], 6, 1); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 1); StartScreenTransition(0, 1, 1, 0x0, 6, 1 * 3, HEAP_ID_93); param0->unk_08++; break; @@ -679,11 +679,11 @@ static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 *param0) ov105_02244B90(param0, 3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); - sub_02007DEC(param0->unk_12C[0], 6, 0); - sub_0200872C(param0->unk_128, 16, 0, 1, 0xffff); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 0); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 16, 0, 1, 0xffff); } - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1047,7 +1047,7 @@ static void ov105_02242B54(UnkStruct_ov105_02241FF4 *param0) if (param0->unk_11 >= 2) { if (param0->unk_324[0] == ov105_022461A0(param0->unk_30C)) { param0->unk_324[0] = param0->unk_324[1]; - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_31C, ov105_022461A0(param0->unk_30C)), 120, 43, 0); } } @@ -1107,7 +1107,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) Window_ScheduleCopyToVRAM(¶m0->unk_50[0]); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); - sub_0200872C(param0->unk_128, 0, 16, 0, 0xffff); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 0, 16, 0, 0xffff); param0->unk_19 = 0; param0->unk_08++; @@ -1119,7 +1119,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) break; } - sub_02007DEC(param0->unk_12C[0], 6, 1); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 1); ov105_02244924(param0, 1); ov105_022448F4(param0, 3, ov105_02245538(param0, 0, 0), 21, 11); @@ -1128,7 +1128,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) param0->unk_08++; break; case 2: - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1137,7 +1137,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) } ov105_02245A30(param0); - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); v3[0] = 44; v3[1] = 128; @@ -1145,7 +1145,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) for (v2 = 0; v2 < v0; v2++) { ov105_022455C4(param0, v2, Party_GetPokemonBySlotIndex(param0->unk_31C, param0->unk_324[v2]), v3[v2], 43, 0); - sub_02007DEC(param0->unk_12C[v2], 6, 1); + PokemonSprite_SetAttribute(param0->unk_12C[v2], 6, 1); } ov105_02244924(param0, 4); @@ -1166,7 +1166,7 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) ov105_02244C0C(param0, 3); for (v2 = 0; v2 < v0; v2++) { - sub_02007DEC(param0->unk_12C[v2], 6, 0); + PokemonSprite_SetAttribute(param0->unk_12C[v2], 6, 0); } if (ov104_0223AED4(param0->unk_09) == 0) { @@ -1175,10 +1175,10 @@ static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 1), 21, 11); } - sub_0200872C(param0->unk_128, 16, 0, 1, 0xffff); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 16, 0, 1, 0xffff); } - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1288,7 +1288,7 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 1), 21, 11); } - sub_0200872C(param0->unk_128, 0, 16, 0, 0xffff); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 0, 16, 0, 0xffff); param0->unk_19 = 0; param0->unk_08++; @@ -1301,7 +1301,7 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) } for (v1 = 0; v1 < v0; v1++) { - sub_02007DC8(param0->unk_12C[v1]); + PokemonSprite_Delete(param0->unk_12C[v1]); } ov105_02244924(param0, 5); @@ -1319,7 +1319,7 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) break; case 2: - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1330,7 +1330,7 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) ov105_02245A30(param0); ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_31C, ov105_022461A0(param0->unk_30C)), 120, 43, 0); - sub_02007DEC(param0->unk_12C[0], 6, 1); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 1); ov105_02244924(param0, 0); param0->unk_08++; @@ -1347,12 +1347,12 @@ static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) case 4: if (param0->unk_19 == 0) { ov105_02244B90(param0, 3); - sub_02007DEC(param0->unk_12C[0], 6, 0); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 0); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); - sub_0200872C(param0->unk_128, 16, 0, 1, 0xffff); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 16, 0, 1, 0xffff); } - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1535,7 +1535,7 @@ static BOOL ov105_02243818(UnkStruct_ov105_02241FF4 *param0) Window_FillTilemap(¶m0->unk_50[2], 0); Window_ScheduleCopyToVRAM(¶m0->unk_50[2 + param0->unk_11]); - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); param0->unk_10 = ov105_02244D14(param0, 10); @@ -1712,7 +1712,7 @@ static void ov105_02243D20(UnkStruct_ov105_02241FF4 *param0) Window_FillTilemap(¶m0->unk_50[2], 0); Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); Window_FillTilemap(¶m0->unk_50[7], 15); Window_EraseMessageBox(¶m0->unk_50[7], 1); @@ -1736,7 +1736,7 @@ static void ov105_02243D84(UnkStruct_ov105_02241FF4 *param0) Window_FillTilemap(¶m0->unk_50[2], 0); Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); return; } @@ -1763,7 +1763,7 @@ static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0) case 0: Window_FillTilemap(¶m0->unk_50[2], 0); Window_ScheduleCopyToVRAM(¶m0->unk_50[2]); - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); ov105_0224628C(¶m0->unk_50[5], Options_Frame(param0->unk_138)); param0->unk_10 = ov105_02244D14(param0, 10); @@ -1853,7 +1853,7 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) ov105_02246244(param0->unk_50); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 0), 21, 11); - sub_0200872C(param0->unk_128, 0, 16, 0, 0xffff); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 0, 16, 0, 0xffff); param0->unk_19 = 0; param0->unk_08++; @@ -1865,7 +1865,7 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) break; } - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); ov105_02244924(param0, 1); ov105_022448F4(param0, 3, ov105_02245538(param0, 0, 0), 21, 11); @@ -1875,7 +1875,7 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) param0->unk_08++; break; case 2: - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -1964,13 +1964,13 @@ static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_320, 0), 120, 43, 0); } - sub_02007DEC(param0->unk_12C[0], 6, 0); - sub_0200872C(param0->unk_128, 16, 0, 1, 0xffff); + PokemonSprite_SetAttribute(param0->unk_12C[0], 6, 0); + PokemonSpriteManager_StartFadeAll(param0->unk_128, 16, 0, 1, 0xffff); ov105_022448F4(param0, 3, ov105_02245538(param0, 1, 1), 21, 11); } - if (sub_020087B4(param0->unk_12C[0])) { + if (PokemonSprite_IsFadeActive(param0->unk_12C[0])) { (void)0; } @@ -2118,7 +2118,7 @@ static void ov105_0224451C(void *param0) return; } - sub_02008A94(v0->unk_128); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_128); if (v0->unk_120 != NULL) { PaletteData_CommitFadedBuffers(v0->unk_120); @@ -2768,11 +2768,11 @@ static void ov105_022451B4(UnkStruct_ov105_02241FF4 *param0) for (v0 = 0; v0 < 3; v0++) { if (param0->unk_12C[v0] != NULL) { - sub_02007DC8(param0->unk_12C[v0]); + PokemonSprite_Delete(param0->unk_12C[v0]); } } - sub_02007B6C(param0->unk_128); + PokemonSpriteManager_Free(param0->unk_128); MessageLoader_Free(param0->unk_1C); StringTemplate_Free(param0->unk_20); Strbuf_Free(param0->unk_24); @@ -2841,7 +2841,7 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) Font_LoadTextPalette(0, 13 * 32, HEAP_ID_93); Font_LoadScreenIndicatorsPalette(0, 12 * 32, HEAP_ID_93); - param0->unk_128 = sub_0200762C(HEAP_ID_93); + param0->unk_128 = PokemonSpriteManager_New(HEAP_ID_93); if (CommSys_IsInitialized()) { ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K); @@ -2868,7 +2868,7 @@ static void ov105_022453F8(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param int v0 = param2; if (ov105_022461A0(param0->unk_30C) < param0->unk_12) { - sub_02007DC8(param0->unk_12C[0]); + PokemonSprite_Delete(param0->unk_12C[0]); ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param4, v0), 120, 43, param3); ov105_02244FF8(param0, ¶m0->unk_50[2 + param1], v0, 0, 0, 15, 2, 0, 0, param4); } @@ -2997,7 +2997,7 @@ static void ov105_022455C4(UnkStruct_ov105_02241FF4 *param0, u8 param1, Pokemon param0->unk_12C[param1] = ov105_02245D88(param0->unk_128, 0, param2, param3, param4, 0); - sub_02007DEC(param0->unk_12C[param1], 6, 0); + PokemonSprite_SetAttribute(param0->unk_12C[param1], 6, 0); v0 = Pokemon_GetValue(param2, MON_DATA_SPECIES, NULL); v1 = Pokemon_GetValue(param2, MON_DATA_FORM, NULL); diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c index 529ad8ff9d..e82ad8593b 100644 --- a/src/overlay105/ov105_02245CD0.c +++ b/src/overlay105/ov105_02245CD0.c @@ -40,7 +40,7 @@ void ov105_02245D50(PokemonSpriteManager *param0) NNS_G3dGlbFlush(); NNS_G2dSetupSoftwareSpriteCamera(); - sub_02007768(param0); + PokemonSpriteManager_DrawSprites(param0); G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); return; @@ -56,13 +56,13 @@ PokemonSprite *ov105_02245D88(PokemonSpriteManager *param0, int param1, Pokemon Pokemon_BuildSpriteTemplate(&v0, param2, 2); v2 = 0; - v1 = sub_02007C34(param0, &v0, param3, (param4 + v2), param5, param1, NULL, NULL); + v1 = PokemonSpriteManager_CreateSprite(param0, &v0, param3, (param4 + v2), param5, param1, NULL, NULL); return v1; } void ov105_02245DB8(PokemonSprite *param0, int param1) { - sub_02007DEC(param0, 35, param1); + PokemonSprite_SetAttribute(param0, 35, param1); return; } diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 825d90f13c..3923b1ae66 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -231,7 +231,7 @@ void ov119_021D0FD0(void *param0) { UnkStruct_ov119_021D0FD0 *v0 = (UnkStruct_ov119_021D0FD0 *)param0; - sub_02008A94(v0->unk_04.unk_38); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_04.unk_38); VramTransfer_Process(); SpriteSystem_TransferOam(); PaletteData_CommitFadedBuffers(v0->unk_04.unk_04); @@ -754,7 +754,7 @@ void ov119_021D1858(UnkStruct_ov119_021D0FD0 *param0) Pokemon_BuildSpriteTemplate(&v0, v2, 2); PokeSprite_LoadAnimationFrames(param0->unk_04.unk_3C, &v1[0], v3, 1); - param0->unk_70 = sub_02007C34(param0->unk_04.unk_38, &v0, 128, 96 + v4, 0, 0, &v1[0], NULL); + param0->unk_70 = PokemonSpriteManager_CreateSprite(param0->unk_04.unk_38, &v0, 128, 96 + v4, 0, 0, &v1[0], NULL); } void ov119_021D18C0(UnkStruct_ov119_021D0FD0 *param0) @@ -765,16 +765,16 @@ void ov119_021D18C0(UnkStruct_ov119_021D0FD0 *param0) v0 = Pokemon_GetValue(param0->unk_00->unk_0C.unk_00, MON_DATA_SPECIES, NULL); v1 = Pokemon_GetNature(param0->unk_00->unk_0C.unk_00); - sub_02007B98(param0->unk_70, 1); + PokemonSprite_InitAnim(param0->unk_70, 1); PokeSprite_LoadAnimation(param0->unk_04.unk_3C, param0->unk_04.unk_54, param0->unk_70, v0, 2, 0, 0); } void ov119_021D1900(UnkStruct_ov119_021D0FD0 *param0) { - sub_02007DC8(param0->unk_70); + PokemonSprite_Delete(param0->unk_70); } void ov119_021D190C(UnkStruct_ov119_021D0FD0 *param0, int param1) { - sub_02007DEC(param0->unk_70, 6, param1); + PokemonSprite_SetAttribute(param0->unk_70, 6, param1); } diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c index e77563c655..044e5a42b6 100644 --- a/src/overlay119/ov119_021D191C.c +++ b/src/overlay119/ov119_021D191C.c @@ -161,7 +161,7 @@ static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 *param0) break; } - if (sub_02007C24(param0->unk_70) != 0) { + if (PokemonSprite_IsAnimActive(param0->unk_70) != 0) { break; } @@ -311,7 +311,7 @@ static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0) break; } - if (sub_02007C24(param0->unk_70) != 0) { + if (PokemonSprite_IsAnimActive(param0->unk_70) != 0) { break; } @@ -547,7 +547,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0) PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v2), 0, 0, 16, 0xFFFF); } - sub_020086FC(param0->unk_70, 0, 16, 0, 0xFFFF); + PokemonSprite_StartFade(param0->unk_70, 0, 16, 0, 0xFFFF); param0->unk_68++; } break; @@ -571,7 +571,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0) v5++; } - if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (v5 != 2) || (sub_020087B4(param0->unk_70) != 0)) { + if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (v5 != 2) || (PokemonSprite_IsFadeActive(param0->unk_70) != 0)) { break; } @@ -587,7 +587,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0) if ((++param0->unk_64) >= 25) { param0->unk_64 = 0; - sub_020086FC(param0->unk_70, 16, 0, 0, 0xFFFF); + PokemonSprite_StartFade(param0->unk_70, 16, 0, 0, 0xFFFF); PaletteData_StartFade(param0->unk_04.unk_04, 0x1, 0xFFFF, 0, 16, 0, 0xFFFF); PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF, 0, 16, 0, 0xFFFF); @@ -595,7 +595,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0) } break; case 5: - if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (sub_020087B4(param0->unk_70) != 0)) { + if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (PokemonSprite_IsFadeActive(param0->unk_70) != 0)) { break; } @@ -653,7 +653,7 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0) PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v1), 0, 0, 16, 0xFFFF); } - sub_020086FC(param0->unk_70, 0, 16, 0, 0xFFFF); + PokemonSprite_StartFade(param0->unk_70, 0, 16, 0, 0xFFFF); param0->unk_68++; } break; @@ -677,7 +677,7 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0) v4++; } - if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (v4 != 2) || (sub_020087B4(param0->unk_70) != 0)) { + if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (v4 != 2) || (PokemonSprite_IsFadeActive(param0->unk_70) != 0)) { break; } @@ -694,7 +694,7 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0) if ((++param0->unk_64) >= 25) { param0->unk_64 = 0; - sub_020086FC(param0->unk_70, 16, 0, 0, 0xFFFF); + PokemonSprite_StartFade(param0->unk_70, 16, 0, 0, 0xFFFF); PaletteData_StartFade(param0->unk_04.unk_04, 0x1, 0xFFFF, 0, 16, 0, 0xFFFF); PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF, 0, 16, 0, 0xFFFF); @@ -702,7 +702,7 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0) } break; case 4: - if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (sub_020087B4(param0->unk_70) != 0)) { + if ((PaletteData_GetSelectedBuffersMask(param0->unk_04.unk_04) != 0) || (PokemonSprite_IsFadeActive(param0->unk_70) != 0)) { break; } diff --git a/src/pokemon_sprite.c b/src/pokemon_sprite.c index d50afd2f85..b424adf6a0 100644 --- a/src/pokemon_sprite.c +++ b/src/pokemon_sprite.c @@ -278,8 +278,7 @@ static void PokemonSprite_RunAnim(PokemonSprite *monSprite); static u8 SwapNybbles(u8 value); static void TryDrawSpindaSpots(PokemonSprite *monSprite, u8 *rawCharData); -// PokemonSpriteManager_New -void *sub_0200762C(enum HeapId heapID) +void *PokemonSpriteManager_New(enum HeapId heapID) { PokemonSpriteManager *monSpriteMan = Heap_AllocFromHeap(heapID, sizeof(PokemonSpriteManager)); @@ -358,8 +357,7 @@ static const int sShadowTextureCoords[MAX_SHADOW_SIZES][4] = { [SHADOW_SIZE_LARGE] = { 160, 192, 224, 208 } }; -// PokemonSpriteManager_DrawAll -void sub_02007768(PokemonSpriteManager *monSpriteMan) +void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan) { int width, height; int u0, v0, u1, v1; @@ -474,8 +472,7 @@ void sub_02007768(PokemonSpriteManager *monSpriteMan) G3_PopMtx(1); } -// PokemonSpriteManager_Free -void sub_02007B6C(PokemonSpriteManager *monSpriteMan) +void PokemonSpriteManager_Free(PokemonSpriteManager *monSpriteMan) { Heap_FreeToHeap(monSpriteMan->charRawData); Heap_FreeToHeap(monSpriteMan->plttRawData); @@ -483,8 +480,7 @@ void sub_02007B6C(PokemonSpriteManager *monSpriteMan) Heap_FreeToHeap(monSpriteMan); } -// PokemonSprite_StartAnim -void sub_02007B98(PokemonSprite *monSprite, int dummy) +void PokemonSprite_InitAnim(PokemonSprite *monSprite, int dummy) { monSprite->currAnimFrame = 0; @@ -502,21 +498,18 @@ void sub_02007B98(PokemonSprite *monSprite, int dummy) } } -// PokemonSprite_SetAnim -void sub_02007C10(PokemonSprite *monSprite, SpriteAnimationFrame *animFrames) +void PokemonSprite_SetAnim(PokemonSprite *monSprite, SpriteAnimationFrame *animFrames) { MI_CpuCopy8(animFrames, &monSprite->animFrames, sizeof(SpriteAnimationFrame) * MAX_ANIMATION_FRAMES); } -// PokemonSprite_IsAnimActive -BOOL sub_02007C24(PokemonSprite *monSprite) +BOOL PokemonSprite_IsAnimActive(PokemonSprite *monSprite) { // Doesn't match when simplified. return monSprite->animActive != FALSE; } -// PokemonSpriteManager_CreateSprite -PokemonSprite *sub_02007C34(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback) +PokemonSprite *PokemonSpriteManager_CreateSprite(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback) { int i; for (i = 0; i < MAX_POKEMON_SPRITES; i++) { @@ -527,11 +520,10 @@ PokemonSprite *sub_02007C34(PokemonSpriteManager *monSpriteMan, PokemonSpriteTem GF_ASSERT(i != MAX_POKEMON_SPRITES); - return sub_02007C7C(monSpriteMan, spriteTemplate, x, y, z, polygonID, i, animFrames, callback); + return PokemonSpriteManager_CreateSpriteAtIndex(monSpriteMan, spriteTemplate, x, y, z, polygonID, i, animFrames, callback); } -// PokemonSpriteManager_CreateSpriteAtIndex -PokemonSprite *sub_02007C7C(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, int index, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback) +PokemonSprite *PokemonSpriteManager_CreateSpriteAtIndex(PokemonSpriteManager *monSpriteMan, PokemonSpriteTemplate *spriteTemplate, int x, int y, int z, int polygonID, int index, SpriteAnimationFrame *animFrames, PokemonSpriteCallback *callback) { GF_ASSERT(monSpriteMan->sprites[index].active == FALSE); @@ -569,22 +561,19 @@ PokemonSprite *sub_02007C7C(PokemonSpriteManager *monSpriteMan, PokemonSpriteTem return &monSpriteMan->sprites[index]; } -// PokemonSprite_Delete -void sub_02007DC8(PokemonSprite *monSprite) +void PokemonSprite_Delete(PokemonSprite *monSprite) { monSprite->active = FALSE; } -// PokemonSpriteManager_DeleteAll -void sub_02007DD4(PokemonSpriteManager *monSpriteMan) +void PokemonSpriteManager_DeleteAll(PokemonSpriteManager *monSpriteMan) { for (int i = 0; i < MAX_POKEMON_SPRITES; i++) { - sub_02007DC8(&monSpriteMan->sprites[i]); + PokemonSprite_Delete(&monSpriteMan->sprites[i]); } } -// PokemonSprite_SetAttribute -void sub_02007DEC(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int value) +void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int value) { switch (attribute) { case MON_SPRITE_X_CENTER: @@ -736,8 +725,7 @@ void sub_02007DEC(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribut } } -// PokemonSprite_GetAttribute -int sub_020080C0(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute) +int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute) { switch (attribute) { case MON_SPRITE_X_CENTER: @@ -838,8 +826,7 @@ int sub_020080C0(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute return 0; } -// PokemonSprite_AddAttribute -void sub_02008274(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int delta) +void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int delta) { switch (attribute) { case MON_SPRITE_X_CENTER: @@ -991,8 +978,7 @@ void sub_02008274(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribut } } -// PokemonSprite_SetVisible -void sub_020086D4(PokemonSprite *monSprite, int x, int y, int width, int height) +void PokemonSprite_SetVisible(PokemonSprite *monSprite, int x, int y, int width, int height) { monSprite->transforms.visible = TRUE; monSprite->transforms.xOffset2 = x; @@ -1001,8 +987,7 @@ void sub_020086D4(PokemonSprite *monSprite, int x, int y, int width, int height) monSprite->transforms.height = height; } -// PokemonSprite_StartFade -void sub_020086FC(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int delay, int color) +void PokemonSprite_StartFade(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int delay, int color) { monSprite->transforms.fadeActive = TRUE; monSprite->transforms.fadeInitAlpha = initAlpha; @@ -1012,8 +997,7 @@ void sub_020086FC(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int monSprite->transforms.fadeTargetColor = color; } -// PokemonSpriteManager_StartFadeAll -void sub_0200872C(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetAlpha, int delay, int color) +void PokemonSpriteManager_StartFadeAll(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetAlpha, int delay, int color) { for (int i = 0; i < MAX_POKEMON_SPRITES; i++) { if (monSpriteMan->sprites[i].active) { @@ -1027,8 +1011,7 @@ void sub_0200872C(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetA } } -// PokemonSprite_ClearFade -void sub_02008780(PokemonSprite *monSprite) +void PokemonSprite_ClearFade(PokemonSprite *monSprite) { monSprite->transforms.fadeActive = FALSE; monSprite->transforms.fadeInitAlpha = 0; @@ -1039,14 +1022,12 @@ void sub_02008780(PokemonSprite *monSprite) monSprite->needReloadPltt = TRUE; } -// PokemonSprite_IsFadeActive -BOOL sub_020087B4(PokemonSprite *monSprite) +BOOL PokemonSprite_IsFadeActive(PokemonSprite *monSprite) { return monSprite->transforms.fadeActive == TRUE; } -// PokemonSprite_CalcAffineYOffset -void sub_020087C8(PokemonSprite *monSprite, int height) +void PokemonSprite_CalcAffineYOffset(PokemonSprite *monSprite, int height) { monSprite->transforms.yOffset = ((80 / 2) - height) - ((((80 / 2) - height) * monSprite->transforms.affineHeight) >> 8); } @@ -1147,22 +1128,19 @@ int sub_02008900(UnkStruct_02008900 *param0) return -1; } -// PokemonSprite_ScheduleReloadFromNARC -void sub_020089A0(PokemonSprite *monSprite) +void PokemonSprite_ScheduleReloadFromNARC(PokemonSprite *monSprite) { monSprite->needReloadChar = TRUE; monSprite->needReloadPltt = TRUE; } -// PokemonSprite_Push -void sub_020089B0(PokemonSprite *monSprite) +void PokemonSprite_Push(PokemonSprite *monSprite) { monSprite->templateBackup = monSprite->template; monSprite->shadowBackup = monSprite->shadow; } -// PokemonSprite_Pop -void sub_02008A0C(PokemonSprite *monSprite) +void PokemonSprite_Pop(PokemonSprite *monSprite) { monSprite->template = monSprite->templateBackup; monSprite->shadow = monSprite->shadowBackup; @@ -1170,28 +1148,24 @@ void sub_02008A0C(PokemonSprite *monSprite) monSprite->needReloadPltt = TRUE; } -// PokemonSpriteManager_SetCharBaseAddrAndSize -void sub_02008A78(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size) +void PokemonSpriteManager_SetCharBaseAddrAndSize(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size) { monSpriteMan->charBaseAddr = addr; monSpriteMan->charSize = size; } -// PokemonSpriteManager_SetPlttBaseAddrAndSize -void sub_02008A84(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size) +void PokemonSpriteManager_SetPlttBaseAddrAndSize(PokemonSpriteManager *monSpriteMan, u32 addr, u32 size) { monSpriteMan->plttBaseAddr = addr; monSpriteMan->plttSize = size; } -// PokemonSprite_GetTemplate -PokemonSpriteTemplate *sub_02008A90(PokemonSprite *monSprite) +PokemonSpriteTemplate *PokemonSprite_GetTemplate(PokemonSprite *monSprite) { return &monSprite->template; } -// PokemonSpriteManager_LoadCharAndPltt -void sub_02008A94(PokemonSpriteManager *monSpriteMan) +void PokemonSpriteManager_UpdateCharAndPltt(PokemonSpriteManager *monSpriteMan) { if (monSpriteMan->needLoadChar) { monSpriteMan->needLoadChar = FALSE; @@ -1218,27 +1192,23 @@ void sub_02008A94(PokemonSpriteManager *monSpriteMan) } } -// PokemonSpriteManager_SetExcludeG3Identity -void sub_02008B2C(PokemonSpriteManager *monSpriteMan, int value) +void PokemonSpriteManager_SetExcludeG3Identity(PokemonSpriteManager *monSpriteMan, int value) { monSpriteMan->excludeG3Identity = value; } -// PokemonSprite_IsActive -BOOL sub_02008B38(PokemonSprite *monSprite) +BOOL PokemonSprite_IsActive(PokemonSprite *monSprite) { GF_ASSERT(monSprite != NULL); return monSprite->active != FALSE; } -// PokemonSpriteManager_SetHideShadows -void sub_02008B54(PokemonSpriteManager *monSpriteMan, u32 value) +void PokemonSpriteManager_SetHideShadows(PokemonSpriteManager *monSpriteMan, u32 value) { monSpriteMan->hideShadows |= value; } -// PokemonSpriteManager_ClearHideShadows -void sub_02008B60(PokemonSpriteManager *monSpriteMan, u32 value) +void PokemonSpriteManager_ClearHideShadows(PokemonSpriteManager *monSpriteMan, u32 value) { monSpriteMan->hideShadows &= (value ^ 0xFFFFFFFF); } @@ -1266,7 +1236,7 @@ static void BufferPokemonSpriteCharData(PokemonSpriteManager *monSpriteMan) rawCharData = charData->pRawData; - sub_020093A0(rawCharData, monSpriteMan->sprites[i].template.archive); + PokemonSprite_Decrypt(rawCharData, monSpriteMan->sprites[i].template.archive); TryDrawSpindaSpots(&monSpriteMan->sprites[i], rawCharData); if (i == 3) { @@ -1443,12 +1413,11 @@ static u8 SwapNybbles(u8 value) static void TryDrawSpindaSpots(PokemonSprite *monSprite, u8 *rawCharData) { if (monSprite->template.spindaSpots != 0) { - sub_020091D8(rawCharData, monSprite->template.personality, TRUE); + PokemonSprite_DrawSpindaSpots(rawCharData, monSprite->template.personality, TRUE); } } -// PokemonSprite_DrawSpindaSpots -void sub_020091D8(u8 *rawCharData, u32 personality, BOOL isAnimated) +void PokemonSprite_DrawSpindaSpots(u8 *rawCharData, u32 personality, BOOL isAnimated) { const SpindaSpotCoords *currSpotCoords; int i, destOffset; @@ -1538,8 +1507,7 @@ void PokemonSprite_DecryptDP(u8 *rawCharData) } } -// PokemonSprite_Decrypt -void sub_020093A0(u8 *rawCharData, int narcID) +void PokemonSprite_Decrypt(u8 *rawCharData, int narcID) { if (narcID == NARC_INDEX_POKETOOL__POKEGRA__POKEGRA || narcID == NARC_INDEX_POKETOOL__POKEGRA__OTHERPOKE) { PokemonSprite_DecryptDP(rawCharData); diff --git a/src/render_window.c b/src/render_window.c index 6e1a1635f6..e977f9e393 100644 --- a/src/render_window.c +++ b/src/render_window.c @@ -853,22 +853,22 @@ static void CreatePokemonPreviewSprite(PokemonPreview *preview, u8 x, u8 y) static void LoadAndDrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, u16 species, u8 gender) { - void *buf = sub_0200762C(param0->heapId); + void *buf = PokemonSpriteManager_New(param0->heapId); PokemonSpriteTemplate sprite; BuildPokemonSpriteTemplate(&sprite, species, gender, FACE_FRONT, FALSE, NULL, NULL); DrawPokemonPreviewSprite(param0, &sprite); - sub_02007B6C(buf); + PokemonSpriteManager_Free(buf); } static void LoadAndDrawPokemonPreviewSpriteFromStruct(UnkStruct_ov5_021D30A8 *param0, Pokemon *mon) { - void *buf = sub_0200762C(param0->heapId); + void *buf = PokemonSpriteManager_New(param0->heapId); PokemonSpriteTemplate sprite; Pokemon_BuildSpriteTemplate(&sprite, mon, FACE_FRONT); DrawPokemonPreviewSprite(param0, &sprite); - sub_02007B6C(buf); + PokemonSpriteManager_Free(buf); } #define POKEMON_SPRITE_FRAME_WIDTH_TILES 10 diff --git a/src/unk_020131EC.c b/src/unk_020131EC.c index 270df59a24..07f7eb0a52 100644 --- a/src/unk_020131EC.c +++ b/src/unk_020131EC.c @@ -103,12 +103,12 @@ static void sub_02013338(int param0, int param1, int param2, int param3, int par NNSG2dCharacterData *v1 = NULL; sub_0201322C(param0, param1, param2, &v1); - sub_020093A0(v1->pRawData, param0); + PokemonSprite_Decrypt(v1->pRawData, param0); v0 = sub_020132F8(param11); if ((param10 == 2) && (v0 == 1)) { - sub_020091D8(v1->pRawData, param8, param9); + PokemonSprite_DrawSpindaSpots(v1->pRawData, param8, param9); } sub_02013260(param3, param4, param5, param6, v1, param7); @@ -149,7 +149,7 @@ void sub_020133D4(int param0, int param1, int param2, int param3, int param4, in v5 = (sizeof(u8) * 4); v1 = v3->pRawData; - sub_020093A0(v1, param0); + PokemonSprite_Decrypt(v1, param0); v2 = (u8 *)param7; v8 = (v3->W * v5); diff --git a/src/unk_02015F84.c b/src/unk_02015F84.c index b1c78717b8..38b0923922 100644 --- a/src/unk_02015F84.c +++ b/src/unk_02015F84.c @@ -227,8 +227,8 @@ void PokeAnimation_Init(PokemonAnimationSys *param0, PokemonSprite *param1, cons param0->pokeAnimation[v0].unk_1C7 = 0; param0->pokeAnimation[v0].unk_04 = SysTask_Start(sub_02016150, ¶m0->pokeAnimation[v0], 0); param0->pokeAnimation[v0].unk_54 = v2; - param0->pokeAnimation[v0].unk_58 = sub_020080C0(param1, 0); - param0->pokeAnimation[v0].unk_5C = sub_020080C0(param1, 1); + param0->pokeAnimation[v0].unk_58 = PokemonSprite_GetAttribute(param1, 0); + param0->pokeAnimation[v0].unk_5C = PokemonSprite_GetAttribute(param1, 1); param0->pokeAnimation[v0].unk_60 = 0; param0->pokeAnimation[v0].unk_64 = 0; param0->pokeAnimation[v0].unk_68 = 0; @@ -317,7 +317,7 @@ static void sub_02016188(UnkStruct_02016E64 *param0) } if (param0->unk_1C7) { - if (!sub_020087B4(param0->unk_00)) { + if (!PokemonSprite_IsFadeActive(param0->unk_00)) { param0->unk_1C7 = 0; } else { return; @@ -524,7 +524,7 @@ static u8 sub_020164FC(const int *param0, const int *param1) static void sub_02016514(UnkStruct_02016E64 *param0) { int v0 = (-param0->unk_74) / 8; - sub_02008274(param0->unk_00, 1, v0); + PokemonSprite_AddAttribute(param0->unk_00, 1, v0); } static void sub_02016530(UnkStruct_02016E64 *param0) @@ -542,14 +542,14 @@ static void sub_02016540(UnkStruct_02016E64 *param0) static void sub_02016548(UnkStruct_02016E64 *param0) { - sub_02007DEC(param0->unk_00, 0, param0->unk_58); - sub_02007DEC(param0->unk_00, 1, param0->unk_5C); + PokemonSprite_SetAttribute(param0->unk_00, 0, param0->unk_58); + PokemonSprite_SetAttribute(param0->unk_00, 1, param0->unk_5C); - sub_02007DEC(param0->unk_00, 9, 0); - sub_02007DEC(param0->unk_00, 10, 0); + PokemonSprite_SetAttribute(param0->unk_00, 9, 0); + PokemonSprite_SetAttribute(param0->unk_00, 10, 0); - sub_02007DEC(param0->unk_00, 12, 0x100); - sub_02007DEC(param0->unk_00, 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_00, 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_00, 13, 0x100); } static void sub_02016590(UnkStruct_02016E64 *param0) @@ -695,7 +695,7 @@ static void sub_020167BC(UnkStruct_02016E64 *param0) sub_020162F8(param0, &v1); sub_02016320(param0, &v0); - sub_02007DEC(param0->unk_00, v1, param0->unk_24[v0]); + PokemonSprite_SetAttribute(param0->unk_00, v1, param0->unk_24[v0]); } static void sub_020167E8(UnkStruct_02016E64 *param0) @@ -705,7 +705,7 @@ static void sub_020167E8(UnkStruct_02016E64 *param0) sub_020162F8(param0, &v1); sub_02016320(param0, &v0); - sub_02008274(param0->unk_00, v1, param0->unk_24[v0]); + PokemonSprite_AddAttribute(param0->unk_00, v1, param0->unk_24[v0]); } static void sub_02016814(UnkStruct_02016E64 *param0) @@ -737,9 +737,9 @@ static void sub_02016814(UnkStruct_02016E64 *param0) sub_0201630C(param0, &v4); if (v4 == 22) { - sub_02007DEC(param0->unk_00, v0, v1); + PokemonSprite_SetAttribute(param0->unk_00, v0, v1); } else if (v4 == 23) { - sub_02008274(param0->unk_00, v0, v1); + PokemonSprite_AddAttribute(param0->unk_00, v0, v1); } else { GF_ASSERT(0); } @@ -863,19 +863,19 @@ static void sub_02016998(UnkStruct_02016E64 *param0) static void sub_02016A60(UnkStruct_02016E64 *param0) { if (param0->unk_1C4) { - sub_02007DEC(param0->unk_00, 0, param0->unk_58 - (param0->unk_60 + param0->unk_68)); + PokemonSprite_SetAttribute(param0->unk_00, 0, param0->unk_58 - (param0->unk_60 + param0->unk_68)); } else { - sub_02007DEC(param0->unk_00, 0, param0->unk_58 + param0->unk_60 + param0->unk_68); + PokemonSprite_SetAttribute(param0->unk_00, 0, param0->unk_58 + param0->unk_60 + param0->unk_68); } - sub_02007DEC(param0->unk_00, 1, param0->unk_5C + param0->unk_64 + param0->unk_6C); + PokemonSprite_SetAttribute(param0->unk_00, 1, param0->unk_5C + param0->unk_64 + param0->unk_6C); } static void sub_02016AA8(UnkStruct_02016E64 *param0) { - sub_02007DEC(param0->unk_00, 12, 0x100 + param0->unk_70); - sub_02007DEC(param0->unk_00, 13, 0x100 + param0->unk_74); - sub_02007DEC(param0->unk_00, 9, (u16)param0->unk_78); + PokemonSprite_SetAttribute(param0->unk_00, 12, 0x100 + param0->unk_70); + PokemonSprite_SetAttribute(param0->unk_00, 13, 0x100 + param0->unk_74); + PokemonSprite_SetAttribute(param0->unk_00, 9, (u16)param0->unk_78); { int v0; @@ -930,14 +930,14 @@ static void sub_02016B78(UnkStruct_02016E64 *param0) sub_0201630C(param0, &v1); sub_0201630C(param0, &v2); sub_020162F8(param0, &v3); - sub_020086FC(param0->unk_00, v0, v1, v2, v3); + PokemonSprite_StartFade(param0->unk_00, v0, v1, v2, v3); } static void sub_02016BB8(UnkStruct_02016E64 *param0) { u8 v0, v1, v2; - if (sub_020087B4(param0->unk_00)) { + if (PokemonSprite_IsFadeActive(param0->unk_00)) { param0->unk_1C7 = 1; param0->unk_18 = 1; } diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 799090e69f..95f841889d 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -133,7 +133,7 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt Window_FillTilemap(v0->unk_04, 0xff); Window_DrawMessageBoxWithScrollCursor(v0->unk_04, 0, 1, 10); - v0->unk_18 = sub_0200762C(heapID); + v0->unk_18 = PokemonSpriteManager_New(heapID); v0->unk_44 = sub_02015F84(heapID, 1, 0); v0->unk_67 = 0; v0->unk_66 = 2; @@ -154,7 +154,7 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt sub_0207C498(v0); PaletteData_StartFade(v0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 16, 0, 0x0); - sub_0200872C(v0->unk_18, 16, 0, 0, 0x0); + PokemonSpriteManager_StartFadeAll(v0->unk_18, 16, 0, 0, 0x0); v0->unk_58 = sub_0201567C(v0->unk_14, 0, 0xb, heapID); @@ -171,7 +171,7 @@ static void sub_0207B0A0(SysTask *param0, void *param1) UnkStruct_0207AE68 *v0 = (UnkStruct_0207AE68 *)param1; sub_0207B180(v0); - sub_02007768(v0->unk_18); + PokemonSpriteManager_DrawSprites(v0->unk_18); sub_0207C770(); G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); @@ -198,7 +198,7 @@ void sub_0207B0E0(UnkStruct_0207AE68 *param0) PaletteData_FreeBuffer(param0->unk_14, 2); PaletteData_FreeBuffer(param0->unk_14, 3); PaletteData_Free(param0->unk_14); - sub_02007B6C(param0->unk_18); + PokemonSpriteManager_Free(param0->unk_18); sub_02015FB8(param0->unk_44); sub_020242C4(param0->unk_34); sub_0207C460(param0->unk_00); @@ -217,21 +217,21 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) { if (param0->unk_70) { if ((param0->unk_70 & 1) == 0) { - sub_02008274(param0->unk_1C[0], 12, param0->unk_71 * -1); - sub_02008274(param0->unk_1C[0], 13, param0->unk_71 * -1); - sub_02008274(param0->unk_1C[1], 12, param0->unk_71); - sub_02008274(param0->unk_1C[1], 13, param0->unk_71); + PokemonSprite_AddAttribute(param0->unk_1C[0], 12, param0->unk_71 * -1); + PokemonSprite_AddAttribute(param0->unk_1C[0], 13, param0->unk_71 * -1); + PokemonSprite_AddAttribute(param0->unk_1C[1], 12, param0->unk_71); + PokemonSprite_AddAttribute(param0->unk_1C[1], 13, param0->unk_71); - if (sub_020080C0(param0->unk_1C[0], 12) == 0) { + if (PokemonSprite_GetAttribute(param0->unk_1C[0], 12) == 0) { param0->unk_70 ^= 1; } } else { - sub_02008274(param0->unk_1C[0], 12, param0->unk_71); - sub_02008274(param0->unk_1C[0], 13, param0->unk_71); - sub_02008274(param0->unk_1C[1], 12, param0->unk_71 * -1); - sub_02008274(param0->unk_1C[1], 13, param0->unk_71 * -1); + PokemonSprite_AddAttribute(param0->unk_1C[0], 12, param0->unk_71); + PokemonSprite_AddAttribute(param0->unk_1C[0], 13, param0->unk_71); + PokemonSprite_AddAttribute(param0->unk_1C[1], 12, param0->unk_71 * -1); + PokemonSprite_AddAttribute(param0->unk_1C[1], 13, param0->unk_71 * -1); - if (sub_020080C0(param0->unk_1C[1], 12) == 0) { + if (PokemonSprite_GetAttribute(param0->unk_1C[1], 12) == 0) { param0->unk_70 ^= 1; if (param0->unk_71 < 0x40) { @@ -281,8 +281,8 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) PokeSprite_LoadAnimation(param0->unk_80, param0->unk_44, param0->unk_1C[0], param0->unk_60, 2, 0, 0); PokeSprite_LoadAnimationFrames(param0->unk_80, &v0[0], param0->unk_60, 1); - sub_02007C10(param0->unk_1C[0], &v0[0]); - sub_02007B98(param0->unk_1C[0], NULL); + PokemonSprite_SetAnim(param0->unk_1C[0], &v0[0]); + PokemonSprite_InitAnim(param0->unk_1C[0], NULL); } sub_0200590C(param0->unk_60, param0->unk_84, param0->unk_86); @@ -298,7 +298,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) } break; case 5: - if ((Text_IsPrinterActive(param0->unk_65) == 0) && (sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (sub_02007C24(param0->unk_1C[0]) == 0)) { + if ((Text_IsPrinterActive(param0->unk_65) == 0) && (sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (PokemonSprite_IsAnimActive(param0->unk_1C[0]) == 0)) { sub_02015738(param0->unk_58, 1); sub_02005474(1141); param0->unk_66 = 20; @@ -315,8 +315,8 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) param0->unk_30 = sub_0207C894(&v1); sub_0207C8C4(param0->unk_30, 0); - sub_020086FC(param0->unk_1C[0], 0, 16, 4, 0x7fff); - sub_020086FC(param0->unk_1C[1], 0, 16, 4, 0x7fff); + PokemonSprite_StartFade(param0->unk_1C[0], 0, 16, 4, 0x7fff); + PokemonSprite_StartFade(param0->unk_1C[1], 0, 16, 4, 0x7fff); GF_ASSERT(Heap_FndGetTotalFreeSizeForExpHeap(param0->unk_5C) > 0x8000); Sound_PlayEffect(1529); @@ -352,10 +352,10 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) sub_0207C8C4(param0->unk_30, 6); sub_0207C8C4(param0->unk_30, 10); PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 2, 0, 16, 0x7fff); - sub_02007DEC(param0->unk_1C[0], 12, 0x0); - sub_02007DEC(param0->unk_1C[0], 13, 0x0); - sub_02007DEC(param0->unk_1C[1], 12, 0x100); - sub_02007DEC(param0->unk_1C[1], 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_1C[0], 12, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[0], 13, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_1C[1], 13, 0x100); Sound_PlayEffect(1531); param0->unk_70 = 0; param0->unk_66 = 8; @@ -372,7 +372,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) if (--param0->unk_66 == 0) { sub_0207C8C4(param0->unk_30, 12); PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 4, 16, 0, 0x7fff); - sub_0200872C(param0->unk_18, 16, 0, 3, 0x7fff); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 16, 0, 3, 0x7fff); Sound_PlayEffect(1532); param0->unk_64++; } @@ -385,8 +385,8 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) PokeSprite_LoadAnimation(param0->unk_80, param0->unk_44, param0->unk_1C[1], param0->unk_62, 2, 0, 0); PokeSprite_LoadAnimationFrames(param0->unk_80, &v2[0], param0->unk_62, 1); - sub_02007C10(param0->unk_1C[1], &v2[0]); - sub_02007B98(param0->unk_1C[1], NULL); + PokemonSprite_SetAnim(param0->unk_1C[1], &v2[0]); + PokemonSprite_InitAnim(param0->unk_1C[1], NULL); } sub_0200590C(param0->unk_62, param0->unk_85, param0->unk_86); @@ -394,7 +394,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) } break; case 11: - if ((sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (sub_02007C24(param0->unk_1C[1]) == 0)) { + if ((sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (PokemonSprite_IsAnimActive(param0->unk_1C[1]) == 0)) { Pokemon_SetValue(param0->unk_28, MON_DATA_SPECIES, (u8 *)¶m0->unk_62); Pokemon_CalcAbility(param0->unk_28); Pokemon_CalcLevelAndStats(param0->unk_28); @@ -483,7 +483,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) case 0: param0->unk_64 = 22; PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 0, 16, 0, 0x0); break; case 0xfffffffe: param0->unk_64 = 32; @@ -495,8 +495,8 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); sub_0207C460(param0->unk_00); - sub_02007DEC(param0->unk_1C[0], 6, 1); - sub_02007DEC(param0->unk_1C[1], 6, 1); + PokemonSprite_SetAttribute(param0->unk_1C[0], 6, 1); + PokemonSprite_SetAttribute(param0->unk_1C[1], 6, 1); param0->unk_3C->monData = param0->unk_28; param0->unk_3C->options = param0->unk_2C; param0->unk_3C->dataType = SUMMARY_DATA_MON; @@ -515,12 +515,12 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) OverlayManager_Free(param0->unk_38); sub_0207C1CC(param0, param0->unk_00); Window_DrawMessageBoxWithScrollCursor(param0->unk_04, 0, 1, 10); - sub_02007DEC(param0->unk_1C[0], 6, 0); - sub_02007DEC(param0->unk_1C[1], 6, 0); - sub_020089A0(param0->unk_1C[0]); - sub_020089A0(param0->unk_1C[1]); + PokemonSprite_SetAttribute(param0->unk_1C[0], 6, 0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 6, 0); + PokemonSprite_ScheduleReloadFromNARC(param0->unk_1C[0]); + PokemonSprite_ScheduleReloadFromNARC(param0->unk_1C[1]); PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 16, 0, 0x0); - sub_0200872C(param0->unk_18, 16, 0, 0, 0x0); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 16, 0, 0, 0x0); sub_02039734(); param0->unk_64++; } @@ -611,7 +611,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) break; case 39: PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 0, 16, 0, 0x0); param0->unk_64++; break; case 40: @@ -623,13 +623,13 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) break; case 41: if (PaletteData_GetSelectedBuffersMask(param0->unk_14) == 0) { - sub_02007DEC(param0->unk_1C[0], 12, 0x100); - sub_02007DEC(param0->unk_1C[0], 13, 0x100); - sub_02007DEC(param0->unk_1C[1], 12, 0x0); - sub_02007DEC(param0->unk_1C[1], 13, 0x0); - sub_02007DEC(param0->unk_1C[1], 6, 1); + PokemonSprite_SetAttribute(param0->unk_1C[0], 12, 0x100); + PokemonSprite_SetAttribute(param0->unk_1C[0], 13, 0x100); + PokemonSprite_SetAttribute(param0->unk_1C[1], 12, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 13, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 6, 1); PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 0, 16, 0, 0x7fff); - sub_0200872C(param0->unk_18, 16, 0, 0, 0x7fff); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 16, 0, 0, 0x7fff); param0->unk_72 = 0; param0->unk_73 = 0; param0->unk_74 = 0xff; @@ -647,8 +647,8 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) PokeSprite_LoadAnimation(param0->unk_80, param0->unk_44, param0->unk_1C[0], param0->unk_60, 2, 0, 0); PokeSprite_LoadAnimationFrames(param0->unk_80, &v4[0], param0->unk_60, 1); - sub_02007C10(param0->unk_1C[0], &v4[0]); - sub_02007B98(param0->unk_1C[0], NULL); + PokemonSprite_SetAnim(param0->unk_1C[0], &v4[0]); + PokemonSprite_InitAnim(param0->unk_1C[0], NULL); } sub_0200590C(param0->unk_60, param0->unk_84, param0->unk_86); @@ -656,7 +656,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) } break; case 43: - if ((sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (sub_02007C24(param0->unk_1C[0]) == 0)) { + if ((sub_0200598C() == 0) && (sub_020160F4(param0->unk_44, 0) == 1) && (PokemonSprite_IsAnimActive(param0->unk_1C[0]) == 0)) { StringTemplate_SetNickname(param0->unk_0C, 0, Pokemon_GetBoxPokemon(param0->unk_28)); param0->unk_65 = sub_0207C584(param0, 919); param0->unk_66 = 20; @@ -667,7 +667,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) if (Text_IsPrinterActive(param0->unk_65) == 0) { if (--param0->unk_66 == 0) { PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); - sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); + PokemonSpriteManager_StartFadeAll(param0->unk_18, 0, 16, 0, 0x0); param0->unk_64++; } } @@ -940,7 +940,7 @@ static void sub_0207C498(UnkStruct_0207AE68 *param0) Pokemon_BuildSpriteTemplate(&v0, param0->unk_28, 2); - param0->unk_1C[0] = sub_02007C34(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); + param0->unk_1C[0] = PokemonSpriteManager_CreateSprite(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); v1 = Pokemon_New(param0->unk_5C); Pokemon_Copy(param0->unk_28, v1); @@ -949,10 +949,10 @@ static void sub_0207C498(UnkStruct_0207AE68 *param0) Pokemon_BuildSpriteTemplate(&v0, v1, 2); Heap_FreeToHeap(v1); - param0->unk_1C[1] = sub_02007C34(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); + param0->unk_1C[1] = PokemonSpriteManager_CreateSprite(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); - sub_02007DEC(param0->unk_1C[1], 12, 0x0); - sub_02007DEC(param0->unk_1C[1], 13, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 12, 0x0); + PokemonSprite_SetAttribute(param0->unk_1C[1], 13, 0x0); } static void sub_0207C520(void *param0) @@ -961,7 +961,7 @@ static void sub_0207C520(void *param0) G2_SetWnd0Position(v0->unk_72, v0->unk_73, v0->unk_74, v0->unk_75); - sub_02008A94(v0->unk_18); + PokemonSpriteManager_UpdateCharAndPltt(v0->unk_18); VramTransfer_Process(); PaletteData_CommitFadedBuffers(v0->unk_14); Bg_RunScheduledUpdates(v0->unk_00); diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 846363ef59..3cb27162ef 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -676,7 +676,7 @@ PokemonSprite *sub_02095484(PokemonSpriteManager *param0, int param1, Pokemon *p param4->unk_04 = v0.archive; } - v1 = sub_02007C34(param0, &v0, param6, param7 + v2, param8, param1, NULL, NULL); + v1 = PokemonSpriteManager_CreateSprite(param0, &v0, param6, param7 + v2, param8, param1, NULL, NULL); return v1; } diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 79c624e9f6..ad74c4547b 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -153,7 +153,7 @@ static int sub_02097B18(OverlayManager *param0, int *param1) ov76_0223EB64(v0->unk_D4.unk_10); ov76_0223BF10(); - v0->unk_D4.unk_D0 = sub_0200762C(HEAP_ID_53); + v0->unk_D4.unk_D0 = PokemonSpriteManager_New(HEAP_ID_53); v0->unk_D4.unk_188 = sub_02015F84(HEAP_ID_53, 1, 0); { @@ -203,7 +203,7 @@ static int sub_02097D30(OverlayManager *param0, int *param1) break; } - sub_02007768(v0->unk_D4.unk_D0); + PokemonSpriteManager_DrawSprites(v0->unk_D4.unk_D0); ov76_0223BF50(); } break; case 2: @@ -245,7 +245,7 @@ static int sub_02097D88(OverlayManager *param0, int *param1) Heap_FreeToHeap(v0->unk_428); ov76_0223B678(v0); sub_02024034(v0->unk_D4.unk_F8); - sub_02007B6C(v0->unk_D4.unk_D0); + PokemonSpriteManager_Free(v0->unk_D4.unk_D0); sub_02015FB8(v0->unk_D4.unk_188); ov76_0223B8C4(v0); ov76_0223C424(&v0->unk_D4); diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 08f4021d92..090ee5e0af 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -75,7 +75,7 @@ static int sub_02098218(OverlayManager *param0, int *param1) v1->unk_04.unk_0C = Options_TextFrameDelay(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_10 = Options_Frame(v1->unk_00->unk_0C.unk_04); v1->unk_04.unk_34 = ov119_021D0DD4(); - v1->unk_04.unk_38 = sub_0200762C(HEAP_ID_71); + v1->unk_04.unk_38 = PokemonSpriteManager_New(HEAP_ID_71); v1->unk_04.unk_3C = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_71); v1->unk_04.unk_00 = BgConfig_New(HEAP_ID_71); @@ -137,7 +137,7 @@ static int sub_02098304(OverlayManager *param0, int *param1) break; } - sub_02007768(v0->unk_04.unk_38); + PokemonSpriteManager_DrawSprites(v0->unk_04.unk_38); ov119_021D1004(); } break; default: @@ -175,7 +175,7 @@ static int sub_02098388(OverlayManager *param0, int *param1) Heap_FreeToHeap(v0->unk_04.unk_00); VramTransfer_Free(); - sub_02007B6C(v0->unk_04.unk_38); + PokemonSpriteManager_Free(v0->unk_04.unk_38); sub_02015FB8(v0->unk_04.unk_54); NARC_dtor(v0->unk_04.unk_3C);