mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_salvage OK

Browse Source
This commit is contained in:
LagoLunatic
2024-02-29 19:42:35 -05:00
parent 6321fd44f5
commit bda17503da
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -416,7 +416,7 @@ config.libs = [
Object(NonMatching, "d/d_2dnumber.cpp"),
Object(Matching, "d/d_a_npc_cb1_static.cpp"),
Object(NonMatching, "d/d_a_npc_mk_static.cpp"),
Object(NonMatching, "d/d_salvage.cpp"),
Object(Matching, "d/d_salvage.cpp"),
Object(Matching, "d/d_snap.cpp"),
Object(Matching, "d/d_point_wind.cpp"),
Object(Matching, "d/actor/d_a_agb.cpp", extra_cflags=['-pragma "nosyminline on"']),
src/d/d_salvage.cpp
+8 -11
View File
@@ -38,7 +38,6 @@ void dSalvage_control_c::init_end() {
/* 800CC7C4-800CCB70 .text entry__18dSalvage_control_cFP10fopAc_ac_cP14JPABaseEmitter */
void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
/* Nonmatching */
JUT_ASSERT(0x8b, pact != 0);
s8 roomNo = fopAcM_GetRoomNo(pact);
u32 kind = daSalvage_prm::getKind(pact);
@@ -46,21 +45,19 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
u32 type = daSalvage_prm::getType(pact);
u32 saveNo = daSalvage_prm::getSvNo(pact);
s8 roomNoPrm = daSalvage_prm::getRoomNo(pact);
// s8 cmapNo;
s32 switchNo = daSalvage_prm::getSwitchNo(pact);
s8 cmapNo;
s32 no;
bool invalid = false;
if (roomNo != 0) {
cmapNo = roomNo;
no = mRoomNum + MAX_SEA;
// cmapNo = roomNoPrm;
roomNoPrm = roomNo;
} else {
no = mSeaNum;
// cmapNo = roomNoPrm;
cmapNo = roomNoPrm;
}
no = roomNo != 0 ? mRoomNum + MAX_SEA : mSeaNum;
if (roomNo != 0) {
if (mRoomNum > MAX_ROOM)
invalid = true;
@@ -69,7 +66,7 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
invalid = true;
}
if (roomNoPrm <= 0 || roomNoPrm > 64)
if (cmapNo <= 0 || cmapNo > 64)
invalid = true;
if (kind == 2 || kind == 3) {
@@ -99,11 +96,11 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
if (!fopAcM_isSwitch(pact, switchNo))
mInfo[no].setFlag(1);
case 3:
if (saveNo != 31 && dComIfGs_isOceanSvBit(roomNoPrm, saveNo))
if (saveNo != 31 && dComIfGs_isOceanSvBit(cmapNo, saveNo))
return;
break;
case 4:
if (saveNo != 31 && dComIfGs_isOceanSvBit(roomNoPrm, saveNo))
if (saveNo != 31 && dComIfGs_isOceanSvBit(cmapNo, saveNo))
return;
if (!dKy_daynight_check())
mInfo[no].setFlag(1);
@@ -127,11 +124,11 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
switch (kind) {
case 0:
mInfo[no].mH = pact->mScale.y * 1000.0f;
mInfo[no].mR = pact->mScale.x * 500.0f;
mInfo[no].mR = pact->mScale.x * 700.0f;
break;
case 5:
mInfo[no].mH = pact->mScale.y * 1000.0f;
mInfo[no].mR = pact->mScale.x * 700.0f;
mInfo[no].mR = pact->mScale.x * 500.0f;
break;
default:
mInfo[no].mH = pact->mScale.y * 500.0f;