mirror of
https://github.com/blawar/ooot.git
synced 2024-07-04 18:13:37 +00:00
cleanup unused code
This commit is contained in:
parent
beb9f01f27
commit
1ea869d808
|
@ -9,8 +9,6 @@
|
||||||
struct FileChooseContext {
|
struct FileChooseContext {
|
||||||
/* 0x00000 */ GameState state;
|
/* 0x00000 */ GameState state;
|
||||||
/* 0x000A4 */ Vtx* windowVtx;
|
/* 0x000A4 */ Vtx* windowVtx;
|
||||||
/* 0x000A8 */ u8* staticSegment;
|
|
||||||
/* 0x000AC */ u8* parameterSegment;
|
|
||||||
/* 0x000B0 */ char unk_B0[0x8];
|
/* 0x000B0 */ char unk_B0[0x8];
|
||||||
/* 0x000B8 */ View view;
|
/* 0x000B8 */ View view;
|
||||||
/* 0x001E0 */ SramContext sramCtx;
|
/* 0x001E0 */ SramContext sramCtx;
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
struct TitleContext {
|
struct TitleContext {
|
||||||
/* 0x0000 */ GameState state;
|
/* 0x0000 */ GameState state;
|
||||||
/* 0x00A4 */ u8* staticSegment;
|
|
||||||
/* 0x00A8 */ View view;
|
/* 0x00A8 */ View view;
|
||||||
/* 0x01D0 */ SramContext sramCtx;
|
/* 0x01D0 */ SramContext sramCtx;
|
||||||
/* 0x01D4 */ u16 unk_1D4; // not used in mq dbg (some sort of timer that doesn't seem to affect anything)
|
/* 0x01D4 */ u16 unk_1D4; // not used in mq dbg (some sort of timer that doesn't seem to affect anything)
|
||||||
|
|
|
@ -1632,8 +1632,8 @@ void FileChoose_Main(GameState* pthisx) {
|
||||||
pthis->n64ddFlag = 0;
|
pthis->n64ddFlag = 0;
|
||||||
|
|
||||||
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
|
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
|
||||||
gSPSegment(POLY_OPA_DISP++, 0x01, pthis->staticSegment);
|
gSPSegment(POLY_OPA_DISP++, 0x01, NULL);
|
||||||
gSPSegment(POLY_OPA_DISP++, 0x02, pthis->parameterSegment);
|
gSPSegment(POLY_OPA_DISP++, 0x02, NULL);
|
||||||
|
|
||||||
Gfx_ClearDisplay(pthis->state.gfxCtx, 0, 0, 0);
|
Gfx_ClearDisplay(pthis->state.gfxCtx, 0, 0, 0);
|
||||||
|
|
||||||
|
@ -1900,21 +1900,9 @@ void FileChoose_Destroy(GameState* pthisx) {
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
void FileChoose_Init(GameState* pthisx) {
|
void FileChoose_Init(GameState* pthisx) {
|
||||||
FileChooseContext* pthis = (FileChooseContext*)pthisx;
|
FileChooseContext* pthis = (FileChooseContext*)pthisx;
|
||||||
u32 size = POINTER_SUB(_title_staticSegmentRomEnd, _title_staticSegmentRomStart);
|
|
||||||
s32 pad;
|
s32 pad;
|
||||||
|
|
||||||
framerate_set_profile(PROFILE_FILE_CHOOSE);
|
framerate_set_profile(PROFILE_FILE_CHOOSE);
|
||||||
osSyncPrintf("SIZE=%x\n", size);
|
|
||||||
|
|
||||||
pthis->staticSegment = (u8*)GameState_Alloc(&pthis->state, size, "../z_file_choose.c", 3392);
|
|
||||||
ASSERT(pthis->staticSegment != NULL, "pthis->staticSegment != NULL", "../z_file_choose.c", 3393);
|
|
||||||
//DmaMgr_SendRequest1(pthis->staticSegment, (u32)_title_staticSegmentRomStart, size, "../z_file_choose.c", 3394);
|
|
||||||
|
|
||||||
size = POINTER_SUB(_parameter_staticSegmentRomEnd, _parameter_staticSegmentRomStart);
|
|
||||||
pthis->parameterSegment = (u8*)GameState_Alloc(&pthis->state, size, "../z_file_choose.c", 3398);
|
|
||||||
ASSERT(pthis->parameterSegment != NULL, "pthis->parameterSegment != NULL", "../z_file_choose.c", 3399);
|
|
||||||
//DmaMgr_SendRequest1(pthis->parameterSegment, (u32)_parameter_staticSegmentRomStart, size, "../z_file_choose.c",
|
|
||||||
// 3400);
|
|
||||||
|
|
||||||
Matrix_Init(&pthis->state);
|
Matrix_Init(&pthis->state);
|
||||||
View_Init(&pthis->view, pthis->state.gfxCtx);
|
View_Init(&pthis->view, pthis->state.gfxCtx);
|
||||||
|
|
|
@ -172,7 +172,7 @@ void Title_Main(GameState* thisx) {
|
||||||
OPEN_DISPS(pthis->state.gfxCtx, "../z_title.c", 494);
|
OPEN_DISPS(pthis->state.gfxCtx, "../z_title.c", 494);
|
||||||
|
|
||||||
gSPSegment(POLY_OPA_DISP++, 0, NULL);
|
gSPSegment(POLY_OPA_DISP++, 0, NULL);
|
||||||
gSPSegment(POLY_OPA_DISP++, 1, pthis->staticSegment);
|
gSPSegment(POLY_OPA_DISP++, 1, NULL);
|
||||||
Gfx_ClearDisplay(pthis->state.gfxCtx, 0, 0, 0);
|
Gfx_ClearDisplay(pthis->state.gfxCtx, 0, 0, 0);
|
||||||
Title_Calc(pthis);
|
Title_Calc(pthis);
|
||||||
Title_Draw(pthis);
|
Title_Draw(pthis);
|
||||||
|
@ -203,12 +203,8 @@ void Title_Destroy(GameState* thisx) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Title_Init(GameState* thisx) {
|
void Title_Init(GameState* thisx) {
|
||||||
size_t size = POINTER_SUB(_nintendo_rogo_staticSegmentRomEnd, _nintendo_rogo_staticSegmentRomStart);
|
|
||||||
TitleContext* pthis = (TitleContext*)thisx;
|
TitleContext* pthis = (TitleContext*)thisx;
|
||||||
|
|
||||||
//pthis->staticSegment = GameState_Alloc(&pthis->state, size, "../z_title.c", 611);
|
|
||||||
osSyncPrintf("z_title.c\n");
|
|
||||||
pthis->staticSegment = _nintendo_rogo_staticSegmentRomStart;
|
|
||||||
framerate_set_profile(PROFILE_TITLE);
|
framerate_set_profile(PROFILE_TITLE);
|
||||||
Matrix_Init(&pthis->state);
|
Matrix_Init(&pthis->state);
|
||||||
View_Init(&pthis->view, pthis->state.gfxCtx);
|
View_Init(&pthis->view, pthis->state.gfxCtx);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user