mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-17 14:26:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Array D_80165230 Fake Match Usage (#521)

Browse Source 
* Fix arr
This commit is contained in:
MegaMech
2023-12-30 20:32:51 -07:00
committed by GitHub
parent c3975f2865
commit 9370701ca4
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/camera.c
+2 -2
View File
@@ -237,7 +237,7 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
} else {
var_f14 = sp5C[0] + temp_s2->posX;
}
temp_f16 = sp5C[2] + D_8016524C;
temp_f16 = D_80165230[7] + sp5C[2];
temp_f18 = sp5C[1] + (temp_s2->posY + D_80164A30);
arg2[0] += (var_f14 - camera->lookAt[0]) * 1;
arg2[1] += (temp_f18 - camera->lookAt[1]) * 1;
@@ -248,7 +248,7 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
} else {
var_f14 = sp68[0] + temp_s2->posX;
}
temp_f16 = sp68[2] + D_8016524C;
temp_f16 = D_80165230[7] + sp68[2];
temp_f18 = sp68[1] + (temp_s2->posY + D_80164A30 + 6.0f);
move_f32_towards(&D_80164A30, 0, 0.02f);
posX = camera->pos[0];
src/player_controller.c
+1 -1
View File
@@ -3249,7 +3249,7 @@ void func_80030C34(Player *player) {
}
if (D_80165440[var_v0] == 5) {
gIsPlayerTripleAButtonCombo[var_v0] = TRUE;
D_80165480[var_v0] = 0x00000078;
D_80165480[var_v0] = 120;
D_80165440[var_v0] = 0;
D_80165420[var_v0] = 0;
}
src/spawn_players.c
+3 -6
View File
@@ -23,9 +23,7 @@
#include "render_player.h"
f32 D_80165210[8];
f32 D_80165230[7];
// weird D_8016524C should not exist and be in D_80165230 but don't match
f32 D_8016524C;
f32 D_80165230[8];
f32 D_80165250[8];
s16 D_80165270[8];
f32 D_80165280[8];
@@ -55,7 +53,6 @@ s32 D_80165500[8];
s32 D_80165520[8];
s32 D_80165540[8];
s16 D_80165560[7];
// weird D_8016556E should not exist and be in D_80165560 but don't match
s16 D_8016556E;
s16 D_80165570;
s16 D_80165572;
@@ -1108,9 +1105,9 @@ void func_8003D080(void) {
switch (gModeSelection) {
case GRAND_PRIX:
if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
camera_init(0.0f, player->pos[1], D_8016524C, player->unk_02C[1], 8, 0);
camera_init(0.0f, player->pos[1], D_80165230[7], player->unk_02C[1], 8, 0);
} else {
camera_init((D_80165210[7] + D_80165210[6]) / 2, player->pos[1], D_8016524C, player->unk_02C[1], 8, 0);
camera_init((D_80165210[7] + D_80165210[6]) / 2, player->pos[1], D_80165230[7], player->unk_02C[1], 8, 0);
}
break;
src/spawn_players.h
-1
View File
@@ -27,7 +27,6 @@ void func_8003DB5C(void);
extern f32 D_80165210[];
extern f32 D_80165230[];
extern f32 D_8016524C;
extern s16 D_80165270[];
extern f32 D_80165280[];
extern f32 D_801652A0[];
tools/doxygen_syms.md
-1
View File
@@ -4363,7 +4363,6 @@ Variable Name | Memory Address
[D_801651D0](@ref D_801651D0) | 0x801651D0
[D_80165210](@ref D_80165210) | 0x80165210
[D_80165230](@ref D_80165230) | 0x80165230
[D_8016524C](@ref D_8016524C) | 0x8016524C
[D_80165250](@ref D_80165250) | 0x80165250
[D_80165270](@ref D_80165270) | 0x80165270
[D_80165280](@ref D_80165280) | 0x80165280