mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 15:42:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_camera work (#2369)

Browse Source 
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
This commit is contained in:
Caroline Madsen
2025-04-01 22:05:30 -04:00
committed by GitHub
parent 2976066aa6
commit 03fafe3e15
56 changed files with 5623 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_map_path_fmap.cpp
+5 -9
View File
@@ -569,17 +569,15 @@ bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX
*/
// NONMATCHING regalloc
bool dMenuFmapIconDisp_c::isDrawDisp() {
bool ret;
dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc();
if (stage_arc == NULL) {
return false;
}
u8 save_table_no = stage_arc->getSaveTableNo();
int room_no = mpRoomData->getRoomNo();
s32 room_no = mpRoomData->getRoomNo();
bool bVar2 = (mStayStageNo == mStageNo && mStayRoomNo == room_no) || mpRoomData->isArrival();
ret = false;
bool ret = false;
bool bVar1;
switch (mTypeGroupNo) {
@@ -633,11 +631,9 @@ bool dMenuFmapIconDisp_c::isDrawDisp() {
case 6:
if (save_table_no == mSaveTbl) {
ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) ? true : false;
} else {
if (mpTresData->mSwBit < 0x80) {
ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) ? true : false;
}
ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) != FALSE;
} else if (mpTresData->mSwBit < 0x80) {
ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) != FALSE;
}
break;