mirror of
https://github.com/HarbourMasters/Starship
synced 2026-07-06 06:04:25 -04:00
Fixed rtc errors on meteo/hud
This commit is contained in:
@@ -710,8 +710,8 @@ bool func_enmy_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) {
|
||||
Vec3f sp50;
|
||||
Vec3f sp44;
|
||||
s32 colId;
|
||||
s32 pad1[3];
|
||||
f32 sp30;
|
||||
s32 pad1[2];
|
||||
f32 sp30[2];
|
||||
s32 pad2;
|
||||
|
||||
sp74.x = arg0->x - obj->pos.x;
|
||||
@@ -745,7 +745,7 @@ bool func_enmy_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) {
|
||||
} else if (objId == OBJ_BOSS_313) {
|
||||
colId = COL1_8;
|
||||
}
|
||||
if (func_col1_800998FC(&sp5C, &sp50, arg1, colId, &sp44, &sp30) > 0) {
|
||||
if (func_col1_800998FC(&sp5C, &sp50, arg1, colId, &sp44, sp30) > 0) {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1352,8 +1352,8 @@ void func_hud_80088784(s32 arg0) {
|
||||
}
|
||||
|
||||
void func_hud_80088970(void) {
|
||||
s32 i;
|
||||
s32 j;
|
||||
s32 i = 0;
|
||||
s32 j = 0;
|
||||
Player* player;
|
||||
f32 x0;
|
||||
f32 y0;
|
||||
|
||||
@@ -1191,10 +1191,9 @@ bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
|
||||
Vec3f sp54;
|
||||
Vec3f sp48;
|
||||
Vec3f sp3C;
|
||||
f32 pad1;
|
||||
f32 sp34;
|
||||
f32 sp34[2] = { 0, 0 };
|
||||
s32 colId;
|
||||
s32 useCol2;
|
||||
bool useCol2;
|
||||
|
||||
sp54.x = arg4;
|
||||
sp54.y = arg5;
|
||||
@@ -1361,7 +1360,7 @@ bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
|
||||
}
|
||||
|
||||
if (!useCol2) {
|
||||
if (func_col1_800998FC(&sp54, &sp48, arg8, colId, &sp3C, &sp34) > 0) {
|
||||
if (func_col1_800998FC(&sp54, &sp48, arg8, colId, &sp3C, sp34) > 0) {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -152,7 +152,7 @@ s32 D_radio_80178744;
|
||||
|
||||
void func_radio_800BAAE8(void) {
|
||||
static f32 D_800D4A74 = -1.0f;
|
||||
u16* sp44;
|
||||
u16* sp44 = NULL;
|
||||
s32 mirror;
|
||||
s32 i;
|
||||
f32 sp38;
|
||||
|
||||
Reference in New Issue
Block a user