diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-12-27 15:24:45 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 04:24:45 +0000 |
| commit | f19571dfcd92f09c1d187372405b5304bda495e5 (patch) | |
| tree | 0dbc9cfc58f7ccd30a342c9fb42ade6de87cb0b8 /src/code/z_effect_soft_sprite_old_init.c | |
| parent | 5455cbc0c89ae19ad98ad633be5ea49f34b1d7ee (diff) | |
Bigslime OK and Documented (#361)
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "d218cdf0"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git"
branch: "main"
commit: "d218cdf0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "f5fe93d7"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "f5fe93d7"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "e7a8a48c"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "e7a8a48c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* Bring Bigslime over from old branch
* Format
* Improve docs
* format
* More cleanup
* Fix Zero Vectors Name
* Improve docs
* Spelling/Grammar
* Small typo
* Extra space
* Fix zapd merge conflict
* tab
* Fix remaining names
* format
* Better documentation
* format
* fix
* Add names to identity matrices
* Minor Cleanup
* easier to read comments
* Another touch-up
* Missed a spot
* one more...
* typo
* Another typo
* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime
* PR Feedback
* Fix variable
* Add in gZeroVec3f in new prs
* Fix gZeroVec3f
* gZeroVec3f
* PR Feedback, move lots of static data inside functions
* Use z_actor decomp of `func_800BE680` for better macro name
* Naming gone wrong, but fixed now
* Fix dList
* Add an extra line of docs about shadows for a function
* dList -> shadowDList
* Next round of PR feedback
* Document object file, still need to double check some
* Small cleanup
* Improve and fix many docs, unname unknown material texture
* format
* Oops
* Clean up blobs from object file
* Aha! I finally get what's going on
* Remove Bigslime undefined_syms
* Remove more undefined symbols
Co-authored-by: Angie <angheloalf95@gmail.com>
Diffstat (limited to 'src/code/z_effect_soft_sprite_old_init.c')
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 6deeb7943..4303d3db2 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -590,7 +590,7 @@ extern Vec3f D_801AE3E0; void func_800B2364(GlobalContext* globalCtx, Vec3f* pos, Gfx* dList) { Vec3f posVec = D_801AE3E0; - EffectSsHahen_Spawn(globalCtx, pos, &D_801D15B0, &posVec, 1, 5, 1, 10, dList); + EffectSsHahen_Spawn(globalCtx, pos, &gZeroVec3f, &posVec, 1, 5, 1, 10, dList); } // EffectSsStick Spawn Functions @@ -1032,7 +1032,7 @@ void EffectSsDeadDs_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, } void func_800B31BC(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha, s32 life) { - EffectSsDeadDs_Spawn(globalCtx, pos, &D_801D15B0, &D_801D15B0, scale, scaleStep, alpha, life); + EffectSsDeadDs_Spawn(globalCtx, pos, &gZeroVec3f, &gZeroVec3f, scale, scaleStep, alpha, life); } // EffectSsIceSmoke Spawn Functions |