mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-06 01:58:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining pointers for shifting

Browse Source
This commit is contained in:
CoderStig
2022-03-04 23:10:21 -07:00
parent c1114ebb6b
commit 345cbd4f19
11 changed files with 24 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800029B0.c
+1 -1
View File
@@ -101,7 +101,7 @@ Lights1 D_800DC610[] = {
gdSPDefLights1(175, 175, 175, 255, 255, 255, 0, 0, 120),
gdSPDefLights1(115, 115, 115, 255, 255, 255, 0, 0, 120),
};
static s32 pad = 0x80000000;
static s32 pad_800029B0 = 0x80000000;
s16 gCreditsCourseId = COURSE_LUIGI_RACEWAY;
s16 gPlaceItemBoxes = 1;
src/code_8001C4D0.c
-1
View File
@@ -14,7 +14,6 @@ Camera *camera1 = &cameras[0];
Camera *camera2 = &cameras[1];
Camera *camera3 = &cameras[2];
Camera *camera4 = &cameras[3];
//s32 test;
extern Player *gPlayerTwo;
src/code_800393C0.c
-2
View File
@@ -12,8 +12,6 @@ extern Camera *camera2;
extern Camera *camera3;
extern Camera *camera4;
//GLOBAL_ASM("asm/non_matchings/code_800393C0/spawn_player.s")
void spawn_player(Player *player, s8 playerIndex, f32 arg2, f32 arg3, f32 arg4, f32 arg5, u16 arg6, s16 arg7) {
f32 ret;
s8 idx;
src/code_8028DF00.c
+1 -1
View File
@@ -115,7 +115,7 @@ extern void func_80005AE8();
extern u16 D_8015F894;
//u32 testbss[0x200];
u16 D_802BA030;
u16 D_802BA032;
src/crash_screen.c
+1
View File
@@ -47,6 +47,7 @@ extern void read_controllers();
extern struct Controller *gControllerOne;
//s32 shift = 0;
u32 D_800DC670 = 0;
src/main.c
+14 -4
View File
@@ -63,6 +63,9 @@ struct Controller *gControllerFive = &gControllers[4]; // 0x800DC4CC
struct Controller *gControllerSix = &gControllers[5]; // 0x800DC4D0
struct Controller *gControllerSeven = &gControllers[6]; // 0x800DC4D4
struct Controller *gControllerEight = &gControllers[7]; // 0x800DC4D8
//Player shift[1];
//Player *shifting = &shift[0];
Player gPlayers[8];
Player *gPlayerOne = &gPlayers[0]; // 0x800DC4DC
@@ -171,8 +174,8 @@ u16 gEnableDebugMode = 0;
s32 D_800DC524 = 7; // = COURSE_DATA_MENU?;
UNUSED s32 D_800DC528 = 1;
s32 gActiveScreenMode = SCREEN_MODE_1P;
s32 gScreenModeSelection[2] = {0};
s32 gScreenModeSelection = 0;
UNUSED s32 D_800DC534 = 0;
s32 gPlayerCountSelection1 = 2;
s32 gModeSelection = GRAND_PRIX;
@@ -1123,7 +1126,7 @@ void func_80002684(void) {
extern s32 D_800DC600;
extern s32 D_8015F8B8, D_8015F8BC, D_8015F8C0, D_8015F8C4, D_8015F8C8, D_8015F8CC;
//extern u8 _networkSegmentRomStart;
void thread5_game_logic(s32 arg0) {
osCreateMesgQueue(&D_8014EF88, &D_8014F00C, 1);
osCreateMesgQueue(&D_8014EF70, &D_8014F008, 1);
@@ -1142,6 +1145,13 @@ void thread5_game_logic(s32 arg0) {
read_controllers();
func_800C5CB8();
//set_segment_base_addr(0x8, SEG_NETWORK);
//osInvalICache(SEG_NETWORK, 0x90);
//osInvalDCache(SEG_NETWORK+0x90, 0xFF);
//osPiStartDma(&gDmaIoMesg, 0, 0, &_networkSegmentRomStart, SEG_NETWORK, 0xFF, &gDmaMesgQueue);
//osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1);
while(1) {
func_800CB2C4();
if (D_800DC524 != D_800DC50C) {
@@ -1174,4 +1184,4 @@ void thread4_audio(UNUSED s32 arg0) {
}
profiler_log_thread4_time();
}
}
}