mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-04 08:46:07 +00:00
Code Issues Projects Releases Wiki Activity
oot/src/code/z_player_call.c

59 lines
2 KiB
C
Raw Normal View History

libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
2020-10-03 15:22:44 +00:00
#include "global.h"
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
#define FLAGS 0x06000035
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void (*sPlayerCallInitFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallDestroyFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallUpdateFunc)(Actor* thisx, GlobalContext* globalCtx);
void (*sPlayerCallDrawFunc)(Actor* thisx, GlobalContext* globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Update(Actor* thisx, GlobalContext* globalCtx);
void PlayerCall_Draw(Actor* thisx, GlobalContext* globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
void Player_Init(Actor* thisx, GlobalContext* globalCtx);
void Player_Destroy(Actor* thisx, GlobalContext* globalCtx);
void Player_Update(Actor* thisx, GlobalContext* globalCtx);
void Player_Draw(Actor* thisx, GlobalContext* globalCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
const ActorInit Player_InitVars = {
First proper commit.
2020-03-17 04:31:30 +00:00
ACTOR_PLAYER,
Actor Struct Changes (and a few related things) (#617) * reformat header * type -> category * done for now i think * some more stuff * first -> head * focus * flag comment * ground -> floor * remove asm, name wrapper funcs * name func, format * review * targetPriority, format * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * comment * review * feet flags * horse shadow
2021-01-18 21:04:04 +00:00
ACTORCAT_PLAYER,
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
FLAGS,
First proper commit.
2020-03-17 04:31:30 +00:00
OBJECT_GAMEPLAY_KEEP,
sizeof(Player),
(ActorFunc)PlayerCall_Init,
(ActorFunc)PlayerCall_Destroy,
(ActorFunc)PlayerCall_Update,
(ActorFunc)PlayerCall_Draw,
};
Fix most compiler warnings in the boot and code segments (#674) * Less warnings in boot & code segments * few more warnings gone * Ran formatter * z_view warning gone * -> 1 * f31 -> 31 * Remove function casts * Few more small improvements * Separate declaration and assignment in func_80091738 and Item_Give Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-02-14 00:49:40 +00:00
void PlayerCall_InitFuncPtrs(void) {
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
sPlayerCallInitFunc = KaleidoManager_GetRamAddr(Player_Init);
sPlayerCallDestroyFunc = KaleidoManager_GetRamAddr(Player_Destroy);
sPlayerCallUpdateFunc = KaleidoManager_GetRamAddr(Player_Update);
sPlayerCallDrawFunc = KaleidoManager_GetRamAddr(Player_Draw);
First proper commit.
2020-03-17 04:31:30 +00:00
}
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
KaleidoScopeCall_LoadPlayer();
PlayerCall_InitFuncPtrs();
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
sPlayerCallInitFunc(thisx, globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
}
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void PlayerCall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
KaleidoScopeCall_LoadPlayer();
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
sPlayerCallDestroyFunc(thisx, globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
}
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void PlayerCall_Update(Actor* thisx, GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
KaleidoScopeCall_LoadPlayer();
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
sPlayerCallUpdateFunc(thisx, globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
}
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
void PlayerCall_Draw(Actor* thisx, GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
KaleidoScopeCall_LoadPlayer();
More actor cleanup Part 2 (#116) * Change all main actor functions to take a 'Actor* thisx' argument * Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 19:02:51 +00:00
sPlayerCallDrawFunc(thisx, globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Reference in a new issue Copy permalink