mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 05:22:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix version defines

Browse Source
This commit is contained in:
LagoLunatic
2025-05-19 20:17:13 -04:00
parent 6610bf1d1c
commit 99c78680de
85 changed files with 491 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com_inf_game.cpp
+12 -12
View File
@@ -32,7 +32,7 @@ GXColor g_whiteColor = {0xFF, 0xFF, 0xFF, 0xFF};
GXColor g_saftyWhiteColor = {0xA0, 0xA0, 0xA0, 0xFF};
/* 80052134-800521A4 .text ct__14dComIfG_play_cFv */
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dComIfG_play_c::dComIfG_play_c()
#else
void dComIfG_play_c::ct()
@@ -228,7 +228,7 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
return layer | 6;
}
} else if (strcmp(dComIfGp_getStartStageName(), "kenroom") == 0) {
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
if (dComIfGs_isEventBit(0x2C01)) {
#else
if (dComIfGs_isEventBit(0x2C01) ||
@@ -238,7 +238,7 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
return layer | 6;
} else if (dComIfGs_getTriforceNum() == 8) {
return layer | 4;
} else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) {
} else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, 0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) {
return layer | 2;
}
} else if (strcmp(dComIfGp_getStartStageName(), "M2tower") == 0) {
@@ -265,14 +265,14 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
void dComIfG_play_c::createParticle() {
mParticle = new dPa_control_c();
JUT_ASSERT(VERSION_SELECT(358, 360, 360), mParticle != NULL);
JUT_ASSERT(VERSION_SELECT(358, 358, 360, 360), mParticle != NULL);
}
/* 800528F4-8005297C .text createDemo__14dComIfG_play_cFv */
void dComIfG_play_c::createDemo() {
mDemo = new dDemo_manager_c();
JUT_ASSERT(VERSION_SELECT(388, 390, 390), mDemo != NULL);
JUT_ASSERT(VERSION_SELECT(388, 388, 390, 390), mDemo != NULL);
}
/* 8005297C-800529B8 .text removeDemo__14dComIfG_play_cFv */
@@ -462,7 +462,7 @@ void dComIfG_play_c::drawWood() {
}
}
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dComIfG_inf_c::dComIfG_inf_c() {
mBrightness = 0xFF;
}
@@ -544,7 +544,7 @@ cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, const char*
/* 800533D0-8005347C .text dComIfG_resDelete__FP30request_of_phase_process_classPCc */
int dComIfG_resDelete(request_of_phase_process_class* i_phase, const char* i_resName) {
JUT_ASSERT(VERSION_SELECT(1045, 1048, 1048), i_phase->id != 1);
JUT_ASSERT(VERSION_SELECT(1045, 1045, 1048, 1048), i_phase->id != 1);
if (i_phase->id == 2) {
dComIfG_deleteObjectRes(i_resName);
@@ -1063,12 +1063,12 @@ static void dummy() {
/* 8005468C-800547BC .text getSceneList__Fi */
stage_scls_info_class* getSceneList(int i_no) {
stage_scls_info_dummy_class* sclsInfo = dComIfGp_getStage().getSclsInfo();
JUT_ASSERT(VERSION_SELECT(2129, 2132, 2132), sclsInfo != NULL);
JUT_ASSERT(VERSION_SELECT(2129, 2129, 2132, 2132), sclsInfo != NULL);
JUT_ASSERT(VERSION_SELECT(2131, 2134, 2134), 0 <= i_no && i_no < sclsInfo->num);
JUT_ASSERT(VERSION_SELECT(2131, 2131, 2134, 2134), 0 <= i_no && i_no < sclsInfo->num);
stage_scls_info_class* sclsData = sclsInfo->m_entries;
JUT_ASSERT(VERSION_SELECT(2133, 2136, 2136), sclsData != NULL);
JUT_ASSERT(VERSION_SELECT(2133, 2133, 2136, 2136), sclsData != NULL);
return &sclsData[i_no];
}
@@ -1208,7 +1208,7 @@ void dComIfGs_setGameStartStage() {
strcpy(stage_name, "sea");
stage_map_info_class* mapInfo = dComIfGp_getStage().getMapInfo();
JUT_ASSERT(VERSION_SELECT(2359, 2362, 2362), mapInfo != NULL);
JUT_ASSERT(VERSION_SELECT(2359, 2359, 2362, 2362), mapInfo != NULL);
room_no = 4 + dStage_mapInfo_GetOceanX(mapInfo) + ((dStage_mapInfo_GetOceanZ(mapInfo) + 3) * 7);
point = 0;
@@ -1265,7 +1265,7 @@ void dComIfGs_copyPlayerRecollectionData() {
/* 80054E9C-80055318 .text dComIfGs_setPlayerRecollectionData__Fv */
void dComIfGs_setPlayerRecollectionData() {
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
daArrow_c::setKeepType(daArrow_c::TYPE_NORMAL);
#endif