Skip to content

Commit

Permalink
a bit of d_a_insect
Browse files Browse the repository at this point in the history
  • Loading branch information
robojumper committed Oct 27, 2024
1 parent a2f2321 commit 95fe486
Show file tree
Hide file tree
Showing 6 changed files with 332 additions and 26 deletions.
5 changes: 5 additions & 0 deletions config/SOUE01/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,11 @@ d/lyt/d_screen_fader.cpp:
.data start:0x80528D68 end:0x80528D90
.sdata2 start:0x8057ABE0 end:0x8057AC08

d/a/d_a_insect.cpp:
.text start:0x8018F190 end:0x80190710
.data start:0x8052ABD8 end:0x8052ACC0
.sdata2 start:0x8057ADD8 end:0x8057AE30

d/d_cs_base.cpp:
.text start:0x801BC6C0 end:0x801BD250
.data start:0x8052E860 end:0x8052E968
Expand Down
51 changes: 26 additions & 25 deletions config/SOUE01/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10222,38 +10222,38 @@ fn_8018EBE0 = .text:0x8018EBE0; // type:function size:0x38
fn_8018EC20 = .text:0x8018EC20; // type:function size:0x2C
fn_8018EC50 = .text:0x8018EC50; // type:function size:0x538
fn_8018F190 = .text:0x8018F190; // type:function size:0x60
fn_8018F1F0 = .text:0x8018F1F0; // type:function size:0xAC
checkForLinkScare__12dAcOInsect_cFv = .text:0x8018F1F0; // type:function size:0xAC
fn_8018F2A0 = .text:0x8018F2A0; // type:function size:0xA0
fn_8018F340 = .text:0x8018F340; // type:function size:0x4C
fn_8018F390 = .text:0x8018F390; // type:function size:0x50
fn_8018F3E0 = .text:0x8018F3E0; // type:function size:0x40
fn_8018F420 = .text:0x8018F420; // type:function size:0x38
fn_8018F460 = .text:0x8018F460; // type:function size:0xD8
fn_8018F540 = .text:0x8018F540; // type:function size:0x8
fn_8018F550 = .text:0x8018F550; // type:function size:0xD4
fn_8018F630 = .text:0x8018F630; // type:function size:0xB8
fn_8018F6F0 = .text:0x8018F6F0; // type:function size:0x4
fn_8018F700 = .text:0x8018F700; // type:function size:0x8
fn_8018F710 = .text:0x8018F710; // type:function size:0x30
fn_8018F740 = .text:0x8018F740; // type:function size:0x84
fn_8018F7D0 = .text:0x8018F7D0; // type:function size:0x8
fn_8018F7E0 = .text:0x8018F7E0; // type:function size:0x8
fn_8018F7F0 = .text:0x8018F7F0; // type:function size:0xA8
fn_8018F8A0 = .text:0x8018F8A0; // type:function size:0x8
isLinkUsingBugNet__12dAcOInsect_cFv = .text:0x8018F340; // type:function size:0x4C
getLinkSpeedLevel__12dAcOInsect_cFv = .text:0x8018F390; // type:function size:0x50
isLinkNearby__12dAcOInsect_cFf = .text:0x8018F3E0; // type:function size:0x40
isLinkNearbyZ__12dAcOInsect_cFf = .text:0x8018F420; // type:function size:0x38
someBaseFunction__12dAcOInsect_cFv = .text:0x8018F460; // type:function size:0xD8
dAcOInsect_0x8C__12dAcOInsect_cFv = .text:0x8018F540; // type:function size:0x8
someBaseFunction0__12dAcOInsect_cFv = .text:0x8018F550; // type:function size:0xD4
addAttentionTarget__12dAcOInsect_cFv = .text:0x8018F630; // type:function size:0xB8
shouldAddAttentionTarget__12dAcOInsect_cFv = .text:0x8018F6F0; // type:function size:0x4
getAttentionField__12dAcOInsect_cFv = .text:0x8018F700; // type:function size:0x8
preAttention__12dAcOInsect_cFv = .text:0x8018F710; // type:function size:0x30
dAcOInsect_0x80__12dAcOInsect_cFv = .text:0x8018F740; // type:function size:0x84
dAcOInsect_0x84__12dAcOInsect_cFv = .text:0x8018F7D0; // type:function size:0x8
dAcOInsect_0x88__12dAcOInsect_cFv = .text:0x8018F7E0; // type:function size:0x8
isLinkCloseAndFlag__12dAcOInsect_cFv = .text:0x8018F7F0; // type:function size:0xA8
dAcOInsect_0x94__12dAcOInsect_cFv = .text:0x8018F8A0; // type:function size:0x8
fn_8018F8B0 = .text:0x8018F8B0; // type:function size:0x14C
fn_8018FA00 = .text:0x8018FA00; // type:function size:0x7C
fn_8018FA80 = .text:0x8018FA80; // type:function size:0x18
fn_8018FAA0 = .text:0x8018FAA0; // type:function size:0x28
resetScale__12dAcOInsect_cFv = .text:0x8018FA80; // type:function size:0x18
fn_8018FAA0__12dAcOInsect_cFv = .text:0x8018FAA0; // type:function size:0x28
fn_8018FAD0 = .text:0x8018FAD0; // type:function size:0x314
fn_8018FDF0 = .text:0x8018FDF0; // type:function size:0x2C0
fn_801900B0 = .text:0x801900B0; // type:function size:0xD0
fn_80190180 = .text:0x80190180; // type:function size:0x2C0
fn_80190180__12dAcOInsect_cFR4mAng = .text:0x80190180; // type:function size:0x2C0
fn_80190440 = .text:0x80190440; // type:function size:0x1D0
fn_80190610 = .text:0x80190610; // type:function size:0x2C
fn_80190640 = .text:0x80190640; // type:function size:0x4
fn_80190650 = .text:0x80190650; // type:function size:0x4
fn_80190660 = .text:0x80190660; // type:function size:0x8
fn_80190670 = .text:0x80190670; // type:function size:0xA0
dAcOInsect_0xAC__12dAcOInsect_cFv = .text:0x80190640; // type:function size:0x4
dAcOInsect_0xA8__12dAcOInsect_cFv = .text:0x80190650; // type:function size:0x4
dAcOInsect_0xA4__12dAcOInsect_cFv = .text:0x80190660; // type:function size:0x8
__dt__12dAcOInsect_cFv = .text:0x80190670; // type:function size:0xA0
fn_80190710 = .text:0x80190710; // type:function size:0x14
fn_80190730 = .text:0x80190730; // type:function size:0x48
fn_80190780 = .text:0x80190780; // type:function size:0x40
Expand Down Expand Up @@ -33803,7 +33803,8 @@ lbl_8052A890 = .data:0x8052A890; // type:object size:0xC8
lbl_8052A958 = .data:0x8052A958; // type:object size:0x68
lbl_8052A9C0 = .data:0x8052A9C0; // type:object size:0x1AC
lbl_8052AB6C = .data:0x8052AB6C; // type:object size:0x6C
lbl_8052ABD8 = .data:0x8052ABD8; // type:object size:0xE8
@LOCAL@addAttentionTarget__12dAcOInsect_cFv@tmpTarget = .data:0x8052ABD8; // type:object size:0x30 scope:local
__vt__12dAcOInsect_c = .data:0x8052AC08; // type:object size:0xB4
lbl_8052ACC0 = .data:0x8052ACC0; // type:object size:0x10
lbl_8052ACD0 = .data:0x8052ACD0; // type:object size:0x340
lbl_8052B010 = .data:0x8052B010; // type:object size:0x34
Expand Down
1 change: 1 addition & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "d/lyt/d_lyt_pause_disp_00.cpp"),
Object(Matching, "d/lyt/d_lyt_fader.cpp"),
Object(Matching, "d/lyt/d_screen_fader.cpp"),
Object(NonMatching, "d/a/d_a_insect.cpp"),
Object(NonMatching, "d/d_cs_base.cpp"),
Object(NonMatching, "d/d_cs_game.cpp"),
Object(Matching, "d/lyt/d_lyt_common_arrow.cpp"),
Expand Down
76 changes: 76 additions & 0 deletions include/d/a/d_a_insect.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#include "d/a/d_a_base.h"
#include "d/a/obj/d_a_obj_base.h"
#include "m/m_mtx.h"
#include "m/m_vec.h"

class dAcOInsect_c : public dAcObjBase_c {
public:
dAcOInsect_c() {}
virtual ~dAcOInsect_c() {}

/* 0x80 */ virtual f32 dAcOInsect_0x80();
/* 0x84 */ virtual f32 dAcOInsect_0x84() {
return 0.0f;
}
/* 0x88 */ virtual f32 dAcOInsect_0x88() {
return 0.0f;
}
/* 0x8C */ virtual f32 dAcOInsect_0x8C() {
return 0.0f;
}
/* 0x90 */ virtual f32 getAttentionField() {
return 0.0f;
}
/* 0x94 */ virtual f32 dAcOInsect_0x94() {
return 0.0f;
}
/* 0x98 */ virtual bool shouldAddAttentionTarget() {
return isLinkUsingBugNet();
}
/* 0x9C */ virtual void addAttentionTarget();
/* 0xA0 */ virtual void preAttention();
/* 0xA4 */ virtual s32 dAcOInsect_0xA4() {
return 0;
}
/* 0xA8 */ virtual bool dAcOInsect_0xA8() {
return checkForLinkScare();
}
/* 0xAC */ virtual void dAcOInsect_0xAC() {}
/* 0xB0 */ virtual void dAcOInsect_0xB0();

protected:
void goPoof();
bool isLinkNearby(f32 radius);
bool isLinkNearbyZ(f32 distance);
void someBaseFunction();
bool someBaseFunction0();
bool checkForLinkScare();
bool isLinkCloseAndFlag();
s32 getLinkSpeedLevel();
static bool isLinkUsingBugNet();
bool resetScale();
bool fn_8018FAA0();
bool fn_80190180(mAng &outAng);

private:
/* 0x330 */ s32 field_0x330;
/* 0x334 */ u8 field_0x334;
/* 0x335 */ u8 field_0x335;
/* 0x338 */ u32 field_0x338;
/* 0x33C */ mVec3_c field_0x33C;
/* 0x348 */ u8 field_0x348[0x35C - 0x348];
/* 0x35C */ f32 field_0x35C;
/* 0x360 */ u8 field_0x360[0x3BE - 0x360];
/* 0x3BE */ u8 field_0x3BE;
/* 0x3BF */ u8 field_0x3BF;
/* 0x3C0 */ mMtx_c field_0x3C0;
/* 0x3F0 */ u8 field_0x3F0[0x3F8 - 0x3F0];
/* 0x3F8 */ u32 mLinkNearby;
/* 0x3FC */ dAcRef_c<dAcBase_c> field_0x3FC;
/* 0x408 */ u8 field_0x408[0x40D - 0x408];
/* 0x40D */ u8 field_0x40D;
/* 0x410 */ mVec3_c field_0x410[3];
/* 0x434 */ mVec3_c field_0x434[3];
/* 0x458 */ u8 field_0x458[0x45C - 0x458];
/* 0x45C */ mVec3_c field_0x45C;
};
2 changes: 1 addition & 1 deletion include/d/a/d_a_player.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class dAcPy_c : public dAcObjBase_c {
/* vt 0x280 */ virtual void vt_0x280();
/* vt 0x284 */ virtual bool isUsingBugnet() const;
/* vt 0x288 */ virtual const mVec3_c &getBugNetPos() const;
/* vt 0x28C */ virtual void isUsingBugnet1();
/* vt 0x28C */ virtual bool isUsingBugnet1();
/* vt 0x290 */ virtual void bugNetCollectTreasure();
/* vt 0x294 */ virtual void somethingSwitchDials();
/* vt 0x298 */ virtual void vt_0x298();
Expand Down
Loading

0 comments on commit 95fe486

Please sign in to comment.