mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-24 01:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_menu_dmap (#2073)

Browse Source 
* Move some J2DPicture inlines to header

* Work on d_menu_dmap

* JASBasicInst OK

* JASCalc cleanup
This commit is contained in:
hatal175
2024-02-17 04:22:01 +02:00
committed by GitHub
parent 672990a0b0
commit 8164c34142
36 changed files with 1789 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/menu/d_menu_dmap_map.cpp
+3 -64
View File
@@ -129,67 +129,6 @@ struct dMpath_c {
static f32 mAllSizeZ;
};
struct dMenu_StageMapCtrl_c {
/* 801C0EE0 */ void getMapBlendPer() const;
/* 801C0F24 */ void getPixelStageSizeX() const;
/* 801C0F3C */ void getPixelStageSizeZ() const;
/* 801C0F54 */ void getPixelCenterX() const;
/* 801C0F74 */ void getPixelCenterZ() const;
/* 801C0F94 */ void initGetTreasureList(u8, s8);
/* 801C0FF8 */ void getTreasureList(f32*, f32*, s8*, u8*, s8*);
/* 801C1128 */ void cnvPosTo2Dpos(f32, f32, f32*, f32*) const;
/* 801C1194 */ void getPlayerDrawInfo(f32*, f32*, s16*) const;
/* 801C1218 */ void getRestartDrawInfo(f32*, f32*, s16*) const;
/* 801C12A8 */ void setPlusNowStayFloorNo(s8, u8);
/* 801C12B4 */ void moveFloor();
/* 801C1878 */ void wait_init_proc();
/* 801C188C */ void wait_proc();
/* 801C18AC */ void zoomIn_init_proc();
/* 801C1C40 */ void initZoomIn(u8);
/* 801C1CEC */ void initZoomIn(u8, f32, f32);
/* 801C1E00 */ void initZoomInCenterHold(u8);
/* 801C1E74 */ void zoomCalcSet(f32);
/* 801C1EC0 */ void zoomIn_proc();
/* 801C1F2C */ void initZoomOut(u8);
/* 801C1F70 */ void initZoomWait(f32, f32);
/* 801C2004 */ void zoomWait_init_proc();
/* 801C205C */ void zoomWait_proc();
/* 801C2198 */ void zoomOut_init_proc();
/* 801C21AC */ void zoomOut_proc();
/* 801C2234 */ void move();
/* 801C22F8 */ void getPlayerStayFloorNo() const;
/* 801C231C */ void _create(u16, u16, u16, u16, void*);
/* 801C235C */ void _create(u16, u16, u16, u16, s8, void*);
/* 801C2518 */ void _delete();
/* 801C2538 */ void isEnableZoomIn();
/* 801C2578 */ void isEnableZoomOut();
/* 801C2588 */ void setPlusZoomCenterX(f32);
/* 801C2590 */ void setPlusZoomCenterZ(f32);
static f32 m_zoomCenterMinX;
static f32 m_zoomCenterMaxX;
static f32 m_zoomCenterMinZ;
static f32 m_zoomCenterMaxZ[1 + 1 /* padding */];
};
struct dMenu_DmapMap_c {
/* 801C0CD8 */ void _create(u16, u16, u16, u16, void*);
/* 801C0D04 */ void _delete();
/* 801C0D70 */ void setTexture(u16, u16, u16, u16);
/* 801C0E4C */ void setPos(int, int, f32, f32, f32, bool, f32);
};
struct dMenu_DmapMapCtrl_c {
/* 801BD144 */ ~dMenu_DmapMapCtrl_c();
/* 801C18C0 */ void getZoomMinMaxCheck(f32*, f32*, f32*, f32*, bool*, bool*);
/* 801C1B14 */ void calcZoomCenter(f32*, f32*);
/* 801C1BA4 */ void getZoomCmPerPixel();
/* 801C2028 */ void isEnableZoomMove() const;
/* 801C22A8 */ void draw();
/* 801C2598 */ void getInitWholeMapScale(f32*, f32, f32, f32, f32);
/* 801C25C0 */ void getInitDispCenter(f32*, f32*);
};
struct dMdm_HIO_prm_res_dst_s {
static u8 m_res[4];
};
@@ -786,7 +725,7 @@ SECTION_SDATA2 static f64 lit_3947 = 1.0;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_StageMapCtrl_c::getMapBlendPer() const {
asm f32 dMenu_StageMapCtrl_c::getMapBlendPer() const {
nofralloc
#include "asm/d/menu/d_menu_dmap_map/getMapBlendPer__20dMenu_StageMapCtrl_cCFv.s"
}
@@ -852,7 +791,7 @@ asm void dMenu_StageMapCtrl_c::initGetTreasureList(u8 param_0, s8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_StageMapCtrl_c::getTreasureList(f32* param_0, f32* param_1, s8* param_2, u8* param_3,
asm bool dMenu_StageMapCtrl_c::getTreasureList(f32* param_0, f32* param_1, s8* param_2, u8* param_3,
s8* param_4) {
nofralloc
#include "asm/d/menu/d_menu_dmap_map/getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s"
@@ -887,7 +826,7 @@ asm void dMenu_StageMapCtrl_c::getPlayerDrawInfo(f32* param_0, f32* param_1, s16
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* param_0, f32* param_1, s16* param_2) const {
asm s8 dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* param_0, f32* param_1, s16* param_2) const {
nofralloc
#include "asm/d/menu/d_menu_dmap_map/getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs.s"
}