izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

E9F1D0 partial (#91)

Browse Source 
* E9F1D0 partial

* format

* unformat format
This commit is contained in:
inspectredc
2024-01-17 08:04:59 -06:00
committed by GitHub
parent 4ba101e283
commit 3ce61b6d95
5 changed files with 654 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -804,7 +804,7 @@ s32 func_i5_801A3790(Player*, f32, f32);
void func_E9F1D0_8018769C(Actor*);
void func_E9F1D0_80187520(u32 mode, void* ptr);
void func_E9F1D0_801878A8(Object_58**);
void func_E9F1D0_801878A8(void);
void func_E9F1D0_801888F4(Actor *);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
include/sf64object.h
+1 -3
View File
@@ -82,9 +82,7 @@ typedef struct {
/* 0x04 */ s16 zPos2;
/* 0x06 */ s16 xPos;
/* 0x08 */ s16 yPos;
/* 0x0A */ s16 unk_A;
/* 0x0C */ s16 unk_C;
/* 0x0E */ s16 unk_E;
/* 0x0A */ Vec3s rot;
/* 0x10 */ s16 id;
} ObjectInit; // size = 0x14
src/main/fox_enmy.c
+22 -22
View File
@@ -184,9 +184,9 @@ void Object_80_Load(Object_80* obj80, ObjectInit* objInit) {
obj80->obj.pos.z += -3000.0f + objInit->zPos2;
obj80->obj.pos.x = objInit->xPos;
obj80->obj.pos.y = objInit->yPos;
obj80->obj.rot.x = objInit->unk_A;
obj80->obj.rot.y = objInit->unk_C;
obj80->obj.rot.z = objInit->unk_E;
obj80->obj.rot.x = objInit->rot.x;
obj80->obj.rot.y = objInit->rot.y;
obj80->obj.rot.z = objInit->rot.z;
obj80->obj.id = objInit->id;
Object_SetInfo(&obj80->info, obj80->obj.id);
}
@@ -198,9 +198,9 @@ void Object_4C_Load(Object_4C* obj4C, ObjectInit* objInit) {
obj4C->obj.pos.z += -3000.0f + objInit->zPos2;
obj4C->obj.pos.x = objInit->xPos;
obj4C->obj.pos.y = objInit->yPos;
obj4C->obj.rot.y = objInit->unk_C;
obj4C->obj.rot.x = objInit->unk_A;
obj4C->obj.rot.z = objInit->unk_E;
obj4C->obj.rot.y = objInit->rot.y;
obj4C->obj.rot.x = objInit->rot.x;
obj4C->obj.rot.z = objInit->rot.z;
obj4C->obj.id = objInit->id;
Object_SetInfo(&obj4C->info, obj4C->obj.id);
}
@@ -212,9 +212,9 @@ void Actor_Load(Actor* actor, ObjectInit* objInit) {
actor->obj.pos.z += -3000.0f + objInit->zPos2;
actor->obj.pos.x = objInit->xPos;
actor->obj.pos.y = objInit->yPos;
actor->obj.rot.y = objInit->unk_C;
actor->obj.rot.x = objInit->unk_A;
actor->obj.rot.z = objInit->unk_E;
actor->obj.rot.y = objInit->rot.y;
actor->obj.rot.x = objInit->rot.x;
actor->obj.rot.z = objInit->rot.z;
actor->obj.id = objInit->id;
Object_SetInfo(&actor->info, actor->obj.id);
}
@@ -226,9 +226,9 @@ void Boss_Load(Boss* boss, ObjectInit* objInit) {
boss->obj.pos.z += -3000.0f + objInit->zPos2;
boss->obj.pos.x = objInit->xPos;
boss->obj.pos.y = objInit->yPos;
boss->obj.rot.y = objInit->unk_C;
boss->obj.rot.x = objInit->unk_A;
boss->obj.rot.z = objInit->unk_E;
boss->obj.rot.y = objInit->rot.y;
boss->obj.rot.x = objInit->rot.x;
boss->obj.rot.z = objInit->rot.z;
boss->obj.id = objInit->id;
Object_SetInfo(&boss->info, boss->obj.id);
}
@@ -240,9 +240,9 @@ void Item_Load(Item* item, ObjectInit* objInit) {
item->obj.pos.z += -3000.0f + objInit->zPos2;
item->obj.pos.x = objInit->xPos;
item->obj.pos.y = objInit->yPos;
item->obj.rot.y = objInit->unk_C;
item->obj.rot.x = objInit->unk_A;
item->obj.rot.z = objInit->unk_E;
item->obj.rot.y = objInit->rot.y;
item->obj.rot.x = objInit->rot.x;
item->obj.rot.z = objInit->rot.z;
item->obj.id = objInit->id;
item->scale = 1.0f;
Object_SetInfo(&item->info, item->obj.id);
@@ -369,9 +369,9 @@ void func_80061F0C(Actor* actor, ObjectInit* objInit, s32 arg2) {
actor->obj.pos.z += -3000.0f + objInit->zPos2;
actor->obj.pos.x = objInit->xPos;
actor->obj.pos.y = objInit->yPos;
actor->obj.rot.y = actor->unk_0F4.y = objInit->unk_C;
actor->obj.rot.x = actor->unk_0F4.x = objInit->unk_A;
actor->unk_0F4.z = objInit->unk_E;
actor->obj.rot.y = actor->unk_0F4.y = objInit->rot.y;
actor->obj.rot.x = actor->unk_0F4.x = objInit->rot.x;
actor->unk_0F4.z = objInit->rot.z;
actor->obj.id = OBJ_ACTOR_200;
actor->timer_0C2 = 10;
actor->unk_0B4 = 4095;
@@ -468,8 +468,8 @@ void Object_Load(ObjectInit* objInit, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
D_i5_801BA1E8 = 98;
break;
case OBJ_UNK_402:
D_E9F1D0_801A7F78 = objInit->unk_E * 0.1f;
D_E9F1D0_801A7F60 = -(f32) objInit->unk_A;
D_E9F1D0_801A7F78 = objInit->rot.z * 0.1f;
D_E9F1D0_801A7F60 = -(f32) objInit->rot.x;
break;
case OBJ_UNK_400:
D_801782B8++;
@@ -561,8 +561,8 @@ void func_80062664(void) {
for (i = 0, objInit = &D_80178310[D_80177DC8]; i < 10000; i++, D_80177DC8++, objInit++) {
if ((objInit->id > OBJ_INVALID) && D_80177D20 <= objInit->zPos1 && objInit->zPos1 <= D_80177D20 + 200.0f) {
if ((gCurrentLevel == LEVEL_VENOM_1) && (objInit->id >= OBJ_UNK_1000)) {
if (((objInit->unk_C < 180.0f) && (objInit->xPos < gPlayer[0].unk_0AC)) ||
((objInit->unk_C > 180.0f) && (gPlayer[0].unk_0AC < objInit->xPos))) {
if (((objInit->rot.y < 180.0f) && (objInit->xPos < gPlayer[0].unk_0AC)) ||
((objInit->rot.y > 180.0f) && (gPlayer[0].unk_0AC < objInit->xPos))) {
Object_Load(objInit, var_fs1, var_fs2, var_fs3, var_fs4);
}
} else {
src/main/fox_play.c
+4 -4
View File
@@ -345,7 +345,7 @@ void func_800A4F7C(void) {
gObjects58[i].obj.pos.x = D_80178310[j].xPos;
gObjects58[i].obj.pos.z = D_80178310[j].zPos1;
gObjects58[i].obj.pos.y = D_80178310[j].yPos;
gObjects58[i].obj.rot.y = D_80178310[j].unk_C;
gObjects58[i].obj.rot.y = D_80178310[j].rot.y;
Object_SetInfo(&gObjects58[i].info, gObjects58[i].obj.id);
i++;
}
@@ -374,7 +374,7 @@ void func_800A5338(void) {
obj58->obj.pos.x = D_80178310[j].xPos;
obj58->obj.pos.z = D_80178310[j].zPos1;
obj58->obj.pos.y = D_80178310[j].yPos;
obj58->obj.rot.y = D_80178310[j].unk_C;
obj58->obj.rot.y = D_80178310[j].rot.y;
Object_SetInfo(&obj58->info, obj58->obj.id);
if (obj58->obj.id == OBJ_80_1) {
obj58->info.dList = D_6020760;
@@ -426,7 +426,7 @@ void func_800A55B0(void) {
obj58->obj.pos.x = D_80178310[j].xPos;
obj58->obj.pos.z = D_80178310[j].zPos1;
obj58->obj.pos.y = D_80178310[j].yPos;
obj58->obj.rot.y = D_80178310[j].unk_C;
obj58->obj.rot.y = D_80178310[j].rot.y;
Object_SetInfo(&obj58->info, obj58->obj.id);
obj58++;
}
@@ -2653,7 +2653,7 @@ void func_800ABAB4(void) {
case LEVEL_VENOM_ANDROSS:
if (D_8017827C == 1) {
if (D_8015F924 == 0) {
func_E9F1D0_801878A8(&gObjects58);
func_E9F1D0_801878A8();
} else {
func_E9F1D0_801961AC(&gObjects58);
}
src/overlays/ovl_i6/E9F1E0.c
+626 -21
View File
File diff suppressed because it is too large Load Diff