mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Actor* player.unk_684 (#193)

Browse source 
* 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>
This commit is contained in:
cmon-meow 2020-06-07 08:47:11 -05:00 • committed by GitHub
parent 68f5d212a7
commit 80ca848cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/code/z_player_lib.c
View file

@ -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;