Merged
Conversation
Matched daObj_Maki_HIO_c::daObj_Maki_HIO_c() and started work on daObj_Maki_HIO_c::~daObj_Maki_HIO_c()
More structures defined, work on all methods, some equivalent, just missing registers
Final work on maki to get it to Match 100%.
TakaRikka
reviewed
Apr 2, 2025
Contributor
TakaRikka
left a comment
TakaRikka
left a comment
There was a problem hiding this comment.
mostly just formatting and some cleanup
include/d/actor/d_a_obj_maki.h
Outdated
Comment on lines
+26
to
+35
| /* 0x57d */ char field_0x57d; // Undefined | ||
| /* 0x57e */ short field_0x57e; | ||
| /* 0x580 */ short field_0x580[2]; | ||
| /* 0x584*/ dCcD_Stts mStts; | ||
| /* 0x5c0 */ dCcD_Sph mSph; | ||
| /* 0x6f8 */ u32 field_0x6f8[4]; | ||
| /* 0x6fc */ char field_0x6fc[0x70c - 0x708]; // Undefined | ||
| /* 0x70c */ LIGHT_INFLUENCE mLightObj; | ||
| /* 0x72c */ u8 field_0x72c; | ||
| /* 0x72d */ char field_0x72d[0x730 - 0x72d]; //Undefined |
Contributor
There was a problem hiding this comment.
use s16 instead of short and u8 instead of char here
src/d/actor/d_a_obj_maki.cpp
Outdated
Comment on lines
+34
to
+39
| if(param_0->field_0x57e == 0){ | ||
| g_env_light.setLightTevColorType_MAJI(param_0->mModel1, ¶m_0->tevStr); | ||
| param_0->mBrk->entry(param_0->mModel1->getModelData()); | ||
| mDoExt_modelUpdateDL(param_0->mModel1); | ||
|
|
||
| } else if(param_0->field_0x57c != 0x01){ |
Contributor
There was a problem hiding this comment.
can the formatting here be cleaned up, remove the extra line under modelUpdate DL and put spaces after the if and before the opening braces
src/d/actor/d_a_obj_maki.cpp
Outdated
|
|
||
| for (int i = 0; i < 5; i++) { | ||
| static u16 eff_id[] = {0x8204,0x8205,0x8206,0x8207,0x8208}; | ||
| param_0->field_0x6f8[i] = dComIfGp_particle_set(param_0->field_0x6f8[i], eff_id[i] , ¶m_0->current.pos, ¶m_0->tevStr, ¶m_0->shape_angle,0,0xff,0,0xffffffff,0,0,0); |
Contributor
There was a problem hiding this comment.
make sure to use NULL for null pointers and -1 for the signed char arg here
src/d/actor/d_a_obj_maki.cpp
Outdated
|
|
||
| /* 80C8FEDC-80C90378 0001BC 049C+00 2/1 0/0 0/0 .text daObj_Maki_Execute__FP14obj_maki_class */ | ||
| static void daObj_Maki_Execute(obj_maki_class* param_0) { | ||
| int daObj_Maki_Execute(obj_maki_class* param_0) { |
Contributor
There was a problem hiding this comment.
for all obj_maki_class param's in this TU, you can just name them i_this
src/d/actor/d_a_obj_maki.cpp
Outdated
|
|
||
| /* 80C90378-80C90380 000658 0008+00 1/0 0/0 0/0 .text daObj_Maki_IsDelete__FP14obj_maki_class */ | ||
| static bool daObj_Maki_IsDelete(obj_maki_class* param_0) { | ||
| bool daObj_Maki_IsDelete(obj_maki_class* param_0) { |
src/d/actor/d_a_obj_maki.cpp
Outdated
Comment on lines
+125
to
+128
| pfVar5 = mDoMtx_stack_c::get(); | ||
| model->setBaseTRMtx(pfVar5); | ||
| Mtx &mtx = model->getBaseTRMtx(); | ||
| fopAcM_SetMtx(param_0, mtx); |
Contributor
There was a problem hiding this comment.
you should be able to remove temps here, just passing the results directly into the functions
d_a_obj_maki matching | * cleanup for PR
Contributor
Author
|
Added all the formatting changes |
TakaRikka
approved these changes
Apr 3, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Matching d_a_obj_maki for #1047