mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into undecided

Browse Source
This commit is contained in:
Tal Hayon
2023-06-28 15:02:13 +03:00
parent a3c4cc486e 47edd67190
commit f7e5cc384f
95 changed files with 1009 additions and 3160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/menu/d_menu_collect.cpp
+641 -490
View File
File diff suppressed because it is too large Load Diff
src/d/menu/d_menu_insect.cpp
+1 -1
View File
@@ -717,7 +717,7 @@ asm void dMenu_Insect_c::screenSetDoIcon() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::getGetInsectNum() {
asm u8 dMenu_Insect_c::getGetInsectNum() {
nofralloc
#include "asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s"
}
src/d/msg/d_msg_object.cpp
+3 -3
View File
@@ -1704,7 +1704,7 @@ asm fopAc_ac_c* dMsgObject_c::getActor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getpTalkActor() {
asm fopAc_ac_c* dMsgObject_c::getpTalkActor() {
nofralloc
#include "asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s"
}
@@ -1714,7 +1714,7 @@ asm void dMsgObject_c::getpTalkActor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getIdx() {
asm u32 dMsgObject_c::getIdx() {
nofralloc
#include "asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s"
}
@@ -1724,7 +1724,7 @@ asm void dMsgObject_c::getIdx() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getNodeIdx() {
asm u16 dMsgObject_c::getNodeIdx() {
nofralloc
#include "asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s"
}
src/f_op/f_op_actor.cpp
+5 -5
View File
@@ -170,11 +170,11 @@ static int fopAc_Create(void* i_this) {
_this->mAttentionInfo.field_0x0[1] = 2;
_this->mAttentionInfo.field_0x0[2] = 3;
_this->mAttentionInfo.field_0x0[3] = 5;
_this->mAttentionInfo.field_0x4[0] = 6;
_this->mAttentionInfo.field_0x4[3] = 14;
_this->mAttentionInfo.field_0x4[1] = 15;
_this->mAttentionInfo.field_0x4[2] = 15;
_this->mAttentionInfo.field_0x8[0] = 51;
_this->mAttentionInfo.field_0x0[4] = 6;
_this->mAttentionInfo.field_0x0[7] = 14;
_this->mAttentionInfo.field_0x0[5] = 15;
_this->mAttentionInfo.field_0x0[6] = 15;
_this->mAttentionInfo.field_0x0[8] = 51;
_this->mAttentionInfo.mPosition = _this->orig.pos;
_this->mAttentionInfo.field_0xa = 30;
dKy_tevstr_init(&_this->mTevStr, _this->orig.roomNo, -1);