mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 20:05:02 +00:00
Code Issues Projects Releases Wiki Activity

Format all src C files

Browse source
This commit is contained in:
Roman971 2020-03-22 22:19:43 +01:00
parent 251aea64ab
commit 8cfe7cce9f
652 changed files with 12488 additions and 19093 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/code/z_player_lib.c
View file

@ -3,33 +3,22 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008E750.s")
UNK_TYPE func_8008E8DC(GlobalContext* globalCtx, Player* player)
{
return (
player->stateFlags1 & 0x20000080 ||
player->action ||
globalCtx->sceneLoadFlag == 0x14 ||
player->stateFlags1 & 1 ||
player->unk_692 & 0x80 ||
gSaveContext.unk_13F0 &&
func_8008F0D8(player, player->unk_154) >= 0
);
UNK_TYPE func_8008E8DC(GlobalContext* globalCtx, Player* player) {
return (player->stateFlags1 & 0x20000080 || player->action || globalCtx->sceneLoadFlag == 0x14 ||
player->stateFlags1 & 1 || player->unk_692 & 0x80 ||
gSaveContext.unk_13F0 && func_8008F0D8(player, player->unk_154) >= 0);
}
UNK_TYPE func_8008E988(GlobalContext* globalCtx)
{
UNK_TYPE func_8008E988(GlobalContext* globalCtx) {
Player* player = PLAYER;
return func_8008E8DC(globalCtx, player) || player->unk_6AD == 4;
}
UNK_TYPE func_8008E9C4(Player* player)
{
UNK_TYPE func_8008E9C4(Player* player) {
return player->stateFlags1 & 0x10;
}
UNK_TYPE func_8008E9D0(Player* player)
{
UNK_TYPE func_8008E9D0(Player* player) {
return LINK_IS_CHILD && player->currentShield == 2;
}
@ -41,8 +30,7 @@ UNK_TYPE func_8008E9D0(Player* player)
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EC04.s")
void func_8008EC70(Player* player)
{
void func_8008EC70(Player* player) {
player->unk_154 = player->unk_151;
func_8008EC04(player, func_8008E9F8(player, player->unk_151));
player->unk_6AD = 0;
@ -50,19 +38,16 @@ void func_8008EC70(Player* player)
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008ECAC.s")
void func_8008ED9C(GlobalContext* globalCtx, Player* player, UNK_TYPE item, UNK_TYPE arg2)
{
void func_8008ED9C(GlobalContext* globalCtx, Player* player, UNK_TYPE item, UNK_TYPE arg2) {
Inventory_UpdateBottleItem(globalCtx, item, player->unk_150);
if (item != ITEM_BOTTLE)
{
if (item != ITEM_BOTTLE) {
player->unk_152 = item;
player->unk_151 = arg2;
}
player->unk_154 = arg2;
}
void func_8008EDF0(Player* player)
{
void func_8008EDF0(Player* player) {
player->unk_664 = NULL;
player->stateFlags2 &= ~0x2000;
}
@ -71,8 +56,7 @@ void func_8008EDF0(Player* player)
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EEAC.s")
UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1)
{
UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1) {
globalCtx->unk_11E5C = (arg1 + 1);
return 1;
}
@ -81,69 +65,56 @@ UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1)
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F034.s")
u8 func_8008F080(GlobalContext* globalCtx)
{
u8 func_8008F080(GlobalContext* globalCtx) {
Player* player = PLAYER;
return player->currentMask;
}
void func_8008F08C(GlobalContext* globalCtx)
{
void func_8008F08C(GlobalContext* globalCtx) {
Player* player = PLAYER;
player->currentMask = 0;
}
UNK_TYPE func_8008F098(GlobalContext* globalCtx)
{
UNK_TYPE func_8008F098(GlobalContext* globalCtx) {
Player* player = PLAYER;
return player->currentShield == 3;
}
UNK_TYPE func_8008F0AC(GlobalContext* globalCtx)
{
UNK_TYPE func_8008F0AC(GlobalContext* globalCtx) {
Player* player = PLAYER;
return player->unk_15D == 0xa && player->currentShield == 3;
}
s32 func_8008F0D8(Player* player, UNK_TYPE arg1)
{
s32 func_8008F0D8(Player* player, UNK_TYPE arg1) {
s32 temp_v0 = arg1 - 0x15;
if (temp_v0 >= 0 && temp_v0 < 6)
{
if (temp_v0 >= 0 && temp_v0 < 6) {
return temp_v0;
}
return -1;
}
UNK_TYPE func_8008F104(Player* player)
{
UNK_TYPE func_8008F104(Player* player) {
return player->unk_151 == 0x10 || player->unk_151 == 0x11;
}
UNK_TYPE func_8008F128(Player* player)
{
UNK_TYPE func_8008F128(Player* player) {
return func_8008F104(player) && player->heldActor == NULL;
}
s32 func_8008F158(UNK_TYPE arg0)
{
s32 func_8008F158(UNK_TYPE arg0) {
s32 temp_v0 = arg0 - 2;
if (temp_v0 > 0 && temp_v0 < 6)
{
if (temp_v0 > 0 && temp_v0 < 6) {
return temp_v0;
}
return 0;
}
void func_8008F180(Player* player)
{
void func_8008F180(Player* player) {
func_8008F158(player->unk_151);
}
UNK_TYPE func_8008F1A0(Player* player)
{
if (player->unk_151 >= 5 && player->unk_151 < 8)
{
UNK_TYPE func_8008F1A0(Player* player) {
if (player->unk_151 >= 5 && player->unk_151 < 8) {
return 1;
}
return 0;
@ -151,33 +122,27 @@ UNK_TYPE func_8008F1A0(Player* player)
#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F1CC.s")
s32 func_8008F224(Player* player, UNK_TYPE arg1)
{
s32 func_8008F224(Player* player, UNK_TYPE arg1) {
s32 temp_v0 = arg1 - 0x1E;
if (temp_v0 >= 0 && temp_v0 < 0xD)
{
if (temp_v0 >= 0 && temp_v0 < 0xD) {
return temp_v0;
}
return -1;
}
void func_8008F250(Player* player)
{
void func_8008F250(Player* player) {
func_8008F224(player, player->unk_151);
}
s32 func_8008F270(Player* player, UNK_TYPE arg1)
{
s32 func_8008F270(Player* player, UNK_TYPE arg1) {
s32 temp_v0 = arg1 - 0x12;
if (temp_v0 >= 0 && temp_v0 < 2)
{
if (temp_v0 >= 0 && temp_v0 < 2) {
return temp_v0;
}
return -1;
}
s32 func_8008F29C(Player* player)
{
s32 func_8008F29C(Player* player) {
return func_8008F270(player, player->unk_151);
}