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

Merge pull request #28 from Roman971/z_path.c

Browse source 
Rename/document some small files and Decompile z_path.c
This commit is contained in:
fig02 2020-03-23 18:09:18 -04:00 • committed by GitHub
commit 78a4684e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 163 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -224,7 +224,7 @@ static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) {
s16 targetYaw;
f32 waypointDistSq;
waypointDistSq = func_8008E520(&this->actor, this->path, this->waypoint, &targetYaw);
waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw);
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1);
if ((waypointDistSq > 0.0f) && (waypointDistSq < 1000.0f)) {
@ -261,7 +261,7 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.0075f);
this->waypoint = 0;
this->actor.gravity = -1.0f;
this->path = func_8008E4E0(globalCtx, (s16)((this->actor.params & 0x00F0) >> 4), 0xF);
this->path = Path_GetByIndex(globalCtx, (this->actor.params & 0x00F0) >> 4, 0xF);
switch (globalCtx->sceneNum) {
case SCENE_MARKET_NIGHT:

6
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -67,13 +67,13 @@ extern D_060005EC;
extern D_06003DC0;
static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) {
this->actor.textId = func_8006C360(globalCtx, 0x1B);
this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B);
if (this->actor.textId == 0) {
if (BEANS_BOUGHT >= 10) {
this->actor.textId = 0x406B;
return;
} else {
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
}

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -335,7 +335,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
}
path = &globalCtx->setupPathList[0];
point = SEGMENTED_TO_VIRTUAL(path->path);
point = SEGMENTED_TO_VIRTUAL(path->points);
point += this->currentWaypoint;
dx = point->x - this->actor.posRot.pos.x;
@ -359,7 +359,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) {
u16 ret;
ret = func_8006C360(globalCtx, 14);
ret = Text_GetFaceReaction(globalCtx, 14);
if (ret != 0) {
return ret;
}