From 28cdec47bc4cc93bdfbc5fbeeda2a827817d07a8 Mon Sep 17 00:00:00 2001 From: Nuss <67802335+hack-nuss@users.noreply.github.com> Date: Fri, 8 Sep 2023 18:14:10 +0200 Subject: [PATCH] Empty actors decompiled (#93) * data * ovl_BoxManager * ovl_Fieldm_Draw * ovl_Dummy * dumm to dummy --- .../actors/ovl_BoxManager/ac_boxManager.c | 14 ++++++++------ .../actors/ovl_Dummy/{ac_dumm.c => ac_dummy.c} | 16 +++++++++------- .../actors/ovl_Dummy/{ac_dumm.h => ac_dummy.h} | 0 .../actors/ovl_Fieldm_Draw/ac_fieldm_draw.c | 14 ++++++++------ yamls/jp/overlays.yaml | 10 +++++----- 5 files changed, 30 insertions(+), 24 deletions(-) rename src/overlays/actors/ovl_Dummy/{ac_dumm.c => ac_dummy.c} (61%) rename src/overlays/actors/ovl_Dummy/{ac_dumm.h => ac_dummy.h} (100%) diff --git a/src/overlays/actors/ovl_BoxManager/ac_boxManager.c b/src/overlays/actors/ovl_BoxManager/ac_boxManager.c index 50013cf8..b5dace04 100644 --- a/src/overlays/actors/ovl_BoxManager/ac_boxManager.c +++ b/src/overlays/actors/ovl_BoxManager/ac_boxManager.c @@ -8,7 +8,6 @@ void BoxManager_Actor_dt(Actor* thisx, Game_Play* game_play); void BoxManager_Actor_move(Actor* thisx, Game_Play* game_play); void BoxManager_Actor_draw(Actor* thisx, Game_Play* game_play); -#if 0 ActorProfile BoxManager_Profile = { /* */ ACTOR_BOX_MANAGER, /* */ ACTOR_PART_4, @@ -22,12 +21,15 @@ ActorProfile BoxManager_Profile = { /* */ BoxManager_Actor_draw, /* */ NULL, }; -#endif -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_BoxManager/ac_boxManager/BoxManager_Actor_ct.s") +void BoxManager_Actor_ct(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_BoxManager/ac_boxManager/BoxManager_Actor_dt.s") +void BoxManager_Actor_dt(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_BoxManager/ac_boxManager/BoxManager_Actor_move.s") +void BoxManager_Actor_move(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_BoxManager/ac_boxManager/BoxManager_Actor_draw.s") +void BoxManager_Actor_draw(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} diff --git a/src/overlays/actors/ovl_Dummy/ac_dumm.c b/src/overlays/actors/ovl_Dummy/ac_dummy.c similarity index 61% rename from src/overlays/actors/ovl_Dummy/ac_dumm.c rename to src/overlays/actors/ovl_Dummy/ac_dummy.c index fdf837a6..39b7b41a 100644 --- a/src/overlays/actors/ovl_Dummy/ac_dumm.c +++ b/src/overlays/actors/ovl_Dummy/ac_dummy.c @@ -1,4 +1,4 @@ -#include "ac_dumm.h" +#include "ac_dummy.h" #include "m_actor_dlftbls.h" #include "m_object.h" #include "overlays/gamestates/ovl_play/m_play.h" @@ -8,7 +8,6 @@ void Dummy_Actor_dt(Actor* thisx, Game_Play* game_play); void Dummy_Actor_move(Actor* thisx, Game_Play* game_play); void Dummy_Actor_draw(Actor* thisx, Game_Play* game_play); -#if 0 ActorProfile Dummy_Profile = { /* */ ACTOR_DUMMY, /* */ ACTOR_PART_7, @@ -22,12 +21,15 @@ ActorProfile Dummy_Profile = { /* */ Dummy_Actor_draw, /* */ NULL, }; -#endif -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Dummy/ac_dumm/Dummy_Actor_ct.s") +void Dummy_Actor_ct(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Dummy/ac_dumm/Dummy_Actor_dt.s") +void Dummy_Actor_dt(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Dummy/ac_dumm/Dummy_Actor_draw.s") +void Dummy_Actor_draw(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Dummy/ac_dumm/Dummy_Actor_move.s") +void Dummy_Actor_move(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} diff --git a/src/overlays/actors/ovl_Dummy/ac_dumm.h b/src/overlays/actors/ovl_Dummy/ac_dummy.h similarity index 100% rename from src/overlays/actors/ovl_Dummy/ac_dumm.h rename to src/overlays/actors/ovl_Dummy/ac_dummy.h diff --git a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c index 9d673eec..b053aed1 100644 --- a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c +++ b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c @@ -8,7 +8,6 @@ void Fieldm_Actor_dt(Actor* thisx, Game_Play* game_play); void Fieldm_Actor_move(Actor* thisx, Game_Play* game_play); void Fieldm_Actor_draw(Actor* thisx, Game_Play* game_play); -#if 0 ActorProfile Fieldm_Draw_Profile = { /* */ ACTOR_FIELDM_DRAW, /* */ ACTOR_PART_4, @@ -22,12 +21,15 @@ ActorProfile Fieldm_Draw_Profile = { /* */ Fieldm_Actor_draw, /* */ NULL, }; -#endif -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw/Fieldm_Actor_ct.s") +void Fieldm_Actor_ct(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw/Fieldm_Actor_dt.s") +void Fieldm_Actor_dt(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw/Fieldm_Actor_move.s") +void Fieldm_Actor_move(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw/Fieldm_Actor_draw.s") +void Fieldm_Actor_draw(Actor* thisx UNUSED, Game_Play* game_play UNUSED) { +} diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml index abdfc609..f4a2f651 100644 --- a/yamls/jp/overlays.yaml +++ b/yamls/jp/overlays.yaml @@ -1224,7 +1224,7 @@ bss_size: 0x0 subsegments: - [0x82BB80, c, overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw] - - [0x82BBC0, data, overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw] + - [0x82BBC0, .data, overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw] - name: ovl_Fieldm_Draw_reloc type: code start: 0x82BBF0 @@ -1880,7 +1880,7 @@ bss_size: 0x0 subsegments: - [0x867C60, c, overlays/actors/ovl_BoxManager/ac_boxManager] - - [0x867CA0, data, overlays/actors/ovl_BoxManager/ac_boxManager] + - [0x867CA0, .data, overlays/actors/ovl_BoxManager/ac_boxManager] - name: ovl_BoxManager_reloc type: code start: 0x867CD0 @@ -17311,8 +17311,8 @@ compress: True bss_size: 0x0 subsegments: - - [0x970880, c, overlays/actors/ovl_Dummy/ac_dumm] - - [0x9708C0, data, overlays/actors/ovl_Dummy/ac_dumm] + - [0x970880, c, overlays/actors/ovl_Dummy/ac_dummy] + - [0x9708C0, .data, overlays/actors/ovl_Dummy/ac_dummy] - name: ovl_Dummy_reloc type: code start: 0x9708F0 @@ -17320,7 +17320,7 @@ follows_vram: ovl_Dummy compress: True subsegments: - - [0x9708F0, data, overlays/actors/ovl_Dummy/ac_dumm_reloc] + - [0x9708F0, data, overlays/actors/ovl_Dummy/ac_dummy_reloc] - name: ovl__00970920 type: code