mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
Work on d_menu_fmap2D (#2167)
* Start d_menu_fmap2d * checkpoint * checkpoint
This commit is contained in:
jdflyer
+1705
-537
File diff suppressed because it is too large
Load Diff
@@ -10,77 +10,18 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct dDrawPath_c {
|
||||
struct group_class {};
|
||||
|
||||
struct line_class {};
|
||||
|
||||
struct poly_class {};
|
||||
|
||||
struct room_class {};
|
||||
|
||||
/* 8002ABF0 */ bool isDrawType(int);
|
||||
/* 8002AD84 */ void getLineColor(int, int);
|
||||
/* 8003CA40 */ void rendering(dDrawPath_c::poly_class const*);
|
||||
/* 8003CC24 */ void rendering(dDrawPath_c::room_class const*);
|
||||
/* 8003C94C */ void rendering(dDrawPath_c::line_class const*);
|
||||
/* 8003CCC4 */ void drawPath();
|
||||
};
|
||||
|
||||
struct dMenu_Fmap_region_data_c {
|
||||
/* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*);
|
||||
};
|
||||
|
||||
struct dMenu_Fmap_world_data_c {};
|
||||
|
||||
struct renderingFmap_c {
|
||||
struct palette_e {};
|
||||
|
||||
/* 801CE15C */ void init(u8*, u16, u16, u16, u16);
|
||||
/* 801CE188 */ void entry(dMenu_Fmap_world_data_c*, int, f32, f32, f32);
|
||||
/* 801CE224 */ void isSwitchSpecialOff(int);
|
||||
/* 801CE288 */ void isSwitch(dDrawPath_c::group_class const*);
|
||||
/* 801CE3C0 */ void getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*,
|
||||
int*);
|
||||
/* 801CE410 */ void preDrawPath();
|
||||
/* 801CE4D4 */ bool isDrawPath();
|
||||
/* 801CE4DC */ void isDrawRoom();
|
||||
/* 801CE560 */ void postDrawPath();
|
||||
/* 801CE5B8 */ void postRenderingMap();
|
||||
/* 801CE5EC */ void roomSetteing();
|
||||
/* 801CE6A8 */ void getFirstRoomPointer();
|
||||
/* 801CE75C */ void getFirstRegion();
|
||||
/* 801CE7A8 */ void getFirstStage();
|
||||
/* 801CE80C */ void getFirstRoom();
|
||||
/* 801CE84C */ void getNextRoom();
|
||||
/* 801CE8B8 */ void getNextStage();
|
||||
/* 801CE93C */ void getNextRegion();
|
||||
/* 801CE9A4 */ void getNextRoomPointer();
|
||||
/* 801CF4D0 */ ~renderingFmap_c();
|
||||
/* 801CF55C */ bool isRenderingFloor(int);
|
||||
/* 801CF564 */ void beforeDrawPath();
|
||||
/* 801CF568 */ void afterDrawPath();
|
||||
};
|
||||
|
||||
struct dSv_info_c {
|
||||
/* 80035360 */ void isSwitch(int, int) const;
|
||||
};
|
||||
|
||||
struct ResTIMG {};
|
||||
|
||||
struct dRenderingMap_c {
|
||||
/* 8003CD38 */ void makeResTIMG(ResTIMG*, u16, u16, u8*, u8*, u16) const;
|
||||
/* 8003CDAC */ void renderingMap();
|
||||
};
|
||||
|
||||
struct dRenderingFDAmap_c {
|
||||
/* 8003D188 */ void preRenderingMap();
|
||||
/* 8003D320 */ void postRenderingMap();
|
||||
/* 8003D3C0 */ void renderingDecoration(dDrawPath_c::line_class const*);
|
||||
/* 8003D68C */ void getDecoLineColor(int, int);
|
||||
/* 8003D6B8 */ void getDecorationLineWidth(int);
|
||||
};
|
||||
|
||||
struct dMfm_HIO_prm_res_src_s {
|
||||
static u8 m_other[1 + 3 /* padding */];
|
||||
};
|
||||
@@ -89,43 +30,6 @@ struct dMenu_Fmap_room_data_c {
|
||||
/* 8003D818 */ void isArrival();
|
||||
};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct dMenu_FmapMap_c {
|
||||
/* 801CEAAC */ void setFmapPaletteColor(renderingFmap_c::palette_e, _GXColor const&);
|
||||
/* 801CEA38 */ void setFmapPaletteColor(renderingFmap_c::palette_e, u8, u8, u8, u8);
|
||||
/* 801CEAE0 */ void isFlashRoomNoCheck(int) const;
|
||||
/* 801CEB1C */ void setPointColor(f32);
|
||||
/* 801CEC24 */ dMenu_FmapMap_c();
|
||||
/* 801CED38 */ ~dMenu_FmapMap_c();
|
||||
/* 801CEDE8 */ void _create(u16, u16, u16, u16, void*);
|
||||
/* 801CEE3C */ void _delete();
|
||||
/* 801CEE94 */ void draw();
|
||||
/* 801CF0B4 */ void rendering(dDrawPath_c::line_class const*);
|
||||
/* 801CF12C */ void getLineWidth(int);
|
||||
/* 801CF1D4 */ void isDrawType(int);
|
||||
/* 801CF1E0 */ void setFlashOn(int, int, u8*, int);
|
||||
/* 801CF208 */ void getLineColor(int, int);
|
||||
/* 801CF298 */ void getBackColor() const;
|
||||
/* 801CF2A0 */ void getColor(int);
|
||||
/* 801CF394 */ void setTexture(u16, u16, u16, u16);
|
||||
/* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32);
|
||||
};
|
||||
|
||||
struct dDlst_base_c {
|
||||
/* 8002ABEC */ void draw();
|
||||
};
|
||||
|
||||
struct dDlst_list_c {
|
||||
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -205,20 +109,13 @@ extern "C" void* __nw__FUli();
|
||||
extern "C" void* __nwa__FUli();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __dla__FPv();
|
||||
extern "C" void DCStoreRange();
|
||||
extern "C" void GXSetVtxDesc();
|
||||
extern "C" void GXClearVtxDesc();
|
||||
extern "C" void GXSetVtxAttrFmt();
|
||||
extern "C" void GXSetMisc();
|
||||
extern "C" void GXGetTexBufferSize();
|
||||
extern "C" void GXLoadPosMtxImm();
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_27();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void strcmp();
|
||||
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];
|
||||
|
||||
@@ -41,7 +41,7 @@ dMenuMapCommon_c::dMenuMapCommon_c() {
|
||||
_c7c = 0.0f;
|
||||
_c84 = 0.0f;
|
||||
_c88 = 0.0f;
|
||||
_c8c = 0.0f;
|
||||
mCenterPosX = 0.0f;
|
||||
_c90 = 0;
|
||||
clearIconInfo();
|
||||
}
|
||||
@@ -226,20 +226,17 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
|
||||
mPictures[5]->append(mp_image, 0.0f);
|
||||
mPictures[5]->setBasePosition(J2DBasePosition_4);
|
||||
mPictures[5]->setInfluencedAlpha(false, false);
|
||||
|
||||
mPictures[5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255));
|
||||
|
||||
// todo check if this value is mPictures[23] (out of the array) or field 0x60
|
||||
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti");
|
||||
ASSERT(mp_image != 0);
|
||||
mPictures[23] = new J2DPicture(mp_image);
|
||||
_60 = new J2DPicture(mp_image);
|
||||
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti");
|
||||
ASSERT(mp_image != 0);
|
||||
mPictures[23]->append(mp_image, 0.0f);
|
||||
mPictures[23]->setBasePosition(J2DBasePosition_4);
|
||||
mPictures[23]->setInfluencedAlpha(false, false);
|
||||
|
||||
mPictures[23]->setBlackWhite(JUtility::TColor(0, 240, 170, 0),
|
||||
_60->append(mp_image, 0.0f);
|
||||
_60->setBasePosition(J2DBasePosition_4);
|
||||
_60->setInfluencedAlpha(false, false);
|
||||
_60->setBlackWhite(JUtility::TColor(0, 240, 170, 0),
|
||||
JUtility::TColor(255, 255, 230, 255));
|
||||
|
||||
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti");
|
||||
|
||||
@@ -1392,7 +1392,7 @@ SECTION_SDATA2 static f64 lit_5206 = 4503599627370496.0 /* cast u32 to float */;
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
|
||||
asm bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
|
||||
f32 param_5, ResTIMG const* param_6) {
|
||||
nofralloc
|
||||
#include "asm/d/meter/d_meter2_info/dMeter2Info_getPixel__FffffffPC7ResTIMG.s"
|
||||
|
||||
Reference in New Issue
Block a user