diff options
| -rw-r--r-- | include/m_actor.h | 3 | ||||
| -rw-r--r-- | include/m_clip.h | 5 | ||||
| -rw-r--r-- | include/unknown_structs.h | 4 | ||||
| -rw-r--r-- | src/code/m_actor.c | 19 |
4 files changed, 13 insertions, 18 deletions
diff --git a/include/m_actor.h b/include/m_actor.h index 808b592..5a1c59e 100644 --- a/include/m_actor.h +++ b/include/m_actor.h @@ -10,7 +10,6 @@ struct Actor; struct Game_Play; struct ActorEntry; struct ActorOverlay; -struct struct_801161E8_jp; struct LightsN; struct GraphicsContext; @@ -249,7 +248,7 @@ void Actor_info_dt(ActorInfo* actorInfo, struct Game_Play* game_play); void Actor_info_call_actor(struct Game_Play* game_play, ActorInfo* actorInfo); void Actor_info_draw_actor(struct Game_Play* game_play, ActorInfo* actorInfo); void Actor_free_overlay_area(struct ActorOverlay* overlayEntry); -void Actor_get_overlay_area(struct ActorOverlay* overlayEntry, const struct struct_801161E8_jp* arg1, size_t overlaySize); +void Actor_get_overlay_area(struct ActorOverlay* overlayEntry, const u8*, size_t overlaySize); void Actor_init_actor_class(Actor* actor, ActorProfile* profile, struct ActorOverlay* overlayEntry, struct Game_Play* game_play, s32 arg4, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD, u16 fgName, s16 params); Actor* Actor_info_make_actor(ActorInfo* actorInfo, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE, s32 argF); Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD); diff --git a/include/m_clip.h b/include/m_clip.h index f5c3a3b..3f58ad1 100644 --- a/include/m_clip.h +++ b/include/m_clip.h @@ -7,7 +7,6 @@ struct Actor; struct ActorOverlay; -struct struct_801161E8_jp; struct ObjectStatus; struct Clip_unk_040_unk_14_arg0; struct Game_Play; @@ -18,9 +17,9 @@ struct FurnitureActor; struct WeatherClip; struct ObjectExchangeBank; -typedef UNK_RET (*Clip_unk_040_unk_04)(struct ActorOverlay*, const struct struct_801161E8_jp*, size_t, s32); +typedef UNK_RET (*Clip_unk_040_unk_04)(struct ActorOverlay*, const u8*, size_t, s32); typedef UNK_RET (*Clip_unk_040_unk_08)(void); -typedef UNK_PTR (*Clip_unk_040_unk_0C)(size_t, const struct struct_801161E8_jp*, s32); +typedef UNK_PTR (*Clip_unk_040_unk_0C)(size_t, const u8*, s32); typedef UNK_RET (*Clip_unk_040_unk_10)(struct Actor*); typedef UNK_RET (*Clip_unk_040_unk_14)(struct Clip_unk_040_unk_14_arg0*, u16); typedef UNK_RET (*Clip_unk_040_unk_BC)(struct Actor*, struct Game_Play*); diff --git a/include/unknown_structs.h b/include/unknown_structs.h index 383f2cd..ce3fdb0 100644 --- a/include/unknown_structs.h +++ b/include/unknown_structs.h @@ -7,10 +7,6 @@ #include "unk.h" #include "other_types.h" -typedef struct struct_801161E8_jp { - /* 0x0 */ UNK_TYPE1 unk_0[0x8]; -} struct_801161E8_jp; // size <= 0x8 - typedef struct Clip_unk_040_unk_14_arg0 { /* 0x00 */ s16 unk_00; /* 0x00 */ s16 unk_02; diff --git a/src/code/m_actor.c b/src/code/m_actor.c index 23c5f7a..2fe38e2 100644 --- a/src/code/m_actor.c +++ b/src/code/m_actor.c @@ -609,7 +609,7 @@ void actor_free_check(ActorOverlay* overlayEntry, u16 fgName) { } } -void Actor_get_overlay_area(ActorOverlay* overlayEntry, const struct_801161E8_jp* arg1 UNUSED, size_t overlaySize) { +void Actor_get_overlay_area(ActorOverlay* overlayEntry, const u8* arg1 UNUSED, size_t overlaySize) { if (overlayEntry->allocType & ALLOCTYPE_PERMANENT) { overlayEntry->loadedRamAddr = zelda_malloc_r(overlaySize); } else { @@ -617,8 +617,8 @@ void Actor_get_overlay_area(ActorOverlay* overlayEntry, const struct_801161E8_jp } } -s32 func_80057940_jp(ActorProfile** profileP, ActorOverlay* overlayEntry, const struct_801161E8_jp* arg2, - size_t overlaySize, u16 fgName) { +s32 func_80057940_jp(ActorProfile** profileP, ActorOverlay* overlayEntry, const u8* arg2, size_t overlaySize, + u16 fgName) { if (overlayEntry->vramStart == NULL) { *profileP = overlayEntry->profile; } else { @@ -729,8 +729,8 @@ s32 Actor_data_bank_regist_check(s32* arg0, ActorProfile* profile, ActorOverlay* return var_v1; } -s32 Actor_malloc_actor_class(Actor** actorP, ActorProfile* profile, ActorOverlay* overlayEntry, - const struct_801161E8_jp* arg3, u16 fgName) { +s32 Actor_malloc_actor_class(Actor** actorP, ActorProfile* profile, ActorOverlay* overlayEntry, const u8* arg3, + u16 fgName) { Clip_unk_040_unk_14_arg0 sp24; switch (ACTOR_FGNAME_GET_F000(fgName)) { @@ -795,8 +795,7 @@ void Actor_init_actor_class(Actor* actor, ActorProfile* profile, ActorOverlay* o actor->fgName = fgName; } -extern const struct_801161E8_jp RO_801161E8_jp; -#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_actor/RO_801161E8_jp.s") +const u8 RO_801161E8_jp[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; Actor* Actor_info_make_actor(ActorInfo* actorInfo, Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE, @@ -811,13 +810,15 @@ Actor* Actor_info_make_actor(ActorInfo* actorInfo, Game_Play* game_play, s16 act return NULL; } - if (func_80057940_jp(&profile, temp_s0, &RO_801161E8_jp, size, *new_var) == 0) { + if (func_80057940_jp(&profile, temp_s0, RO_801161E8_jp, size, *new_var) == 0) { return NULL; } + if (Actor_data_bank_regist_check(&argF, profile, temp_s0, game_play, fgName) == 0) { return NULL; } - if (Actor_malloc_actor_class(&sp68, profile, temp_s0, &RO_801161E8_jp, fgName) == 0) { + + if (Actor_malloc_actor_class(&sp68, profile, temp_s0, RO_801161E8_jp, fgName) == 0) { return NULL; } |