falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

attempt 2 at d_a_cow debug work (#3030) 

* transfer cow progress

* fix symbol names

* Fix shield names

* typo

* remove predefined macro
This commit is contained in:
roeming 2026-01-12 15:17:09 -05:00 committed by GitHub
parent 24c08d322e
commit 6cc5e6fcca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 372 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/Shield/rels/d_a_cow/symbols.txt
View File

@ -271,11 +271,11 @@ m_near_dist = .bss:0x00000020; // type:object size:0x4 scope:global
m_view_angle_wide = .bss:0x00000024; // type:object size:0x2 scope:global
m_view_angle = .bss:0x00000026; // type:object size:0x2 scope:global
m_angry_cow = .bss:0x00000028; // type:object size:0x2 scope:global data:2byte
lbl_160_bss_2A = .bss:0x0000002A; // type:object size:0x1 data:byte
@GUARD@setEffect__7daCow_cFv@runScale = .bss:0x0000002A; // type:object size:0x1 data:byte
@LOCAL@setEffect__7daCow_cFv@runScale = .bss:0x0000002C; // type:object size:0xC scope:local align:4 data:float
lbl_160_bss_38 = .bss:0x00000038; // type:object size:0x1 data:byte
@GUARD@setCollisions__7daCow_cFv@headOfst = .bss:0x00000038; // type:object size:0x1 data:byte
@LOCAL@setCollisions__7daCow_cFv@headOfst = .bss:0x0000003C; // type:object size:0xC scope:local align:4 data:float
lbl_160_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte
@GUARD@setCollisions__7daCow_cFv@backBornOfst@0 = .bss:0x00000048; // type:object size:0x1 data:byte
@LOCAL@setCollisions__7daCow_cFv@backBornOfst@0 = .bss:0x0000004C; // type:object size:0xC scope:local align:4 data:float
lbl_160_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte
@GUARD@setCollisions__7daCow_cFv@waistOfst@1 = .bss:0x00000058; // type:object size:0x1 data:byte
@LOCAL@setCollisions__7daCow_cFv@waistOfst@1 = .bss:0x0000005C; // type:object size:0xC scope:local align:4 data:float

5
config/ShieldD/rels/d_a_cowD/symbols.txt
View File

@ -304,13 +304,16 @@ pen_pos__21@unnamed@d_a_cow_cpp@ = .bss:0x00000000; // type:object size:0xC scop
gate_pos__21@unnamed@d_a_cow_cpp@ = .bss:0x0000000C; // type:object size:0xC scope:global
l_CowRoomNo__21@unnamed@d_a_cow_cpp@ = .bss:0x00000018; // type:object size:0x4 scope:global data:4byte
l_CowType__21@unnamed@d_a_cow_cpp@ = .bss:0x0000001C; // type:object size:0x4 scope:global data:4byte
lbl_154_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte
@GUARD@setEffect__7daCow_cFv@runScale = .bss:0x00000020; // type:object size:0x1 data:byte
@LOCAL@setEffect__7daCow_cFv@runScale = .bss:0x00000024; // type:object size:0xC scope:local
m_near_dist = .bss:0x00000030; // type:object size:0x4 scope:global align:4 data:float
m_view_angle_wide = .bss:0x00000034; // type:object size:0x2 scope:global data:2byte
m_view_angle = .bss:0x00000036; // type:object size:0x2 scope:global data:2byte
m_angry_cow = .bss:0x00000038; // type:object size:0x2 scope:global data:2byte
m_search_range = .bss:0x0000003C; // type:object size:0x4 scope:global
@GUARD@setCollisions__7daCow_cFv@headOfst = .bss:0x00000040; // type:object size:0x1 scope:local
@LOCAL@setCollisions__7daCow_cFv@headOfst = .bss:0x00000044; // type:object size:0xC scope:local
@GUARD@setCollisions__7daCow_cFv@backBornOfst@0 = .bss:0x00000050; // type:object size:0x1 scope:local
@LOCAL@setCollisions__7daCow_cFv@backBornOfst@0 = .bss:0x00000054; // type:object size:0xC scope:local
@GUARD@setCollisions__7daCow_cFv@waistOfst@1 = .bss:0x00000060; // type:object size:0x1 scope:local
@LOCAL@setCollisions__7daCow_cFv@waistOfst@1 = .bss:0x00000064; // type:object size:0xC scope:local

8
include/d/actor/d_a_cow.h
View File

@ -106,7 +106,7 @@ public:
int calcRunAnime(int);
void setBck(int, u8, f32, f32);
u8 checkBck(int);
bool checkBck(int);
void setEffect();
bool isChaseCowGame();
void setCarryStatus();
@ -181,7 +181,7 @@ public:
int Execute();
int CreateHeap();
static int createHeapCallBack(fopAc_ac_c*);
u8 initialize();
bool initialize();
int create();
int ctrlJoint(J3DJoint*, J3DModel*);
static int ctrlJointCallBack(J3DJoint*, int);
@ -205,8 +205,8 @@ public:
void setNaderuFinish() { mFlags |= Flag_NaderuFinish; }
void setCrazyReadyDrawOn() { mFlags |= Flag_CrazyReadyDrawOn; }
bool getCowIn() { return mCowIn; }
int getNoNearCheckTimer() const { return mNoNearCheckTimer; }
u8 getCowIn() { return mCowIn; }
u8 getNoNearCheckTimer() { return mNoNearCheckTimer; }
private:
/* 0x568 */ u16 mFlags;

709
src/d/actor/d_a_cow.cpp
View File

File diff suppressed because it is too large Load Diff