Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-26 22:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Doodad

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-07-06 09:38:59 -03:00
parent aa685cc1c8
commit 434d6a3855
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/i5.h
View File

@ -93,9 +93,9 @@ void Macbeth_Actor213_Update(Actor*);
void Macbeth_Actor212_Update(Actor*);
void Macbeth_Scenery104_Update(Scenery*);
void Macbeth_ActorDoodad_Draw(Actor*);
void Macbeth_SceneryDoodah_Draw(Scenery*);
void Macbeth_SceneryDoodad_Draw(Scenery*);
void Macbeth_Scenery61_Draw(Scenery*);
void Macbeth_SceneryDoodah2_Draw(Scenery*);
void Macbeth_SceneryDoodad2_Draw(Scenery*);
void Macbeth_Scenery83_Update(Scenery*);
void Macbeth_Scenery83_Draw(Scenery*);
void Macbeth_Actor214_Update(Actor*);

56
src/engine/fox_edata_info.c
View File

@ -170,35 +170,35 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_SCENERY_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_77, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_78, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_79, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_80, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_81, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_82, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_77, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_78, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_79, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_80, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_81, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_82, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_83, */ {(void*) Macbeth_Scenery83_Draw, 1, (ObjectFunc) Macbeth_Scenery83_Update, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_84, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_85, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_86, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_87, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_88, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_89, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_90, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_91, */ {(void*) Macbeth_SceneryDoodah2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_92, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_93, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_94, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_95, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_96, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_97, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_98, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_99, */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_100 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_101 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_102 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_103 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_104 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) Macbeth_Scenery104_Update, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_105 */ {(void*) Macbeth_SceneryDoodah_Draw, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_84, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_85, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_86, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_87, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_88, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_89, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_90, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_91, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_92, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_93, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_94, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_95, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_96, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_97, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_98, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_99, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_100 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_101 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_102 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_103 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_104 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) Macbeth_Scenery104_Update, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_105 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_SCENERY_107 */ {(void*) D_SY_601D730, 0, (ObjectFunc) NULL, D_SY_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_SCENERY_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },

2
src/engine/fox_enmy2.c
View File

@ -3655,7 +3655,7 @@ void ActorEvent_Update(ActorEvent* this) {
effect->unk_60.z = -effect->unk_60.z;
}
if (gGameFrameCount & 2) {
if ((gGameFrameCount & 2) != 0) {
effect->vel.y = -effect->vel.y;
}
}

12
src/overlays/ovl_i1/fox_co.c
View File

@ -2931,7 +2931,7 @@ void Corneria_LevelStart(Player* player) {
}
}
for (i = 0; ((i < 40) && (D_ctx_80177A48[7] >= 0.3f)); i++, D_ctx_80177A48[7] -= 0.3f) {
for (i = 0; (i < 40) && (D_ctx_80177A48[7] >= 0.3f); i++, D_ctx_80177A48[7] -= 0.3f) {
if (sp40 >= 0) {
Texture_Scroll(D_arwing_30184D8, 64, 32, 0);
} else {
@ -3076,7 +3076,7 @@ void Corneria_LevelStart(Player* player) {
falco->obj.pos.z += 100.0f;
}
if (gMsgCharIsPrinting && (gGameFrameCount & 2)) {
if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
player->wings.unk_30 = 5.0f;
}
break;
@ -3088,7 +3088,7 @@ void Corneria_LevelStart(Player* player) {
player->csTimer = 190;
}
if (gMsgCharIsPrinting && (gGameFrameCount & 2)) {
if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
player->wings.unk_30 = 5.0f;
}
@ -3097,7 +3097,7 @@ void Corneria_LevelStart(Player* player) {
break;
case 4:
if (gMsgCharIsPrinting && (gGameFrameCount & 2)) {
if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
player->wings.unk_30 = 5.0f;
}
@ -3126,7 +3126,7 @@ void Corneria_LevelStart(Player* player) {
falco->fwork[20] = 0.0f;
if (gMsgCharIsPrinting && (gGameFrameCount & 2)) {
if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
falco->fwork[20] = 5.0f;
}
break;
@ -3172,7 +3172,7 @@ void Corneria_LevelStart(Player* player) {
peppy->fwork[20] = 0.0f;
if (gMsgCharIsPrinting && (gGameFrameCount & 2)) {
if (gMsgCharIsPrinting && ((gGameFrameCount & 2) != 0)) {
peppy->fwork[20] = 5.0f;
}
break;

4
src/overlays/ovl_i5/fox_ma.c
View File

@ -2297,7 +2297,7 @@ void Macbeth_ActorDoodad_Draw(Actor* actor) {
}
// Scenery 92 to 105
void Macbeth_SceneryDoodah_Draw(Scenery* scenery) {
void Macbeth_SceneryDoodad_Draw(Scenery* scenery) {
Vec3f sp78[50];
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
@ -2410,7 +2410,7 @@ void Macbeth_Scenery61_Draw(Scenery* scenery) {
}
// Scenery 77 to 82, and 84 to 91
void Macbeth_SceneryDoodah2_Draw(Scenery* scenery) {
void Macbeth_SceneryDoodad2_Draw(Scenery* scenery) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE) {
Object_Kill(&scenery->obj, scenery->sfxSource);
}