encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

first d_menu_ring (item wheel) pass (#1928)

Browse Source 
* first pass on d_menu_ring

* d_menu_item_explain mostly OK

* match ptmf's and sinit

* format d_menu_item_explain

* first item wheel pass to pr

* fix seStart calls

* d_menu_item_explain OK
This commit is contained in:
Trueffel
2023-09-16 20:16:57 +03:00
committed by GitHub
parent c2193c41eb
commit 3d8048edba
54 changed files with 2087 additions and 4610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+22 -1
View File
@@ -415,9 +415,12 @@ public:
JKRArchive* getCollectResArchive() { return mCollectResArchive; }
JKRArchive* getItemIconArchive() { return mItemIconArchive; }
JKRArchive* getNameResArchive() { return mNameResArchive; }
JKRArchive* getDemoMsgArchive() { return mDemoMsgArchive; }
JKRArchive* getFmapResArchive() { return mFmapResArchive; }
JKRArchive* getDmapResArchive() { return mDmapResArchive; }
JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; }
JKRArchive* getOptionResArchive() { return mOptionResArchive; }
JKRArchive* getRingResArchive() { return mRingResArchive; }
void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; }
void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; }
@@ -902,12 +905,14 @@ u8 dComIfGs_getBottleMax();
u8 dComIfGs_checkGetItem(u8 i_itemNo);
void dComIfGs_setSelectEquipClothes(u8 i_itemNo);
void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum);
s32 dComIfGs_isDungeonItemWarp(int i_stageNo);
void dComIfGs_BossLife_public_Set(s8);
s8 dComIfGs_sense_type_change_Get();
cXyz& dComIfGs_getWarpPlayerPos();
const char* dComIfGs_getWarpStageName();
s16 dComIfGs_getWarpPlayerAngleY();
s8 dComIfGs_getWarpRoomNo();
bool dComIfGs_getWarpMarkFlag();
BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo);
BOOL dComIfGs_isZoneSwitch(int, int);
@@ -1126,6 +1131,10 @@ inline u8 dComIfGs_getItem(int i_slotNo, bool i_checkCombo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(i_slotNo, i_checkCombo);
}
inline u8 dComIfGs_getLineUpItem(int i_slotNo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getLineUpItem(i_slotNo);
}
inline BOOL dComIfGs_isCollectSword(u8 i_swordNo) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, i_swordNo);
}
@@ -1195,7 +1204,7 @@ inline u8 dComIfGs_getLastWarpMarkRoomNo() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getRoomNo();
}
inline char dComIfGs_getLastWarpAcceptStage() {
inline s8 dComIfGs_getLastWarpAcceptStage() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getWarpAcceptStage();
}
@@ -1899,6 +1908,10 @@ inline JKRArchive* dComIfGp_getNameResArchive() {
return g_dComIfG_gameInfo.play.getNameResArchive();
}
inline JKRArchive* dComIfGp_getDemoMsgArchive() {
return g_dComIfG_gameInfo.play.getDemoMsgArchive();
}
inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) {
return g_dComIfG_gameInfo.play.getMsgDtArchive(idx);
}
@@ -2774,6 +2787,10 @@ inline JKRArchive* dComIfGp_getOptionResArchive() {
return g_dComIfG_gameInfo.play.getOptionResArchive();
}
inline JKRArchive* dComIfGp_getRingResArchive() {
return g_dComIfG_gameInfo.play.getRingResArchive();
}
inline void dComIfGp_onPauseFlag() {
g_dComIfG_gameInfo.play.onPauseFlag();
}
@@ -2792,6 +2809,10 @@ inline JKRArchive* dComIfGp_getFmapResArchive() {
return g_dComIfG_gameInfo.play.getFmapResArchive();
}
inline JKRArchive* dComIfGp_getDmapResArchive() {
return g_dComIfG_gameInfo.play.getDmapResArchive();
}
inline u8 dComIfGp_getMesgStatus() {
return g_dComIfG_gameInfo.play.getMesgStatus();
}