Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daSwLBall_c OK #2220

Merged
merged 1 commit into from
Oct 20, 2024
Merged

daSwLBall_c OK #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions config/GZ2E01/rels/d_a_swLBall/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
s_lb_sub__FPvPv = .text:0x00000078; // type:function size:0x94 scope:global
s_lb_sub__FPvPv = .text:0x00000078; // type:function size:0x94 scope:local
checkArea_sub__11daSwLBall_cFP10fopAc_ac_c = .text:0x0000010C; // type:function size:0x140 scope:global
checkArea__11daSwLBall_cFv = .text:0x0000024C; // type:function size:0xB4 scope:global
search_lb__11daSwLBall_cFv = .text:0x00000300; // type:function size:0x12C scope:global
Expand All @@ -13,9 +13,9 @@ actionRun__11daSwLBall_cFv = .text:0x00000600; // type:function size:0x1A0 scope
actionStop__11daSwLBall_cFv = .text:0x000007A0; // type:function size:0x4 scope:global
PutCrrPos__11daSwLBall_cFv = .text:0x000007A4; // type:function size:0x220 scope:global
_delete__11daSwLBall_cFv = .text:0x000009C4; // type:function size:0x8 scope:global
daSwLBall_Execute__FP11daSwLBall_c = .text:0x000009CC; // type:function size:0x20 scope:global
daSwLBall_Delete__FP11daSwLBall_c = .text:0x000009EC; // type:function size:0x20 scope:global
daSwLBall_Create__FP10fopAc_ac_c = .text:0x00000A0C; // type:function size:0x20 scope:global
daSwLBall_Execute__FP11daSwLBall_c = .text:0x000009CC; // type:function size:0x20 scope:local
daSwLBall_Delete__FP11daSwLBall_c = .text:0x000009EC; // type:function size:0x20 scope:local
daSwLBall_Create__FP10fopAc_ac_c = .text:0x00000A0C; // type:function size:0x20 scope:local
cLib_calcTimer<Uc>__FPUc = .text:0x00000A2C; // type:function size:0x1C scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
Expand All @@ -26,14 +26,14 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3726 = .rodata:0x0000000C; // type:object size:0x4 scope:local
@4000 = .rodata:0x00000010; // type:object size:0x4 scope:local
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
@3835 = .data:0x00000020; // type:object size:0xC scope:local
@3836 = .data:0x0000002C; // type:object size:0xC scope:local
@3837 = .data:0x00000038; // type:object size:0xC scope:local
l_func$3834 = .data:0x00000044; // type:object size:0x24 scope:local
l_daSwLBall_Method = .data:0x00000068; // type:object size:0x20 scope:global
l_daSwLBall_Method = .data:0x00000068; // type:object size:0x20 scope:local
g_profile_SwLBall = .data:0x00000088; // type:object size:0x30 scope:global
l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global
l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte
lbl_708_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte
l_target_info = .bss:0x00000000; // type:object size:0x8 scope:local
l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte
lbl_708_bss_C = .bss:0x0000000C; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,7 @@ def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="thi
ActorRel(Matching, "d_a_skip_2D"),
ActorRel(Matching, "d_a_startAndGoal", extra_cflags=['-pragma "nosyminline off"']),
ActorRel(NonMatching, "d_a_swBall"),
ActorRel(NonMatching, "d_a_swLBall"),
ActorRel(Matching, "d_a_swLBall"),
ActorRel(Matching, "d_a_swTime"),
ActorRel(NonMatching, "d_a_tag_Lv6Gate"),
ActorRel(Matching, "d_a_tag_Lv7Gate"),
Expand Down
36 changes: 29 additions & 7 deletions include/d/actor/d_a_swLBall.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,42 @@
*/
class daSwLBall_c : public fopAc_ac_c {
public:
/* 80D4EB8C */ void checkArea_sub(fopAc_ac_c*);
/* 80D4ECCC */ void checkArea();
enum Action {
ACTION_INIT,
ACTION_RUN,
ACTION_STOP,
};

typedef void (daSwLBall_c::*actionFunc)();

/* 80D4EB8C */ int checkArea_sub(fopAc_ac_c*);
/* 80D4ECCC */ int checkArea();
/* 80D4ED80 */ void search_lb();
/* 80D4EEAC */ void Create();
/* 80D4EEF8 */ void create();
/* 80D4EF60 */ void execute();
/* 80D4EEAC */ int Create();
/* 80D4EEF8 */ int create();
/* 80D4EF60 */ int execute();
/* 80D4F008 */ void actionInit();
/* 80D4F080 */ void actionRun();
/* 80D4F220 */ void actionStop();
/* 80D4F224 */ void PutCrrPos();
/* 80D4F444 */ bool _delete();
/* 80D4F444 */ int _delete();

u8 getType() { return fopAcM_GetParamBit(this, 24, 4); }
u8 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getArg1() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 16, 8); }
void setAction(Action action) { mAction = action; }
int checkPullLBall() {
return fopAcM_GetParamBit(this,28,2) == 0;
}

private:
/* 0x568 */ u8 field_0x568[0x578 - 0x568];
/* 0x568 */ fpc_ProcID mProcIds[2];
/* 0x570 */ u8 mRunTimer;
/* 0x571 */ u8 mAction;
/* 0x572 */ u8 field_0x572;
/* 0x574 */ u8 mIsActorCarrying[2];
/* 0x575 */ u8 mIsPulled[2];
};

STATIC_ASSERT(sizeof(daSwLBall_c) == 0x578);
Expand Down
Loading