mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-06 09:53:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some nonmatching functions (#2141)

Browse Source
This commit is contained in:
Caroline Madsen
2024-04-28 22:33:32 -04:00
committed by GitHub
parent 669c7d920b
commit 7339a87bd9
75 changed files with 673 additions and 6374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+32 -4
View File
@@ -1152,7 +1152,35 @@ inline void dComIfGs_onRegionBit(int i_region) {
}
inline void dComIfGs_onSvZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().onSwitch(i_swBit);
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().onSwitch(i_swBit);
}
inline void dComIfGs_offSvZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().offSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvZoneSwitch(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isSwitch(i_swBit);
}
inline void dComIfGs_onSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().onOneSwitch(i_swBit);
}
inline void dComIfGs_offSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().offOneSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isOneSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvZoneItem(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isItem(i_swBit);
}
inline BOOL dComIfGs_isSvOneZoneItem(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isOneItem(i_swBit);
}
inline s32 dComIfGs_isDungeonItemMap() {
@@ -1607,11 +1635,11 @@ inline void dComIfGs_setStartPoint(s16 i_point) {
}
inline void dComIfGs_clearRoomSwitch(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomSwitch();
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().clearRoomSwitch();
}
inline void dComIfGs_clearRoomItem(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomItem();
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().clearRoomItem();
}
inline void dComIfGs_removeZone(int i_zoneNo) {
@@ -3027,7 +3055,7 @@ inline s32 dComIfGp_roomControl_getStayNo() {
}
inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) {
return dStage_roomControl_c::getZoneNo(i_roomNo);
return g_dComIfG_gameInfo.play.getRoomControl()->getZoneNo(i_roomNo);
}
inline void dComIfGp_roomControl_initZone() {