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

Merge pull request #310 from robojumper/simple-remly-names

Browse Source 
Simple Remly field names
This commit is contained in:
robojumper
2026-05-04 21:54:51 +02:00
committed by GitHub
parent 434b1bef7f 24624a4fd2
commit ddb1161879
9 changed files with 539 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_e_remlyNP/symbols.txt
+10 -10
View File
@@ -95,28 +95,28 @@ initializeState_BirthWait__11dAcEremly_cFv = .text:0x00006870; // type:function
executeState_BirthWait__11dAcEremly_cFv = .text:0x000068F0; // type:function size:0x13C
finalizeState_BirthWait__11dAcEremly_cFv = .text:0x00006A30; // type:function size:0x4
playWink__11dAcEremly_cFv = .text:0x00006A40; // type:function size:0xCC
fn_177_6B10__11dAcEremly_cFbRC4mAng = .text:0x00006B10; // type:function size:0x38C
fn_177_6EA0__11dAcEremly_cFb = .text:0x00006EA0; // type:function size:0x120
adjustHeadRotation__11dAcEremly_cFb = .text:0x00006FC0; // type:function size:0x78
calcHeadRotation__11dAcEremly_cFbRC4mAng = .text:0x00006B10; // type:function size:0x38C
calcHeadPitch__11dAcEremly_cFb = .text:0x00006EA0; // type:function size:0x120
resetHeadRotation__11dAcEremly_cFb = .text:0x00006FC0; // type:function size:0x78
fn_177_7040__11dAcEremly_cFUlf = .text:0x00007040; // type:function size:0x2EC
isScary__11dAcEremly_cFv = .text:0x00007330; // type:function size:0x90
shouldBeScared__11dAcEremly_cFv = .text:0x000073C0; // type:function size:0x144
fn_177_7510__11dAcEremly_cFf = .text:0x00007510; // type:function size:0xC8
fn_177_75E0__11dAcEremly_cFv = .text:0x000075E0; // type:function size:0x6C
isWithinTargetRadius__11dAcEremly_cFf = .text:0x00007510; // type:function size:0xC8
isHorwellRemlitQuestComplete__11dAcEremly_cFv = .text:0x000075E0; // type:function size:0x6C
fn_177_7650__11dAcEremly_cCFb = .text:0x00007650; // type:function size:0x164
fn_177_77C0__11dAcEremly_cFv = .text:0x000077C0; // type:function size:0x108
fn_177_78D0__11dAcEremly_cFv = .text:0x000078D0; // type:function size:0xF4
applyScaryMat__11dAcEremly_cFv = .text:0x000078D0; // type:function size:0xF4
fn_177_79D0__11dAcEremly_cFb = .text:0x000079D0; // type:function size:0x134
fn_177_7B10__11dAcEremly_cFv = .text:0x00007B10; // type:function size:0x1B4
isUnderWater__11dAcEremly_cFv = .text:0x00007B10; // type:function size:0x1B4
nightSleepDemoImpl__11dAcEremly_cFv = .text:0x00007CD0; // type:function size:0x844
fn_177_8520__11dAcEremly_cFb = .text:0x00008520; // type:function size:0xD8
fn_177_8600__11dAcEremly_cFv = .text:0x00008600; // type:function size:0xC0
checkSlope__11dAcEremly_cFb = .text:0x00008520; // type:function size:0xD8
spawnGroundEffect__11dAcEremly_cFv = .text:0x00008600; // type:function size:0xC0
fn_177_86C0__11dAcEremly_cFv = .text:0x000086C0; // type:function size:0x2B4
fn_177_8980__11dAcEremly_cFf = .text:0x00008980; // type:function size:0x13C
fn_177_8AC0__11dAcEremly_cFv = .text:0x00008AC0; // type:function size:0x160
fn_177_8C20__11dAcEremly_cF4mAng = .text:0x00008C20; // type:function size:0x36C
fn_177_8F90__11dAcEremly_cFv = .text:0x00008F90; // type:function size:0x3E0
fn_177_9370__11dAcEremly_cFf = .text:0x00009370; // type:function size:0xE8
isPlayerInNightRange__11dAcEremly_cFf = .text:0x00009370; // type:function size:0xE8
vt_0x88__11dAcEnBase_cFi = .text:0x00009460; // type:function size:0x8
vt_0x84__11dAcEnBase_cFv = .text:0x00009470; // type:function size:0x4
vt_0x80__11dAcEnBase_cFv = .text:0x00009480; // type:function size:0x4
config/SOUE01/symbols.txt
+2 -2
View File
@@ -1174,7 +1174,7 @@ someEnemyDamageCollisionStuffMaybe__11dAcEnBase_cFR19dColliderLinkedListPUs = .t
fn_8002FD90 = .text:0x8002FD90; // type:function size:0x4C
fn_8002FDE0__11dAcEnBase_cFR8cCcD_ObjPUs = .text:0x8002FDE0; // type:function size:0x170
fn_8002FF50 = .text:0x8002FF50; // type:function size:0xD4
fn_80030030__11dAcEnBase_cFRC7mVec3_cRsRsf = .text:0x80030030; // type:function size:0x174
checkSlope__11dAcEnBase_cFRC7mVec3_cRsRsf = .text:0x80030030; // type:function size:0x174
fn_800301b0__11dAcEnBase_cFRC7mVec3_c4mAngbf = .text:0x800301B0; // type:function size:0x1D4
fn_80030390 = .text:0x80030390; // type:function size:0x64
fn_80030400__11dAcEnBase_cFRQ23m3d5mdl_cUcbUc = .text:0x80030400; // type:function size:0x168
@@ -2103,7 +2103,7 @@ tryAttach__10dLinkage_cFP12dAcObjBase_cP12dAcObjBase_cP12dAcRefBase_cQ210dLinkag
fn_80050DC0__10dLinkage_cFP12dAcObjBase_cff4mAng = .text:0x80050DC0; // type:function size:0x34
fn_80050E00__10dLinkage_cFP12dAcObjBase_cff4mAng = .text:0x80050E00; // type:function size:0x34
fn_80050E40__10dLinkage_cFP12dAcObjBase_cff4mAng = .text:0x80050E40; // type:function size:0x60
fn_80050EA0__10dLinkage_cFP12dAcObjBase_c = .text:0x80050EA0; // type:function size:0xC
forceRemove__10dLinkage_cFP12dAcObjBase_c = .text:0x80050EA0; // type:function size:0xC
fn_80050EB0__10dLinkage_cFP12dAcObjBase_c = .text:0x80050EB0; // type:function size:0x140
bushTpFunc__10dLinkage_cFR9dBgS_Acch = .text:0x80050FF0; // type:function size:0x19C
fn_80051190__10dLinkage_cFP12dAcObjBase_c = .text:0x80051190; // type:function size:0x4C
include/d/a/e/d_a_e_remly.h
+78 -79
View File
@@ -28,40 +28,40 @@ public:
/* 0x0C */ UNKWORD field_0x0C; // Guess
};
enum State_e {
STATE_0 = 0,
STATE_1 = 1,
STATE_2 = 2,
STATE_3 = 3,
STATE_4 = 4,
STATE_5 = 5,
STATE_6 = 6,
STATE_7 = 7,
STATE_8 = 8,
STATE_9 = 9,
STATE_10 = 10,
STATE_11 = 11,
STATE_12 = 12,
STATE_13 = 13,
STATE_14 = 14,
STATE_15 = 15,
STATE_16 = 16,
STATE_17 = 17,
STATE_18 = 18,
STATE_19 = 19,
STATE_20 = 20,
STATE_21 = 21,
STATE_22 = 22,
STATE_23 = 23,
STATE_24 = 24,
STATE_25 = 25,
STATE_26 = 26,
STATE_27 = 27,
STATE_28 = 28,
STATE_29 = 29,
STATE_30 = 30,
STATE_31 = 31,
STATE_32 = 32,
enum Animation_e {
ANM_WaitStand = 0,
ANM_WaitSit = 1,
ANM_WaitSitCry = 2,
ANM_CryWalk = 3,
ANM_RemlyWalk = 4,
ANM_Run = 5,
ANM_Swim = 6,
ANM_Water = 7,
ANM_SwimDamage = 8,
ANM_Wind = 9,
ANM_WindBack = 10,
ANM_Hold = 11,
ANM_HoldMozo = 12,
ANM_HoldBata = 13,
ANM_HoldJumpStart = 14,
ANM_HoldJumpEnd = 15,
ANM_Fly = 16,
ANM_FlyDamage = 17,
ANM_Damage = 18,
ANM_Sleep = 19,
ANM_WakeUp = 20,
ANM_Scared = 21,
ANM_Piyo1 = 22,
ANM_Piyo2 = 23,
ANM_Piyo3 = 24,
ANM_SleepNight = 25,
ANM_Demo = 26,
ANM_27 = 27, // UNUSED
ANM_Foo = 28,
ANM_WalkNight = 29,
ANM_RunFast = 30,
ANM_Jump = 31,
ANM_Sound = 32,
};
public:
@@ -100,8 +100,8 @@ public:
STATE_FUNC_DECLARE(dAcEremly_c, NightJumpAttack);
STATE_FUNC_DECLARE(dAcEremly_c, BirthWait);
bool isState(State_e state) {
return field_0xB60 == (u32)state;
bool isAnimation(Animation_e state) {
return mAnimation == (u32)state;
}
STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcEremly_c);
@@ -110,42 +110,41 @@ public:
private:
void playWink();
bool fn_177_6B10(bool lookAtTarget, const mAng &);
void fn_177_6EA0(bool);
void adjustHeadRotation(bool);
bool calcHeadRotation(bool lookAtTarget, const mAng &); // the Side-to-side angle
void calcHeadPitch(bool); // The up-down angle
void resetHeadRotation(bool);
bool fn_177_7040(u32, f32);
bool isScary();
bool shouldBeScared();
bool fn_177_7510(f32);
bool isWithinTargetRadius(f32 radius);
bool isHorwellRemlitQuestComplete();
bool fn_177_75E0();
/** false -> comapres to camera
/** false -> compares to camera
* true -> compares to player */
bool fn_177_7650(bool comparePlayer) const;
void fn_177_77C0();
// Set Scary Face
void fn_177_78D0();
void applyScaryMat();
void fn_177_79D0(bool);
bool fn_177_7B10();
bool isUnderWater();
void nightSleepDemoImpl();
void fn_177_8520(bool);
void fn_177_8600();
void checkSlope(bool);
void spawnGroundEffect();
bool fn_177_86C0();
bool fn_177_8980(f32);
bool fn_177_8AC0();
bool fn_177_8C20(mAng);
bool fn_177_8F90();
bool fn_177_9370(f32);
bool isPlayerInNightRange(f32 range);
private:
/* 0x378 */ STATE_MGR_DECLARE(dAcEremly_c);
@@ -162,7 +161,7 @@ private:
/* 0x9C4 */ dEmitter_c mEmitters[2];
/* 0xA2C */ dAcRef_c<dAcNpcSkn2_c> mRef1; // Temporary until type known
/* 0xA2C */ dAcRef_c<dAcNpcSkn2_c> mHorwellRef;
/* 0xA38 */ dAcRef_c<dAcBomb_c> mNearbyBombRef;
/* 0xA44 */ mVec3_c mTargetPosition;
@@ -180,49 +179,49 @@ private:
/* 0xAF8 */ mVec3_c field_0xAF8;
/* 0xB04 */ f32 field_0xB04;
/* 0xB08 */ f32 field_0xB08;
/* 0xB0C */ f32 field_0xB0C;
/* 0xB10 */ f32 field_0xB10;
/* 0xB14 */ s32 field_0xB14;
/* 0xB18 */ u32 field_0xB18;
/* 0xB08 */ f32 mPatrolAreaSize;
/* 0xB0C */ f32 mWaterHeight;
/* 0xB10 */ f32 mScaleF;
/* 0xB14 */ s32 mSomeCounter;
/* 0xB18 */ u32 mSomeCounter2;
/* 0xB1C */ u8 _B1C[0xB1E - 0xB1C];
/* 0xB1E */ mAng3_c field_0xB1E;
/* 0xB24 */ s16 field_0xB24;
/* 0xB26 */ s16 field_0xB26;
/* 0xB26 */ u32 field_0xB28;
/* 0xB2C */ s32 field_0xB2C;
/* 0xB30 */ mAng field_0xB30;
/* 0xB1E */ mAng3_c mSlope;
/* 0xB24 */ s16 mSlopeXTarget;
/* 0xB26 */ s16 mSlopeZTarget;
/* 0xB26 */ u32 mSlopeCheckCounter;
/* 0xB2C */ s32 mHarpCounter;
/* 0xB30 */ mAng mHeadTiltTarget;
/* 0xB32 */ mAng field_0xB32;
/* 0xB34 */ mAng field_0xB34;
/* 0xB38 */ f32 field_0xB38;
/* 0xB3C */ f32 field_0xB3C;
/* 0xB40 */ f32 field_0xB40;
/* 0xB38 */ f32 mYPosition;
/* 0xB3C */ f32 mYOffset;
/* 0xB40 */ f32 mScaleFTarget;
/* 0xB44 */ u16 field_0xB44;
/* 0xB46 */ u16 field_0xB46;
/* 0xB48 */ u16 field_0xB48;
/* 0xB48 */ u16 mAnimTimer;
/* 0xB4A */ u16 mWinkTimer;
/* 0xB4C */ u16 field_0xB4C;
/* 0xB4E */ u16 field_0xB4E;
/* 0xB4C */ u16 mHeadTiltTimer;
/* 0xB4E */ u16 mAnimSafeTimer;
/* 0xB50 */ u16 field_0xB50;
/* 0xB52 */ u16 field_0xB52;
/* 0xB54 */ u16 field_0xB54;
/* 0xB54 */ u16 mScaleFTimer;
/* 0xB56 */ u16 field_0xB56;
/* 0xB58 */ u16 field_0xB58;
/* 0xB5A */ u16 field_0xB5A;
/* 0xB5C */ u16 field_0xB5C;
/* 0xB5E */ u16 field_0xB5E;
/* 0xB60 */ u8 field_0xB60; // Some State representation
/* 0xB61 */ u8 field_0xB61;
/* 0xB62 */ u8 mSleepDemoPlayedSceneflag;
/* 0xB63 */ u8 field_0xB63;
/* 0xB58 */ u16 mNoGroundCounter;
/* 0xB5A */ u16 mSwimPosYCounter;
/* 0xB5C */ u16 mFlySpeedCounter;
/* 0xB5E */ u16 mFlyAngleCounter;
/* 0xB60 */ u8 mAnimation;
/* 0xB61 */ u8 mIsHorwellsPet;
/* 0xB62 */ u8 mSceneflag;
/* 0xB63 */ u8 mNightSleepDemoStep;
/* 0xB64 */ u8 field_0xB64;
/* 0xB65 */ u8 field_0xB65;
/* 0xB66 */ u8 field_0xB66;
/* 0xB65 */ u8 mAnmStep;
/* 0xB66 */ bool field_0xB66;
/* 0xB67 */ u8 field_0xB67;
/* 0xB68 */ u8 field_0xB68;
/* 0xB69 */ u8 field_0xB69;
/* 0xB6A */ u8 field_0xB6A;
/* 0xB6B */ u8 field_0xB6B;
/* 0xB6B */ bool field_0xB6B;
/* 0xB6C */ u8 field_0xB6C;
/* 0xB6D */ u8 field_0xB6D;
/* 0xB6E */ u8 field_0xB6E;
include/d/a/e/d_a_en_base.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
// Deals with dealing damage to Enemy
// Returns a value 0-13 (similar to mStts rank?)
int fn_8002FDE0(cCcD_Obj &mCc, u16 *pTgOut);
void fn_80030030(const mVec3_c &pos, s16 &, s16 &, f32);
void checkSlope(const mVec3_c &pos, s16 &, s16 &, f32);
// Returns 0-3 based on collision
int fn_800301b0(const mVec3_c &pos, mAng ang, bool, f32);
void fn_80030400(m3d::mdl_c &, u8, bool, u8);
include/d/d_linkage.h
+1 -1
View File
@@ -74,7 +74,7 @@ public:
void fn_80050DC0(dAcObjBase_c *, f32, f32, mAng);
void fn_80050E00(dAcObjBase_c *, f32, f32, mAng);
void fn_80050E40(dAcObjBase_c *, f32, f32, mAng);
void fn_80050EA0(dAcObjBase_c *);
void forceRemove(dAcObjBase_c *);
void fn_800511E0(dAcObjBase_c *);
void bushTpFunc(dBgS_Acch &);
void fn_80051190(dAcObjBase_c *);
src/REL/d/a/e/d_a_e_remly.cpp
+437 -459
View File
File diff suppressed because it is too large Load Diff
src/REL/d/a/obj/d_a_obj_barrel.cpp
+3 -3
View File
@@ -536,7 +536,7 @@ void dAcOBarrel_c::executeState_GrabUp() {
dAcNpcCeFriend_c *pCeFriend = mCeFriend.get();
if (0 == sLib::calcTimer(&field_0xE15)) {
if ((pCeLady && pCeLady->fn_12_1C20(this)) || (pCeFriend && pCeFriend->fn_11_17C0(this))) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
quat_0xD80 = quat_0xD60;
mStateMgr.changeState(StateID_Wait);
return;
@@ -826,7 +826,7 @@ void dAcOBarrel_c::initializeState_Rebirth() {
mCyl.ClrCoSet();
mCyl.ClrTgSet();
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
mStts.SetRank(0);
setObjectProperty(OBJ_PROP_0x200);
@@ -1069,7 +1069,7 @@ void dAcOBarrel_c::fn_293_3DB0() {
extern "C" void fn_800307E0(const mVec3_c &, s32);
void dAcOBarrel_c::fn_293_4200() {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
if (field_0xE04 || field_0xE05) {
dAcNpcCeLady_c *pCeLady = mCeLady.get();
src/REL/d/a/obj/d_a_obj_tubo.cpp
+4 -4
View File
@@ -284,9 +284,9 @@ void dAcOtubo_c::executeState_Grab() {
dAcNpcCeLady_c *lady = mCeLady.get();
dAcNpcCeFriend_c *ceFriend = mCeFriend.get();
if (ceFriend && ceFriend->fn_11_17C0(this)) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
} else if (lady && lady->fn_12_1C20(this)) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
}
}
@@ -403,7 +403,7 @@ void dAcOtubo_c::initializeState_Rebirth() {
mSph.ClrCoSet();
mSph.ClrTgSet();
setObjectProperty(OBJ_PROP_0x200);
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
int item_drop_table = getParams2UpperByte();
switch (item_drop_table) {
@@ -452,7 +452,7 @@ void dAcOtubo_c::destroy() {
return;
}
fn_80022BE0(dLightEnv_c::GetPInstance(), mPosition);
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
dEmitterBase_c *fx_thing = dJEffManager_c::spawnEffect(
PARTICLE_RESOURCE_ID_MAPPING_211_, mPositionCopy2, nullptr, nullptr, nullptr, nullptr, 0, 0
src/d/d_linkage.cpp
+3 -3
View File
@@ -115,7 +115,7 @@ void dLinkage_c::fn_80050E40(dAcObjBase_c *pActor, const f32 speed, const f32 ve
pActor->mAngle.y = rot;
}
void dLinkage_c::fn_80050EA0(dAcObjBase_c *pActor) {
void dLinkage_c::forceRemove(dAcObjBase_c *pActor) {
mState = STATE_DELETE;
fn_80050EB0(pActor);
}
@@ -178,7 +178,7 @@ void dLinkage_c::bushTpFunc(dBgS_Acch &acch) {
if (mType == CONNECTION_7 && mControllingActor.p_owner == player) {
if (!checkFlag(0x10000)) {
if (acch.ChkWallHit(nullptr)) {
fn_80050EA0(player->getWhippedItem());
forceRemove(player->getWhippedItem());
return;
}
field_0x1A = 3;
@@ -210,7 +210,7 @@ void dLinkage_c::fn_80051190(dAcObjBase_c *pActor) {
}
pLinkedActor = nullptr;
fn_80050EA0(pActor);
forceRemove(pActor);
}
void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {