diff options
| author | fig02 <fig02srl@gmail.com> | 2020-05-29 17:20:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 17:20:00 -0400 |
| commit | ac978077620beea250156c2bc15f57550e041494 (patch) | |
| tree | 78c162f5592c4007e6cefa67a0c9f86343a3cf56 /src/code | |
| parent | 038ab888f6a741805a2b133fad6e11680d55c18a (diff) | |
En_Kz OK (#176)
* 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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 4 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 5 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 411cc1857..d7af214e5 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -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; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 9cc105dd1..bc3ff73d8 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -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; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index ab88d7f02..412303ffc 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -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]; |