From 6c75c400f27dd2d71e5830d94254ee6b9bc915ca Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 1 Mar 2025 00:54:22 -0500 Subject: [PATCH] Reorder dComIfG inlines --- include/d/d_com_inf_game.h | 291 +++++++++++++++++++------------------ 1 file changed, 152 insertions(+), 139 deletions(-) diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index ead00fdfb..3f8025fbe 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2011,86 +2011,6 @@ inline u16 dComIfGp_getStagePlayerNum() { return g_dComIfG_gameInfo.play.getStage().getPlayerNum(); } -inline s32 dComIfGp_roomControl_getTimePass() { - return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass(); -} - -inline int dComIfGp_roomControl_getStayNo() { - return dStage_roomControl_c::getStayNo(); -} - -inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) { - return g_dComIfG_gameInfo.play.getRoomControl()->getBgW(i_roomNo); -} - -inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) { - return g_dComIfG_gameInfo.play.getRoomControl()->getZoneNo(i_roomNo); -} - -inline void dComIfGp_roomControl_setZoneNo(int i_roomNo, int i_zoneNo) { - g_dComIfG_gameInfo.play.getRoomControl()->setZoneNo(i_roomNo, i_zoneNo); -} - -inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int room_no) { - return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(room_no); -} - -inline void dComIfGp_roomControl_init() { - g_dComIfG_gameInfo.play.getRoomControl()->init(); -} - -inline dStage_roomDt_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { - return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); -} - -inline void dComIfGp_roomControl_checkDrawArea() { - return g_dComIfG_gameInfo.play.getRoomControl()->checkDrawArea(); -} - -inline void dComIfGp_roomControl_setStayNo(int stayNo) { - g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo); -} - -inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 i_flag) { - g_dComIfG_gameInfo.play.getRoomControl()->setStatusFlag(i_roomNo, i_flag); -} - -inline void dComIfGp_roomControl_onStatusFlag(int i_roomNo, u8 i_flag) { - g_dComIfG_gameInfo.play.getRoomControl()->onStatusFlag(i_roomNo, i_flag); -} - -inline void dComIfGp_roomControl_offStatusFlag(int i_roomNo, u8 i_flag) { - g_dComIfG_gameInfo.play.getRoomControl()->offStatusFlag(i_roomNo, i_flag); -} - -inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 i_flag) { - return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, i_flag); -} - -inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) { - g_dComIfG_gameInfo.play.getRoomControl()->zoneCountCheck(i_roomNo); -} - -inline void dComIfGp_roomControl_setTimePass(int isPassing) { - g_dComIfG_gameInfo.play.getRoomControl()->SetTimePass(isPassing); -} - -inline int dComIfGp_roomControl_loadRoom(int roomCount, u8* rooms) { - return g_dComIfG_gameInfo.play.getRoomControl()->loadRoom(roomCount, rooms); -} - -inline BOOL dComIfGp_roomControl_checkRoomDisp(int i_roomNo) { - return g_dComIfG_gameInfo.play.getRoomControl()->checkRoomDisp(i_roomNo); -} - -inline dBgS* dComIfG_Bgsp() { - return &g_dComIfG_gameInfo.play.mBgS; -} - -inline dCcS* dComIfG_Ccsp() { - return &g_dComIfG_gameInfo.play.mCcS; -} - inline daShip_c* dComIfGp_getShipActor() { return (daShip_c*)g_dComIfG_gameInfo.play.getPlayerPtr(2); } @@ -2169,58 +2089,6 @@ inline void dComIfGp_removeTree() { g_dComIfG_gameInfo.play.removeTree(); } inline void dComIfGp_removeWood() { g_dComIfG_gameInfo.play.removeWood(); } inline void dComIfGp_removeFlower() { g_dComIfG_gameInfo.play.removeFlower(); } -inline void dComIfGp_map_mapBufferSendAGB(int param_0) { - dMap_c::mapBufferSendAGB(param_0); -} - -inline void dComIfGp_map_setImage(int param_0, int param_1, f32 param_2) { - dMap_c::setImage(param_0, param_1, param_2); -} - -inline void dComIfGp_map_deleteImage(int param_0) { - dMap_c::deleteImage(param_0); -} - -inline void dComIfGp_map_setAGBMapSendStopFlg() { - dMap_c::setAGBMapSendStopFlg(); -} - -inline void dComIfGp_map_clrAGBMapSendStopFlg() { - dMap_c::clrAGBMapSendStopFlg(); -} - -inline void dComIfGp_createDemo() { - return g_dComIfG_gameInfo.play.createDemo(); -} - -inline void dComIfGp_removeDemo() { - return g_dComIfG_gameInfo.play.removeDemo(); -} - -inline dDemo_manager_c* dComIfGp_demo_get() { - return g_dComIfG_gameInfo.play.getDemo(); -} - -inline void dComIfGp_demo_create(const u8* demo_data, cXyz* offsetPos, f32 offsetAngleY) { - g_dComIfG_gameInfo.play.getDemo()->create(demo_data, offsetPos, offsetAngleY); -} - -inline void dComIfGp_demo_remove() { - g_dComIfG_gameInfo.play.getDemo()->remove(); -} - -inline void dComIfGp_demo_update() { - g_dComIfG_gameInfo.play.getDemo()->update(); -} - -inline s32 dComIfGp_demo_mode() { - return g_dComIfG_gameInfo.play.getDemo()->getMode(); -} - -inline dDemo_actor_c* dComIfGp_demo_getActor(u8 id) { - return g_dComIfG_gameInfo.play.getDemo()->mDemoObj.getActor(id); -} - inline JKRArchive* dComIfGp_getLkDemoAnmArchive() { return g_dComIfG_gameInfo.play.getLkDemoAnmArchive(); } @@ -2736,6 +2604,82 @@ inline void dComIfGp_setAdvanceDirection(u8 direction) { return g_dComIfG_gameInfo.play.setDirection(direction); } +/** + * === ROOM CONTROL === + */ + +inline s32 dComIfGp_roomControl_getTimePass() { + return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass(); +} + +inline int dComIfGp_roomControl_getStayNo() { + return dStage_roomControl_c::getStayNo(); +} + +inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->getBgW(i_roomNo); +} + +inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->getZoneNo(i_roomNo); +} + +inline void dComIfGp_roomControl_setZoneNo(int i_roomNo, int i_zoneNo) { + g_dComIfG_gameInfo.play.getRoomControl()->setZoneNo(i_roomNo, i_zoneNo); +} + +inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int room_no) { + return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(room_no); +} + +inline void dComIfGp_roomControl_init() { + g_dComIfG_gameInfo.play.getRoomControl()->init(); +} + +inline dStage_roomDt_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { + return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); +} + +inline void dComIfGp_roomControl_checkDrawArea() { + return g_dComIfG_gameInfo.play.getRoomControl()->checkDrawArea(); +} + +inline void dComIfGp_roomControl_setStayNo(int stayNo) { + g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo); +} + +inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 i_flag) { + g_dComIfG_gameInfo.play.getRoomControl()->setStatusFlag(i_roomNo, i_flag); +} + +inline void dComIfGp_roomControl_onStatusFlag(int i_roomNo, u8 i_flag) { + g_dComIfG_gameInfo.play.getRoomControl()->onStatusFlag(i_roomNo, i_flag); +} + +inline void dComIfGp_roomControl_offStatusFlag(int i_roomNo, u8 i_flag) { + g_dComIfG_gameInfo.play.getRoomControl()->offStatusFlag(i_roomNo, i_flag); +} + +inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 i_flag) { + return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, i_flag); +} + +inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) { + g_dComIfG_gameInfo.play.getRoomControl()->zoneCountCheck(i_roomNo); +} + +inline void dComIfGp_roomControl_setTimePass(int isPassing) { + g_dComIfG_gameInfo.play.getRoomControl()->SetTimePass(isPassing); +} + +inline int dComIfGp_roomControl_loadRoom(int roomCount, u8* rooms) { + return g_dComIfG_gameInfo.play.getRoomControl()->loadRoom(roomCount, rooms); +} + +inline BOOL dComIfGp_roomControl_checkRoomDisp(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->checkRoomDisp(i_roomNo); +} + /** * === EVENT === */ @@ -2845,10 +2789,6 @@ inline BOOL dComIfGp_event_check() { return g_dComIfG_gameInfo.play.getEvent().check(); } -inline dEvent_manager_c* dComIfGp_getPEvtManager() { - return &g_dComIfG_gameInfo.play.getEvtManager(); -} - inline u8 dComIfGp_event_getMode() { return g_dComIfG_gameInfo.play.getEvent().getMode(); } @@ -2861,6 +2801,14 @@ inline u8 dComIfGp_event_getTactFreeCStick(int which) { return g_dComIfG_gameInfo.play.getEvent().getTactFreeCStick(which); } +/** + * === EVENT MANAGER === + */ + +inline dEvent_manager_c* dComIfGp_getPEvtManager() { + return &g_dComIfG_gameInfo.play.getEvtManager(); +} + // Note: Some of the below functions call g_dComIfG_gameInfo.play.getEvtManager(), while others use // dComIfGp_getPEvtManager(), without a clear pattern for which was chosen. @@ -2989,6 +2937,42 @@ inline u8 dComIfGp_evmng_getEventEndSound(s16 eventIdx) { return g_dComIfG_gameInfo.play.getEvtManager().getEventEndSound(eventIdx); } +/** + * === DEMO === + */ + +inline void dComIfGp_createDemo() { + return g_dComIfG_gameInfo.play.createDemo(); +} + +inline void dComIfGp_removeDemo() { + return g_dComIfG_gameInfo.play.removeDemo(); +} + +inline dDemo_manager_c* dComIfGp_demo_get() { + return g_dComIfG_gameInfo.play.getDemo(); +} + +inline void dComIfGp_demo_create(const u8* demo_data, cXyz* offsetPos, f32 offsetAngleY) { + g_dComIfG_gameInfo.play.getDemo()->create(demo_data, offsetPos, offsetAngleY); +} + +inline void dComIfGp_demo_remove() { + g_dComIfG_gameInfo.play.getDemo()->remove(); +} + +inline void dComIfGp_demo_update() { + g_dComIfG_gameInfo.play.getDemo()->update(); +} + +inline s32 dComIfGp_demo_mode() { + return g_dComIfG_gameInfo.play.getDemo()->getMode(); +} + +inline dDemo_actor_c* dComIfGp_demo_getActor(u8 id) { + return g_dComIfG_gameInfo.play.getDemo()->mDemoObj.getActor(id); +} + /** * === DRAWLIST === */ @@ -3283,9 +3267,6 @@ inline void dComIfG_dumpResControl() { * === PARTICLE === */ -void set(u8, u16, cXyz const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, - GXColor const*, GXColor const*, cXyz const*); - inline JPABaseEmitter* dComIfGp_particle_set(u16 particleID, const cXyz* pos, const csXyz* angle = NULL, const cXyz* scale = NULL, u8 alpha = 0xFF, dPa_levelEcallBack* pCallBack = NULL, @@ -3540,10 +3521,42 @@ inline void dComIfGp_att_chkEnemySound() { return dComIfGp_getAttention().chkEnemySound(); } +/** + * === MAP === + */ + +inline void dComIfGp_map_mapBufferSendAGB(int param_0) { + dMap_c::mapBufferSendAGB(param_0); +} + +inline void dComIfGp_map_setImage(int param_0, int param_1, f32 param_2) { + dMap_c::setImage(param_0, param_1, param_2); +} + +inline void dComIfGp_map_deleteImage(int param_0) { + dMap_c::deleteImage(param_0); +} + +inline void dComIfGp_map_setAGBMapSendStopFlg() { + dMap_c::setAGBMapSendStopFlg(); +} + +inline void dComIfGp_map_clrAGBMapSendStopFlg() { + dMap_c::clrAGBMapSendStopFlg(); +} + /** * === MISC === */ + inline dBgS* dComIfG_Bgsp() { + return &g_dComIfG_gameInfo.play.mBgS; +} + +inline dCcS* dComIfG_Ccsp() { + return &g_dComIfG_gameInfo.play.mCcS; +} + inline void dComIfG_setTimerMode(int ms) { g_dComIfG_gameInfo.play.setTimerMode(ms); } inline int dComIfG_getTimerMode() { return g_dComIfG_gameInfo.play.getTimerMode(); }