summaryrefslogtreecommitdiff
path: root/src/code/m_actor.c
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-09-08 12:02:32 -0300
committerGitHub <noreply@github.com>2023-09-08 08:02:32 -0700
commit81b40ad296cc1f501bf8a33ecb38015a1d6148a8 (patch)
treee784e455d63c1a77b697278c5d4e52f311cb14ef /src/code/m_actor.c
parente8c701eeb4309235940ca685b00031140e22f79a (diff)
`submenu_ovl`, 3 NON_EQUIVALENTs and 2 NON_MATCHINGs (#88)
* C file * func_8085DA28_jp, func_8085DA9C_jp * func_8085D638_jp * func_8085D358_jp, func_8085D500_jp, func_8085D674_jp * bleh * func_8085BAC0_jp * func_8085D128_jp * Rename many functions * mSM_move_menu * a * func_8085D43C_jp * mSM_set_char_matrix * mSM_cbuf_copy draft * mSM_cbuf_copy NON_EQUIVALENT * func_8085C20C_jp draft * match func_8085C20C_jp * cleanup unc_8085C20C_jp * func_8085C7A4_jp ok, func_8085C7B8_jp NON_EQUIVALENT * mSM_draw_mail NON_MATCHING * func_8085D094_jp * mSM_set_other_seg mSM_set_before_menu_proc * meh * mSM_move_Move * migrate data * move submenu overlays to the submenu folder and make headers for them * name some files based on rodata strings * name functions from known submenu overlays * mSM_move_chg_base * mSM_menu_ovl_init NON_MATCHING * migrate bss * mSM_menu_ovl_init * SubmenuProgramId * mSM_save_before_func * mSM_return_func NON_EQUIVALENT * some cleanup * rename lots of data * kinda format * more cleanup * symbolize remaining stuff * format * Kinda fix whatever is going on with Game_Play_unk_0110 * mroecleanup * name known overlays * tag_program_dlftbl, hand_program_dlftbl, haniwa_program_dlftbl * format * flag defines
Diffstat (limited to 'src/code/m_actor.c')
-rw-r--r--src/code/m_actor.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/code/m_actor.c b/src/code/m_actor.c
index 7398d4b..9ef1551 100644
--- a/src/code/m_actor.c
+++ b/src/code/m_actor.c
@@ -103,11 +103,11 @@ s32 Actor_data_bank_dma_end_check(Actor* actor, Game_Play* game_play) {
switch (ACTOR_FGNAME_GET_F000(actor->fgName)) {
case FGNAME_F000_D:
case FGNAME_F000_E:
- var_v1 = common_data.unk_1004C->unk_F4(game_play->unk_0110, actor);
+ var_v1 = common_data.unk_1004C->unk_F4(game_play->unk_0110.unk_0000, actor);
break;
default:
- var_v1 = game_play->unk_0110[actor->unk_026].unk_00 > 0;
+ var_v1 = game_play->unk_0110.unk_0000[actor->unk_026].unk_00 > 0;
break;
}
@@ -147,14 +147,14 @@ void Actor_delete(Actor* actor) {
void Actor_ct(Actor* actor, Game_Play* game_play) {
s32 pad[2] UNUSED;
- Game_Play_unk_0110* temp;
+ Game_Play_unk_0110_unk_0000* temp;
Npc* npc;
CommonData_unk_1004C_unk_14_arg0 sp34;
Game_Play_unk_0110* temp_a0;
- temp_a0 = game_play->unk_0110;
+ temp_a0 = &game_play->unk_0110;
- temp = temp_a0;
+ temp = temp_a0->unk_0000;
temp += actor->unk_026;
temp->unk_50++;
@@ -162,8 +162,8 @@ void Actor_ct(Actor* actor, Game_Play* game_play) {
npc = (Npc*)actor;
common_data.unk_1004C->unk_14(&sp34, npc->actor.fgName);
- npc->unk_708 = mSc_bank_regist_check(temp_a0, sp34.unk_02);
- temp_a0[npc->unk_708].unk_50++;
+ npc->unk_708 = mSc_bank_regist_check(temp_a0->unk_0000, sp34.unk_02);
+ temp_a0->unk_0000[npc->unk_708].unk_50++;
}
actor->world = actor->home;
@@ -193,7 +193,7 @@ void Actor_ct(Actor* actor, Game_Play* game_play) {
Shape_Info_init(actor, 0.0f, NULL, 0.0f, 0.0f);
if (Actor_data_bank_dma_end_check(actor, game_play) == 1) {
- gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_a0[actor->unk_026].segment);
+ gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_a0->unk_0000[actor->unk_026].segment);
actor->ct(actor, game_play);
actor->ct = NULL;
}
@@ -201,7 +201,7 @@ void Actor_ct(Actor* actor, Game_Play* game_play) {
#ifdef NON_MATCHING
void Actor_dt(Actor* actor, Game_Play* game_play) {
- Game_Play_unk_0110* temp_v0_6;
+ Game_Play_unk_0110_unk_0000* temp_v0_6;
s32 new_var;
if (actor->save != NULL) {
@@ -222,7 +222,7 @@ void Actor_dt(Actor* actor, Game_Play* game_play) {
actor->parent->child = NULL;
}
- temp_v0_6 = game_play->unk_0110;
+ temp_v0_6 = game_play->unk_0110.unk_0000;
if (0) {}
switch ((actor->fgName & 0xF000) >> 0xC) {
@@ -232,7 +232,7 @@ void Actor_dt(Actor* actor, Game_Play* game_play) {
break;
default:
- new_var = game_play->unk_190C;
+ new_var = game_play->unk_0110.unk_17FC;
if (actor->unk_026 >= new_var) {
temp_v0_6 = &temp_v0_6[(void)0, actor->unk_026];
@@ -272,7 +272,7 @@ void Actor_draw(Game_Play* game_play, Actor* actor) {
Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, MTXMODE_APPLY);
{
- void* segment = game_play->unk_0110[(void)0, actor->unk_026].segment;
+ void* segment = game_play->unk_0110.unk_0000[(void)0, actor->unk_026].segment;
gSegments[6] = (uintptr_t)OS_PHYSICAL_TO_K0(segment);
@@ -452,7 +452,7 @@ void Actor_info_call_actor(Game_Play* game_play, ActorInfo* actorInfo) {
if (actor->ct != NULL) {
if (Actor_data_bank_dma_end_check(actor, game_play) == 1) {
- gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110[actor->unk_026].segment);
+ gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110.unk_0000[actor->unk_026].segment);
game_play->state.unk_9D = 0x98;
actor->ct(actor, game_play);
@@ -488,7 +488,7 @@ void Actor_info_call_actor(Game_Play* game_play, ActorInfo* actorInfo) {
actor->flags &= ~ACTOR_FLAG_1000000;
if ((actor->flags & (ACTOR_FLAG_40 | ACTOR_FLAG_10)) || (actor->part == ACTOR_PART_NPC)) {
- gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110[actor->unk_026].segment);
+ gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110.unk_0000[actor->unk_026].segment);
game_play->state.unk_9D = 0xA1;
actor->update(actor, game_play);
game_play->state.unk_9D = 0xA2;
@@ -692,8 +692,8 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
sp90 = sp24.unk_02;
}
- *arg0 = mSc_bank_regist_check(game_play->unk_0110, sp92);
- temp_v0 = mSc_bank_regist_check(game_play->unk_0110, sp90);
+ *arg0 = mSc_bank_regist_check(game_play->unk_0110.unk_0000, sp92);
+ temp_v0 = mSc_bank_regist_check(game_play->unk_0110.unk_0000, sp90);
if ((*arg0 < 0) || (temp_v0 < 0)) {
if (*arg0 >= 0) {
@@ -702,7 +702,7 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
if (temp_v0 >= 0) {
sp90 = 0;
}
- common_data.unk_1004C->unk_EC(game_play->unk_0110, sp92, sp90);
+ common_data.unk_1004C->unk_EC(game_play->unk_0110.unk_0000, sp92, sp90);
actor_free_check(overlayEntry, fgName);
ret = 0;
}
@@ -713,10 +713,10 @@ s32 func_80057B70_jp(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntr
s32 pad UNUSED;
s32 ret = 1;
- *arg0 = mSc_bank_regist_check(game_play->unk_0110, profile->objectId);
+ *arg0 = mSc_bank_regist_check(game_play->unk_0110.unk_0000, profile->objectId);
if (*arg0 == -1) {
- func_800C6144_jp(game_play->unk_0110, profile->objectId);
+ func_800C6144_jp(game_play->unk_0110.unk_0000, profile->objectId);
actor_free_check(overlayEntry, fgName);
ret = 0;
}