diff options
| author | cmon-meow <avey358@gmail.com> | 2020-06-07 08:47:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 09:47:11 -0400 |
| commit | 80ca848cfb297cb06e39dd5c5350c4e941354beb (patch) | |
| tree | cd0ebe2c00fdf7f2245b01a62c316bee6806668e /src/code | |
| parent | 68f5d212a7354bb4d8032e61b4e659be837eca38 (diff) | |
Actor* player.unk_684 (#193)
* Actor* player.unk_684
* delete 8008EEAC.s
* Update include/z64actor.h
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index c1630564d..88e056f51 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -238,9 +238,7 @@ void func_8008EE08(Player* player) { func_8008EDF0(player); } -#ifdef NON_MATCHING -// v1 instead of v0 -void func_8008EEAC(GlobalContext* globalCtx, UNK_PTR arg1) { +void func_8008EEAC(GlobalContext* globalCtx, Actor* arg1) { Player* player; player = PLAYER; @@ -251,9 +249,6 @@ void func_8008EEAC(GlobalContext* globalCtx, UNK_PTR arg1) { Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, arg1); func_8005A444(Gameplay_GetCamera(globalCtx, 0), 2); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EEAC.s") -#endif s32 func_8008EF40(GlobalContext* globalCtx) { Player* player = PLAYER; |