izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

match: func_800101AC (#641)

Browse Source
This commit is contained in:
Dominik Peters
2025-06-22 19:08:34 +02:00
committed by GitHub
parent 0a1502afa3
commit 7f82296e78
3 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+20 -20
View File
@@ -7,7 +7,7 @@ All versions are supported, and the US 1.0 version (SHA1 = 0cb115d8716dbbc2922fd
<!-- README_SCORE_SUMMARY_BEGIN -->
As of June 21, 2025, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 93.71%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 93.94%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 59.95%
<!-- README_SCORE_SUMMARY_END -->
@@ -119,28 +119,28 @@ s32 is_drumstick_unlocked(void) {
<!-- README_SCORE_BEGIN -->
As of June 21, 2025, this is our current score:
```
======================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 93.71% Complete (94.42% NON_MATCHING) ----------------
# Decompiled functions: 1929
# GLOBAL_ASM remaining: 21
=====================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 93.94% Complete (94.65% NON_MATCHING) ---------------
# Decompiled functions: 1930
# GLOBAL_ASM remaining: 20
# NON_MATCHING functions: 4
# NON_EQUIVALENT WIP functions: 17
---------------------------- Game Status -----------------------------
Balloons: 44/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
----------------------------------------------------------------------
We are collecting silver coins in Darkmoon Caverns. (7/8 silver coins)
======================================================================
# NON_EQUIVALENT WIP functions: 16
---------------------------- Game Status ----------------------------
Balloons: 45/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
---------------------------------------------------------------------
We are collecting silver coins in Spaceport Alpha. (0/8 silver coins)
=====================================================================
ADVENTURE TWO (Cleanup & Documentation)
-------------------------- 59.95% Complete ---------------------------
# Documented functions: 1210
-------------------------- 59.95% Complete --------------------------
# Documented functions: 1210
# Undocumented remaining: 440
---------------------------- Game Status -----------------------------
---------------------------- Game Status ----------------------------
Balloons: 29/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 3/4, Wizpig Amulets: 2/4
----------------------------------------------------------------------
We are collecting silver coins in Treasure Caves. (5/8 silver coins)
======================================================================
T.T. Amulets: 3/4, Wizpig Amulets: 2/4
---------------------------------------------------------------------
We are collecting silver coins in Treasure Caves. (5/8 silver coins)
=====================================================================
```
<!-- README_SCORE_END -->
include/structs.h
+4 -3
View File
@@ -1511,10 +1511,11 @@ typedef struct Object_Audio {
} Object_Audio;
typedef struct Object_MidiFade {
/* 0x00 */ u8 unk0;
/* 0x00 */ s8 unk0;
/* 0x01 */ u8 unk1;
/* 0x02 */ u8 unk2;
/* 0x04 */ f32 unk4;
/* 0x04 */ u16 unk4;
/* 0x06 */ s16 unk6;
/* 0x08 */ f32 unk8;
/* 0x0C */ f32 unkC;
/* 0x10 */ f32 unk10;
@@ -1539,7 +1540,7 @@ typedef struct Object_MidiFadePoint {
} Object_MidiFadePoint;
typedef struct Object_MidiChannelSet {
s16 unk0;
u16 unk0;
u8 unk2;
u8 unk3;
} Object_MidiChannelSet;
src/objects.c
+71 -42
View File
@@ -2524,13 +2524,11 @@ void gParticlePtrList_flush(void) {
gFreeListCount = 0;
}
// https://decomp.me/scratch/DW6EX
#ifdef NON_EQUIVALENT
void func_800101AC(Object *obj, s32 arg1) {
Object *tempObj;
Object_Weapon *weapon;
Object_Racer *racer;
Object_Racer *snowball;
Object_Animation *snowball;
Object_Fireball_Octoweapon *fireball;
Object_Log *log;
Object_Butterfly *butterfly;
@@ -2538,20 +2536,24 @@ void func_800101AC(Object *obj, s32 arg1) {
s32 numberOfModelIds;
s32 i;
s32 j;
Object_64 *obj64;
ModelInstance *models;
s32 modelType;
if (obj->segment.trans.flags & OBJ_FLAGS_PARTICLE) {
particle_deallocate((Particle *) obj);
gParticleCount--;
return;
}
if (obj->unk60 != NULL) {
for (i = 0; i < obj->unk60->unk0; i++) {
tempObj = obj->unk60->unk4[i];
numberOfModelIds = tempObj->segment.header->numberOfModelIds;
if (tempObj->segment.header->modelType == OBJECT_MODEL_TYPE_3D_MODEL) {
if (!gObjPtrList) {} // fake
modelType = tempObj->segment.header->modelType;
if (modelType == OBJECT_MODEL_TYPE_3D_MODEL) {
for (j = 0; j < numberOfModelIds; j++) {
free_3d_model(tempObj->modelInstances[j]);
free_3d_model(&tempObj->modelInstances[j]->objModel);
}
} else {
for (j = 0; j < numberOfModelIds; j++) {
@@ -2571,14 +2573,17 @@ void func_800101AC(Object *obj, s32 arg1) {
case BHV_RACER:
case BHV_ANIMATED_OBJECT_3:
for (i = 0; i < gObjectCount; i++) {
if (gObjPtrList[i]->behaviorId == BHV_BUTTERFLY) {
butterfly = &gObjPtrList[i]->unk64->butterfly;
tempObj = gObjPtrList[i];
if (tempObj->behaviorId == BHV_BUTTERFLY) {
butterfly = &tempObj->unk64->butterfly;
if (obj == butterfly->unk100) {
butterfly->unk100 = 0;
butterfly->unkFD = 1;
}
}
}
i = BHV_RACER;
break;
case BHV_WEAPON:
case BHV_WEAPON_2:
@@ -2590,42 +2595,57 @@ void func_800101AC(Object *obj, s32 arg1) {
decrease_rocket_sound_timer();
}
}
i = BHV_RACER;
break;
case BHV_FIREBALL_OCTOWEAPON_2:
fireball = &obj->unk64->fireball_octoweapon;
if (fireball->soundMask != NULL) {
audspat_point_stop(fireball->soundMask);
// This needs to be a weapon otherwise it doesn't match
weapon = (Object_Weapon *) &obj->unk64->fireball_octoweapon;
if (weapon->soundMask != NULL) {
audspat_point_stop(weapon->soundMask);
}
i = BHV_RACER;
break;
case BHV_SNOWBALL:
case BHV_SNOWBALL_2:
case BHV_SNOWBALL_3:
case BHV_SNOWBALL_4:
// TODO: Get a Snowball struct?
snowball = &obj->unk64->racer;
// This should probably be it's own struct instead of re-using animation
snowball = &obj->unk64->animation;
if (snowball->unk20 != NULL) {
audspat_point_stop((AudioPoint *) snowball->unk20);
}
i = BHV_RACER;
break;
case BHV_WAVE_GENERATOR:
wavegen_destroy(obj);
i = BHV_RACER;
break;
case BHV_LIGHT_RGBA:
func_80032BAC((ObjectLight *) obj->unk64);
i = BHV_RACER;
break;
case BHV_ANIMATION:
if (obj->unk64 != NULL && arg1 == 0) {
free_object(obj->unk64->obj);
free_object((Object *) &obj->unk64->obj);
}
i = BHV_RACER;
break;
case BHV_OVERRIDE_POS:
for (i = 0; i < D_8011AE00 && obj != D_8011ADD8[i]; i++) {}
if (i < D_8011AE00) {
for (j = 0; j < D_8011AE00 && obj != D_8011ADD8[j]; j++) {}
if (j < D_8011AE00) {
D_8011AE00--;
for (; i < D_8011AE00; i++) {
D_8011ADD8[i] = D_8011ADD8[i + 1];
for (; j < D_8011AE00; j++) {
D_8011ADD8[j] = D_8011ADD8[j + 1];
}
}
i = BHV_RACER;
break;
case BHV_BUOY_PIRATE_SHIP:
case BHV_LOG:
@@ -2633,12 +2653,22 @@ void func_800101AC(Object *obj, s32 arg1) {
if (log != NULL) {
mempool_free(log);
}
i = BHV_RACER;
break;
case BHV_LENS_FLARE:
lensflare_remove(obj);
i = BHV_RACER;
break;
case BHV_LENS_FLARE_SWITCH:
lensflare_override_remove(obj);
i = BHV_RACER;
break;
default:
i = BHV_RACER;
break;
}
switch (obj->behaviorId) {
@@ -2664,14 +2694,14 @@ void func_800101AC(Object *obj, s32 arg1) {
case BHV_DOOR_OPENER:
case BHV_PIG_ROCKETEER:
case BHV_WIZPIG_GHOSTS:
// Not sure if this is an animation yet...
soundMask = obj->unk64->animation.unk18;
obj64 = obj->unk64;
soundMask = obj64->animation.unk18;
if (soundMask != NULL) {
sndp_stop(soundMask);
}
break;
}
if (obj->behaviorId == BHV_RACER) {
if (obj->behaviorId == i) {
racer = &obj->unk64->racer;
if (racer->unk18 != NULL) {
sndp_stop((SoundHandle) (s32) racer->unk18); // type cast required to match
@@ -2698,14 +2728,14 @@ void func_800101AC(Object *obj, s32 arg1) {
sndp_stop(racer->magnetSoundMask);
}
racer_sound_free(obj);
for (i = 0; i < gObjectCount; i++) {
if ((gObjPtrList[i]->segment.trans.flags & OBJ_FLAGS_PARTICLE) &&
(gObjPtrList[i]->segment.level_entry == obj->segment.level_entry)) {
gObjPtrList[i]->segment.level_entry = NULL;
for (j = 0; j < gObjectCount; j++) {
if ((gObjPtrList[j]->segment.trans.flags & OBJ_FLAGS_PARTICLE) &&
((s32) gObjPtrList[j]->segment.level_entry == (s32) obj)) {
gObjPtrList[j]->segment.level_entry = NULL;
}
if (gObjPtrList[i]->behaviorId == BHV_WEAPON_2 || gObjPtrList[i]->behaviorId == BHV_FLY_COIN ||
gObjPtrList[i]->behaviorId == BHV_WEAPON) {
free_object((Object *) gObjPtrList[i]);
if (gObjPtrList[j]->behaviorId == BHV_WEAPON_2 || gObjPtrList[j]->behaviorId == BHV_FLY_COIN ||
gObjPtrList[j]->behaviorId == BHV_WEAPON) {
free_object(gObjPtrList[j]);
}
}
}
@@ -2716,32 +2746,31 @@ void func_800101AC(Object *obj, s32 arg1) {
tex_free(obj->waterEffect->texture);
}
numberOfModelIds = obj->segment.header->numberOfModelIds;
if (obj->segment.header->modelType == OBJECT_MODEL_TYPE_3D_MODEL) {
for (i = 0; i < numberOfModelIds; i++) {
if (obj->modelInstances[i] != NULL) {
free_3d_model(obj->modelInstances[i]);
modelType = obj->segment.header->modelType;
if (modelType == OBJECT_MODEL_TYPE_3D_MODEL) {
for (j = 0; j < numberOfModelIds; j++) {
if (obj->modelInstances[j] != NULL) {
models = obj->modelInstances[j];
free_3d_model(models);
}
}
} else if (obj->segment.header->modelType == OBJECT_MODEL_TYPE_MISC) {
for (i = 0; i < numberOfModelIds; i++) {
tex_free(obj->textures[i]);
} else if (modelType == OBJECT_MODEL_TYPE_MISC) {
for (j = 0; j < numberOfModelIds; j++) {
tex_free(obj->textures[j]);
}
} else {
for (i = 0; i < numberOfModelIds; i++) {
sprite_free(obj->sprites[i]);
for (j = 0; j < numberOfModelIds; j++) {
sprite_free(obj->sprites[j]);
}
}
if (obj->segment.header->particleCount > 0) {
for (i = 0; i < obj->segment.header->particleCount; i++) {
emitter_cleanup(&obj->particleEmitter[i]);
for (j = 0; j < obj->segment.header->particleCount; j++) {
emitter_cleanup(&obj->particleEmitter[j]);
}
}
try_free_object_header(obj->segment.object.unk2C);
mempool_free(obj);
}
#else
#pragma GLOBAL_ASM("asm/nonmatchings/objects/func_800101AC.s")
#endif
void obj_update(s32 updateRate) {
s32 i;