From 4ab3a1d9dcb76d80fe745dcbe79f3e925b8fac7e Mon Sep 17 00:00:00 2001 From: emilybrooks Date: Sun, 14 Apr 2024 06:55:02 -0700 Subject: migrated rodata in m_actor.c (#172) --- src/code/m_actor.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/code/m_actor.c') 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; } -- cgit v1.2.3