mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-06 03:28:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_saltalk OK

Browse Source
This commit is contained in:
elijah-thomas774
2024-11-14 22:49:24 -05:00
parent fea7ebb5c8
commit 5c4755eac2
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_npc_saltalkNP/symbols.txt
+1 -1
View File
@@ -21,7 +21,7 @@ getParam4__12dAcNpcSltk_cCFv = .text:0x000005E0; // type:function size:0x24
getSomething__12dAcNpcSltk_cCFv = .text:0x00000610; // type:function size:0x8
isSomething0__12dAcNpcSltk_cCFv = .text:0x00000620; // type:function size:0x28
isSomething1__12dAcNpcSltk_cCFv = .text:0x00000650; // type:function size:0x2C
checkSomething__12dAcNpcSltk_cF7mVec3_c = .text:0x00000680; // type:function size:0xF0
checkSomething__12dAcNpcSltk_cCF7mVec3_c = .text:0x00000680; // type:function size:0xF0
initializeState_Wait__12dAcNpcSltk_cFv = .text:0x00000770; // type:function size:0x4
executeState_Wait__12dAcNpcSltk_cFv = .text:0x00000780; // type:function size:0x1FC
finalizeState_Wait__12dAcNpcSltk_cFv = .text:0x00000980; // type:function size:0x4
config/SOUE01/symbols.txt
+1 -1
View File
@@ -3723,7 +3723,7 @@ fn_800A99D0 = .text:0x800A99D0; // type:function size:0xE0
ActorOnRail2__setSegment = .text:0x800A9AB0; // type:function size:0x50
checkPosInAREA = .text:0x800A9B00; // type:function size:0xC4
getAreaForIndexInRoom__Fll = .text:0x800A9BD0; // type:function size:0x78
checkPosInArea__FllRC7mVec3_cPP4AREA = .text:0x800A9C50; // type:function size:0xD4
checkPosInArea__FllRC7mVec3_cPCP4AREA = .text:0x800A9C50; // type:function size:0xD4
detach__Q23d2d10ResAccIf_cFv = .text:0x800A9D30; // type:function size:0x60
attach__Q23d2d10ResAccIf_cFPvPCc = .text:0x800A9D90; // type:function size:0x90
BuildPaneObj__Q23d2d8Layout_cFlPCvRCQ34nw4r3lyt11ResBlockSet = .text:0x800A9E20; // type:function size:0x12C
configure.py
+1 -1
View File
@@ -1176,7 +1176,7 @@ config.libs = [
"REL/d/a/npc/d_a_npc_salbage_robot_repair.cpp",
),
Rel(NonMatching, "d_a_npc_salesman_s", "REL/d/a/npc/d_a_npc_salesman_s.cpp"),
Rel(NonMatching, "d_a_npc_saltalk", "REL/d/a/npc/d_a_npc_saltalk.cpp"),
Rel(Matching, "d_a_npc_saltalk", "REL/d/a/npc/d_a_npc_saltalk.cpp"),
Rel(
NonMatching, "d_a_npc_senpaia_mother", "REL/d/a/npc/d_a_npc_senpaia_mother.cpp"
),
include/d/a/npc/d_a_npc_saltalk.h
+1 -1
View File
@@ -38,7 +38,7 @@ private:
bool isSomething0() const;
bool isSomething1() const;
bool checkSomething(mVec3_c pos);
bool checkSomething(mVec3_c pos) const;
/* 0x6E4 */ dAcRef_c<dAcNpcSlb2_c> mRef;
/* 0x6F0 */ int mAreaIndex;
include/toBeSorted/area_utils.h
+1 -1
View File
@@ -14,6 +14,6 @@ struct AREA {
/* 800a9b00 */ bool checkPosInArea(AREA **area, const mVec3_c &pos);
/* 800a9bd0 */ AREA *getAreaForIndexInRoom(s32 areaIndex, s32 roomId);
/* 800a9c50 */ bool checkPosInArea(s32 areaIndex, s32 roomId, const mVec3_c &pos, AREA **area);
/* 800a9c50 */ bool checkPosInArea(s32 areaIndex, s32 roomId, const mVec3_c &pos, AREA *const *area);
#endif
src/REL/d/a/npc/d_a_npc_saltalk.cpp
+2 -2
View File
@@ -136,7 +136,7 @@ bool dAcNpcSltk_c::isSomething1() const {
return getSomething() == 1;
}
bool dAcNpcSltk_c::checkSomething(mVec3_c pos) {
bool dAcNpcSltk_c::checkSomething(mVec3_c pos) const {
if (mAreaIndex != 0xFF) {
return checkPosInArea(mAreaIndex, roomid, pos, &mpArea) == 1;
} else {
@@ -145,7 +145,7 @@ bool dAcNpcSltk_c::checkSomething(mVec3_c pos) {
// TODO reload from position.y here
f32 fDist = field_0x75C + position.y;
f32 fDist2 = position.y;
if (fDist <= position.y) {
if (fDist <= fDist2) {
fDist2 = fDist;
fDist = position.y;
}