mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fpc symbol names (#119)

Browse Source 
* fpcCtIt_filter_JudgeInLayer

* dStage_roomControl_c::getZoneNo

* fix fpc symbol names

* format

* mUnk0 -> mLayerID

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-28 20:07:21 +02:00
committed by GitHub
parent d63066e617
commit 3d66902e1a
34 changed files with 111 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com/d_com_inf_game.cpp
+4 -5
View File
@@ -5,6 +5,7 @@
#include "d/d_item/d_item/d_item.h"
#include "d/d_kankyo/d_kankyo.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "d/d_stage/d_stage.h"
#include "f/f_op/f_op_scene_mng.h"
#include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
@@ -297,7 +298,7 @@ extern u8 lbl_803A71C4;
extern u8 lbl_80451D00;
extern u8 lbl_803A37C0;
extern u8 lbl_80451D04;
extern u8 lbl_803F6094;
extern dStage_roomStatus_c lbl_803F6094[0x40];
extern u8 lbl_80451D10;
extern u8 lbl_80451D08;
extern u8 lbl_803A71D0;
@@ -733,10 +734,8 @@ asm void dComIfGs_onZoneSwitch__Fii(void) {
}
// getZoneNo__20dStage_roomControl_cFi
// dStage_roomControl_c::getZoneNo(int)
asm int getZoneNo__20dStage_roomControl_cFi(int) {
nofralloc
#include "d/d_com/d_com_inf_game/asm/func_8002D9B0.s"
int dStage_roomControl_c::getZoneNo(int room) {
return lbl_803F6094[room].getZoneNo();
}
// dComIfGs_offZoneSwitch__Fii
src/d/d_save/d_save.cpp
+9 -9
View File
@@ -1391,7 +1391,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xc0) {
dungeon_bit.onSwitch(i_no - 0x80);
} else {
int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
zones[zoneId].getZoneBit().onSwitch(i_no - 0xC0);
} else {
@@ -1410,7 +1410,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xc0) {
dungeon_bit.offSwitch(i_no - 0x80);
} else {
int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
zones[zoneId].getZoneBit().offSwitch(i_no - 0xC0);
} else {
@@ -1430,7 +1430,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
} else if (i_no < 0xc0) {
value = dungeon_bit.isSwitch(i_no - 0x80);
} else {
int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo);
if ((zoneId < 0) || (zoneId >= 0x20)) {
value = FALSE;
} else {
@@ -1455,7 +1455,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xC0) {
value = dungeon_bit.revSwitch(i_no - 0x80);
} else {
int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xE0) {
value = zones[zoneNo].getZoneBit().revSwitch(i_no - 0xC0);
} else {
@@ -1476,7 +1476,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
} else if (i_no < 0xA0) {
memory.getTempFlags().onItem(i_no - 0x80);
} else {
int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xC0) {
zones[zoneNo].getZoneBit().onItem(i_no - 0xA0);
} else {
@@ -1496,7 +1496,7 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
} else if (i_no < 0xA0) {
value = memory.getTempFlagsConst().isItem(i_no - 0x80);
} else {
int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
if (i_no < 0xC0) {
value = zones[zoneNo].getZoneBitConst().isItem(i_no - 0xA0);
} else {
@@ -1512,7 +1512,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) {
return;
}
int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
zones[zoneNo].getZoneActor().on(i_id);
}
@@ -1521,7 +1521,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
return;
}
int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
zones[zoneNo].getZoneActor().off(i_id);
}
@@ -1530,7 +1530,7 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
return FALSE;
}
int ActorZoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo);
int ActorZoneNo = dStage_roomControl_c::getZoneNo(i_roomNo);
return zones[ActorZoneNo].getZoneActorConst().is(i_id);
}