kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up and label main.c

Browse source
This commit is contained in:
gamemasterplc 2023-12-28 16:07:15 -06:00
parent 9a763f3334
commit 3bc40d4e62
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/GMPE01_00/symbols.txt
View file

@ -5942,7 +5942,7 @@ lbl_801D39E0 = .sdata:0x801D39E0; // type:object size:0x8
lbl_801D39E8 = .sdata:0x801D39E8; // type:object size:0x8 lbl_801D39E8 = .sdata:0x801D39E8; // type:object size:0x8
lbl_801D39F0 = .sdata:0x801D39F0; // type:object size:0x8 data:2byte lbl_801D39F0 = .sdata:0x801D39F0; // type:object size:0x8 data:2byte
lbl_801D39F8 = .sdata:0x801D39F8; // type:object size:0x1 data:byte lbl_801D39F8 = .sdata:0x801D39F8; // type:object size:0x1 data:byte
lbl_801D3A00 = .sbss:0x801D3A00; // type:object size:0x4 data:4byte SystemInitF = .sbss:0x801D3A00; // type:object size:0x4 data:4byte
HuDvdErrWait = .sbss:0x801D3A04; // type:object size:0x4 data:4byte HuDvdErrWait = .sbss:0x801D3A04; // type:object size:0x4 data:4byte
lbl_801D3A08 = .sbss:0x801D3A08; // type:object size:0x4 lbl_801D3A08 = .sbss:0x801D3A08; // type:object size:0x4
lbl_801D3A0C = .sbss:0x801D3A0C; // type:object size:0x4 lbl_801D3A0C = .sbss:0x801D3A0C; // type:object size:0x4
@ -5963,7 +5963,7 @@ lbl_801D3A44 = .sbss:0x801D3A44; // type:object size:0x4
lbl_801D3A48 = .sbss:0x801D3A48; // type:object size:0x4 lbl_801D3A48 = .sbss:0x801D3A48; // type:object size:0x4
lbl_801D3A4C = .sbss:0x801D3A4C; // type:object size:0x4 lbl_801D3A4C = .sbss:0x801D3A4C; // type:object size:0x4
lbl_801D3A50 = .sbss:0x801D3A50; // type:object size:0x4 lbl_801D3A50 = .sbss:0x801D3A50; // type:object size:0x4
lbl_801D3A54 = .sbss:0x801D3A54; // type:object size:0x4 data:4byte GlobalCounter = .sbss:0x801D3A54; // type:object size:0x4 data:4byte
VCounter = .sbss:0x801D3A58; // type:object size:0x4 data:4byte VCounter = .sbss:0x801D3A58; // type:object size:0x4 data:4byte
RumbleBit = .sbss:0x801D3A5C; // type:object size:0x4 scope:local data:4byte RumbleBit = .sbss:0x801D3A5C; // type:object size:0x4 scope:local data:4byte
_PadErr = .sbss:0x801D3A60; // type:object size:0x4 scope:local _PadErr = .sbss:0x801D3A60; // type:object size:0x4 scope:local

1
include/dolphin/vifuncs.h
View file

@ -10,6 +10,7 @@ extern "C" {
#endif #endif
u32 VIGetNextField(void); u32 VIGetNextField(void);
u32 VIGetRetraceCount();
VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback callback); VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback callback);
VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback callback); VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback callback);
void __VIGetCurrentPosition(s16* x, s16* y); void __VIGetCurrentPosition(s16* x, s16* y);

12
src/REL/bootDll/bootDll.c
View file

@ -17,7 +17,7 @@
#define HU_PAD_BTNDOWN_ALL (HuPadBtnDown[0] | HuPadBtnDown[1] | HuPadBtnDown[2] | HuPadBtnDown[3]) #define HU_PAD_BTNDOWN_ALL (HuPadBtnDown[0] | HuPadBtnDown[1] | HuPadBtnDown[2] | HuPadBtnDown[3])
#define HU_PAD_DSTK_ALL (HuPadDStkRep[0] | HuPadDStkRep[1] | HuPadDStkRep[2] | HuPadDStkRep[3]) #define HU_PAD_DSTK_ALL (HuPadDStkRep[0] | HuPadDStkRep[1] | HuPadDStkRep[2] | HuPadDStkRep[3])
extern int lbl_801D3A00; extern int SystemInitF;
static Process *objman; static Process *objman;
Vec lbl_1_bss_3C[2]; Vec lbl_1_bss_3C[2];
@ -90,7 +90,7 @@ static void BootProc(void)
HuSprAttrSet(group, 1, SPRITE_ATTR_HIDDEN); HuSprAttrSet(group, 1, SPRITE_ATTR_HIDDEN);
HuWinInit(1); HuWinInit(1);
TitleInit(); TitleInit();
lbl_801D3A00 = 1; SystemInitF = 1;
} else { } else {
s16 group_thp; s16 group_thp;
BOOL skip_wait; BOOL skip_wait;
@ -106,7 +106,7 @@ static void BootProc(void)
HuPrcVSleep(); HuPrcVSleep();
} }
WipeColorSet(255, 255, 255); WipeColorSet(255, 255, 255);
if(!lbl_801D3A00) { if(!SystemInitF) {
tick_prev = OSGetTick(); tick_prev = OSGetTick();
fn_800498F0(); fn_800498F0();
HuWindowInit(); HuWindowInit();
@ -140,7 +140,7 @@ static void BootProc(void)
while(WipeStatGet()) { while(WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
if(!lbl_801D3A00) { if(!SystemInitF) {
void *group_samp; void *group_samp;
tick_prev = OSGetTick(); tick_prev = OSGetTick();
group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0)); group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0));
@ -162,9 +162,9 @@ static void BootProc(void)
HuPrcVSleep(); HuPrcVSleep();
} }
tick_prev = OSGetTick(); tick_prev = OSGetTick();
if(!lbl_801D3A00) { if(!SystemInitF) {
HuAudSndGrpSetSet(0); HuAudSndGrpSetSet(0);
lbl_801D3A00 = 1; SystemInitF = 1;
} }
while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 1000) { while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 1000) {
HuPrcVSleep(); HuPrcVSleep();

13
src/game/main.c
View file

@ -13,11 +13,8 @@
#include "game/perf.h" #include "game/perf.h"
#include "game/gamework.h" #include "game/gamework.h"
extern s32 ViGetRetraceCount(void);
extern GXRenderModeObj* RenderMode;
extern FileListEntry _ovltbl[]; extern FileListEntry _ovltbl[];
s32 lbl_801D3A54; s32 GlobalCounter;
u32 lbl_801D3A50; u32 lbl_801D3A50;
u32 lbl_801D3A4C; u32 lbl_801D3A4C;
u32 lbl_801D3A48; u32 lbl_801D3A48;
@ -38,7 +35,7 @@ u32 lbl_801D3A10;
u32 lbl_801D3A0C; u32 lbl_801D3A0C;
u32 lbl_801D3A08; u32 lbl_801D3A08;
s32 HuDvdErrWait; s32 HuDvdErrWait;
s32 lbl_801D3A00; s32 SystemInitF;
void main(void) { void main(void) {
u32 sp14; u32 sp14;
@ -49,13 +46,13 @@ void main(void) {
s32 temp_r30; s32 temp_r30;
HuDvdErrWait = 0; HuDvdErrWait = 0;
lbl_801D3A00 = 0; SystemInitF = 0;
HuSysInit(&GXNtsc480IntDf); HuSysInit(&GXNtsc480IntDf);
HuPrcInit(); HuPrcInit();
HuPadInit(); HuPadInit();
GWInit(); GWInit();
pfInit(); pfInit();
lbl_801D3A54 = 0; GlobalCounter = 0;
HuSprInit(); HuSprInit();
Hu3DInit(); Hu3DInit();
HuDataInit(); HuDataInit();
@ -109,7 +106,7 @@ void main(void) {
GXReadPixMetric(&lbl_801D3A44, &lbl_801D3A40, &lbl_801D3A3C, &lbl_801D3A38, &lbl_801D3A34, &lbl_801D3A30); GXReadPixMetric(&lbl_801D3A44, &lbl_801D3A40, &lbl_801D3A3C, &lbl_801D3A38, &lbl_801D3A34, &lbl_801D3A30);
GXReadMemMetric(&lbl_801D3A2C, &lbl_801D3A28, &lbl_801D3A24, &lbl_801D3A20, &lbl_801D3A1C, &lbl_801D3A18, &lbl_801D3A14, &lbl_801D3A10, &lbl_801D3A0C, &lbl_801D3A08); GXReadMemMetric(&lbl_801D3A2C, &lbl_801D3A28, &lbl_801D3A24, &lbl_801D3A20, &lbl_801D3A1C, &lbl_801D3A18, &lbl_801D3A14, &lbl_801D3A10, &lbl_801D3A0C, &lbl_801D3A08);
HuPerfEnd(2); HuPerfEnd(2);
lbl_801D3A54++; GlobalCounter++;
} }
} }