mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-10 21:40:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update the GfxPool struct and match some functions (#134)

Browse Source 
* Update the GfxPool struct and match some functions

Also reordered variables.h a bit

* Match 2 more functions

* Replace reaming ->buffer references with ->mtxPool

Update the mips_to_c output of a couple functions based on new GfxPool
 definition

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-01-09 22:02:34 -05:00
committed by GitHub
parent bc99dedb8b
commit dd05d49f5f
26 changed files with 811 additions and 1489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+96 -68
View File
@@ -5,7 +5,7 @@
#include "defines.h"
#include "common_structs.h"
extern s32 gCCSelection;
extern s32 gCCSelection; // D_800DC548
extern s8 gCharacterIdByGPOverallRank[8]; // D_8018D9D0
extern s8 gCharacterGridSelections[4]; // D_8018EDE4
extern s8 gCharacterSelections[4]; // D_800E86A8
@@ -24,14 +24,15 @@ extern u8 gCupSelectionByCourseId[NUM_COURSES]; // D_800E7664
extern s16 gCurrentCourseId; // D_800DC5A0
extern s32 gD_8018E118TotalSize; // D_8018E110
extern s8 gDebugMenuSelection; // D_8018EDEF
extern char *gDebugSoundModeNames[NUM_SOUND_MODES]; // D_800E7700
extern Gfx *gDisplayListHead; // D_80150298
extern u16 gEnableDebugMode; // D_800DC520
extern u16 gEnableDebugMode; // D_800DC520
extern s32 gGlobalTimer; // D_800DC54C
extern s8 gGPPointsByCharacterId[8]; // D_8018D9C8
extern s16 gGPCurrentRacePlayerIdByRank[8]; // D_80164360
extern s32 gGlobalTimer; // D_800DC54C
extern s8 gGPPointsByCharacterId[8]; // D_8018D9C8
extern s16 gGPCurrentRacePlayerIdByRank[8]; // D_80164360
extern s8 gHumanPlayerCount;
@@ -42,6 +43,7 @@ extern f32 gKartBoundingBoxTable[];
extern f32 gKartGravityTable[];
extern s32 gMenuTimingCounter; // D_8018EE00
extern s32 gMenuSelection; // D_800E86A0
extern s32 gModeSelection; // D_800DC53C
// Indicates the ID of the next title screen demo that will be played
@@ -49,9 +51,10 @@ extern u8 gNextDemoId; // D_800E86BC
extern s32 gNumD_8018E118Entries; // D_8018E758
// Maps course IDs (as defined in the COURSES enum) to an index in a given cup's track order
extern u8 gPerCupIndexByCourseId[NUM_COURSES]; // D_800EFD50
extern u8 gPerCupIndexByCourseId[NUM_COURSES]; // D_800EFD50
extern s32 gPlayerCountSelection1;
extern s32 gPlayerPositions[]; // D_801643B8
extern s32 gPlayerIsThrottleActive[]; // D_801653E0
extern s32 gPlayerPositions[]; // D_801643B8
extern u8 gSaveDataSoundMode; // D_8018ED14
extern u8 gSaveDataSoundModeBackup; // D_8018ED8C
@@ -64,29 +67,11 @@ extern char *gSoundModeNames[NUM_SOUND_MODES]; // D_800E7710
extern f32 gTimePlayerLastTouchedFinishLine[8]; // D_8015F898
extern s8 gTimeTrialDataCourseIndex; // D_8018EDF7
extern SaveData D_8018EB90;
extern struct_D_802874D8 D_802874D8;
extern s16 D_801650D0[4][8];
extern s16 D_80165110[4][8];
extern s16 D_80165150[4][8];
extern s16 D_80165190[4][8];
extern s16 D_801651D0[4][8];
extern struct_D_8018CE10 D_8018CE10[];
extern struct_D_802DFB80 D_802DFB80[][8];
extern struct_D_802BFB80 D_802BFB80[][8];
extern s32 D_800DC52C;
extern s32 D_800DC50C;
extern s16 D_80165578;
extern s16 D_8016557A;
extern s16 D_8016557C;
extern s16 D_8016557E;
extern s16 D_80165574;
extern s16 D_80165576;
extern s16 D_80165570;
extern s16 D_80165572;
extern s16 D_80165580;
extern s16 D_80165582;
extern s16 D_80165270[8];
extern Camera *camera1;
extern Camera *camera2;
extern Camera *camera3;
extern Camera *camera4;
extern Player* gPlayerOne;
extern Player* gPlayerTwo;
extern Player* gPlayerThree;
@@ -96,45 +81,88 @@ extern Player* gPlayerSix;
extern Player* gPlayerSeven;
extern Player* gPlayerEight;
extern Player* gPlayerOneCopy;
extern u16 D_800DC51C;
extern s8 gDebugMenuSelection; // D_8018EDEF
extern s32 D_80164A28;
extern s16 D_8016556E;
extern s32 D_80162DE0;
extern s32 D_80162DE4;
extern s32 D_80162DE8;
extern u16 D_8015F890;
extern u16 D_80162DD4[];
extern u16 D_80162DD8;
extern s16* D_80164550;
extern f32 D_80165210[];
extern f32 D_80165230[];
extern SaveData D_8018EB90;
extern Mtx D_80183D60;
extern struct_D_800E261C D_800E261C;
extern f32 D_80164510[];
extern s32 D_80165420[];
extern s32 D_80165440[];
extern s32 D_80165460[];
extern s32 D_80165480[];
extern s32 D_801654E0[];
extern s32 D_80165500[];
extern s32 D_80165520[];
extern s32 D_80165540[];
extern s32 D_8018D900;
extern s32 D_801652E0[];
extern s32 D_801652C0[];
extern s16 D_80165020[];
extern struct_D_8018CE10 D_8018CE10[];
extern struct_D_802874D8 D_802874D8;
extern struct_D_802DFB80 D_802DFB80[][8];
extern struct_D_802BFB80 D_802BFB80[][8];
extern struct GfxPool *gGfxPool; // D_8014EF40
extern Vec3f D_80165070[];
extern f32 D_80165280[];
extern f32 D_801652A0[];
extern s32 gPlayerIsThrottleActive[];
extern s32 D_80165400[];
extern s32 D_801654A0[];
extern s32 D_801654C0[];
extern s16 D_80165300[];
extern Camera *camera1;
extern Camera *camera2;
extern Camera *camera3;
extern Camera *camera4;
extern s32 D_8016524C;
extern Vp D_802B8880[];
extern Gfx D_0D0077A0[];
extern u16 D_800DC51C;
extern s32 D_800DC52C;
extern s32 D_800DC50C;
extern u16 D_8015F890;
extern u16 D_80162DD4[];
extern u16 D_80162DD8;
extern s32 D_80162DE0;
extern s32 D_80162DE4;
extern s32 D_80162DE8;
extern s32 D_80164A28;
extern f32 D_80164510[];
extern s16* D_80164550;
extern s16 D_80164AF0;
extern s16 D_80165020[];
extern s16 D_801650D0[4][8];
extern s16 D_80165110[4][8];
extern s16 D_80165150[4][8];
extern s16 D_80165190[4][8];
extern s16 D_801651D0[4][8];
extern f32 D_80165210[];
extern f32 D_80165230[];
extern s32 D_8016524C;
extern s16 D_80165270[8];
extern f32 D_80165280[];
extern f32 D_801652A0[];
extern s32 D_801652C0[];
extern s32 D_801652E0[];
extern s16 D_80165300[];
extern s32 D_80165400[];
extern s32 D_80165420[];
extern s32 D_80165440[];
extern s32 D_80165460[];
extern s32 D_80165480[];
extern s32 D_801654A0[];
extern s32 D_801654C0[];
extern s32 D_801654E0[];
extern s32 D_80165500[];
extern s32 D_80165520[];
extern s32 D_80165540[];
extern s16 D_8016556E;
extern s16 D_80165570;
extern s16 D_80165572;
extern s16 D_80165574;
extern s16 D_80165576;
extern s16 D_80165578;
extern s16 D_8016557A;
extern s16 D_8016557C;
extern s16 D_8016557E;
extern s16 D_80165580;
extern s16 D_80165582;
extern s8 D_801658FE;
extern s32 D_8018D120;
extern s32 D_8018D900;
#endif