some renaming (#419)

* Renames
This commit is contained in:
coco875
2023-09-19 20:23:12 +02:00
committed by GitHub
parent 91fc8ea473
commit 378144b35b
33 changed files with 549 additions and 510 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ void func_802816B8(void) {
cameras[0].up[0] = 0.0f;
cameras[0].up[1] = 1.0f;
cameras[0].up[2] = 0.0f;
D_80150130[0] = 40.0f;
gCameraZoom[0] = 40.0f;
D_80150148 = 1.33333333f;
D_80150150 = 3.0f;
D_8015014C = 6800.0f;
+3 -3
View File
@@ -20,7 +20,7 @@
#include "podium_ceremony_actors.h"
#include "code_80091750.h"
extern f32 D_80150130[];
extern f32 gCameraZoom[];
f32 D_802856B0 = 98.0f;
f32 D_802856B4 = 12.0f;
@@ -543,7 +543,7 @@ void init_cinematic_camera(void) {
camera->unk68 = 0.0f;
camera->unk6C = 0;
camera->unk6E = 0;
camera->unk20 = D_80150130[0];
camera->unk20 = gCameraZoom[0];
sCutsceneShot = 0;
gCutsceneShotTimer = 0;
D_802876D4 = 0;
@@ -626,7 +626,7 @@ s32 func_80283648(Camera *camera) {
}
func_80282F44(0, new_var, camera);
func_80282F44(1, new_var, camera);
func_80283100(new_var, D_80150130);
func_80283100(new_var, gCameraZoom);
vec3f_copy_dupe(new_var->unk30, camera->pos);
vec3f_copy_dupe(new_var->unk24, camera->lookAt);
vec3f_copy_dupe(new_var->unk3C, camera->up);
+4 -4
View File
@@ -51,16 +51,16 @@ void func_80280038(void) {
func_80057FC4(0);
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
guLookAt(&gGfxPool->mtxLookAt[0], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxLookAt[0]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
gCurrentCourseId = gCreditsCourseId;
mtxf_identity(matrix);
func_802B4FF8(matrix, 0);
render_set_position(matrix, 0);
func_80295A38(D_800DC5EC);
func_802A3008(D_800DC5EC);
render_course_actors(D_800DC5EC);
func_80058090(0);
func_80058538(0);
transition_sliding_borders();
@@ -128,7 +128,7 @@ void load_credits(void) {
func_802A4D18();
func_802A74BC();
camera->unk_B4 = 60.0f;
D_80150130[0] = 60.0f;
gCameraZoom[0] = 60.0f;
D_800DC5EC->screenWidth = SCREEN_WIDTH;
D_800DC5EC->screenHeight = SCREEN_HEIGHT;
D_800DC5EC->screenStartX = 160;
+1 -1
View File
@@ -14,7 +14,7 @@ void load_credits(void);
extern Gfx *gDisplayListHead;
extern f32 D_80150148, D_8015014C, D_80150150;
extern f32 D_80150130[4];
extern f32 gCameraZoom[4];
extern s16 gCreditsCourseId;
extern u16 gMatrixObjectCount;
extern s16 gMatrixEffectCount;
+1 -1
View File
@@ -96,7 +96,7 @@ void load_ceremony_cutscene(void) {
func_802A4D18();
func_802A74BC();
camera->unk_B4 = 60.0f;
D_80150130[0] = 60.0f;
gCameraZoom[0] = 60.0f;
D_800DC5EC->screenWidth = SCREEN_WIDTH;
D_800DC5EC->screenHeight = SCREEN_HEIGHT;
D_800DC5EC->screenStartX = 160;
+1 -1
View File
@@ -29,7 +29,7 @@ extern struct UnkStruct_800DC5EC *D_800DC5EC;
extern s32 D_80287554;
extern f32 D_801647A4;
extern f32 D_80150130[];
extern f32 gCameraZoom[];
extern s32 D_8015F5A0;
+2 -2
View File
@@ -67,13 +67,13 @@ void func_80281D00(void) {
}
func_8028150C();
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, D_80150130[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
guLookAt((Mtx*) &gGfxPool->mtxLookAt[0], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxLookAt[0]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
mtxf_identity(matrix);
func_802B4FF8(matrix, 0);
render_set_position(matrix, 0);
gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284F70));
func_800212B4();
gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284EE0));
+1 -1
View File
@@ -14,6 +14,6 @@ extern Gfx D_00284EE0[];
extern f32 D_80150148, D_8015014C, D_80150150;
extern f32 D_80150130[];
extern f32 gCameraZoom[];
#endif