mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-30 03:48:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fully split / more work on d_com_inf_game (#81)

Browse Source 
* split d_com_inf_game

* fix func name

* start some dcomifg funcs

* fix

* clang-format

* change dComIfGs_setWarpItemData back to inline asm for now

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
TakaRikka
2021-01-10 06:00:45 -08:00
committed by GitHub
parent 2d1d72e1c9
commit 8cf6641bd4
195 changed files with 7912 additions and 6930 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com/d_com_inf_game.cpp
+1243
View File
File diff suppressed because it is too large Load Diff
src/d/d_item/d_item.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "d/d_item/d_item/d_item.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
inline void dComIfGp_setItemLifeCount(float amount, u8 unk) {
src/d/d_kankyo.cpp
+1 -1
View File
@@ -366,7 +366,7 @@ asm void dKy_getdaytime_minute(void) {
// dKy_daynight_check__Fv
// dKy_daynight_check(void)
asm void dKy_daynight_check(void) {
asm int dKy_daynight_check(void) {
nofralloc
#include "d/d_kankyo/asm/func_8019FAB8.s"
}
src/d/d_kankyo/d_kankyo_rain.cpp
+1
View File
@@ -1,5 +1,6 @@
/* d_kankyo_rain.cpp autogenerated by split.py v0.3 at 2021-01-01 22:35:45.009983 */
#include "SComponent/c_math.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
src/d/d_save/d_save.cpp
+9 -9
View File
@@ -1361,7 +1361,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xc0) {
this->dungeon_bit.onSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if (i_no < 0xE0) {
this->zones[zoneId].getZoneBit().onSwitch(i_no - 0xC0);
} else {
@@ -1380,7 +1380,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xc0) {
this->dungeon_bit.offSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if (i_no < 0xE0) {
this->zones[zoneId].getZoneBit().offSwitch(i_no - 0xC0);
} else {
@@ -1400,7 +1400,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
} else if (i_no < 0xc0) {
value = this->dungeon_bit.isSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if ((zoneId < 0) || (zoneId >= 0x20)) {
value = FALSE;
} else {
@@ -1425,7 +1425,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
} else if (i_no < 0xC0) {
value = this->dungeon_bit.revSwitch(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if (i_no < 0xE0) {
value = this->zones[zoneNo].getZoneBit().revSwitch(i_no - 0xC0);
} else {
@@ -1446,7 +1446,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
} else if (i_no < 0xA0) {
this->memory.getTempFlags().onItem(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if (i_no < 0xC0) {
this->zones[zoneNo].getZoneBit().onItem(i_no - 0xA0);
} else {
@@ -1466,7 +1466,7 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
} else if (i_no < 0xA0) {
value = this->memory.getTempFlagsConst().isItem(i_no - 0x80);
} else {
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
if (i_no < 0xC0) {
value = this->zones[zoneNo].getZoneBitConst().isItem(i_no - 0xA0);
} else {
@@ -1482,7 +1482,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) {
return;
}
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id);
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
this->zones[zoneNo].getZoneActor().on(i_id);
}
@@ -1491,7 +1491,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
return;
}
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id);
int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
this->zones[zoneNo].getZoneActor().off(i_id);
}
@@ -1500,7 +1500,7 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
return FALSE;
}
int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id);
int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo);
return this->zones[ActorZoneNo].getZoneActorConst().is(i_id);
}