mirror of
https://github.com/n64decomp/mk64
synced 2026-06-07 11:27:36 -04:00
Matches and m2c refreshing for code_80057C60 (#266)
* Matches and m2c refreshing for code_80057C60 * Convert some Vtx's into a Mtx Based on the usage of D_0D008E98, it seems like it should be a Mtx. So this commit changes some Vtx's into a Mtx Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
+3975
-5074
File diff suppressed because it is too large
Load Diff
+23
-2
@@ -91,14 +91,29 @@ void func_8005D794(Player*, UnkPlayerStruct258*, f32, f32, f32, s8, s8);
|
||||
void func_8005D7D8(UnkPlayerStruct258*, s8, f32);
|
||||
void func_8005D800(UnkPlayerStruct258*, s32, s16);
|
||||
void func_8005D82C(UnkPlayerStruct258*, s32, s16);
|
||||
void func_8005D898(Player*, s16, s8, s8);
|
||||
void func_8005D898(Player*, s16, s32, s8, s8);
|
||||
void func_8005DA30(Player*, s16, s32, s8, s8);
|
||||
void func_8005DAD0();
|
||||
void func_8005DAD8(UnkPlayerStruct258*, s16, s16, s16);
|
||||
|
||||
void func_80060BCC(Player*, s16, s32, s32);
|
||||
void func_80060F50(Player*, s16, s8, s8);
|
||||
|
||||
void func_80061094(Player*, s16, s8, s8);
|
||||
void func_80061130(Player*, s16, s8, s8);
|
||||
void func_80061130(Player*, s16, s32, s8, s8);
|
||||
void func_80061224(Player*, s16, s32, s8, s8);
|
||||
void func_800612F8(Player*, s32, s32, s32);
|
||||
void func_80061430(Player*, s32, s32, s32);
|
||||
void func_800615AC(Player*, s16, s32, s32);
|
||||
void func_80061754(Player*, s16, s32, s32, s32);
|
||||
void func_8006199C(Player*, s16, s32, s8, s8);
|
||||
void func_80061A34(Player*, s16, s32, s32);
|
||||
void func_80061D4C(Player*, s16, s32, s32);
|
||||
void func_80061EF4(Player*, s16, s32, s32);
|
||||
|
||||
void func_800621BC(Player*, s16, s32, s8);
|
||||
void func_80062484(Player*, UnkPlayerStruct258*, s32);
|
||||
void func_800624D8(Player*, s32, s32, s32);
|
||||
void func_800628C0(Player*, s8, s8, s8);
|
||||
void func_80062914(Player*, s8, s8, s8);
|
||||
void func_80062968(Player*, s8, s8, s8);
|
||||
@@ -106,6 +121,7 @@ void func_800629BC(Player*, s8, s8, s8);
|
||||
void func_80062A18(Player*, s8, s8, s8);
|
||||
void func_80062AA8(Player*, s8, s8, s8);
|
||||
void func_80062B18(f32*, f32*, f32*, f32, f32, f32, u16, u16);
|
||||
void func_80062C74(Player*, s16, s32, s32);
|
||||
void func_80062F98(Player*, s16, s8, s8);
|
||||
|
||||
void func_800630C0(Player*, s16, s8, s8);
|
||||
@@ -116,9 +132,12 @@ void func_800635D4(Player*, s16, s8, s8);
|
||||
void func_800639DC(Player*, s16, s8, s8);
|
||||
void func_80063BD4(Player*, s16, s8, s8);
|
||||
void func_80063D58(Player*, s16, s8, s8);
|
||||
void func_80063FBC(Player*, s16, s32, s32);
|
||||
|
||||
void func_80064184(Player*, s16, s8, s8);
|
||||
void func_800643A8(Player*, s16, s8, s8);
|
||||
void func_800644E8(Player*, s16, s32, s32);
|
||||
void func_80064664(Player*, s16, s32, s32);
|
||||
void func_800647C8(Player*, s16, s8, s8);
|
||||
void func_800648E4(Player*, s16, s8, s8);
|
||||
void func_80064988(Player*, s16, s8, s8);
|
||||
@@ -132,6 +151,7 @@ void func_80064F88(Player*, s16, s8, s8);
|
||||
void func_80065030(Player*, s16, s8, s8);
|
||||
void func_800650FC(Player*, s16, s8, s8);
|
||||
void func_800651F4(Player*, s16, s8, s8);
|
||||
void func_800652D4(Vec3f, Vec3s, f32);
|
||||
void func_800658A0(Player*, s8, s16, s8);
|
||||
|
||||
void func_80066998(Player*, s8, s16, s8);
|
||||
@@ -199,6 +219,7 @@ extern u8 D_801658FF;
|
||||
extern struct Controller *gControllerOne;
|
||||
extern s32 D_8018D214;
|
||||
extern s32 D_8018D2C8[];
|
||||
extern uintptr_t D_8018D48C; // Some kind of pointer to some decoded texture(s)
|
||||
|
||||
extern u16 gPlayerBalloonStatus[8][3]; // D_8018D5F0
|
||||
extern s16 gPlayerBalloonCount[]; // D_8018D8C0
|
||||
|
||||
@@ -207,7 +207,8 @@ extern Gfx D_0D008DF8[];
|
||||
extern Gfx D_0D008E20[];
|
||||
extern Gfx D_0D008E48[];
|
||||
extern Gfx D_0D008E70[];
|
||||
extern Vtx D_0D008E98[];
|
||||
extern Mtx D_0D008E98;
|
||||
extern Vtx D_0D008EA8[];
|
||||
extern f32 D_0D009418[];
|
||||
extern f32 D_0D009568[];
|
||||
extern f32 D_0D0096B8[];
|
||||
|
||||
@@ -1893,92 +1893,123 @@ Gfx D_0D008E70[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
static Vtx D_0D008E98[] = {
|
||||
static Mtx D_0D008E98 = {
|
||||
{{65536, 0, 1, 0},
|
||||
{ 0, 65536, 0, 1},
|
||||
{ 0, 0, 0, 0},
|
||||
{ 0, 0, 0, 0}},
|
||||
};
|
||||
|
||||
{{{ 1, 0, 0}, 0, {0, 1}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 0, 0, 1}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
static Vtx D_0D008EA8[] = {
|
||||
|
||||
// I think these 4 Vtx's are really the rows of a Mtx (D_0D008E98), based on the usage of D_0D008E98 throughout the code base
|
||||
// {{{ 1, 0, 0}, 0, {0, 1}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
// {{{ 0, 0, 1}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
// {{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
// {{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
|
||||
// These 4 Vtx's MAY be a Mtx too, its hard to say though as I can't find any references
|
||||
// to any of them in the code base
|
||||
{{{ 0, 410, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 0, 0, 0}, 546, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 0, 0, 0}, 0, {65535, 3}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ -1, 3, -1}, 3, {65535, 3}, {0x00, 0x01, 0x00, 0x00}}},
|
||||
|
||||
{{{ 1, 3, 0}, 2, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {11, 30}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 55, 74, 0}, 1, {90, 105}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 139, 155, 0}, 1, {177, 205}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 225, 242, 0}, 1, {292, 313}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 352, 373, 0}, 1, {452, 465}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
{{{ 10, 25, 0}, 1, {190, 210}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 270, 290, 0}, 1, {410, 440}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 540, 550, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {60, 80}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 125, 140, 0}, 1, {170, 185}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 230, 240, 0}, 1, {275, 285}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 310, 320, 0}, 1, {321, 349}, {0x00, 0x00, 0x00, 0x03}}},
|
||||
{{{ 350, 360, 0}, 1, {385, 415}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 450, 468, 0}, 1, {470, 477}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
|
||||
{{{ 480, 485, 0}, 11, {543, 546}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
{{{ 548, 550, 0}, 11, {565, 568}, {0x00, 0x00, 0x00, 0x02}}},
|
||||
{{{ 630, 631, 0}, 6, {635, 640}, {0x00, 0x00, 0x00, 0x0a}}},
|
||||
{{{ 645, 655, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
|
||||
{{{ 1, 2, 0}, 6, {15, 30}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 55, 65, 0}, 1, {125, 150}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 265, 270, 0}, 1, {275, 285}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 305, 320, 0}, 2, {330, 340}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 375, 385, 0}, 1, {547, 570}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 582, 600, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {70, 94}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 120, 133, 0}, 1, {150, 170}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 249, 265, 0}, 1, {360, 395}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 635, 655, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {15, 30}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 41, 63, 0}, 1, {115, 155}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 200, 215, 0}, 1, {240, 241}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
{{{ 264, 265, 0}, 10, {270, 290}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 345, 375, 0}, 1, {493, 544}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 583, 605, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
|
||||
{{{ 1, 2, 0}, 6, {75, 100}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 135, 150, 0}, 1, {355, 390}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 505, 525, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {65, 80}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 165, 166, 0}, 9, {180, 210}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 220, 221, 0}, 10, {250, 275}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 360, 380, 0}, 1, {440, 480}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 600, 601, 0}, 9, {689, 690}, {0x00, 0x00, 0x00, 0x0a}}},
|
||||
|
||||
{{{ 695, 725, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {128, 275}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 320, 345, 0}, 1, {465, 565}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
|
||||
{{{ 75, 100, 0}, 1, {175, 210}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 275, 300, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {106, 188}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 220, 386, 0}, 1, {583, 765}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
{{{ 245, 262, 0}, 1, {585, 606}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
{{{ 7, 38, 0}, 1, {36, 54}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 129, 150, 0}, 1, {380, 410}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 425, 445, 0}, 1, {456, 500}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 594, 625, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
|
||||
{{{ 1, 2, 0}, 6, {4, 5}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
|
||||
{{{ 129, 130, 0}, 10, {555, 560}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
{{{ 827, 832, 0}, 10, {810, 845}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 910, 993, 0}, 1, {1390, 1600}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
|
||||
{{{ 80, 120, 0}, 1, {200, 250}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 252, 253, 0}, 9, {273, 295}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 300, 315, 0}, 1, {333, 384}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 400, 401, 0}, 10, {405, 435}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 445, 475, 0}, 1, {485, 525}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 585, 615, 0}, 1, {685, 735}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 783, 820, 0}, 1, {956, 984}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 1005, 1050, 0}, 1, {1063, 1088}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
{{{ 1130, 1131, 0}, 9, {1169, 1170}, {0x00, 0x00, 0x00, 0x0a}}},
|
||||
{{{ 1195, 1240, 0}, 1, {1262, 1300}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
|
||||
{{{ 20, 40, 0}, 1, {190, 191}, {0x00, 0x00, 0x00, 0x09}}},
|
||||
|
||||
{{{ 259, 260, 0}, 10, {315, 335}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 353, 370, 0}, 1, {398, 430}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
{{{ 458, 485, 0}, 1, {510, 535}, {0x00, 0x00, 0x00, 0x01}}},
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <variables.h>
|
||||
#include <config.h>
|
||||
#include "camera.h"
|
||||
#include "common_textures.h"
|
||||
#include "skybox_and_splitscreen.h"
|
||||
|
||||
Vp D_802B8880[] = {
|
||||
|
||||
@@ -73,7 +73,6 @@ extern s32 D_801625EC;
|
||||
extern s32 D_801625F0;
|
||||
extern s32 D_801625F4;
|
||||
extern u16 D_800DC5BC;
|
||||
extern Mtx *D_0D008E98;
|
||||
extern struct GfxPool *gGfxPool;
|
||||
extern f32 D_80150130[];
|
||||
extern u16 D_800DC5B4;
|
||||
|
||||
Reference in New Issue
Block a user