mirror of https://github.com/n64decomp/mk64.git
Identify a couple debug related variables and match a couple debug related functions (#94)
* Identified some debug mode specific variables * Matched a couple debug related functions Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
GitHub
parent
12be6a8824
commit
66d9a4fe88
|
|
@ -120,7 +120,7 @@ glabel L8009568C
|
|||
/* 096318 80095718 2442C5A0 */ addiu $v0, %lo(gCurrentCourseId) # addiu $v0, $v0, -0x3a60
|
||||
/* 09631C 8009571C 84470000 */ lh $a3, ($v0)
|
||||
/* 096320 80095720 2405006E */ li $a1, 110
|
||||
/* 096324 80095724 3C06800E */ lui $a2, %hi(D_800E7614)
|
||||
/* 096324 80095724 3C06800E */ lui $a2, %hi(gDebugCourseNames)
|
||||
/* 096328 80095728 28E1000A */ slti $at, $a3, 0xa
|
||||
/* 09632C 8009572C 10200003 */ beqz $at, .L8009573C
|
||||
/* 096330 80095730 00074880 */ sll $t1, $a3, 2
|
||||
|
|
@ -130,7 +130,7 @@ glabel L8009568C
|
|||
/* 09633C 8009573C 24020008 */ li $v0, 8
|
||||
.L80095740:
|
||||
/* 096340 80095740 00C93021 */ addu $a2, $a2, $t1
|
||||
/* 096344 80095744 8CC67614 */ lw $a2, %lo(D_800E7614)($a2)
|
||||
/* 096344 80095744 8CC67614 */ lw $a2, %lo(gDebugCourseNames)($a2)
|
||||
/* 096348 80095748 0C015DE9 */ jal debug_print_str2
|
||||
/* 09634C 8009574C 244400B9 */ addiu $a0, $v0, 0xb9
|
||||
/* 096350 80095750 3C06800F */ lui $a2, %hi(D_800F0B90) # $a2, 0x800f
|
||||
|
|
@ -140,11 +140,11 @@ glabel L8009568C
|
|||
/* 096360 80095760 24050078 */ li $a1, 120
|
||||
/* 096364 80095764 3C0A8019 */ lui $t2, %hi(D_8018EDF1) # $t2, 0x8019
|
||||
/* 096368 80095768 814AEDF1 */ lb $t2, %lo(D_8018EDF1)($t2)
|
||||
/* 09636C 8009576C 3C06800E */ lui $a2, %hi(D_800E76EC)
|
||||
/* 09636C 8009576C 3C06800E */ lui $a2, %hi(gDebugScreenModeNames)
|
||||
/* 096370 80095770 240400AA */ li $a0, 170
|
||||
/* 096374 80095774 000A5880 */ sll $t3, $t2, 2
|
||||
/* 096378 80095778 00CB3021 */ addu $a2, $a2, $t3
|
||||
/* 09637C 8009577C 8CC676EC */ lw $a2, %lo(D_800E76EC)($a2)
|
||||
/* 09637C 8009577C 8CC676EC */ lw $a2, %lo(gDebugScreenModeNames)($a2)
|
||||
/* 096380 80095780 0C015DE9 */ jal debug_print_str2
|
||||
/* 096384 80095784 24050078 */ li $a1, 120
|
||||
/* 096388 80095788 3C06800F */ lui $a2, %hi(D_800F0B9C) # $a2, 0x800f
|
||||
|
|
@ -154,11 +154,11 @@ glabel L8009568C
|
|||
/* 096398 80095798 24050082 */ li $a1, 130
|
||||
/* 09639C 8009579C 3C0C800F */ lui $t4, %hi(D_800E86A8) # $t4, 0x800f
|
||||
/* 0963A0 800957A0 818C86A8 */ lb $t4, %lo(D_800E86A8)($t4)
|
||||
/* 0963A4 800957A4 3C06800E */ lui $a2, %hi(D_800E7688)
|
||||
/* 0963A4 800957A4 3C06800E */ lui $a2, %hi(gDebugCharacterNames)
|
||||
/* 0963A8 800957A8 240400AA */ li $a0, 170
|
||||
/* 0963AC 800957AC 000C6880 */ sll $t5, $t4, 2
|
||||
/* 0963B0 800957B0 00CD3021 */ addu $a2, $a2, $t5
|
||||
/* 0963B4 800957B4 8CC67688 */ lw $a2, %lo(D_800E7688)($a2)
|
||||
/* 0963B4 800957B4 8CC67688 */ lw $a2, %lo(gDebugCharacterNames)($a2)
|
||||
/* 0963B8 800957B8 0C015DE9 */ jal debug_print_str2
|
||||
/* 0963BC 800957BC 24050082 */ li $a1, 130
|
||||
/* 0963C0 800957C0 3C06800F */ lui $a2, %hi(D_800F0BA4) # $a2, 0x800f
|
||||
|
|
|
|||
|
|
@ -1742,7 +1742,7 @@ glabel D_800E75C4
|
|||
.word D_800EFC20, D_800EFC30, D_800EFC40, D_800EFC50
|
||||
.word D_800EFC5C, D_800EFC68, D_800EFC74, D_800EFC8C
|
||||
|
||||
glabel D_800E7614
|
||||
glabel gDebugCourseNames
|
||||
.word D_800EFC98, D_800EFCA4, D_800EFCB0, D_800EFCB8
|
||||
.word D_800EFCC0, D_800EFCC8, D_800EFCD0, D_800EFCD8
|
||||
.word D_800EFCE4, D_800EFCF0, D_800EFCF8, D_800EFD00
|
||||
|
|
@ -1756,7 +1756,7 @@ glabel gCupSelectionByCourseId
|
|||
glabel D_800E7678
|
||||
.word D_800EFD6C, D_800EFD74, D_800EFD7C, D_800EFD84
|
||||
|
||||
glabel D_800E7688
|
||||
glabel gDebugCharacterNames
|
||||
.word D_800EFD8C, D_800EFD94, D_800EFD9C, D_800EFDA4
|
||||
.word D_800EFDAC, D_800EFDB4, D_800EFDBC, D_800EFDC4
|
||||
|
||||
|
|
@ -1771,7 +1771,7 @@ glabel D_800E76CC
|
|||
glabel D_800E76DC
|
||||
.word D_800EFE34, D_800EFE38, D_800EFE40, D_800EFE48
|
||||
|
||||
glabel D_800E76EC
|
||||
glabel gDebugScreenModeNames
|
||||
.word D_800EFE50, D_800EFE54, D_800EFE60, D_800EFE6C
|
||||
.word D_800EFE78
|
||||
|
||||
|
|
|
|||
|
|
@ -10330,50 +10330,21 @@ void func_8005762C(s32 *arg0, s32 *arg1, u32 arg2, u32 arg3) {
|
|||
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005762C.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern ? D_0D008080;
|
||||
extern ? D_0D008108;
|
||||
extern void *gDisplayListHead;
|
||||
extern Gfx D_0D008080[];
|
||||
extern Gfx D_0D008108[];
|
||||
extern Gfx *gDisplayListHead;
|
||||
|
||||
void load_debug_font(void) {
|
||||
void *temp_v1;
|
||||
void *temp_v1_2;
|
||||
void *temp_v1_3;
|
||||
|
||||
temp_v1 = gDisplayListHead;
|
||||
gDisplayListHead = temp_v1 + 8;
|
||||
temp_v1->unk4 = &D_0D008108;
|
||||
temp_v1->unk0 = 0x6000000;
|
||||
temp_v1_2 = gDisplayListHead;
|
||||
gDisplayListHead = temp_v1_2 + 8;
|
||||
temp_v1_2->unk4 = &D_0D008080;
|
||||
temp_v1_2->unk0 = 0x6000000;
|
||||
temp_v1_3 = gDisplayListHead;
|
||||
gDisplayListHead = temp_v1_3 + 8;
|
||||
temp_v1_3->unk4 = 1;
|
||||
temp_v1_3->unk0 = 0xB9000002;
|
||||
gSPDisplayList(gDisplayListHead++, D_0D008108);
|
||||
gSPDisplayList(gDisplayListHead++, D_0D008080);
|
||||
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_800431B0/load_debug_font.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern ? D_0D007EB8;
|
||||
extern void *gDisplayListHead;
|
||||
extern Gfx D_0D007EB8[];
|
||||
|
||||
void func_80057778(void) {
|
||||
void *temp_v1;
|
||||
|
||||
temp_v1 = gDisplayListHead;
|
||||
gDisplayListHead = temp_v1 + 8;
|
||||
temp_v1->unk0 = 0x6000000;
|
||||
temp_v1->unk4 = &D_0D007EB8;
|
||||
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80057778.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
|
|
|
|||
|
|
@ -2145,9 +2145,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80094C60.s")
|
|||
? play_sound2(?); /* extern */
|
||||
? print_str_num(?, ?, ? *, s16); /* extern */
|
||||
static ? D_020076E0; /* unable to generate initializer */
|
||||
static ? D_800E7614; /* unable to generate initializer; const */
|
||||
static ? D_800E7688; /* unable to generate initializer; const */
|
||||
static ? D_800E76EC; /* unable to generate initializer; const */
|
||||
static ? gDebugCourseNames; /* unable to generate initializer; const */
|
||||
static ? gDebugCharacterNames; /* unable to generate initializer; const */
|
||||
static ? gDebugScreenModeNames; /* unable to generate initializer; const */
|
||||
static ? gDebugSoundModeNames; /* unable to generate initializer; const */
|
||||
s16 gCurrentCourseId; /* unable to generate initializer */
|
||||
|
||||
|
|
@ -2207,11 +2207,11 @@ void func_80095574(void) {
|
|||
} else {
|
||||
phi_v0 = 8;
|
||||
}
|
||||
debug_print_str2(phi_v0 + 0xB9, 0x6E, *(&D_800E7614 + (temp_a3_2 * 4)), temp_a3_2);
|
||||
debug_print_str2(phi_v0 + 0xB9, 0x6E, gDebugCourseNames[temp_a3_2], temp_a3_2);
|
||||
debug_print_str2(0x50, 0x78, "screen_mode");
|
||||
debug_print_str2(0xAA, 0x78, *(&D_800E76EC + (D_8018EDF1 * 4)));
|
||||
debug_print_str2(0xAA, 0x78, *(&gDebugScreenModeNames + (D_8018EDF1 * 4)));
|
||||
debug_print_str2(0x50, 0x82, "player");
|
||||
debug_print_str2(0xAA, 0x82, *(&D_800E7688 + (D_800E86A8 * 4)));
|
||||
debug_print_str2(0xAA, 0x82, *(&gDebugCharacterNames + (D_800E86A8 * 4)));
|
||||
debug_print_str2(0x50, 0x8C, "sound mode");
|
||||
debug_print_str2(0xAA, 0x8C, gDebugSoundModeNames[gSoundMode]);
|
||||
if (D_8018EDEF == 7) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue