mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-04 09:29:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

matches (#170)

Browse Source
This commit is contained in:
petrie911
2024-03-17 22:23:01 -05:00
committed by GitHub
parent a7aac0753d
commit 5531a140d8
10 changed files with 305 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/assets/ast_7_ti_2.h
+1
View File
@@ -18,5 +18,6 @@ extern Gfx D_7004E80[];
extern Gfx D_7005300[];
extern Gfx D_7009700[];
extern Gfx D_7009890[];
extern Gfx D_7009A80[];
#endif
include/functions.h
+1 -1
View File
@@ -237,7 +237,7 @@ void func_80077218(Actor*);
// fox_effect
s32 func_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits);
s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits);
void BonusText_Update(void);
void BonusText_DrawAll(void);
Effect* func_8007783C(ObjectId objId);
src/main/audiotables.c
+3 -3
View File
@@ -16,7 +16,7 @@ AudioTableEntry gSampleBankTableInitEntries[4] = {
{ 0x678C80, 0xC3900, 2, 4, 0, 0, 0 },
};
AudioTableBase gSeqTableInit = { 0x42, 0, 0 };
AudioTableBase gSeqTableInit = { 66, 0, 0 };
AudioTableEntry gSeqTableInitEntries[66] = {
/* 00 */ { 0, 0x3AF0, 2, 0, 0, 0, 0 },
/* 01 */ { 0x3AF0, 0x56B0, 2, 0, 0, 0, 0 },
@@ -85,8 +85,8 @@ AudioTableEntry gSeqTableInitEntries[66] = {
/* 64 */ { 0x385C0, 0xFB0, 2, 3, 0, 0, 0 },
/* 65 */ { 0x39570, 0x1780, 2, 3, 0, 0, 0 },
};
AudioTableBase gSoundFontTableInit = { 0x21, 0, 0 };
AudioTableEntry gSoundFontTableInitEntries[0x21] = {
AudioTableBase gSoundFontTableInit = { 33, 0, 0 };
AudioTableEntry gSoundFontTableInitEntries[33] = {
{ 0, 0x2F00, 2, 0, 0xFF, 0x7F00, 0 }, { 0x2F00, 0xFE0, 2, 0, 0x1FF, 0x7F00, 0 },
{ 0x3EE0, 0x640, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x4520, 0x1560, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x5A80, 0xC00, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x6680, 0xDE0, 2, 0, 0x2FF, 0x7F00, 0 },
src/main/fox_effect.c
+1 -1
View File
@@ -32,7 +32,7 @@ extern Gfx D_9013C20[];
#include "assets/ast_aquas.h"
#include "assets/ast_A_ti.h"
void BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
s32 i;
for (i = 0; i < ARRAY_COUNT(gBonusText); i++) {
src/main/fox_enmy2.c
+1
View File
@@ -2030,6 +2030,7 @@ void func_800701E0(Actor* actor) {
if (actor->health <= 0) {
if (actor->unk_0B4 == 106) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3);
if (1) {}
gHitCount += 4;
D_80177850 = 15;
}
src/overlays/ovl_i3/fox_aq.c
+7 -14
View File
@@ -3770,7 +3770,7 @@ void func_i3_801B6344(Actor* actor) {
}
#ifdef NON_MATCHING
// The big spherical angle calculation has some reg swaps. BonusText_Display has a return?
// The big spherical angle calculation has a reg swap.
// https://decomp.me/scratch/DLrGN
void func_i3_801B638C(Actor* actor) {
Actor* var_v0;
@@ -3872,9 +3872,9 @@ void func_i3_801B638C(Actor* actor) {
}
}
}
temp_dx = actor->obj.pos.x - actor->fwork[15];
temp_dz = actor->obj.pos.z - actor->fwork[16];
sp98 = sqrtf(SQ(temp_dx) + SQ(temp_dz));
// temp_dx = actor->obj.pos.x - actor->fwork[15];
// temp_dz = actor->obj.pos.z - actor->fwork[16];
sp98 = sqrtf(SQ(actor->obj.pos.z - actor->fwork[16]) + SQ(actor->obj.pos.x - actor->fwork[15]));
actor->fwork[13] -= 20.0f;
actor->fwork[14] += 5.0f;
spB4 = SIN_DEG(actor->fwork[13]) * sp98 * 0.1f;
@@ -3954,8 +3954,9 @@ void func_i3_801B6E54(Actor* actor) {
// OBJ_ACTOR_262 action
#ifdef NON_MATCHING
// reloads 0.0f for temp_fs2_2. BonusText_Display has a return?
// reloads 0.0f for temp_fs2_2.
// https://decomp.me/scratch/02s9H
void func_i3_801B6FF8(Actor* actor) {
s32 i;
f32 temp_dx;
@@ -4027,8 +4028,7 @@ void func_i3_801B6FF8(Actor* actor) {
case 1:
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1);
sp9C.x = 0.0f;
sp9C.y = 0.0f;
sp9C.y = sp9C.x = 0.0f;
sp9C.z = 19.0f;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp9C, &sp90);
actor->vel.x = sp90.x;
@@ -4552,9 +4552,6 @@ void func_i3_801B90DC(Actor* actor) {
}
// OBJ_ACTOR_263 action
#ifdef NON_MATCHING
// BonusText_Display has a return?
// https://decomp.me/scratch/OwFpS
void func_i3_801B91A4(Actor* actor) {
Vec3f spDC = { 0.0f, 0.0f, 50.0f };
Vec3f spD0;
@@ -4712,10 +4709,6 @@ void func_i3_801B91A4(Actor* actor) {
}
}
}
#else
Vec3f D_i3_801C0314 = { 0.0f, 0.0f, 50.0f };
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/func_i3_801B91A4.s")
#endif
void func_i3_801B9DB0(s32 limbIndex, Vec3f* rot, void* thisx) {
Vec3f sp34 = { 0.0f, 0.0f, 0.0f };
src/overlays/ovl_i3/fox_zo.c
-3
View File
@@ -1291,7 +1291,6 @@ void func_i3_80192094(Actor* actor) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 5);
gHitCount += 6;
D_80177850 = 15;
if (actor->unk_0D0 && actor->unk_0D0) {}
actor->state = 4;
}
actor->unk_0D0 = 0;
@@ -1511,7 +1510,6 @@ void func_i3_80192E64(Actor* actor) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 2);
gHitCount += 3;
D_80177850 = 15;
if ((actor->unk_0D0) && (actor->unk_0D0)) {} // fake
actor->state = 3;
}
} else {
@@ -4140,7 +4138,6 @@ void func_i3_8019BE48(Actor* actor) {
if (D_80161684 == 0) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 2);
gHitCount += 2;
if (actor->unk_0D0 && actor->unk_0D0) {}
}
actor->health = actor->unk_044 = 0;
func_80066254(actor);
src/overlays/ovl_i5/fox_ma.c
+1
View File
@@ -4587,6 +4587,7 @@ void func_i5_801A7E7C(Actor* actor) {
Math_SmoothStepToF(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f);
if (actor->obj.pos.z < -135200.0f) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + sp374, actor->obj.pos.z, 50);
if (1) {}
gHitCount += 51;
D_80177850 = 15;
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f);
src/overlays/ovl_i5/fox_ti.c
+289 -314
View File
File diff suppressed because it is too large Load Diff
tools/permuter_settings.toml
+1
View File
@@ -30,6 +30,7 @@ compiler_type = "ido"
"a[A-Z].*" = "void"
"ALIGN.*" = "int"
"OS_K0_TO_PHYSICAL" = "int"
"AUDIO_PLAY_SFX" = "void"
[decompme.compilers]
"tools/ido-recomp/linux/cc" = "ido5.3"