This commit is contained in:
Pheenoh 2021-01-03 22:41:17 -05:00
parent 5217a4189e
commit 922a0df5ea
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
4 changed files with 26 additions and 26 deletions

View File

@ -22,4 +22,8 @@ private:
u32 total_used_size;
};
extern HeapCheck* HeapCheckTable[8];
extern HeapCheck* HeapCheckTable[8];
extern s8 lbl_80450580[4];
extern u8 lbl_80450B1A[2];
extern u8 lbl_80450B18;
extern u8 lbl_80450588[8];

View File

@ -10,9 +10,9 @@ extern char lbl_803739A0[0x310];
extern void* lbl_80451368;
extern u32 _sRumbleSupported;
extern u8 lbl_803A2EF4;
extern u8 lbl_803A2EE0;
extern char lbl_803A2EE0[20];
extern u8 lbl_80450B19;
extern u8 lbl_80450588;
// extern u8 lbl_80450588;
extern u8 lbl_804511B8;
extern u8 lbl_80450B20;
extern u8 lbl_80451A00;
@ -44,8 +44,8 @@ extern u8 lbl_80450C28;
extern u8 lbl_80450C34;
extern u8 lbl_80450B24;
extern u8 lbl_80450B1C;
extern u8 lbl_80450580;
extern u8 lbl_80450B1A;
// extern u8 lbl_80450580;
// extern u8 lbl_80450B1A;
struct JUTGamePad;
extern JUTGamePad* m_gamePad[4];
extern u8 lbl_80450B18;

View File

@ -3,6 +3,7 @@
#include "c/cLib.h"
#include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
#include "m_Do/m_Do_main/m_Do_main.h"
#include "pad/pad.h"
#ifdef NONMATCHING

View File

@ -117,8 +117,7 @@ asm void Debug_console(u32) {
}
#ifdef NONMATCHING
extern u8 lbl_803739a0[0x310];
extern char lbl_803a2ee0[20];
extern void memcpy(void*, void*, int);
void LOAD_COPYDATE(void*) {
@ -126,11 +125,11 @@ void LOAD_COPYDATE(void*) {
char buffer[32];
DVDFileInfo file_info;
dvd_status = DVDOpen((const char*)lbl_803739a0 + 0x283, &file_info);
dvd_status = DVDOpen((const char*)lbl_803739A0[0x283], &file_info);
if (dvd_status) {
DVDReadPrio(&file_info, buffer, 32, 0, 2);
memcpy(lbl_803a2ee0, buffer, 17);
memcpy(lbl_803A2EE0, buffer, 17);
DVDClose(&file_info);
}
return;
@ -142,33 +141,29 @@ asm void LOAD_COPYDATE(void*) {
}
#endif
#ifdef NONMATCHING
#ifndef NONMATCHING
void debug(void) {
if (DAT_80450580) {
if (DAT_80450b1a) {
CheckHeap(0x2);
if (lbl_80450580[0]) {
if (lbl_80450B1A[0]) {
CheckHeap(2);
}
if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x20) &&
(m_gamePad.buttons.field_0x4 & 0x10)) {
// if (1) {
DAT_80450b18 = DAT_80450b18 ^ 0x1;
if (((m_gamePad[2]->buttons.button_flags & ~0x10) == 0x20) &&
(m_gamePad[2]->buttons.field_0x4 & 0x10)) {
lbl_80450B18 ^= 0x1;
}
if (DAT_80450b18) {
if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x40) &&
(m_gamePad.buttons.field_0x4 & 0x10)) {
if (DAT_80450588 < 0x5) {
DAT_80450588 = DAT_80450588 + 0x1;
} else {
DAT_80450588 = 0x1;
}
if (lbl_80450B18) {
if (((m_gamePad[2]->buttons.button_flags & ~0x10) == 0x40) &&
(m_gamePad[2]->buttons.field_0x4 & 0x10)) {
lbl_80450588[0] < 0x5 ? lbl_80450588[0]++ : lbl_80450588[0] = 0x1;
}
debugDisplay();
}
Debug_console(0x2);
Debug_console(2);
}
}
#else