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

Match Overlay_Relocate (#330)

Browse source 
* Finally match Overlay_DoRelocation

* remove asm, rename Overlay_DoRelocation to Overlay_Relocate

* formatter

* comment updates

* comment update
This commit is contained in:
krimtonz 2020-08-19 15:02:10 -05:00 • committed by GitHub
parent 07e6d25be2
commit 4ad461c797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c
View file

@ -68,9 +68,9 @@ void EnNiwGirl_Init(Actor* thisx, GlobalContext* globalCtx) {
vec1.x = vec1.y = 0.0f;
vec1.z = 50.0;
Matrix_MultVec3f(&vec1, &vec2);
this->chasedEnNiw = (EnNiw*)Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_NIW,
this->actor.posRot.pos.x + vec2.x, this->actor.posRot.pos.y + vec2.y,
this->actor.posRot.pos.z + vec2.z, 0, this->actor.posRot.rot.y, 0, 0xA);
this->chasedEnNiw = (EnNiw*)Actor_SpawnAttached(
&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_NIW, this->actor.posRot.pos.x + vec2.x,
this->actor.posRot.pos.y + vec2.y, this->actor.posRot.pos.z + vec2.z, 0, this->actor.posRot.rot.y, 0, 0xA);
if (this->chasedEnNiw != NULL) {
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" VT_RST, this->actor.params);
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" VT_RST, this->path);
@ -142,8 +142,7 @@ void EnNiwGirl_Talk(EnNiwGirl* this, GlobalContext* globalCtx) {
this->actor.textId = 0x7118;
break;
case 3:
this->actor.textId =
0x7119;
this->actor.textId = 0x7119;
break;
case 4:
case 6:

2
src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c
View file

@ -42,7 +42,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_4C, 16, ICHAIN_STOP),
};
UNK_PTR D_80B43F64[] = { 0x06000AF0, 0x06000000};
UNK_PTR D_80B43F64[] = { 0x06000AF0, 0x06000000 };
extern UNK_TYPE D_06000A60;
extern Gfx D_06000970[];