mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-27 02:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

move inlines

Browse Source
This commit is contained in:
lepelog
2022-06-30 23:24:35 +02:00
parent 046d178003
commit e71aa4578d
60 changed files with 620 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/menu/d_menu_window.cpp
+2 -14
View File
@@ -271,10 +271,6 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
// Declarations:
//
inline BOOL dComIfGp_event_runCheck() {
return g_dComIfG_gameInfo.play.getEvent().runCheck();
}
BOOL dMw_UP_TRIGGER() {
return (bool)mDoCPd_c::getTrigUp(PAD_1);
}
@@ -2343,17 +2339,9 @@ BOOL dMw_c::dMw_isPush_S_Button() {
return false;
}
inline dEvt_control_c& dComIfGp_getEvent() {
return g_dComIfG_gameInfo.play.getEvent();
}
inline u16 dComIfGs_getLife() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife();
}
/* 801FCDD8-801FCE08 1F7718 0030+00 1/1 0/0 0/0 .text isPauseReady__5dMw_cFv */
bool dMw_c::isPauseReady() {
if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) {
if (i_dComIfGp_getEvent().checkCompulsory() || i_dComIfGs_getLife() == 0) {
return false;
}
return true;
@@ -2420,7 +2408,7 @@ bool dMw_c::isEventCheck() {
field_0x148 = 0;
}
if (dComIfGp_event_runCheck()) {
if (i_dComIfGp_event_runCheck()) {
if (!dMsgObject_isTalkNowCheck() &&
(dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 ||
dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 ||