Implement & link ac_mural

This commit is contained in:
Cuyler36
2024-02-28 21:25:26 -05:00
parent 3edf86ad45
commit d2a7c0f121
8 changed files with 156 additions and 3 deletions
+17 -1
View File
@@ -8,6 +8,23 @@
extern "C" {
#endif
#define aML_MURAL_X_NUM 4
#define aML_MURAL_Y_NUM 4
#define aML_MURAL_NUM (aML_MURAL_X_NUM * aML_MURAL_Y_NUM)
typedef struct mural_s {
u8 type;
u16* pal_p;
u8* tex_p;
} aML_mural_c;
typedef struct mural_actor_s MURAL_ACTOR;
struct mural_actor_s {
ACTOR actor_class;
aML_mural_c mural[aML_MURAL_NUM];
};
extern ACTOR_PROFILE Mural_Profile;
#ifdef __cplusplus
@@ -15,4 +32,3 @@ extern ACTOR_PROFILE Mural_Profile;
#endif
#endif
+4
View File
@@ -5,6 +5,8 @@
extern "C" {
#endif
// clang-format off
#include "types.h"
#include <PR/mbi.h>
#include "dolphin/gx.h"
@@ -578,6 +580,8 @@ do { \
#define gGXCallDisplayList(pkt, dl, nbytes) gDma1p(pkt, G_DL, dl, nbytes, G_DL_GXDL)
#define gsGXCallDisplayList(dl, nbytes) gsDma1p(pkt, G_DL, dl, nbytes, G_DL_GXDL)
// clang-format on
#ifdef __cplusplus
}
#endif
+1 -1
View File
@@ -450,7 +450,7 @@ typedef enum bank_id {
ACTOR_OBJ_BANK_EF_MUSEUM,
ACTOR_OBJ_BANK_EF_MINSECT,
ACTOR_OBJ_BANK_411,
ACTOR_OBJ_BANK_412,
ACTOR_OBJ_BANK_MURAL,
ACTOR_OBJ_BANK_413,
ACTOR_OBJ_BANK_414,
ACTOR_OBJ_BANK_415,