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

Arms_Hook OK (#210)

Browse source 
* Arms_Hook OK

* cleanup

* decr

* remove redundant include

* missed some things

* rename things

Co-authored-by: dark-samus <mathmcclintic@gmail.com>
This commit is contained in:
fig02 2020-06-17 15:44:22 -04:00 • committed by GitHub
parent 4940621679
commit 67d13fe190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 341 additions and 906 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/code/z_actor.c
View file

@ -1,6 +1,7 @@
#include <ultra64.h>
#include <global.h>
#include <vt.h>
#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
#include "overlays/actors/ovl_En_Part/z_en_part.h"
@ -1020,24 +1021,14 @@ s32 func_8002DDF4(GlobalContext* globalCtx) {
return player->stateFlags2 & 0x1000;
}
typedef struct {
/* 0x000 */ Actor actor;
/* 0x14C */ char unk_14C[0xB4];
/* 0x200 */ Actor* unk_200;
/* 0x204 */ f32 unk_204;
/* 0x208 */ f32 unk_208;
/* 0x20C */ f32 unk_20C;
/* 0x210 */ s16 unk_210;
} ActorArmsHook;
void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) {
ActorArmsHook* hookActor;
ArmsHook* hookshot;
hookActor = (ActorArmsHook*)Actor_Find(&globalCtx->actorCtx, 0x0066, ACTORTYPE_ITEMACTION);
hookActor->unk_200 = actorB;
hookActor->unk_204 = 0.0f;
hookActor->unk_208 = 0.0f;
hookActor->unk_20C = 0.0f;
hookshot = (ArmsHook*)Actor_Find(&globalCtx->actorCtx, ACTOR_ARMS_HOOK, ACTORTYPE_ITEMACTION);
hookshot->grabbed = actorB;
hookshot->grabbedDistDiff.x = 0.0f;
hookshot->grabbedDistDiff.y = 0.0f;
hookshot->grabbedDistDiff.z = 0.0f;
actorB->flags |= 0x2000;
actorA->flags &= ~0x2000;
}

2
src/code/z_play.c
View file

@ -1134,7 +1134,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
if ((globalCtx->transitionMode == 3) || (globalCtx->transitionMode == 11) ||
(globalCtx->transitionCtx.transitionType >= 56)) {
View view; // 0xA0
View view; // 0xA0
View_Init(&view, gfxCtx);
view.flags = 2 | 8;

4
src/code/z_sample.c
View file

@ -52,10 +52,10 @@ void Sample_Destroy(SampleContext* this) {
void Sample_SetupView(SampleContext* this) {
View* view;
GraphicsContext* gfxCtx;
view = &this->view;
gfxCtx = this->state.gfxCtx;
View_Init(view, gfxCtx);
SET_FULLSCREEN_VIEWPORT(view);
func_800AA460(view, 60, 10, 12800);