mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-12 07:37:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Upstream/master'

Browse Source
This commit is contained in:
jdflyer
2022-01-16 15:20:32 -07:00
parent 641b04d470 2d125d40b8
commit 824a9eabc9
203 changed files with 4278 additions and 8902 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/com/d_com_inf_game.cpp
+1 -5
View File
@@ -16,10 +16,6 @@
struct scene_class {};
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct dSmplMdl_draw_c {
/* 80048CB4 */ dSmplMdl_draw_c();
/* 80048E0C */ void draw();
@@ -1360,7 +1356,7 @@ SECTION_SDATA extern u8 g_clearColor[4] = {
};
/* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata g_blackColor */
SECTION_SDATA extern u32 g_blackColor = 0x000000FF;
SECTION_SDATA extern GXColor g_blackColor = {0, 0, 0, 255};
/* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs
*/
src/d/d_resorce.cpp
-5
View File
@@ -26,11 +26,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTimg[4];
static u8 mZbufferTimg[4];
};
struct dBgWKCol {
/* 8007E7D0 */ void initKCollision(void*);
};
src/d/d_select_cursor.cpp
+4 -72
View File
@@ -11,79 +11,10 @@
// Types:
//
struct J2DPane {};
struct dSelect_icon_c {
/* 80195A3C */ void animation();
/* 80195B40 */ void setAlpha(u8);
/* 80195B70 */ void setPos(J2DPane*, f32, f32);
};
struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
};
struct J2DAnmTextureSRTKey {};
struct JKRArchive {};
struct J2DAnmColor {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801949EC */ ~dSelect_cursor_c();
/* 80194C30 */ void draw();
/* 80194CC0 */ void update();
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
/* 80195330 */ void addAlpha();
/* 801953CC */ void decAlpha();
/* 80195460 */ void setBpkAnimation(J2DAnmColor*);
/* 801955F0 */ void setBtk0Animation(J2DAnmTextureSRTKey*);
/* 80195724 */ void setCursorAnimation();
/* 801958E0 */ void setBckAnimation(J2DAnmTransformKey*);
/* 80195940 */ void moveCenter(J2DPane*, f32, f32);
};
struct dSelect_cursorHIO_c {
/* 801941E4 */ dSelect_cursorHIO_c();
/* 80195978 */ ~dSelect_cursorHIO_c();
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -139,7 +70,6 @@ extern "C" void _restgpr_23();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */];
@@ -322,7 +252,8 @@ asm dSelect_cursor_c::~dSelect_cursor_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dSelect_cursor_c::draw() {
// asm void dSelect_cursor_c::draw() {
extern "C" asm void draw__16dSelect_cursor_cFv() {
nofralloc
#include "asm/d/d_select_cursor/draw__16dSelect_cursor_cFv.s"
}
@@ -513,7 +444,8 @@ asm dSelect_cursorHIO_c::~dSelect_cursorHIO_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DAnmTransformKey::~J2DAnmTransformKey() {
// asm J2DAnmTransformKey::~J2DAnmTransformKey() {
extern "C" asm void __dt__18J2DAnmTransformKeyFv() {
nofralloc
#include "asm/d/d_select_cursor/__dt__18J2DAnmTransformKeyFv.s"
}
src/d/event/d_event.cpp
-4
View File
@@ -14,10 +14,6 @@
// Types:
//
struct mDoGph_gInf_c {
/* 800080D0 */ void fadeOut(f32);
};
struct dDemo_c {
/* 80039CF8 */ void end();
src/d/event/d_event_data.cpp
-7
View File
@@ -12,13 +12,6 @@
// Types:
//
struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
/* 800080D0 */ void fadeOut(f32);
static f32 mFadeRate;
};
struct dDemo_c {
/* 80039B6C */ void start(u8 const*, cXyz*, f32);
/* 80039CF8 */ void end();
src/d/kankyo/d_kankyo.cpp
-8
View File
@@ -19,14 +19,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoGph_gInf_c {
struct bloom_c {
/* 80009544 */ void create();
};
static u8 m_bloom[20];
};
struct color_RGB_class {};
struct Z2SeMgr {
src/d/menu/d_menu_collect.cpp
+10 -270
View File
@@ -19,34 +19,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
};
struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct cXyz {
static f32 Zero[3];
};
struct daAlink_c {
/* 80140064 */ void setShieldChange();
/* 801406A8 */ void initStatusWindow();
@@ -76,24 +48,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -120,25 +74,6 @@ struct dMenu_save_c {
/* 801F69B8 */ void _draw();
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
@@ -182,133 +117,8 @@ struct dMenu_Fishing_c {
/* 801C5470 */ void _close();
};
struct dMenu_Collect_c {
/* 801B78C0 */ dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801B795C */ ~dMenu_Collect_c();
/* 801B7A0C */ void _create();
/* 801B7A44 */ void _delete();
/* 801B7A7C */ void _move();
/* 801B7AC0 */ void draw();
};
struct J2DAnmTextureSRTKey {};
struct dMenu_Collect2D_c {
/* 801AFD48 */ dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801AFE34 */ ~dMenu_Collect2D_c();
/* 801AFEA4 */ void _create();
/* 801B0100 */ void _delete();
/* 801B0570 */ void initialize();
/* 801B05A8 */ void isFishIconVisible();
/* 801B061C */ void isSkillIconVisible();
/* 801B071C */ void isInsectIconVisible();
/* 801B074C */ void screenSet();
/* 801B1C3C */ void animationSet();
/* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*);
/* 801B1EDC */ void setBackAlpha();
/* 801B1FAC */ void cursorMove();
/* 801B27EC */ void cursorPosSet();
/* 801B2A74 */ void changeSword();
/* 801B2D00 */ void changeShield();
/* 801B2EE4 */ void changeClothe();
/* 801B30C8 */ void setArrowMaxNum(u8);
/* 801B3340 */ void setWalletMaxNum(u16);
/* 801B3524 */ void setSmellType();
/* 801B3640 */ void setHeartPiece();
/* 801B370C */ void setPohMaxNum(u8);
/* 801B39D0 */ void setEquipItemFrameColorSword(int);
/* 801B3CF4 */ void setEquipItemFrameColorShield(int);
/* 801B3FDC */ void setEquipItemFrameColorClothes(int);
/* 801B42D8 */ void setHIO(bool);
/* 801B46FC */ void getItemTag(int, int, bool);
/* 801B473C */ void wait_init();
/* 801B48D0 */ void wait_proc();
/* 801B4E14 */ void save_open_init();
/* 801B4EC0 */ void save_open_proc();
/* 801B4F30 */ void save_move_init();
/* 801B4F6C */ void save_move_proc();
/* 801B4FDC */ void save_close_init();
/* 801B5018 */ void save_close_proc();
/* 801B5094 */ void option_open_init();
/* 801B513C */ void option_open_proc();
/* 801B51AC */ void option_move_init();
/* 801B51E8 */ void option_move_proc();
/* 801B5258 */ void option_close_init();
/* 801B5294 */ void option_close_proc();
/* 801B5310 */ void letter_open_init();
/* 801B53AC */ void letter_open_proc();
/* 801B541C */ void letter_move_init();
/* 801B5458 */ void letter_move_proc();
/* 801B54C8 */ void letter_close_init();
/* 801B5504 */ void letter_close_proc();
/* 801B5580 */ void fishing_open_init();
/* 801B561C */ void fishing_open_proc();
/* 801B568C */ void fishing_move_init();
/* 801B56C8 */ void fishing_move_proc();
/* 801B5738 */ void fishing_close_init();
/* 801B5774 */ void fishing_close_proc();
/* 801B57F0 */ void skill_open_init();
/* 801B588C */ void skill_open_proc();
/* 801B58FC */ void skill_move_init();
/* 801B5938 */ void skill_move_proc();
/* 801B59A8 */ void skill_close_init();
/* 801B59E4 */ void skill_close_proc();
/* 801B5A60 */ void insect_open_init();
/* 801B5B00 */ void insect_open_proc();
/* 801B5B70 */ void insect_move_init();
/* 801B5BAC */ void insect_move_proc();
/* 801B5C1C */ void insect_close_init();
/* 801B5C58 */ void insect_close_proc();
/* 801B5CD4 */ void _move();
/* 801B5D70 */ void _draw();
/* 801B5F48 */ void drawTop();
/* 801B5F84 */ void isKeyCheck();
/* 801B5FAC */ bool isOutCheck();
/* 801B5FB4 */ void setAButtonString(u16);
/* 801B60B8 */ void setBButtonString(u16);
/* 801B61BC */ void setItemNameString(u8, u8);
/* 801B6344 */ void setItemNameStringNull();
/* 801B7F00 */ void draw();
};
struct dMenu_Collect3D_c {
/* 801B6454 */ dMenu_Collect3D_c(JKRExpHeap*, dMenu_Collect2D_c*, CSTControl*);
/* 801B6538 */ ~dMenu_Collect3D_c();
/* 801B65A8 */ void _create();
/* 801B6694 */ void _delete();
/* 801B66C8 */ void _move(u8, u8);
/* 801B696C */ void draw();
/* 801B6A30 */ void setJ3D(char const*, char const*, char const*);
/* 801B6D30 */ void set_mtx();
/* 801B6E70 */ void animePlay();
/* 801B6FB0 */ void animeEntry();
/* 801B7014 */ void createMaskModel();
/* 801B71C4 */ void createMirrorModel();
/* 801B7434 */ void getCrystalNum();
/* 801B749C */ void getMirrorNum();
/* 801B7504 */ void getMaskMdlVisible();
/* 801B75E8 */ void setupItem3D(f32 (*)[4]);
/* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*);
/* 801B774C */ void calcViewMtx(f32 (*)[4]);
static f32 mViewOffsetY[1 + 1 /* padding */];
};
struct dMenu_Collect2DTop_c {
/* 801B77A4 */ void draw();
/* 801B7EB8 */ ~dMenu_Collect2DTop_c();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -317,20 +127,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JKRSolidHeap {
/* 802D0BF4 */ void adjustSize();
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct J3DVertexBuffer {
/* 80310FD8 */ void init();
};
struct J3DTexNoAnm {
/* 8003B1F8 */ ~J3DTexNoAnm();
/* 8003B240 */ J3DTexNoAnm();
@@ -355,11 +151,6 @@ struct J3DModelLoaderDataBase {
/* 803346BC */ void load(void const*, u32);
};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
};
struct J3DMaterialAnm {
/* 8032C320 */ void initialize();
};
@@ -369,56 +160,16 @@ struct J3DMatColorAnm {
/* 8003B2F4 */ J3DMatColorAnm();
};
struct J3DLightObj {
/* 80018C0C */ J3DLightObj();
};
struct J3DLightInfo {
/* 803256C4 */ void operator=(J3DLightInfo const&);
};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct J3DAnmLoaderDataBaseFlag {};
struct J3DAnmLoaderDataBase {
/* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct CPaneMgrAlpha {
/* 802557D0 */ void setAlphaRate(f32);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -663,13 +414,6 @@ extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData();
extern "C" void initialize__14J3DMaterialAnmFv();
extern "C" void load__22J3DModelLoaderDataBaseFPCvUl();
extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
extern "C" void PSMTXCopy();
extern "C" void PSMTXInverse();
extern "C" void PSMTXTrans();
extern "C" void PSMTXMultVec();
extern "C" void C_MTXPerspective();
extern "C" void GXSetProjection();
extern "C" void GXSetViewport();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_17();
@@ -686,9 +430,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" void tan();
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
@@ -700,7 +441,6 @@ extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -2209,7 +1949,7 @@ asm void dMenu_Collect2D_c::drawTop() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Collect2D_c::isKeyCheck() {
asm bool dMenu_Collect2D_c::isKeyCheck() {
nofralloc
#include "asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s"
}
@@ -2299,7 +2039,8 @@ asm dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c*
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Collect3D_c::~dMenu_Collect3D_c() {
// asm dMenu_Collect3D_c::~dMenu_Collect3D_c() {
extern "C" asm void __dt__17dMenu_Collect3D_cFv() {
nofralloc
#include "asm/d/menu/d_menu_collect/__dt__17dMenu_Collect3D_cFv.s"
}
@@ -2563,11 +2304,7 @@ asm void dMenu_Collect3D_c::getMaskMdlVisible() {
/* ############################################################################################## */
/* 80450720-80450728 0001A0 0004+04 1/1 0/0 1/1 .sdata mViewOffsetY__17dMenu_Collect3D_c
*/
SECTION_SDATA f32 dMenu_Collect3D_c::mViewOffsetY[1 + 1 /* padding */] = {
-100.0f,
/* padding */
0.0f,
};
SECTION_SDATA f32 dMenu_Collect3D_c::mViewOffsetY = -100.0f;
/* 80453FC4-80453FC8 0025C4 0004+00 3/3 0/0 0/0 .sdata2 @7944 */
SECTION_SDATA2 static f32 lit_7944 = 608.0f;
@@ -2630,7 +2367,8 @@ asm void dMenu_Collect3D_c::calcViewMtx(f32 (*param_0)[4]) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Collect2DTop_c::draw() {
// asm void dMenu_Collect2DTop_c::draw() {
extern "C" asm void draw__20dMenu_Collect2DTop_cFv() {
nofralloc
#include "asm/d/menu/d_menu_collect/draw__20dMenu_Collect2DTop_cFv.s"
}
@@ -2651,7 +2389,8 @@ asm dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CS
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Collect_c::~dMenu_Collect_c() {
// asm dMenu_Collect_c::~dMenu_Collect_c() {
extern "C" asm void __dt__15dMenu_Collect_cFv() {
nofralloc
#include "asm/d/menu/d_menu_collect/__dt__15dMenu_Collect_cFv.s"
}
@@ -2726,7 +2465,8 @@ asm dMenu_Collect2DTop_c::~dMenu_Collect2DTop_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Collect2D_c::draw() {
// asm void dMenu_Collect2D_c::draw() {
extern "C" asm void draw__17dMenu_Collect2D_cFv() {
nofralloc
#include "asm/d/menu/d_menu_collect/draw__17dMenu_Collect2D_cFv.s"
}
src/d/menu/d_menu_dmap.cpp
+6 -166
View File
@@ -16,13 +16,6 @@ struct renderingDmap_c {
/* 801C051C */ renderingDmap_c();
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
/* 802CE72C */ void getFreeSize();
/* 802CE784 */ void getTotalFreeSize();
};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -50,22 +43,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DBasePosition {};
struct J2DPane {
/* 802F7100 */ void getBounds();
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -95,8 +72,6 @@ struct dMeterHaihai_c {
/* 8020BC20 */ void setScale(f32);
};
struct ResTIMG {};
struct J2DPicture {
/* 801BDD40 */ void append(ResTIMG const*, f32);
/* 801BDD70 */ void insert(ResTIMG const*, u8, f32);
@@ -140,21 +115,6 @@ struct dMenu_StageMapCtrl_c {
/* 801C2590 */ void setPlusZoomCenterZ(f32);
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DB470 */ void move();
@@ -162,82 +122,6 @@ struct dMenu_ItemExplain_c {
/* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8);
};
struct CSTControl {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct J2DGrafContext {
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct dMenu_Dmap_c {
/* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
/* 801BB634 */ void screenInit();
/* 801BC788 */ void getPlayerIconPos(s8, f32);
/* 801BC848 */ void getIconPos(s8, f32);
/* 801BCDF4 */ ~dMenu_Dmap_c();
/* 801BD1D4 */ void getCurFloorPos();
/* 801BD1E8 */ void getDefaultCurFloorPos();
/* 801BD208 */ void iconMoveCalc();
/* 801BD3B8 */ void drawFloorScreenBack(J2DScreen*, f32, f32, J2DOrthoGraph*);
/* 801BD524 */ void drawFloorScreenTop(J2DScreen*, f32, f32, J2DOrthoGraph*);
/* 801BD690 */ void isMapMoveState();
/* 801BD6C4 */ void floorChangeMode();
/* 801BD7C0 */ void _create();
/* 801BDDA4 */ void _move();
/* 801BDEF8 */ void setMapTexture();
/* 801BDF48 */ void mapBgAnime();
/* 801BDF6C */ void mapControl();
/* 801BE328 */ void isOpen();
/* 801BE670 */ void isClose();
/* 801BE7E0 */ void _draw();
/* 801BEAFC */ void itemInfo_init_proc();
/* 801BEB0C */ void itemInfo_proc();
/* 801BEB44 */ void itemSelect();
/* 801BEF28 */ void getNextItem(int);
/* 801BEFCC */ void itemSelectAnmInit();
/* 801BF030 */ void itemSelectAnm();
/* 801BF180 */ void itemInfoOpenAnm();
/* 801BF18C */ void itemInfoWait();
/* 801BF278 */ void itemInfoCloseAnm();
/* 801BF334 */ void getNextStatus();
/* 801BF410 */ void isSync();
/* 801BF464 */ void isKeyCheck();
/* 801BF4A4 */ void infoModeChange_init_proc();
/* 801BF528 */ void infoModeChange_proc();
/* 801BF688 */ void mapModeChange_init_proc();
/* 801BF70C */ void mapModeChange_proc();
/* 801BF8A0 */ void lv5_talk_init_proc();
/* 801BF8F8 */ void lv5_talk_proc();
/* 801BF9D4 */ void mapMode_init_proc();
/* 801BF9E0 */ void mapMode_proc();
/* 801BFA84 */ void floorSelect_init_proc();
/* 801BFA88 */ void floorSelect_proc();
/* 801BFC78 */ void itemCarryCheck();
/* 801BFCAC */ void floorChange_init_proc();
/* 801BFD5C */ void floorChange_proc();
/* 801BFF84 */ void zoomWait_init_proc();
/* 801BFF88 */ void zoomWait_proc();
/* 801C008C */ void zoomIn_init_proc();
/* 801C01A0 */ void zoomIn_proc();
/* 801C023C */ void zoomOut_init_proc();
/* 801C02F0 */ void zoomOut_proc();
static u8 myclass[4 + 4 /* padding */];
};
struct dMenu_DmapMap_c {
/* 801C04AC */ ~dMenu_DmapMap_c();
};
@@ -285,16 +169,8 @@ struct dMenuMapCommon_c {
/* 801C443C */ void clearIconInfo();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -308,43 +184,10 @@ struct JMath {
static u8 sincosTable_[65536];
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct CPaneMgrAlphaMorf {
/* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255DD0 */ void setBackupAlpha();
/* 80255E28 */ void setAlphaMorfRate(f32);
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255878 */ void alphaAnime(s16, u8, u8, u8);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
/* 80253A18 */ ~CPaneMgr();
/* 802545B0 */ void paneTrans(f32, f32);
/* 802547CC */ void scaleAnime(s16, f32, f32, u8);
/* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -442,8 +285,6 @@ extern "C" u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */];
// External References:
//
SECTION_INIT void memset();
SECTION_INIT void memcpy();
extern "C" void mDoExt_getJ2dHeap__Fv();
extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap();
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
@@ -562,7 +403,6 @@ extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void load__20J2DAnmLoaderDataBaseFPCv();
extern "C" void GXGetScissor();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
@@ -578,7 +418,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
@@ -1773,7 +1612,8 @@ asm void dMenu_Dmap_c::getIconPos(s8 param_0, f32 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Dmap_c::~dMenu_Dmap_c() {
// asm dMenu_Dmap_c::~dMenu_Dmap_c() {
extern "C" asm void __dt__12dMenu_Dmap_cFv() {
nofralloc
#include "asm/d/menu/d_menu_dmap/__dt__12dMenu_Dmap_cFv.s"
}
@@ -1961,7 +1801,7 @@ SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Dmap_c::isOpen() {
asm bool dMenu_Dmap_c::isOpen() {
nofralloc
#include "asm/d/menu/d_menu_dmap/isOpen__12dMenu_Dmap_cFv.s"
}
@@ -1971,7 +1811,7 @@ asm void dMenu_Dmap_c::isOpen() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Dmap_c::isClose() {
asm bool dMenu_Dmap_c::isClose() {
nofralloc
#include "asm/d/menu/d_menu_dmap/isClose__12dMenu_Dmap_cFv.s"
}
@@ -2084,7 +1924,7 @@ asm void dMenu_Dmap_c::itemInfoCloseAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Dmap_c::getNextStatus() {
asm u8 dMenu_Dmap_c::getNextStatus() {
nofralloc
#include "asm/d/menu/d_menu_dmap/getNextStatus__12dMenu_Dmap_cFv.s"
}
@@ -2094,7 +1934,7 @@ asm void dMenu_Dmap_c::getNextStatus() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Dmap_c::isSync() {
asm bool dMenu_Dmap_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_dmap/isSync__12dMenu_Dmap_cFv.s"
}
src/d/menu/d_menu_fishing.cpp
+3 -65
View File
@@ -15,8 +15,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -36,66 +34,6 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Fishing_c {
/* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801C4D98 */ ~dMenu_Fishing_c();
/* 801C504C */ void _create();
/* 801C50B4 */ void _move();
/* 801C514C */ void _draw();
/* 801C5204 */ void isSync();
/* 801C522C */ void init();
/* 801C52E4 */ void _open();
/* 801C5470 */ void _close();
/* 801C556C */ void wait_init();
/* 801C55A8 */ void wait_move();
/* 801C55D8 */ void screenSetBase();
/* 801C5D3C */ void screenSetDoIcon();
/* 801C5EB8 */ void setAButtonString(u16);
/* 801C5F68 */ void setBButtonString(u16);
/* 801C6018 */ void getFigure(int);
/* 801C605C */ void setFishParam(int, u16, u8);
/* 801C6210 */ void setHIO(bool);
/* 801C659C */ void draw();
};
struct ResTIMG {};
struct JKRArchive {};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 802557D0 */ void setAlphaRate(f32);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802545B0 */ void paneTrans(f32, f32);
};
//
// Forward References:
//
@@ -162,7 +100,6 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
@@ -292,7 +229,7 @@ asm void dMenu_Fishing_c::_draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fishing_c::isSync() {
asm bool dMenu_Fishing_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_fishing/isSync__15dMenu_Fishing_cFv.s"
}
@@ -620,7 +557,8 @@ asm void dMenu_Fishing_c::setHIO(bool param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fishing_c::draw() {
// asm void dMenu_Fishing_c::draw() {
extern "C" asm void draw__15dMenu_Fishing_cFv() {
nofralloc
#include "asm/d/menu/d_menu_fishing/draw__15dMenu_Fishing_cFv.s"
}
src/d/menu/d_menu_fmap.cpp
+12 -181
View File
@@ -21,18 +21,10 @@ struct renderingFmap_c {
int*);
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
/* 802CE784 */ void getTotalFreeSize();
};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct fopAc_ac_c {};
struct fmpTresTypeGroupDataList_c {
/* 8003EB10 */ ~fmpTresTypeGroupDataList_c();
};
@@ -70,13 +62,6 @@ struct dMsgObject_c {
/* 8023849C */ void setPortalMessageID(u16);
};
struct dMsgFlow_c {
/* 80249F00 */ dMsgFlow_c();
/* 80249F48 */ ~dMsgFlow_c();
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
};
struct dMf_HIO_c {
/* 801C65F8 */ dMf_HIO_c();
/* 801CDA2C */ ~dMf_HIO_c();
@@ -88,8 +73,6 @@ struct dMeterMap_c {
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
};
struct cXyz {};
struct dMeter2Info_c {
/* 8021CC0C */ void setWarpInfo(char const*, cXyz const&, s16, u8, u8, u8);
};
@@ -100,141 +83,6 @@ struct dMenu_Fmap_world_data_c {
struct dMenu_Fmap_stage_data_c {};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct CSTControl {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct dMenu_Fmap_c {
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
/* 801C6AC8 */ ~dMenu_Fmap_c();
/* 801C6D64 */ void _create();
/* 801C74A4 */ void _delete();
/* 801C74A8 */ void _move();
/* 801C7650 */ void _draw();
/* 801C77F0 */ void getNextStatus(u8*);
/* 801C7AFC */ void isSync();
/* 801C7B24 */ void all_map_init();
/* 801C7C2C */ void all_map_proc();
/* 801C8230 */ void zoom_all_to_region_init();
/* 801C8308 */ void zoom_all_to_region_proc();
/* 801C83E0 */ void zoom_region_to_all_init();
/* 801C8438 */ void zoom_region_to_all_proc();
/* 801C8518 */ void region_map_init();
/* 801C8600 */ void region_map_proc();
/* 801C8B00 */ void to_portal_warp_map_init();
/* 801C8B0C */ void to_portal_warp_map_proc();
/* 801C8B48 */ void portal_warp_map_init();
/* 801C8C0C */ void portal_warp_map_proc();
/* 801C90A4 */ void portal_warp_select_init();
/* 801C90A8 */ void portal_warp_select_proc();
/* 801C91D8 */ void portal_warp_forbid_init();
/* 801C9238 */ void portal_warp_forbid_proc();
/* 801C92A4 */ void zoom_region_to_spot_init();
/* 801C9304 */ void zoom_region_to_spot_proc();
/* 801C93CC */ void zoom_spot_to_region_init();
/* 801C9428 */ void zoom_spot_to_region_proc();
/* 801C950C */ void spot_map_init();
/* 801C9618 */ void spot_map_proc();
/* 801C9A4C */ void portal_demo1_init();
/* 801C9B64 */ void portal_demo1_move();
/* 801C9C7C */ void portal_demo2_init();
/* 801C9CC8 */ void portal_demo2_move();
/* 801C9D60 */ void portal_demo3_init();
/* 801C9DB4 */ void portal_demo3_move();
/* 801C9EB8 */ void portal_demo4_init();
/* 801C9F14 */ void portal_demo4_move();
/* 801C9F7C */ void portal_demo5_init();
/* 801C9FBC */ void portal_demo5_move();
/* 801CA158 */ void portal_demo6_init();
/* 801CA15C */ void portal_demo6_move();
/* 801CA1E8 */ void yamiboss_demo1_init();
/* 801CA2F4 */ void yamiboss_demo1_move();
/* 801CA34C */ void yamiboss_demo2_init();
/* 801CA35C */ void yamiboss_demo2_move();
/* 801CA40C */ void yamiboss_demo3_init();
/* 801CA410 */ void yamiboss_demo3_move();
/* 801CA468 */ void yamiboss_demo4_init();
/* 801CA4C0 */ void yamiboss_demo4_move();
/* 801CA544 */ void yamiboss_demo5_init();
/* 801CA548 */ void yamiboss_demo5_move();
/* 801CA5CC */ void light_demo1_init();
/* 801CA7A4 */ void light_demo1_move();
/* 801CA7E0 */ void light_demo2_init();
/* 801CA814 */ void light_demo2_move();
/* 801CA874 */ void table_demo1_init();
/* 801CA9B4 */ void table_demo1_move();
/* 801CAA78 */ void table_demo2_init();
/* 801CAABC */ void table_demo2_move();
/* 801CAB88 */ void table_demo3_init();
/* 801CABD0 */ void table_demo3_move();
/* 801CAC30 */ void howl_demo1_init();
/* 801CAC7C */ void howl_demo1_move();
/* 801CAD48 */ void howl_demo2_init();
/* 801CAD54 */ void howl_demo2_move();
/* 801CAD9C */ void howl_demo3_init();
/* 801CADA0 */ void howl_demo3_move();
/* 801CADC4 */ void isOpen();
/* 801CB038 */ void isClose();
/* 801CB1DC */ void getProcess();
/* 801CB200 */ void getRegionCursor();
/* 801CB230 */ void getStageCursor();
/* 801CB260 */ void getStageTransX();
/* 801CB290 */ void getStageTransZ();
/* 801CB2C0 */ void isRoomCheck(int, int);
/* 801CB570 */ void checkStRoomData();
/* 801CB664 */ void talkButton();
/* 801CB6D0 */ void setProcess(u8);
/* 801CB6E0 */ void setFlash(u8, bool);
/* 801CB770 */ void readWorldData(u8);
/* 801CB938 */ void readAreaData(u8, bool);
/* 801CBF04 */ void readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8);
/* 801CC094 */ void readFieldMapData(void**, char const*, bool, bool);
/* 801CC2B0 */ void decodeFieldMapData();
/* 801CC4EC */ void decodePortalData();
/* 801CC51C */ void readRoomDzsData(void**, u32, char const*);
/* 801CC61C */ void removeAreaData();
/* 801CC7A8 */ void removeRoomData(dMenu_Fmap_stage_data_c*);
/* 801CC85C */ void setTitleName(u32);
/* 801CC880 */ void setAreaName(u32);
/* 801CC8AC */ void setAreaNameZero();
/* 801CC8DC */ void portalWarpMapMove(STControl*);
/* 801CCA70 */ void onRoomDataBit(int);
/* 801CCA98 */ void isRoomDataBit(int);
/* 801CCAC4 */ void resetRoomDataBit();
/* 801CCB08 */ void drawIcon(f32, bool);
/* 801CD10C */ void drawIcon(u8, int);
/* 801CCD98 */ void drawLightDropIcon();
/* 801CCDDC */ void drawBatsumarkIcon();
/* 801CCE04 */ void drawSnowmanIcon();
/* 801CCE48 */ void drawGoldWolfIcon();
/* 801CCE70 */ void drawCoachIcon();
/* 801CCE98 */ void drawPlayEnterIcon();
/* 801CCFB0 */ void checkDrawPortalIcon(int, int);
/* 801CD000 */ void searchIcon(u8, int, f32*, f32*);
/* 801CD210 */ void drawEnterIcon();
/* 801CD254 */ void drawPortalIcon();
/* 801CD2FC */ void getRegionStageNum(int);
/* 801CD350 */ void getNowFmapRegionData();
/* 801CD368 */ void getNowFmapStageData();
/* 801CD380 */ void searchPortalStageID(char*);
/* 801CD3F0 */ void drawDebugStage();
/* 801CD460 */ void arrowPosInit();
/* 801CD5CC */ void tableArrowPosInit(bool);
/* 801CD770 */ void yamibossArrowPosInit();
/* 801CD814 */ void howlArrowPosInit();
/* 801CD8B4 */ void getHowlRegionID();
/* 801CD92C */ void isLightVesselGet();
/* 801CD95C */ void getPlayerPos2D();
static u8 MyClass[4];
};
struct dMenu_FmapMap_c {
/* 801CEC24 */ dMenu_FmapMap_c();
/* 801CEDE8 */ void _create(u16, u16, u16, u16, void*);
@@ -243,8 +91,6 @@ struct dMenu_FmapMap_c {
/* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32);
};
struct J2DAnmTextureSRTKey {};
struct dMenu_Fmap2DTop_c {
/* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*);
/* 801D6A44 */ void _execute();
@@ -267,8 +113,6 @@ struct dMenu_Fmap2DTop_c {
/* 801D8088 */ void isWarpAccept();
};
struct ResTIMG {};
struct dMenu_Fmap2DBack_c {
/* 801CF56C */ dMenu_Fmap2DBack_c();
/* 801D0804 */ void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32);
@@ -322,16 +166,8 @@ struct dMapInfo_n {
/* 8003F02C */ void getMapRestartPos();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -340,10 +176,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRArchive {
/* 801CC284 */ void getExpandedResSize(void const*) const;
};
struct JKRAramArchive {};
//
@@ -621,8 +453,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
@@ -1429,7 +1259,8 @@ asm dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* param_0, STControl* param_1, CSTContr
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Fmap_c::~dMenu_Fmap_c() {
// asm dMenu_Fmap_c::~dMenu_Fmap_c() {
extern "C" asm void __dt__12dMenu_Fmap_cFv() {
nofralloc
#include "asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s"
}
@@ -1502,7 +1333,7 @@ SECTION_SDATA2 static f32 lit_4541 = -1.0f;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getNextStatus(u8* param_0) {
asm u8 dMenu_Fmap_c::getNextStatus(u8* param_0) {
nofralloc
#include "asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s"
}
@@ -1512,7 +1343,7 @@ asm void dMenu_Fmap_c::getNextStatus(u8* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::isSync() {
asm bool dMenu_Fmap_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s"
}
@@ -2138,7 +1969,7 @@ asm void dMenu_Fmap_c::howl_demo3_move() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::isOpen() {
asm bool dMenu_Fmap_c::isOpen() {
nofralloc
#include "asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s"
}
@@ -2148,7 +1979,7 @@ asm void dMenu_Fmap_c::isOpen() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::isClose() {
asm bool dMenu_Fmap_c::isClose() {
nofralloc
#include "asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s"
}
@@ -2158,7 +1989,7 @@ asm void dMenu_Fmap_c::isClose() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getProcess() {
asm u8 dMenu_Fmap_c::getProcess() {
nofralloc
#include "asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s"
}
@@ -2169,7 +2000,7 @@ asm void dMenu_Fmap_c::getProcess() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getRegionCursor() {
asm u8 dMenu_Fmap_c::getRegionCursor() {
nofralloc
#include "asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s"
}
@@ -2179,7 +2010,7 @@ asm void dMenu_Fmap_c::getRegionCursor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getStageCursor() {
asm u8 dMenu_Fmap_c::getStageCursor() {
nofralloc
#include "asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s"
}
@@ -2189,7 +2020,7 @@ asm void dMenu_Fmap_c::getStageCursor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getStageTransX() {
asm f32 dMenu_Fmap_c::getStageTransX() {
nofralloc
#include "asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s"
}
@@ -2199,7 +2030,7 @@ asm void dMenu_Fmap_c::getStageTransX() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Fmap_c::getStageTransZ() {
asm f32 dMenu_Fmap_c::getStageTransZ() {
nofralloc
#include "asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s"
}
@@ -2303,7 +2134,7 @@ asm void dMenu_Fmap_c::readFieldMapData(void** param_0, char const* param_1, boo
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JKRArchive::getExpandedResSize(void const* param_0) const {
asm u32 JKRArchive::getExpandedResSize(void const* param_0) const {
nofralloc
#include "asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s"
}
src/d/menu/d_menu_insect.cpp
+3 -109
View File
@@ -15,11 +15,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -40,18 +35,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -72,14 +55,6 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
@@ -90,61 +65,8 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Insect_c {
/* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801D82F4 */ ~dMenu_Insect_c();
/* 801D8658 */ void _create();
/* 801D86C8 */ void _move();
/* 801D8760 */ void _draw();
/* 801D88EC */ void isSync();
/* 801D8914 */ void init();
/* 801D894C */ void _open();
/* 801D8B2C */ void _close();
/* 801D8C68 */ void wait_init();
/* 801D8CCC */ void wait_move();
/* 801D8E00 */ void explain_open_init();
/* 801D91E4 */ void explain_open_move();
/* 801D9264 */ void explain_move_init();
/* 801D9268 */ void explain_move_move();
/* 801D9290 */ void select_move_init();
/* 801D92DC */ void select_move_move();
/* 801D9504 */ void explain_close_init();
/* 801D95AC */ void explain_close_move();
/* 801D9644 */ void screenSetBase();
/* 801D98F0 */ void screenSetExplain();
/* 801D9BD0 */ void screenSetDoIcon();
/* 801D9D4C */ void getGetInsectNum();
/* 801D9DCC */ void getInsectItemID(int, int);
/* 801D9DE4 */ void isGetInsect(int, int);
/* 801D9E20 */ void isGiveInsect(int, int);
/* 801D9ED4 */ void isGiveInsect(u8);
/* 801D9E7C */ void isCatchInsect(u8);
/* 801D9F3C */ void isCatchNotGiveInsect(u8);
/* 801D9F8C */ void cursorMove();
/* 801DA1EC */ void setCursorPos();
/* 801DA2FC */ bool dpdMove();
/* 801DA304 */ void setAButtonString(u16);
/* 801DA3B4 */ void setBButtonString(u16);
/* 801DA464 */ void setHIO(bool);
/* 801DA630 */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -153,33 +75,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
/* 80255878 */ void alphaAnime(s16, u8, u8, u8);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -295,8 +190,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void snprintf();
extern "C" void strcat();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
@@ -555,7 +448,7 @@ asm void dMenu_Insect_c::_draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::isSync() {
asm bool dMenu_Insect_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s"
}
@@ -982,7 +875,8 @@ asm void dMenu_Insect_c::setHIO(bool param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::draw() {
// asm void dMenu_Insect_c::draw() {
extern "C" asm void draw__14dMenu_Insect_cFv() {
nofralloc
#include "asm/d/menu/d_menu_insect/draw__14dMenu_Insect_cFv.s"
}
src/d/menu/d_menu_letter.cpp
+3 -129
View File
@@ -15,8 +15,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -31,29 +29,6 @@ struct dSv_letter_info_c {
/* 8003449C */ void isLetterReadFlag(int) const;
};
struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
@@ -85,68 +60,12 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Letter_c {
/* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801DCF34 */ ~dMenu_Letter_c();
/* 801DD36C */ void _create();
/* 801DD474 */ void _move();
/* 801DD50C */ void _draw();
/* 801DD934 */ void isSync();
/* 801DD95C */ void letter_init_calc();
/* 801DDA20 */ void init();
/* 801DDA74 */ void _open();
/* 801DDC98 */ void _close();
/* 801DDE18 */ void wait_init();
/* 801DDE54 */ void wait_move();
/* 801DE164 */ void slide_right_init();
/* 801DE1E8 */ void slide_right_move();
/* 801DE24C */ void slide_left_init();
/* 801DE2D0 */ void slide_left_move();
/* 801DE334 */ void read_open_init();
/* 801DE564 */ void read_open_move();
/* 801DE70C */ void read_move_init();
/* 801DE824 */ void read_move_move();
/* 801DEA48 */ void read_next_fadeout_init();
/* 801DEA94 */ void read_next_fadeout_move();
/* 801DEBD8 */ void read_next_fadein_init();
/* 801DED04 */ void read_next_fadein_move();
/* 801DEE20 */ void read_close_init();
/* 801DEE6C */ void read_close_move();
/* 801DF010 */ void screenSetMenu();
/* 801DFA58 */ void screenSetBase();
/* 801E0330 */ void screenSetShadow();
/* 801E03D8 */ void screenSetLetter();
/* 801E09A8 */ void screenSetDoIcon();
/* 801E0B24 */ void setCursorPos();
/* 801E0BB0 */ void changeActiveColor();
/* 801E0E34 */ void changePageLight();
/* 801E0E84 */ void setPageText();
/* 801E1038 */ void setDMYPageText();
/* 801E11EC */ void copyDMYMenu();
/* 801E1518 */ void setAButtonString(u16);
/* 801E15C8 */ void setBButtonString(u16);
/* 801E1678 */ void getLetterNum();
/* 801E1748 */ void setHIO(bool);
/* 801E1D5C */ void draw();
};
struct dMenu_Letter {
static u8 letter_data[512];
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -155,50 +74,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JUtility {
struct TColor {
/* 80193960 */ TColor();
};
};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct J2DGrafContext {
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct J2DPicture {
/* 801DFA40 */ void getWhite() const;
/* 801DFA4C */ void getBlack() const;
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct CPaneMgrAlpha {
/* 802557D0 */ void setAlphaRate(f32);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
/* 80253A18 */ ~CPaneMgr();
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -308,7 +183,6 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void GXGetScissor();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void __save_gpr();
@@ -326,7 +200,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 letter_data__12dMenu_Letter[512];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
@@ -634,7 +507,7 @@ asm void dMenu_Letter_c::_draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Letter_c::isSync() {
asm bool dMenu_Letter_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_letter/isSync__14dMenu_Letter_cFv.s"
}
@@ -1339,7 +1212,8 @@ asm void dMsgString_c::getStringPage(u32 param_0, u8 param_1, u8 param_2, J2DTex
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Letter_c::draw() {
// asm void dMenu_Letter_c::draw() {
extern "C" asm void draw__14dMenu_Letter_cFv() {
nofralloc
#include "asm/d/menu/d_menu_letter/draw__14dMenu_Letter_cFv.s"
}
src/d/menu/d_menu_option.cpp
+4 -158
View File
@@ -15,8 +15,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -30,24 +28,6 @@ struct dSv_player_config_c {
/* 80034684 */ void getSound();
};
struct J2DBasePosition {};
struct J2DPane {
/* 802F7100 */ void getBounds();
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMw_c {
/* 801FCE08 */ void dMw_fade_out();
/* 801FCE78 */ void dMw_fade_in();
@@ -69,98 +49,10 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct dMenu_Option_c {
/* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*);
/* 801E2014 */ ~dMenu_Option_c();
/* 801E205C */ void _create();
/* 801E2C1C */ void _delete();
/* 801E3408 */ void _move();
/* 801E36CC */ void _draw();
/* 801E38CC */ void drawHaihai();
/* 801E3A7C */ void isSync();
/* 801E3AA4 */ void checkLeftTrigger();
/* 801E3AC8 */ void checkRightTrigger();
/* 801E3AEC */ void setAnimation();
/* 801E3B98 */ void _open();
/* 801E3DE0 */ void _close();
/* 801E3F6C */ void atten_init();
/* 801E3FC4 */ void atten_move();
/* 801E41A0 */ void vib_init();
/* 801E41F8 */ void vib_move();
/* 801E4488 */ void sound_init();
/* 801E44E0 */ void sound_move();
/* 801E48AC */ void change_init();
/* 801E48E8 */ void change_move();
/* 801E4B34 */ void confirm_open_init();
/* 801E4C10 */ void confirm_open_move();
/* 801E4CE4 */ void confirm_move_init();
/* 801E4D20 */ void confirm_move_move();
/* 801E4E98 */ void confirm_select_init();
/* 801E4E9C */ void confirm_select_move();
/* 801E4F18 */ void confirm_close_init();
/* 801E4FB0 */ void confirm_close_move();
/* 801E51CC */ void tv_open1_move();
/* 801E5244 */ void tv_open2_move();
/* 801E5260 */ void tv_move_move();
/* 801E5300 */ void tv_close1_move();
/* 801E5364 */ void tv_close2_move();
/* 801E5380 */ void calibration_open1_move();
/* 801E53C4 */ void calibration_open2_move();
/* 801E53E0 */ void calibration_move_move();
/* 801E5434 */ void calibration_close1_move();
/* 801E5478 */ void calibration_close2_move();
/* 801E5494 */ void menuVisible();
/* 801E54F8 */ void menuShow(int);
/* 801E55B8 */ void menuHide(int);
/* 801E5678 */ void screenSet();
/* 801E6FBC */ void setSoundMode(u32);
/* 801E7004 */ void setAttenString();
/* 801E70E8 */ void setVibString();
/* 801E71CC */ void setSoundString();
/* 801E7314 */ void setCursorPos(u8);
/* 801E73D8 */ void setSelectColor(u8, bool);
/* 801E76EC */ void getSelectType();
/* 801E7718 */ void changeBarColor(bool);
/* 801E78B8 */ void setHIO(bool);
/* 801E7D18 */ void cursorAnime(f32);
/* 801E7D60 */ void setZButtonString(u16);
/* 801E7DF4 */ void changeTVCheck();
/* 801E7E98 */ void setAButtonString(u16);
/* 801E7F9C */ void setBButtonString(u16);
/* 801E80A0 */ void isRumbleSupported();
/* 801E80AC */ bool dpdMenuMove();
/* 801E80B4 */ void paneResize(u64);
/* 801E8210 */ void initialize();
/* 801E82C4 */ void yesnoMenuMoveAnmInitSet(int, int);
/* 801E8438 */ void yesnoMenuMoveAnm();
/* 801E85D4 */ void yesnoSelectMoveAnm();
/* 801E8888 */ void yesnoCursorShow();
/* 801E89F8 */ void yesNoSelectStart();
/* 801E8AC8 */ void yesnoSelectAnmSet();
/* 801E8C38 */ void yesnoCancelAnmSet();
/* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801E8CFC */ void yesnoWakuAlpahAnm(u8);
/* 801E8E6C */ void draw();
};
struct dMenu_Calibration_c {
/* 801AEDAC */ void _move();
};
struct JUtility {
struct TColor {
/* 80193960 */ TColor();
};
};
struct dFile_warning_c {
/* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
/* 80191F18 */ void _move();
@@ -177,8 +69,6 @@ struct dComIfG_play_c {
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -189,8 +79,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JUTGamePad {
struct CRumble {
struct ERumble {};
@@ -201,51 +89,10 @@ struct JUTGamePad {
static u8 sRumbleSupported[4];
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct JKRExpHeap {};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255878 */ void alphaAnime(s16, u8, u8, u8);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
/* 80253A18 */ ~CPaneMgr();
/* 802545B0 */ void paneTrans(f32, f32);
/* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
JUtility::TColor, u8);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -395,7 +242,6 @@ extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void load__20J2DAnmLoaderDataBaseFPCv();
extern "C" void OSSetSoundMode();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_20();
@@ -414,7 +260,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 m_gamePad__8mDoCPd_c[16];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
@@ -1080,7 +925,7 @@ asm void dMenu_Option_c::drawHaihai() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Option_c::isSync() {
asm bool dMenu_Option_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_option/isSync__14dMenu_Option_cFv.s"
}
@@ -1131,7 +976,7 @@ SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Option_c::_open() {
asm bool dMenu_Option_c::_open() {
nofralloc
#include "asm/d/menu/d_menu_option/_open__14dMenu_Option_cFv.s"
}
@@ -2232,7 +2077,8 @@ asm void dMenu_Option_c::yesnoWakuAlpahAnm(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Option_c::draw() {
// asm void dMenu_Option_c::draw() {
extern "C" asm void draw__14dMenu_Option_cFv() {
nofralloc
#include "asm/d/menu/d_menu_option/draw__14dMenu_Option_cFv.s"
}
src/d/menu/d_menu_ring.cpp
+5 -137
View File
@@ -33,26 +33,11 @@ struct dSv_player_item_c {
/* 80033354 */ void getLineUpItem(int) const;
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct dMeter2Info_c {
/* 8021CA04 */ void warpInProc();
/* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*,
@@ -60,78 +45,11 @@ struct dMeter2Info_c {
/* 8021D36C */ void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*);
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
};
struct STControl {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Ring_c {
/* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801EA708 */ ~dMenu_Ring_c();
/* 801EAB7C */ void _create();
/* 801EABE8 */ void _delete();
/* 801EABEC */ void _move();
/* 801EACC8 */ void _draw();
/* 801EB080 */ void setKanteraPos(f32, f32);
/* 801EB0A4 */ void isOpen();
/* 801EB2B4 */ void isMoveEnd();
/* 801EB3CC */ void isClose();
/* 801EB624 */ void getStickInfo(STControl*);
/* 801EB8C0 */ void calcStickAngle(STControl*, u8);
/* 801EB960 */ void setRotate();
/* 801EBA38 */ void setItemScale(int, f32);
/* 801EBAB8 */ void setButtonScale(int, f32);
/* 801EBB10 */ void setItem();
/* 801EBE58 */ void setJumpItem(bool);
/* 801EC20C */ void setScale();
/* 801EC3B0 */ void setNameString(u32);
/* 801EC504 */ void setActiveCursor();
/* 801EC754 */ void setMixItem();
/* 801ECB14 */ void drawItem();
/* 801ECF9C */ void drawItem2();
/* 801ED2BC */ void stick_wait_init();
/* 801ED31C */ void stick_wait_proc();
/* 801ED490 */ void stick_move_init();
/* 801ED53C */ void stick_move_proc();
/* 801ED934 */ void stick_explain_init();
/* 801ED938 */ void stick_explain_force_init();
/* 801ED93C */ void stick_explain_proc();
/* 801EDA0C */ void stick_explain_force_proc();
/* 801EDB14 */ void setSelectItem(int, u8);
/* 801EDC98 */ void drawSelectItem();
/* 801EDF2C */ void setSelectItemForce(int);
/* 801EDFDC */ void getCursorPos(u8);
/* 801EE058 */ void getItemNum(u8);
/* 801EE15C */ void getItemMaxNum(u8);
/* 801EE228 */ void checkExplainForce();
/* 801EE63C */ bool checkCombineBomb(int);
/* 801EE644 */ void setCombineBomb(int);
/* 801EE648 */ void drawNumber(int, int, f32, f32);
/* 801EEA84 */ void getItem(int, u8);
/* 801EEAE4 */ void setDoStatus(u8);
/* 801EEB58 */ void isMixItemOn();
/* 801EEC98 */ void isMixItemOff();
/* 801EED84 */ void setMixMessage();
/* 801EEF14 */ void textScaleHIO();
/* 801EF11C */ void textCentering();
/* 801EF13C */ void clacEllipseFunction(f32, f32, f32);
/* 801EF174 */ void calcDistance(f32, f32, f32, f32);
/* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32);
/* 801EF484 */ bool dpdMove();
/* 801EF48C */ void openExplain(u8);
/* 801EF560 */ void draw();
};
struct J2DOrthoGraph {};
struct dMenu_ItemExplain_c {
@@ -155,12 +73,6 @@ struct dItem_data {
static void* item_resource[1530];
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct JAISoundID {};
struct Z2SeMgr {
@@ -175,47 +87,6 @@ struct JMath {
static u8 sincosTable_[65536];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
/* 802CE784 */ void getTotalFreeSize();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct J2DBasePosition {};
struct J2DPane {
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
/* 80253A18 */ ~CPaneMgr();
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -355,7 +226,6 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void PSVECSquareMag();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_17();
extern "C" void _savegpr_18();
@@ -377,8 +247,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
@@ -386,7 +254,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_meter2_info[248];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
@@ -766,7 +633,7 @@ SECTION_SDATA2 static f64 lit_4596 = 4503601774854144.0 /* cast s32 to float */;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::isOpen() {
asm bool dMenu_Ring_c::isOpen() {
nofralloc
#include "asm/d/menu/d_menu_ring/isOpen__12dMenu_Ring_cFv.s"
}
@@ -776,7 +643,7 @@ asm void dMenu_Ring_c::isOpen() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::isMoveEnd() {
asm bool dMenu_Ring_c::isMoveEnd() {
nofralloc
#include "asm/d/menu/d_menu_ring/isMoveEnd__12dMenu_Ring_cFv.s"
}
@@ -786,7 +653,7 @@ asm void dMenu_Ring_c::isMoveEnd() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::isClose() {
asm bool dMenu_Ring_c::isClose() {
nofralloc
#include "asm/d/menu/d_menu_ring/isClose__12dMenu_Ring_cFv.s"
}
@@ -1292,7 +1159,8 @@ asm void dMenu_Ring_c::openExplain(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::draw() {
// asm void dMenu_Ring_c::draw() {
extern "C" asm void draw__12dMenu_Ring_cFv() {
nofralloc
#include "asm/d/menu/d_menu_ring/draw__12dMenu_Ring_cFv.s"
}
src/d/menu/d_menu_save.cpp
+5 -209
View File
@@ -26,8 +26,6 @@ struct mDoMemCd_Ctrl_c {
/* 800170B8 */ void command_attach();
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -62,33 +60,11 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct dMsgScrnExplain_c {
@@ -108,131 +84,6 @@ struct dMeter2Info_c {
/* 8021E0C4 */ void resetMiniGameItem(bool);
};
struct dMenu_save_c {
/* 801EF6A0 */ dMenu_save_c();
/* 801EF7AC */ void _create();
/* 801EF904 */ void screenSet();
/* 801F0938 */ void initialize();
/* 801F0958 */ void displayInit();
/* 801F09AC */ void _open();
/* 801F0B10 */ void _close();
/* 801F0B28 */ void _delete();
/* 801F1048 */ void _move();
/* 801F1100 */ void saveSelAnm();
/* 801F1148 */ void selFileWakuAnm();
/* 801F11F4 */ void bookIconAnm();
/* 801F12F0 */ void memCardWatch();
/* 801F1378 */ void saveQuestion();
/* 801F1558 */ void saveQuestion2();
/* 801F1620 */ void saveQuestion21();
/* 801F1644 */ void saveQuestion3();
/* 801F16B8 */ void saveQuestion4();
/* 801F16F4 */ void saveGuide();
/* 801F1720 */ void memCardCheck();
/* 801F191C */ void memCardErrMsgWaitKey();
/* 801F19A8 */ void backSaveQuestionInitSet();
/* 801F19DC */ void backSaveQuestion();
/* 801F1A48 */ void backSaveQuestion2();
/* 801F1B38 */ void closeSelect();
/* 801F1BF8 */ void closeSelect2();
/* 801F1C70 */ void iplSelMsgInitSet();
/* 801F1C94 */ void iplSelInitSet();
/* 801F1CEC */ void IPLSelectDisp1();
/* 801F1D54 */ void IPLSelectDisp2();
/* 801F1DD4 */ void memCardErrGoIPLSel();
/* 801F1E58 */ void IPLSelect2Disp();
/* 801F1EE0 */ void memCardErrGoIPLSel2();
/* 801F1F80 */ void memCardErrGotoIPL();
/* 801F2000 */ void memCardErrMsgWaitFormatSel();
/* 801F20AC */ void cardFormatYesSelDisp();
/* 801F2134 */ void cardFormatNoSelDisp();
/* 801F219C */ void memCardErrMsgWaitFormatSel2();
/* 801F2250 */ void cardFormatYesSel2Disp();
/* 801F22CC */ void memCardFormat();
/* 801F232C */ void memCardFormatWait();
/* 801F23A4 */ void gameFileMakeSelInitSet();
/* 801F23FC */ void makeGameFileSelDisp();
/* 801F247C */ void memCardMakeGameFileSel();
/* 801F2514 */ void makeGameFileDisp();
/* 801F25AC */ void memCardMakeGameFile();
/* 801F260C */ void memCardMakeGameFileWait();
/* 801F2698 */ void memCardCommandEnd();
/* 801F2708 */ void memCardCommandEnd2();
/* 801F27CC */ void memCardDataLoadWait();
/* 801F2840 */ void dataWrite();
/* 801F28E4 */ void memCardDataSaveWait();
/* 801F298C */ void memCardDataSaveWait2();
/* 801F2B5C */ void gameContinueDisp();
/* 801F2BF8 */ void gameContinue();
/* 801F2D78 */ void gameContinue2();
/* 801F2DA0 */ void gameContinue3();
/* 801F2DD4 */ void saveEnd();
/* 801F2E88 */ void endingNoSave();
/* 801F2F08 */ void endingNoSave2();
/* 801F2F38 */ void endingDataCheck();
/* 801F2F4C */ void retryQuestion0();
/* 801F2FB4 */ void retryQuestion1();
/* 801F3040 */ void retryQuestion2();
/* 801F30B8 */ void restartInit();
/* 801F31B0 */ void saveWait();
/* 801F31B4 */ void messageChange();
/* 801F328C */ void YesNoSelect();
/* 801F34BC */ void msgTxtSet(u16, bool);
/* 801F3588 */ void openSaveSelect();
/* 801F36B4 */ void openSaveSelect2();
/* 801F37A0 */ void openSaveSelect3();
/* 801F3934 */ void saveSelect();
/* 801F3A94 */ void saveSelectStart();
/* 801F3BE0 */ void selectDataOpenMove();
/* 801F3C7C */ void dataSelectAnmSet();
/* 801F3E30 */ void saveSelectMoveAnime();
/* 801F40D8 */ void saveYesNoSelect();
/* 801F4238 */ void yesnoSelectStart();
/* 801F42FC */ void saveMoveDisp();
/* 801F43F8 */ void saveMoveDisp2();
/* 801F4510 */ void yesnoSelectAnmSet(u8);
/* 801F46B4 */ void yesNoCursorMoveAnm();
/* 801F4724 */ void yesnoCancelAnmSet();
/* 801F47DC */ void saveYesNoCancelMove();
/* 801F485C */ void headerTxtSet(u16);
/* 801F4928 */ void headerTxtChangeAnm();
/* 801F4A10 */ void errDispInitSet(int);
/* 801F4B84 */ void msgWindowInitOpen();
/* 801F4D10 */ void msgWindowOpen();
/* 801F4DAC */ void msgWindowClose();
/* 801F4E48 */ void errYesNoSelect(u8, u8);
/* 801F4FB4 */ void errCurMove(u8, u8);
/* 801F5054 */ void errYesNoCursorMoveAnm();
/* 801F50C4 */ void errorTxtSet(u16);
/* 801F5190 */ void errorTxtChangeAnm();
/* 801F5278 */ void saveSelectOpenInit();
/* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int);
/* 801F53D4 */ void selectDataBaseMoveAnm();
/* 801F54C0 */ void saveSelectOpenAnmSet();
/* 801F5508 */ void selectDataMoveAnmInitSet(int, int);
/* 801F5600 */ void selectDataMoveAnm();
/* 801F5744 */ void yesnoMenuMoveAnmInitSet(int, int, u8);
/* 801F58C8 */ void yesnoMenuMoveAnm();
/* 801F5AE4 */ void yesnoSelectMoveAnm(u8);
/* 801F5D84 */ void yesnoCursorShow();
/* 801F5EF4 */ void errorMoveAnmInitSet(int, int);
/* 801F5F84 */ void errorMoveAnm();
/* 801F60A4 */ void modoruTxtDispAnmInit(u8);
/* 801F6120 */ void modoruTxtDispAnm();
/* 801F61FC */ void ketteiTxtDispAnmInit(u8);
/* 801F6278 */ void ketteiTxtDispAnm();
/* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801F6390 */ void selectWakuAlpahAnm(u8);
/* 801F6458 */ void selFileCursorShow();
/* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801F6654 */ void yesnoWakuAlpahAnm(u8);
/* 801F67B8 */ void dataSave();
/* 801F67F0 */ void setSaveData();
/* 801F6954 */ void setInitSaveData();
/* 801F69B8 */ void _draw();
/* 801F69FC */ void _draw2();
};
struct dFile_warning_c {
/* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
/* 80191F18 */ void _move();
@@ -248,30 +99,12 @@ struct dFile_info_c {
/* 80192D60 */ void _draw();
};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct dDlst_MenuSave_c {
/* 801F6B0C */ void draw();
/* 801F6B44 */ ~dDlst_MenuSave_c();
};
struct dDlst_MenuSaveExplain_c {
/* 801F6ADC */ void draw();
/* 801F6B8C */ ~dDlst_MenuSaveExplain_c();
};
struct Z2SeqMgr {
/* 802B3EAC */ void checkBgmIDPlaying(u32);
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -281,52 +114,14 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JUtility {
struct TColor {};
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
struct JKRExpHeap {};
struct JFWDisplay {
static u8 sManager[4];
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 80300660 */ void setString(char const*, ...);
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255878 */ void alphaAnime(s16, u8, u8, u8);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
JUtility::TColor, u8);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -559,7 +354,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void printf();
extern "C" void strcpy();
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
@@ -1670,7 +1464,7 @@ asm void dMenu_save_c::displayInit() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_save_c::_open() {
asm bool dMenu_save_c::_open() {
nofralloc
#include "asm/d/menu/d_menu_save/_open__12dMenu_save_cFv.s"
}
@@ -2889,7 +2683,8 @@ asm void dMenu_save_c::_draw2() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dDlst_MenuSaveExplain_c::draw() {
// asm void dDlst_MenuSaveExplain_c::draw() {
extern "C" asm void draw__23dDlst_MenuSaveExplain_cFv() {
nofralloc
#include "asm/d/menu/d_menu_save/draw__23dDlst_MenuSaveExplain_cFv.s"
}
@@ -2899,7 +2694,8 @@ asm void dDlst_MenuSaveExplain_c::draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dDlst_MenuSave_c::draw() {
// asm void dDlst_MenuSave_c::draw() {
extern "C" asm void draw__16dDlst_MenuSave_cFv() {
nofralloc
#include "asm/d/menu/d_menu_save/draw__16dDlst_MenuSave_cFv.s"
}
src/d/menu/d_menu_skill.cpp
+26 -111
View File
@@ -15,8 +15,6 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
@@ -33,18 +31,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
/* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
/* 801951C8 */ void setScale(f32);
/* 801952A0 */ void setAlphaRate(f32);
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -56,52 +42,8 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7348 */ ~dMenu_Skill_c();
/* 801F763C */ void _create();
/* 801F7718 */ void _move();
/* 801F77B0 */ void _draw();
/* 801F7950 */ void isSync();
/* 801F7978 */ void skill_init_calc();
/* 801F79EC */ void init();
/* 801F7A40 */ void _open();
/* 801F7C1C */ void _close();
/* 801F7D58 */ void wait_init();
/* 801F7D94 */ void wait_move();
/* 801F7F24 */ void read_open_init();
/* 801F7FF8 */ void read_open_move();
/* 801F8114 */ void read_move_init();
/* 801F8150 */ void read_move_move();
/* 801F8218 */ void read_close_init();
/* 801F826C */ void read_close_move();
/* 801F8388 */ void screenSetMenu();
/* 801F8A18 */ void screenSetLetter();
/* 801F8D20 */ void screenSetDoIcon();
/* 801F8E9C */ void setCursorPos();
/* 801F8F28 */ void changeActiveColor();
/* 801F9144 */ void setPageText();
/* 801F9260 */ void setAButtonString(u16);
/* 801F9310 */ void setBButtonString(u16);
/* 801F93C0 */ void setNameString(u16);
/* 801F9470 */ void getSkillNum();
/* 801F9500 */ void setHIO(bool);
/* 801F9A08 */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -110,41 +52,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JUtility {
struct TColor {
/* 80193960 */ TColor();
};
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct CPaneMgrAlpha {
/* 802557D0 */ void setAlphaRate(f32);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
//
// Forward References:
//
@@ -233,7 +140,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
@@ -379,14 +285,26 @@ SECTION_SDATA2 static f32 lit_3809 = 1.0f;
/* 801F7224-801F7348 1F1B64 0124+00 0/0 2/2 0/0 .text
* __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) {
nofralloc
#include "asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s"
dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) {
field_0x4 = param_0;
field_0x8 = NULL;
field_0x14 = NULL;
field_0xc = param_1;
field_0x10 = param_2;
mStatus = 1;
field_0x205 = 0;
field_0x200 = 0;
field_0x1fc = 0;
field_0x202 = 0;
field_0x206 = 0;
field_0x209 = 255;
field_0x20a = 255;
skill_init_calc();
field_0x1f0 = FLOAT_LABEL(lit_3808);
f32 tmp_1 = lit_3809;
field_0x1f8 = tmp_1;
field_0x1f4 = tmp_1;
}
#pragma pop
/* 801F7348-801F763C 1F1C88 02F4+00 1/0 0/0 0/0 .text __dt__13dMenu_Skill_cFv */
#pragma push
@@ -459,7 +377,7 @@ asm void dMenu_Skill_c::_draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Skill_c::isSync() {
asm bool dMenu_Skill_c::isSync() {
nofralloc
#include "asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s"
}
@@ -818,18 +736,14 @@ asm void dMenu_Skill_c::screenSetLetter() {
/* ############################################################################################## */
/* 80397D30-80397D58 024390 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4365 */
SECTION_RODATA static u8 const text_a_tag[40] = {
0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31,
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
SECTION_RODATA static u64 const text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
};
COMPILER_STRIP_GATE(0x80397D30, &text_a_tag);
/* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */
SECTION_RODATA static u8 const text_b_tag[40] = {
0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31,
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
SECTION_RODATA static u64 const text_b_tag[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
};
COMPILER_STRIP_GATE(0x80397D58, &text_b_tag);
@@ -952,7 +866,8 @@ asm void dMenu_Skill_c::setHIO(bool param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Skill_c::draw() {
// asm void dMenu_Skill_c::draw() {
extern "C" asm void draw__13dMenu_Skill_cFv() {
nofralloc
#include "asm/d/menu/d_menu_skill/draw__13dMenu_Skill_cFv.s"
}
src/d/menu/d_menu_window.cpp
+1093 -889
View File
File diff suppressed because it is too large Load Diff
src/d/msg/d_msg_flow.cpp
-4
View File
@@ -12,10 +12,6 @@
// Types:
//
struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
};
struct dShopSystem_c {
/* 801975F8 */ void isFlag(int);
/* 8019A354 */ void setSoldOutFlag();
src/m_Do/m_Do_graphic.cpp
+1 -146
View File
@@ -23,39 +23,6 @@ struct mDoMch_render_c {
static void* mRenderModeObj[1 + 1 /* padding */];
};
struct _GXColor {};
struct mDoGph_gInf_c {
struct bloom_c {
/* 80009544 */ void create();
/* 800095F8 */ void remove();
/* 80009650 */ void draw();
};
/* 80007E44 */ void create();
/* 80007F90 */ void beginRender();
/* 800080D0 */ void fadeOut(f32);
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
/* 80008028 */ void fadeOut_f(f32, _GXColor&);
/* 800080A0 */ void onBlure(f32 const (*)[4]);
/* 80008078 */ void onBlure();
/* 80008330 */ void calcFade();
static u8 mFrameBufferTexObj[32];
static u8 mZbufferTexObj[32];
static u8 m_bloom[20];
static u8 mBlureMtx[48 + 4 /* padding */];
static u8 mBackColor[4];
static u8 mFadeColor[4];
static u8 mFader[4];
static u8 mFrameBufferTimg[4];
static u8 mFrameBufferTex[4];
static u8 mZbufferTimg[4];
static u8 mZbufferTex[4];
static f32 mFadeRate;
static f32 mFadeSpeed;
};
struct daPy_py_c {
/* 8000B1E4 */ s32 getAtnActorID() const;
};
@@ -101,38 +68,10 @@ struct cXyz {
static f32 Zero[3];
};
struct _GXRenderModeObj {};
struct Vec {};
struct JUtility {
struct TColor {};
};
struct JUTXfb {
struct EXfbNumber {};
static u8 sManager[4 + 4 /* padding */];
};
struct JUTVideo {
/* 802E5198 */ void setRenderMode(_GXRenderModeObj const*);
static u8 sManager[4];
};
struct JUTProcBar {
static u8 sManager[4];
};
struct JUTGamePad {
static u8 mPadStatus[48];
};
struct JUTFader {
/* 802E5530 */ JUTFader(int, int, int, int, JUtility::TColor);
};
struct JUTDbPrint {
static u8 sDebugPrint[4 + 4 /* padding */];
};
@@ -143,31 +82,10 @@ struct JMath {
struct JKRSolidHeap {};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE474 */ void alloc(u32, int, JKRHeap*);
/* 802CE548 */ void free(void*);
static u8 sCurrentHeap[4];
};
struct JGeometry {
template <typename A1>
struct TBox2 {};
/* TBox2<f32> */
struct TBox2__template0 {};
};
struct JFWSystem {
static u8 systemConsole[4];
};
struct JFWDisplay {
/* 802721DC */ void createManager(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber, bool);
static u8 sManager[4];
};
struct J3DSys {
/* 803100BC */ void drawInit();
/* 8031073C */ void reinitGX();
@@ -278,72 +196,9 @@ extern "C" void setBuffer__8J2DPrintFUl();
extern "C" void drawInit__6J3DSysFv();
extern "C" void reinitGX__6J3DSysFv();
extern "C" void PPCSync();
extern "C" void PSMTXCopy();
extern "C" void PSMTXTrans();
extern "C" void C_MTXLightPerspective();
extern "C" void C_MTXLightOrtho();
extern "C" void C_MTXPerspective();
extern "C" void C_MTXOrtho();
extern "C" void PSVECSquareDistance();
extern "C" void VISetBlack();
extern "C" void GXSetVtxDesc();
extern "C" void GXClearVtxDesc();
extern "C" void GXSetVtxAttrFmt();
extern "C" void GXSetTexCoordGen2();
extern "C" void GXSetNumTexGens();
extern "C" void GXPixModeSync();
extern "C" void GXBegin();
extern "C" void GXSetCullMode();
extern "C" void GXSetCoPlanar();
extern "C" void GXSetTexCopySrc();
extern "C" void GXSetTexCopyDst();
extern "C" void GXSetCopyFilter();
extern "C" void GXCopyTex();
extern "C" void GXInitLightSpot();
extern "C" void GXInitLightDistAttn();
extern "C" void GXInitLightPos();
extern "C" void GXInitLightDir();
extern "C" void GXInitLightColor();
extern "C" void GXLoadLightObjImm();
extern "C" void GXSetChanMatColor();
extern "C" void GXSetNumChans();
extern "C" void GXSetChanCtrl();
extern "C" void GXGetTexBufferSize();
extern "C" void GXInitTexObj();
extern "C" void GXInitTexObjLOD();
extern "C" void GXLoadTexObj();
extern "C" void GXInvalidateTexAll();
extern "C" void GXSetNumIndStages();
extern "C" void GXSetTevColorIn();
extern "C" void GXSetTevAlphaIn();
extern "C" void GXSetTevColorOp();
extern "C" void GXSetTevAlphaOp();
extern "C" void GXSetTevColor();
extern "C" void GXSetTevColorS10();
extern "C" void GXSetTevKAlphaSel();
extern "C" void GXSetTevSwapMode();
extern "C" void GXSetTevSwapModeTable();
extern "C" void GXSetAlphaCompare();
extern "C" void GXSetZTexture();
extern "C" void GXSetTevOrder();
extern "C" void GXSetNumTevStages();
extern "C" void GXSetFog();
extern "C" void GXSetFogRangeAdj();
extern "C" void GXSetBlendMode();
extern "C" void GXSetAlphaUpdate();
extern "C" void GXSetZMode();
extern "C" void GXSetZCompLoc();
extern "C" void GXSetDither();
extern "C" void GXProject();
extern "C" void GXSetProjection();
extern "C" void GXGetProjectionv();
extern "C" void GXLoadPosMtxImm();
extern "C" void GXSetCurrentMtx();
extern "C" void GXLoadTexMtxImm();
extern "C" void GXSetViewport();
extern "C" void GXGetViewportv();
extern "C" void GXSetScissor();
extern "C" void GXSetClipMode();
extern "C" void __cvt_fp2unsigned();
extern "C" void _savegpr_17();
extern "C" void _savegpr_21();
@@ -412,7 +267,7 @@ SECTION_SDATA u8 mDoGph_gInf_c::mFadeColor[4] = {
};
/* 80450BC8-80450BCC 0000C8 0004+00 2/2 38/38 1/1 .sbss mFader__13mDoGph_gInf_c */
u8 mDoGph_gInf_c::mFader[4];
JUTFader* mDoGph_gInf_c::mFader;
/* 80450BCC-80450BD0 0000CC 0004+00 3/3 8/8 1/1 .sbss mFrameBufferTimg__13mDoGph_gInf_c
*/
src/m_Do/m_Do_machine.cpp
+2 -1
View File
@@ -356,7 +356,8 @@ void myExceptionCallback(u16 param_0, OSContext* param_1, u32 param_2, u32 param
OSReport("JUTAssertionを可視化しました\n");
JUTAssertion::setVisible(true);
JUTDbPrint::getManager()->setVisible(true);
JFWSystem::getSystemConsole()->setOutput(3);
JFWSystem::getSystemConsole()->setOutput(JUTConsole::OUTPUT_OSREPORT |
JUTConsole::OUTPUT_CONSOLE);
} else {
PPCHalt();
}
src/m_Do/m_Do_main.cpp
+2 -2
View File
@@ -544,7 +544,7 @@ bool Debug_console(u32 i_padNo) {
if (mDoCPd_c::getTrig(i_padNo) & CButton::A) {
console->dumpToTerminal(0xFFFFFFFF);
console->setOutput(3);
console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
}
JUTReport(0x1E, 0x186, 1, "Press X+Y+START to CLEAR console.");
@@ -709,7 +709,7 @@ void main01(void) {
JUTConsole* console = JFWSystem::getSystemConsole();
if (data_80450580 != 0) {
console->setOutput(3);
console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
}
console->setPosition(32, 42);