diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-07-10 18:42:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 18:42:34 +0300 |
| commit | 018fdf29d605459fb6fc38e9036e15ad025a6fca (patch) | |
| tree | 9574c68d069170e92840c1f7cbae69fefee8bf97 /src/d/map/d_map_path_fmap.cpp | |
| parent | 63c782c0d09cd5dd6281defa7117237702cd2449 (diff) | |
| parent | da9deca3a3e5cbc8574c97dd19f3d812fff1aef2 (diff) | |
Merge pull request #367 from Trueffeloot/work11
Few files OK
Diffstat (limited to 'src/d/map/d_map_path_fmap.cpp')
| -rw-r--r-- | src/d/map/d_map_path_fmap.cpp | 13 |
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 */ |