mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-10 21:40:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update gitignore & match more actor funcs (#206)

Browse Source 
* import random_u16 to sm64

* rand math decomp

* Match func_80298AC0

* Match some actor funcs

* Renames

* update gitignore for .bin textures

* update player struct member 34 to Vec3f

* Named and documented actor destroy funcs
This commit is contained in:
MegaMech
2022-05-19 14:20:39 -06:00
committed by GitHub
parent bcf65f3883
commit 489e897147
23 changed files with 139 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_802B0210.c
+13 -13
View File
@@ -327,7 +327,7 @@ s32 func_802B09C0(s16 bananaId) {
#ifdef MIPS_TO_C
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
? func_800C9060(s32, ?); /* extern */
? func_8029E854(struct BananaBunchParent *, s32); /* extern */
? destroy_actor(struct BananaBunchParent *, s32); /* extern */
? func_802B0648(struct BananaBunchParent *); /* extern */
? func_802B0788(s16, struct BananaBunchParent *, Player *, Player *); /* extern */
s32 func_802B09C0(s16, s32); /* extern */
@@ -450,7 +450,7 @@ void update_obj_banana_bunch(struct BananaBunchParent *banana_bunch) {
}
if (phi_v1_5 == 0) {
sp2C = temp_a3;
func_8029E854(banana_bunch, 1);
destroy_actor(banana_bunch, 1);
temp_a3->unk_00C &= 0xFFFBFFFF;
return;
}
@@ -500,7 +500,7 @@ s32 func_802B0E14(s16 arg0) {
? func_8000EDC8(s32); /* extern */
? func_800C9060(u8, ?); /* extern */
? func_800C90F4(u8, s32); /* extern */
? func_8029E854(struct TripleShellParent *); /* extern */
? destroy_actor(struct TripleShellParent *); /* extern */
s32 func_802B0E14(s16, s16); /* extern */
s32 func_802B19EC(struct TripleShellParent *, Player *, s16, ?); /* extern */
? func_802B64C4(f32 *, s16); /* extern */
@@ -636,7 +636,7 @@ void update_obj_triple_shell(struct TripleShellParent *actor, s16 arg1) {
actor->shellIndices[2] = -1.0f;
}
if (phi_v1_3 == 0) {
func_8029E854(actor);
destroy_actor(actor);
return;
}
temp_v0_5 = &gControllers[actor->playerId];
@@ -1010,7 +1010,7 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B1FFC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
? func_800C9060(s32, ?, u16); /* extern */
? func_8029E854(struct BananaActor *); /* extern */
? destroy_actor(struct BananaActor *); /* extern */
? func_8029FDC8(f32, struct BananaActor *); /* extern */
? func_802ADDC8(f32, UnkActorInner *, UnkActorInner *, f32, f32, f32, f32); /* extern */
? func_802B4E30(struct BananaActor *); /* extern */
@@ -1264,7 +1264,7 @@ void update_obj_banana(struct BananaActor *banana) {
banana->elderIndex += -0x5B0;
banana->youngerIndex += 0x38E;
if (banana->unk_04 == 0) {
func_8029E854(banana);
destroy_actor(banana);
return;
}
break;
@@ -1316,12 +1316,12 @@ void func_802B2914(struct BananaBunchParent *banana_bunch, Player *player, s16 b
sp4C += player->pos[0];
sp50 += player->pos[1];
sp54 += player->pos[2];
sp60 = player->unk_034;
sp64 = player->unk_038;
sp60 = player->unk_034[0];
sp64 = player->unk_034[1];
sp58 = 0;
sp5A = 0;
sp5C = 0;
sp68 = player->unk_03C;
sp68 = player->unk_034[2];
temp_v0 = func_8029EC88(temp_a0, temp_a1, temp_a2, 6);
temp_t6 = temp_v0;
if (temp_v0 >= 0) {
@@ -1672,7 +1672,7 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B30EC.s")
? func_800C9060(u8, ?); /* extern */
? func_800C90F4(u8, s32); /* extern */
? func_800C98B8(f32 *, f32 *, ?); /* extern */
? func_8029E854(f32, struct ShellActor *); /* extern */
? destroy_actor(f32, struct ShellActor *); /* extern */
? func_8029FDC8(f32, struct ShellActor *); /* extern */
f32 func_802ABE30(f32, f32, f32, u16); /* extern */
? func_802AC098(UnkActorInner *, f32 *); /* extern */
@@ -1890,7 +1890,7 @@ void update_obj_green_shell(struct ShellActor *shell) {
shell->rotAngle += 0x5B0;
shell->pos[1] += shell->velocity[1];
if (shell->parentIndex == 0) {
func_8029E854(-5.0f, shell);
destroy_actor(-5.0f, shell);
}
break;
}
@@ -2159,7 +2159,7 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B4104.s")
? func_800C9060(u8, ?); /* extern */
? func_800C90F4(u8, s32); /* extern */
? func_800C9D80(f32 *, f32 *, ?); /* extern */
? func_8029E854(f32, struct ShellActor *); /* extern */
? destroy_actor(f32, struct ShellActor *); /* extern */
? func_8029FDC8(f32, struct ShellActor *); /* extern */
f32 func_802ABE30(f32, f32, f32, u16); /* extern */
? func_802AD950(UnkActorInner *, ?, f32, f32, f32, f32, f32, f32); /* extern */
@@ -2464,7 +2464,7 @@ block_16:
shell->rotAngle += 0x5B0;
shell->pos[1] += shell->velocity[1];
if (shell->parentIndex == 0) {
func_8029E854(-5.0f, shell);
destroy_actor(-5.0f, shell);
return;
}
break;