diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-07-04 11:23:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 17:23:18 +0200 |
| commit | 3fd05c9147116c9d0c0b5366cb24105c9ead7427 (patch) | |
| tree | 18937f116d1b4476699a96dbf86a3be2af5e483b /src/code | |
| parent | 7446e5eb800110c20eb701f223748847c21920c1 (diff) | |
z_En_Ossan and dependencies (#824)
* fix colliderinit typo
* fix initchain
* reloc
* progress
* progress
* Pick off a few easy functions, reduce number of warnings
* more tough OKs
* Getting closer to all OK, fix en_girla header
* some hard OKs, 7 to go
* two funcs remaining
* func_80AC7094 OK!
* Fix warnings, begin documentation
* get most of object_ossan documented, document some of en_ossan
* improve en_girla function names
* more EnOssan documentation
* more documentation
* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements
* delete TIME ITSELF
* object_oF1d_map OK
* more names, fixed a poition typo
* Nearly all en_ossan functions named, all variables named
* format.sh
* forgot to delete data
* implement pr changes
* EnOssan OK! implement most of Roman's suggestions
* ugh
* implement figs suggestions
* implement roman's suggestion
* Can't tell my left from my other left
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 562538466..37613baf4 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1560,13 +1560,13 @@ s8 func_8002F368(GlobalContext* globalCtx) { return player->exchangeItemId; } -void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) { +void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* x, s16* y) { Vec3f sp1C; f32 sp18; func_8002BE04(globalCtx, &actor->focus.pos, &sp1C, &sp18); - *arg2 = sp1C.x * sp18 * 160.0f + 160.0f; - *arg3 = sp1C.y * sp18 * -120.0f + 120.0f; + *x = sp1C.x * sp18 * 160.0f + 160.0f; + *y = sp1C.y * sp18 * -120.0f + 120.0f; } u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { |