diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-27 22:12:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 22:12:20 -0700 |
| commit | d0cb5d9be4ba15c4426e8f08cdd59777f99a9bc4 (patch) | |
| tree | 7e5b7c4f2cd00dd54b7fcd577ed599f5d0ef762a /src/code/z_effect_soft_sprite.c | |
| parent | b4d6c3921f4ce8d5847dda195881516a80c453a3 (diff) | |
InitVars -> Profile (#1697)
* ActorProfile
* EffectSsProfile
* TransitionProfile
* variables.txt
Diffstat (limited to 'src/code/z_effect_soft_sprite.c')
| -rw-r--r-- | src/code/z_effect_soft_sprite.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index fda7dc103..e76942d4a 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -171,7 +171,7 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initData) { s32 index; u32 overlaySize; EffectSsOverlay* overlayEntry = &gParticleOverlayTable[type]; - EffectSsInit* initInfo; + EffectSsProfile* profile; if (EffectSS_FindFreeSpace(priority, &index) != 0) { // Abort because we couldn't find a suitable slot to add this effect in @@ -182,7 +182,7 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initData) { overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart; if (overlayEntry->vramStart == NULL) { - initInfo = overlayEntry->initInfo; + profile = overlayEntry->profile; } else { if (overlayEntry->loadedRamAddr == NULL) { overlayEntry->loadedRamAddr = ZeldaArena_MallocR(overlaySize); @@ -195,21 +195,21 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initData) { overlayEntry->vramEnd, overlayEntry->loadedRamAddr); } - initInfo = (void*)(uintptr_t)((overlayEntry->initInfo != NULL) - ? (void*)((uintptr_t)overlayEntry->initInfo - - (intptr_t)((uintptr_t)overlayEntry->vramStart - - (uintptr_t)overlayEntry->loadedRamAddr)) - : NULL); + profile = (void*)(uintptr_t)((overlayEntry->profile != NULL) + ? (void*)((uintptr_t)overlayEntry->profile - + (intptr_t)((uintptr_t)overlayEntry->vramStart - + (uintptr_t)overlayEntry->loadedRamAddr)) + : NULL); } - if (initInfo->init != NULL) { + if (profile->init != NULL) { // Delete the previous effect in the slot, in case the slot wasn't free EffectSS_Delete(&sEffectSsInfo.dataTable[index]); sEffectSsInfo.dataTable[index].type = type; sEffectSsInfo.dataTable[index].priority = priority; - if (initInfo->init(play, index, &sEffectSsInfo.dataTable[index], initData) == 0) { + if (profile->init(play, index, &sEffectSsInfo.dataTable[index], initData) == 0) { EffectSS_ResetEntry(&sEffectSsInfo.dataTable[index]); } } |
