izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

En_Kendo_Js (#606)

Browse Source 
* En_Kendo_Js

* PR

* PR

* PR
This commit is contained in:
Maide
2022-02-19 20:09:27 +00:00
committed by GitHub
parent e353f3bb96
commit 08acf42204
16 changed files with 744 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -2021,8 +2021,8 @@ void func_801229A0(GlobalContext* globalCtx, Player* player);
// void func_80122ED8(void);
// void func_80122EEC(void);
void func_80122F28(Player* player, GlobalContext* globalCtx, Actor* actor);
// void func_80122F9C(void);
// void func_80122FCC(void);
s32 func_80122F9C(GlobalContext* globalCtx);
s32 func_80122FCC(GlobalContext* globalCtx);
// void func_8012300C(void);
void func_8012301C(s32 iParm1, GlobalContext* globalCtx);
void func_80123140(GlobalContext* globalCtx, Player* param_2);
@@ -2058,7 +2058,7 @@ s32 func_801240C8(Player* player);
// void func_80124110(void);
// void func_80124148(void);
// void func_80124168(void);
// void func_80124190(void);
s32 func_80124190(Player* player);
// void func_801241B4(void);
// void func_801241E0(void);
// void func_8012420C(void);
include/z64.h
+2 -1
View File
@@ -879,7 +879,8 @@ typedef struct {
/* 0x1205A */ UNK_TYPE1 pad1205A[0x10];
/* 0x1206A */ s16 unk1206A;
/* 0x1206C */ s32 unk1206C;
/* 0x12070 */ UNK_TYPE1 pad12070[0x8];
/* 0x12070 */ s32 unk12070;
/* 0x12074 */ UNK_TYPE1 pad12074[0x4];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ UNK_TYPE1 pad12080[0x31];
spec
+1 -2
View File
@@ -3975,8 +3975,7 @@ beginseg
name "ovl_En_Kendo_Js"
compress
include "build/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.o"
include "build/data/ovl_En_Kendo_Js/ovl_En_Kendo_Js.data.o"
include "build/data/ovl_En_Kendo_Js/ovl_En_Kendo_Js.reloc.o"
include "build/src/overlays/actors/ovl_En_Kendo_Js/ovl_En_Kendo_Js_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+1 -1
View File
@@ -91,7 +91,7 @@ void func_80B401F8(BgGoronOyu* this, GlobalContext* globalCtx) {
if (dist.x >= 0.0f && dist.x <= this->waterBoxXLength && dist.z >= 0.0f && dist.z <= this->waterBoxZLength &&
fabsf(dist.y) < 100.0f && player->actor.depthInWater > 12.0f) {
Actor_PickUp(&this->dyna.actor, globalCtx, 0xBA, this->dyna.actor.xzDistToPlayer,
Actor_PickUp(&this->dyna.actor, globalCtx, GI_MAX, this->dyna.actor.xzDistToPlayer,
fabsf(this->dyna.actor.playerHeightRel));
}
}
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+2 -2
View File
@@ -768,9 +768,9 @@ void func_809C2A64(EnAob01* this, GlobalContext* globalCtx) {
this->actionFunc = func_809C2BE4;
}
} else if (gSaveContext.weekEventReg[8] & 0x20) {
Actor_PickUp(&this->actor, globalCtx, 4, 300.0f, 300.0f);
Actor_PickUp(&this->actor, globalCtx, GI_RUPEE_RED, 300.0f, 300.0f);
} else {
Actor_PickUp(&this->actor, globalCtx, 12, 300.0f, 300.0f);
Actor_PickUp(&this->actor, globalCtx, GI_HEART_PIECE, 300.0f, 300.0f);
}
}
}
src/overlays/actors/ovl_En_Elf/z_en_elf.c
+1 -1
View File
@@ -700,7 +700,7 @@ void func_8088DD34(EnElf* this, GlobalContext* globalCtx) {
}
if (this->fairyFlags & 0x2000) {
Actor_PickUp(&this->actor, globalCtx, 0xBA, 80.0f, 60.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MAX, 80.0f, 60.0f);
}
}
src/overlays/actors/ovl_En_Fish/z_en_fish.c
+1 -1
View File
@@ -882,7 +882,7 @@ void func_8091F5A4(Actor* thisx, GlobalContext* globalCtx) {
func_8091D904(this);
}
} else if (func_8091DDF4(this, globalCtx)) {
Actor_PickUp(&this->actor, globalCtx, 0xBA, 80.0f, 25.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MAX, 80.0f, 25.0f);
}
}
}
src/overlays/actors/ovl_En_In/z_en_in.c
+6 -6
View File
@@ -411,7 +411,7 @@ void func_808F3B40(EnIn* this, GlobalContext* globalCtx) {
textId = gSaveContext.day != 3 ? 0x3481 : 0x34A4;
this->actor.textId = textId;
} else {
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
}
}
@@ -435,7 +435,7 @@ void func_808F3C40(EnIn* this, GlobalContext* globalCtx) {
textId = gSaveContext.day != 3 ? 0x346A : 0x3492;
this->actor.textId = textId;
} else {
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
}
}
@@ -759,7 +759,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
if (gSaveContext.rupees >= globalCtx->msgCtx.unk1206C) {
if (Interface_HasEmptyBottle()) {
this->actionFunc = func_808F3C40;
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
func_801159EC(-globalCtx->msgCtx.unk1206C);
ret = true;
} else {
@@ -905,7 +905,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_808F35D8(this, globalCtx);
if (Interface_HasEmptyBottle()) {
this->actionFunc = func_808F3B40;
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
ret = true;
} else {
func_800E8EA0(globalCtx, &this->actor, 0x347F);
@@ -1011,7 +1011,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
if (gSaveContext.rupees >= globalCtx->msgCtx.unk1206C) {
if (Interface_HasEmptyBottle()) {
this->actionFunc = func_808F3C40;
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
func_801159EC(-globalCtx->msgCtx.unk1206C);
ret = true;
} else {
@@ -1109,7 +1109,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_808F35D8(this, globalCtx);
if (Interface_HasEmptyBottle()) {
this->actionFunc = func_808F3B40;
Actor_PickUp(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
ret = true;
} else {
func_800E8EA0(globalCtx, &this->actor, 0x34A2);
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+2 -2
View File
@@ -511,9 +511,9 @@ void func_8095E660(EnIshi* this, GlobalContext* globalCtx) {
if ((this->actor.xzDistToPlayer < 90.0f) && (sp30 == 0)) {
if (sp38 == 1) {
Actor_PickUp(&this->actor, globalCtx, 0, 80.0f, 20.0f);
Actor_PickUp(&this->actor, globalCtx, GI_NONE, 80.0f, 20.0f);
} else {
Actor_PickUp(&this->actor, globalCtx, 0, 50.0f, 10.0f);
Actor_PickUp(&this->actor, globalCtx, GI_NONE, 50.0f, 10.0f);
}
}
}
src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+699 -46
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
+20 -2
View File
@@ -7,11 +7,29 @@ struct EnKendoJs;
typedef void (*EnKendoJsActionFunc)(struct EnKendoJs*, GlobalContext*);
#define ENKENDOJS_GET_FF(thisx) ((thisx)->params & 0xFF)
#define ENKENDOJS_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
#define ENKENDOJS_FF_1 1
typedef struct EnKendoJs {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnKendoJsActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0xBC];
/* 0x01D8 */ Vec3s jointTable[13];
/* 0x0226 */ Vec3s morphTable[13];
/* 0x0274 */ Vec3s* unk_274;
/* 0x0278 */ Vec3s unk_278;
/* 0x027E */ Vec3s unk_27E;
/* 0x0284 */ s16 unk_284;
/* 0x0286 */ s16 unk_286;
/* 0x0288 */ s16 unk_288;
/* 0x028A */ s16 unk_28A;
/* 0x028C */ s16 unk_28C;
/* 0x028E */ s16 unk_28E;
/* 0x0290 */ s16 unk_290;
/* 0x0292 */ u8 unk_292;
} EnKendoJs; // size = 0x294
extern const ActorInit En_Kendo_Js_InitVars;
src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
+2 -1
View File
@@ -10,7 +10,8 @@ typedef void (*EnMarutaActionFunc)(struct EnMaruta*, GlobalContext*);
typedef struct EnMaruta {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnMarutaActionFunc actionFunc;
/* 0x0148 */ char unk_148[0xDC];
/* 0x0148 */ char unk_148[0xD8];
/* 0x0220 */ s16 unk_220;
} EnMaruta; // size = 0x224
extern const ActorInit En_Maruta_InitVars;
src/overlays/actors/ovl_En_Zog/z_en_zog.c
+1 -1
View File
@@ -882,7 +882,7 @@ void func_80B94E34(EnZog* this, GlobalContext* globalCtx) {
}
if (ABS_ALT(this->actor.yawTowardsPlayer - this->actor.world.rot.y) > 0x5000) {
Actor_PickUp(&this->actor, globalCtx, 0, 60.0f, 40.0f);
Actor_PickUp(&this->actor, globalCtx, GI_NONE, 60.0f, 40.0f);
}
if (this->unk_324 > 0) {
src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
+1 -1
View File
@@ -518,7 +518,7 @@ void func_80A1C838(ObjFlowerpot* this, GlobalContext* globalCtx) {
s16 temp_v0_3 = this->actor.yawTowardsPlayer - GET_PLAYER(globalCtx)->actor.world.rot.y;
if (ABS_ALT(temp_v0_3) >= 0x5556) {
Actor_PickUp(&this->actor, globalCtx, 0, 36.0f, 30.0f);
Actor_PickUp(&this->actor, globalCtx, GI_NONE, 36.0f, 30.0f);
}
}
}
tools/disasm/functions.txt
+2 -2
View File
@@ -13330,8 +13330,8 @@
0x80B279F0:("func_80B279F0",),
0x80B27A90:("func_80B27A90",),
0x80B27ACC:("EnKendoJs_Update",),
0x80B27B54:("func_80B27B54",),
0x80B27B8C:("func_80B27B8C",),
0x80B27B54:("EnKendoJs_OverrideLimbDraw",),
0x80B27B8C:("EnKendoJs_PostLimbDraw",),
0x80B27BA4:("EnKendoJs_Draw",),
0x80B28080:("BgBotihasira_Init",),
0x80B28124:("BgBotihasira_Destroy",),
undefined_syms.txt
-7
View File
@@ -1548,13 +1548,6 @@ D_06001630 = 0x06001630;
D_06004274 = 0x06004274;
D_0600DEE8 = 0x0600DEE8;
// ovl_En_Kendo_Js
D_0600016C = 0x0600016C;
D_060003DC = 0x060003DC;
D_06000F4C = 0x06000F4C;
D_06006990 = 0x06006990;
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;