mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
+122
-122
@@ -105,127 +105,127 @@ class dMenu_Fmap_c {
|
||||
public:
|
||||
typedef void (dMenu_Fmap_c::*process)();
|
||||
|
||||
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
|
||||
/* 801C6D64 */ void _create();
|
||||
/* 801C74A4 */ void _delete();
|
||||
/* 801C74A8 */ void _move();
|
||||
/* 801C7650 */ void _draw();
|
||||
/* 801C77F0 */ u8 getNextStatus(u8*);
|
||||
/* 801C7AFC */ bool 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 */ bool isOpen();
|
||||
/* 801CB038 */ bool isClose();
|
||||
/* 801CB1DC */ u8 getProcess();
|
||||
/* 801CB200 */ u8 getRegionCursor();
|
||||
/* 801CB230 */ u8 getStageCursor();
|
||||
/* 801CB260 */ f32 getStageTransX();
|
||||
/* 801CB290 */ f32 getStageTransZ();
|
||||
/* 801CB2C0 */ bool isRoomCheck(int, int);
|
||||
/* 801CB570 */ u16 checkStRoomData();
|
||||
/* 801CB664 */ void talkButton();
|
||||
/* 801CB6D0 */ void setProcess(u8);
|
||||
/* 801CB6E0 */ void setFlash(u8, bool);
|
||||
/* 801CB770 */ bool readWorldData(u8);
|
||||
/* 801CB938 */ bool readAreaData(u8, bool);
|
||||
/* 801CBF04 */ bool readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8);
|
||||
/* 801CC094 */ bool readFieldMapData(void**, char const*, bool, bool);
|
||||
/* 801CC2B0 */ void decodeFieldMapData();
|
||||
/* 801CC4EC */ void decodePortalData();
|
||||
/* 801CC51C */ bool readRoomDzsData(void**, u32, char const*);
|
||||
/* 801CC61C */ bool removeAreaData();
|
||||
/* 801CC7A8 */ bool 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 */ BOOL 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 */ bool checkDrawPortalIcon(int, int);
|
||||
/* 801CD000 */ bool searchIcon(u8, int, f32*, f32*);
|
||||
/* 801CD210 */ void drawEnterIcon();
|
||||
/* 801CD254 */ void drawPortalIcon();
|
||||
/* 801CD2FC */ u8 getRegionStageNum(int);
|
||||
/* 801CD350 */ dMenu_Fmap_region_data_c* getNowFmapRegionData();
|
||||
/* 801CD368 */ dMenu_Fmap_stage_data_c* getNowFmapStageData();
|
||||
/* 801CD380 */ u8 searchPortalStageID(char*);
|
||||
/* 801CD3F0 */ void drawDebugStage();
|
||||
/* 801CD460 */ void arrowPosInit();
|
||||
/* 801CD5CC */ void tableArrowPosInit(bool);
|
||||
/* 801CD770 */ void yamibossArrowPosInit();
|
||||
/* 801CD814 */ void howlArrowPosInit();
|
||||
/* 801CD8B4 */ u8 getHowlRegionID();
|
||||
/* 801CD92C */ bool isLightVesselGet();
|
||||
/* 801CD95C */ cXyz* getPlayerPos2D();
|
||||
dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
|
||||
void _create();
|
||||
void _delete();
|
||||
void _move();
|
||||
void _draw();
|
||||
u8 getNextStatus(u8*);
|
||||
bool isSync();
|
||||
void all_map_init();
|
||||
void all_map_proc();
|
||||
void zoom_all_to_region_init();
|
||||
void zoom_all_to_region_proc();
|
||||
void zoom_region_to_all_init();
|
||||
void zoom_region_to_all_proc();
|
||||
void region_map_init();
|
||||
void region_map_proc();
|
||||
void to_portal_warp_map_init();
|
||||
void to_portal_warp_map_proc();
|
||||
void portal_warp_map_init();
|
||||
void portal_warp_map_proc();
|
||||
void portal_warp_select_init();
|
||||
void portal_warp_select_proc();
|
||||
void portal_warp_forbid_init();
|
||||
void portal_warp_forbid_proc();
|
||||
void zoom_region_to_spot_init();
|
||||
void zoom_region_to_spot_proc();
|
||||
void zoom_spot_to_region_init();
|
||||
void zoom_spot_to_region_proc();
|
||||
void spot_map_init();
|
||||
void spot_map_proc();
|
||||
void portal_demo1_init();
|
||||
void portal_demo1_move();
|
||||
void portal_demo2_init();
|
||||
void portal_demo2_move();
|
||||
void portal_demo3_init();
|
||||
void portal_demo3_move();
|
||||
void portal_demo4_init();
|
||||
void portal_demo4_move();
|
||||
void portal_demo5_init();
|
||||
void portal_demo5_move();
|
||||
void portal_demo6_init();
|
||||
void portal_demo6_move();
|
||||
void yamiboss_demo1_init();
|
||||
void yamiboss_demo1_move();
|
||||
void yamiboss_demo2_init();
|
||||
void yamiboss_demo2_move();
|
||||
void yamiboss_demo3_init();
|
||||
void yamiboss_demo3_move();
|
||||
void yamiboss_demo4_init();
|
||||
void yamiboss_demo4_move();
|
||||
void yamiboss_demo5_init();
|
||||
void yamiboss_demo5_move();
|
||||
void light_demo1_init();
|
||||
void light_demo1_move();
|
||||
void light_demo2_init();
|
||||
void light_demo2_move();
|
||||
void table_demo1_init();
|
||||
void table_demo1_move();
|
||||
void table_demo2_init();
|
||||
void table_demo2_move();
|
||||
void table_demo3_init();
|
||||
void table_demo3_move();
|
||||
void howl_demo1_init();
|
||||
void howl_demo1_move();
|
||||
void howl_demo2_init();
|
||||
void howl_demo2_move();
|
||||
void howl_demo3_init();
|
||||
void howl_demo3_move();
|
||||
bool isOpen();
|
||||
bool isClose();
|
||||
u8 getProcess();
|
||||
u8 getRegionCursor();
|
||||
u8 getStageCursor();
|
||||
f32 getStageTransX();
|
||||
f32 getStageTransZ();
|
||||
bool isRoomCheck(int, int);
|
||||
u16 checkStRoomData();
|
||||
void talkButton();
|
||||
void setProcess(u8);
|
||||
void setFlash(u8, bool);
|
||||
bool readWorldData(u8);
|
||||
bool readAreaData(u8, bool);
|
||||
bool readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8);
|
||||
bool readFieldMapData(void**, char const*, bool, bool);
|
||||
void decodeFieldMapData();
|
||||
void decodePortalData();
|
||||
bool readRoomDzsData(void**, u32, char const*);
|
||||
bool removeAreaData();
|
||||
bool removeRoomData(dMenu_Fmap_stage_data_c*);
|
||||
void setTitleName(u32);
|
||||
void setAreaName(u32);
|
||||
void setAreaNameZero();
|
||||
void portalWarpMapMove(STControl*);
|
||||
void onRoomDataBit(int);
|
||||
BOOL isRoomDataBit(int);
|
||||
void resetRoomDataBit();
|
||||
void drawIcon(f32, bool);
|
||||
void drawIcon(u8, int);
|
||||
void drawLightDropIcon();
|
||||
void drawBatsumarkIcon();
|
||||
void drawSnowmanIcon();
|
||||
void drawGoldWolfIcon();
|
||||
void drawCoachIcon();
|
||||
void drawPlayEnterIcon();
|
||||
bool checkDrawPortalIcon(int, int);
|
||||
bool searchIcon(u8, int, f32*, f32*);
|
||||
void drawEnterIcon();
|
||||
void drawPortalIcon();
|
||||
u8 getRegionStageNum(int);
|
||||
dMenu_Fmap_region_data_c* getNowFmapRegionData();
|
||||
dMenu_Fmap_stage_data_c* getNowFmapStageData();
|
||||
u8 searchPortalStageID(char*);
|
||||
void drawDebugStage();
|
||||
void arrowPosInit();
|
||||
void tableArrowPosInit(bool);
|
||||
void yamibossArrowPosInit();
|
||||
void howlArrowPosInit();
|
||||
u8 getHowlRegionID();
|
||||
bool isLightVesselGet();
|
||||
cXyz* getPlayerPos2D();
|
||||
|
||||
/* 801C6AC8 */ virtual ~dMenu_Fmap_c();
|
||||
virtual ~dMenu_Fmap_c();
|
||||
|
||||
enum process_e {
|
||||
/* 0x00 */ PROC_ALL_MAP,
|
||||
@@ -336,8 +336,8 @@ private:
|
||||
|
||||
class dMf_HIO_c {
|
||||
public:
|
||||
/* 801C65F8 */ dMf_HIO_c();
|
||||
/* 801CDA2C */ virtual ~dMf_HIO_c() {}
|
||||
dMf_HIO_c();
|
||||
virtual ~dMf_HIO_c() {}
|
||||
|
||||
/* 0x04 */ u8 field_0x4[4];
|
||||
/* 0x08 */ f32 mBackAnimeStep;
|
||||
|
||||
Reference in New Issue
Block a user