izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename thread3 variables, and use defines for screen width / height

Browse Source
This commit is contained in:
Ryan Myers
2021-10-28 16:52:22 -04:00
parent e00d773e50
commit 98df8525bc
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/main/func_80065D98.s
+6 -6
View File
@@ -3,14 +3,14 @@ glabel func_80065D98
/* 06699C 80065D9C AFBF001C */ sw $ra, 0x1c($sp)
/* 0669A0 80065DA0 0C02DBD4 */ jal func_800B6F50
/* 0669A4 80065DA4 AFA40020 */ sw $a0, 0x20($sp)
/* 0669A8 80065DA8 3C0E8012 */ lui $t6, %hi(D_8011F758) # $t6, 0x8012
/* 0669AC 80065DAC 25CEF758 */ addiu $t6, %lo(D_8011F758) # addiu $t6, $t6, -0x8a8
/* 0669B0 80065DB0 3C048012 */ lui $a0, %hi(D_8011F910) # $a0, 0x8012
/* 0669A8 80065DA8 3C0E8012 */ lui $t6, %hi(gThread3StackPointer) # $t6, 0x8012
/* 0669AC 80065DAC 25CEF758 */ addiu $t6, %lo(gThread3StackPointer) # addiu $t6, $t6, -0x8a8
/* 0669B0 80065DB0 3C048012 */ lui $a0, %hi(gThread3) # $a0, 0x8012
/* 0669B4 80065DB4 3C068007 */ lui $a2, %hi(thread3_main) # $a2, 0x8007
/* 0669B8 80065DB8 240F000A */ li $t7, 10
/* 0669BC 80065DBC AFAF0014 */ sw $t7, 0x14($sp)
/* 0669C0 80065DC0 24C6C330 */ addiu $a2, %lo(thread3_main) # addiu $a2, $a2, -0x3cd0
/* 0669C4 80065DC4 2484F910 */ addiu $a0, %lo(D_8011F910) # addiu $a0, $a0, -0x6f0
/* 0669C4 80065DC4 2484F910 */ addiu $a0, %lo(gThread3) # addiu $a0, $a0, -0x6f0
/* 0669C8 80065DC8 AFAE0010 */ sw $t6, 0x10($sp)
/* 0669CC 80065DCC 24050003 */ li $a1, 3
/* 0669D0 80065DD0 0C032214 */ jal osCreateThread
@@ -21,13 +21,13 @@ glabel func_80065D98
/* 0669E4 80065DE4 24190000 */ li $t9, 0
/* 0669E8 80065DE8 24080000 */ li $t0, 0
/* 0669EC 80065DEC 24090000 */ li $t1, 0
/* 0669F0 80065DF0 3C048012 */ lui $a0, %hi(D_8011F910) # $a0, 0x8012
/* 0669F0 80065DF0 3C048012 */ lui $a0, %hi(gThread3) # $a0, 0x8012
/* 0669F4 80065DF4 AC592004 */ sw $t9, 0x2004($v0)
/* 0669F8 80065DF8 AC582000 */ sw $t8, 0x2000($v0)
/* 0669FC 80065DFC AC490004 */ sw $t1, 4($v0)
/* 066A00 80065E00 AC480000 */ sw $t0, ($v0)
/* 066A04 80065E04 0C032268 */ jal osStartThread
/* 066A08 80065E08 2484F910 */ addiu $a0, %lo(D_8011F910) # addiu $a0, $a0, -0x6f0
/* 066A08 80065E08 2484F910 */ addiu $a0, %lo(gThread3) # addiu $a0, $a0, -0x6f0
/* 066A0C 80065E0C 00002025 */ move $a0, $zero
/* 066A10 80065E10 0C033210 */ jal osSetThreadPri
/* 066A14 80065E14 00002825 */ move $a1, $zero
src/main.c
+4 -4
View File
@@ -20,12 +20,12 @@ const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n";
s32 *gThread1StackPointer; // stack pointer for thread 1
s32 D_8011D754;
s32 D_8011D758[2048];
s32 *D_8011F758;
s32 *gThread3StackPointer; // stack pointer for thread 3
s32 D_8011F75C;
OSThread *gThread1; // OSThread for thread 1
s32 D_8011F764;
s32 D_8011F768[106];
OSThread *D_8011F910; // OSThread for thread 3
OSThread *gThread3; // OSThread for thread 3
s32 D_8011F914;
s32 D_8011F918[1130];
@@ -40,12 +40,12 @@ void main(void) {
#ifdef NON_MATCHING
void func_80065D98(s32 arg0) {
func_800B6F50();
osCreateThread(&D_8011F910, 3, (OSId)&thread3_main, 0, &D_8011F758, (OSPri)10);
osCreateThread(&gThread3, 3, (OSId)&thread3_main, 0, &gThread3StackPointer, (OSPri)10);
D_8011D758[2049] = 0;
D_8011D758[2048] = 0;
D_8011D758[1] = 0;
D_8011D758[0] = 0;
osStartThread(&D_8011F910);
osStartThread(&gThread3);
osSetThreadPri(NULL, 0);
while (1) {}
}
src/video.c
+8 -8
View File
@@ -158,10 +158,10 @@ void init_vi_settings(void) {
}
memory_copy((u8 *)tvViMode, (u8 *)&gTvViMode, sizeof(OSViMode));
gTvViMode.comRegs.width = WIDTH(640);
gTvViMode.comRegs.width = WIDTH(HIGH_RES_SCREEN_WIDTH);
gTvViMode.comRegs.xScale = SCALE(1, 0);
gTvViMode.fldRegs[0].origin = ORIGIN(1280);
gTvViMode.fldRegs[1].origin = ORIGIN(1280);
gTvViMode.fldRegs[0].origin = ORIGIN(HIGH_RES_SCREEN_WIDTH * 2);
gTvViMode.fldRegs[1].origin = ORIGIN(HIGH_RES_SCREEN_WIDTH * 2);
osViSetMode(&gTvViMode);
break;
case 3:
@@ -173,10 +173,10 @@ void init_vi_settings(void) {
tvViMode = &osViModeMpalLan1;
}
memory_copy((u8 *)tvViMode, (u8 *)&gTvViMode, sizeof(OSViMode));
gTvViMode.comRegs.width = WIDTH(640);
gTvViMode.comRegs.width = WIDTH(HIGH_RES_SCREEN_WIDTH);
gTvViMode.comRegs.xScale = SCALE(1, 0);
gTvViMode.fldRegs[0].origin = ORIGIN(1280);
gTvViMode.fldRegs[1].origin = ORIGIN(1280);
gTvViMode.fldRegs[0].origin = ORIGIN(HIGH_RES_SCREEN_WIDTH * 2);
gTvViMode.fldRegs[1].origin = ORIGIN(HIGH_RES_SCREEN_WIDTH * 2);
osViSetMode(&gTvViMode);
break;
case 4:
@@ -209,10 +209,10 @@ void init_framebuffer(s32 index) {
gVideoFbWidths[index] = gVideoModeResolutions[gVideoModeIndex & 7].width;
gVideoFbHeights[index] = gVideoModeResolutions[gVideoModeIndex & 7].height;
if (gVideoModeIndex >= 2) {
gVideoFramebuffers[index] = allocate_from_main_pool_safe((640 * 480 * 2) + 0x30, COLOR_TAG_WHITE);
gVideoFramebuffers[index] = allocate_from_main_pool_safe((HIGH_RES_SCREEN_WIDTH * HIGH_RES_SCREEN_HEIGHT * 2) + 0x30, COLOR_TAG_WHITE);
gVideoFramebuffers[index] = ((s32)gVideoFramebuffers[index] + 0x3F) & ~0x3F;
if (gVideoDepthBuffer == NULL) {
gVideoDepthBuffer = allocate_from_main_pool_safe((640 * 480 * 2) + 0x30, COLOR_TAG_WHITE);
gVideoDepthBuffer = allocate_from_main_pool_safe((HIGH_RES_SCREEN_WIDTH * HIGH_RES_SCREEN_HEIGHT * 2) + 0x30, COLOR_TAG_WHITE);
gVideoDepthBuffer = ((s32)gVideoDepthBuffer + 0x3F) & ~0x3F;
}
} else {