Skip to content

Commit

Permalink
d_a_obj_sekizo OK (zeldaret#2092)
Browse files Browse the repository at this point in the history
* Test commit.

* Match initBaseMtx and setBaseMtx

* Match Create, Draw. Execute almost matched.

* Match Execute and simpler functions.

* Misc changes for pause.

* Match CreateHeap and Delete. Start cleanup.

* Match create(). Update inherited fopAc_ac_c members.

* Most of sekizo matched, but .data has extra zeros (param_c underutilized?).

* Minor cleanup.

* Remove unused asm and update progress.

* Fix progress.

* Casting and cullMtx feedback.
  • Loading branch information
ErraticOocca authored Mar 10, 2024
1 parent dd0fd67 commit 86af5df
Show file tree
Hide file tree
Showing 15 changed files with 141 additions and 534 deletions.
8 changes: 4 additions & 4 deletions Progress.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Total | 52.688307% | 2118424 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 52.688307% | 2118424 | 4020672
RELs | 36.628812% | 4212432 | 11500324
Total | 40.788980% | 6330856 | 15520996
RELs | 36.639420% | 4213652 | 11500324
Total | 40.796841% | 6332076 | 15520996

## RELs

Expand Down Expand Up @@ -592,7 +592,7 @@ d_a_obj_scannon | 35.209799% | 5404 | 15348
d_a_obj_scannon_crs | 35.204678% | 3612 | 10260
d_a_obj_scannon_ten | 37.738049% | 3884 | 10292
d_a_obj_sekidoor | 43.834383% | 1948 | 4444
d_a_obj_sekizo | 58.276334% | 1704 | 2924
d_a_obj_sekizo | 100.000000% | 2924 | 2924
d_a_obj_sekizoa | 32.789446% | 15112 | 46088
d_a_obj_shield | 34.160959% | 3192 | 9344
d_a_obj_sm_door | 39.302885% | 2616 | 6656
Expand Down Expand Up @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244
d_a_warp_bug | 100.000000% | 2024 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 36.628812% | 4212432 | 11500324
Total | 36.639420% | 4213652 | 11500324

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/func_80CCDD8C.s

This file was deleted.

This file was deleted.

This file was deleted.

30 changes: 29 additions & 1 deletion include/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,35 @@
#define D_A_OBJ_SEKIZO_H

#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"

class daObj_Sekizo_c : public dBgS_MoveBgActor {
public:
/* 80CCDC0C */ cPhs__Step create();

/* 80CCDD00 */ int CreateHeap();
/* 80CCDD8C */ int Create();
/* 80CCDDE8 */ int Delete();
/* 80CCDE3C */ int Execute(Mtx**);
/* 80CCDEF4 */ int Draw();
/* 80CCDFA4 */ void initBaseMtx();
/* 80CCDFE0 */ void setBaseMtx();

/* 0x5A0 */ u32 field_0x5a0;

/* 0x5A4 */ request_of_phase_process_class mPhaseReq;

/* 0x5AC */ J3DModel* mpModel;
/* 0x5B0 */ u8 field_0x5b0;
/* 0x5B1 */ bool field_0x5b1;
/* 0x5B2 */ bool field_0x5b2;
}; // Size: 0x5B4

STATIC_ASSERT(sizeof(daObj_Sekizo_c) == 0x5B4);

class daObj_Sekizo_Param_c {
public:
/* 80CCE118 */ virtual ~daObj_Sekizo_Param_c() {}
};

#endif /* D_A_OBJ_SEKIZO_H */
Loading

0 comments on commit 86af5df

Please sign in to comment.