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

En_Kz OK (#176)

Browse source 
* start kz

* remove irrelevant file

* kz progress

* en_kz progress

* match kz switch

* progress

* kz OK

* kz OK

* sync

* kz done

* delete asm files

* pr suggestions 1
This commit is contained in:
fig02 2020-05-29 17:20:00 -04:00 • committed by GitHub
parent 038ab888f6
commit ac97807762
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 479 additions and 1468 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_actor.c
View file

@ -3637,8 +3637,8 @@ Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) {
return func_8002EB44(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx);
}
s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*unkFunc1)(GlobalContext*, Actor*),
s16 (*unkFunc2)(GlobalContext*, Actor*)) {
s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, callback1_800343CC unkFunc1,
callback2_800343CC unkFunc2) {
s16 sp26;
s16 sp24;

5
src/code/z_en_item00.c
View file

@ -478,9 +478,8 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) {
this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f);
if
LINK_IS_ADULT
this->actor.posRot.pos.y += 20.0f;
if LINK_IS_ADULT
this->actor.posRot.pos.y += 20.0f;
}
extern s32 D_80157D90;

2
src/code/z_parameter.c
View file

@ -3554,7 +3554,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
// Revert any spoiling trade quest items
for (phi_s3 = 0; phi_s3 < ARRAY_COUNT(gSpoilingItems); phi_s3++) {
if (INV_CONTENT(ITEM_POCKET_EGG) == gSpoilingItems[phi_s3]) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[phi_s3]) {
gSaveContext.eventInf[0] &= 0x7F80;
osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[0]);
globalCtx->nextEntranceIndex = sSpoilingItemEntrances[phi_s3];