summaryrefslogtreecommitdiff
path: root/src/d/map/d_map_path_fmap.cpp
diff options
context:
space:
mode:
authorTrueffeloot <geiloking135@gmail.com>2023-07-10 02:34:35 +0200
committerTrueffeloot <geiloking135@gmail.com>2023-07-10 02:34:35 +0200
commit65ef839bb558a8f6044423ce7e6303313dce3bd5 (patch)
tree1130ca2de3204d0cb05bd076749412600a61a4ac /src/d/map/d_map_path_fmap.cpp
parent31683953a69f0d8f618262831c82e0b312b63632 (diff)
several files OK
Diffstat (limited to 'src/d/map/d_map_path_fmap.cpp')
-rw-r--r--src/d/map/d_map_path_fmap.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp
index 61c4e42e9b..81515cebf8 100644
--- a/src/d/map/d_map_path_fmap.cpp
+++ b/src/d/map/d_map_path_fmap.cpp
@@ -255,21 +255,10 @@ void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo,
}
/* 8003D818-8003D868 038158 0050+00 1/1 1/1 0/0 .text isArrival__22dMenu_Fmap_room_data_cFv */
-#ifdef NONMATCHING
bool dMenu_Fmap_room_data_c::isArrival() {
- u8 table_no = mp_parentStage->getStageArc()->getVisitedRoomSaveTableNo();
+ u8 table_no = mp_parentStage->getStageArc()->mVisitedRoomSaveTableNo;
return dComIfGs_isSaveVisitedRoom(table_no, m_roomNo) != false;
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm bool dMenu_Fmap_room_data_c::isArrival() {
- nofralloc
-#include "asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s"
-}
-#pragma pop
-#endif
/* 8003D868-8003D92C 0381A8 00C4+00 1/1 0/0 0/0 .text
* buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii */