mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

link ac_arrange_room

Browse Source
This commit is contained in:
Prakxo
2024-10-01 21:02:54 +02:00
parent d9e7117f13
commit 2c7ad2bbd7
4 changed files with 193 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+4
View File
@@ -433,6 +433,10 @@ ac_animal_logo.c:
.data: [0x8065FB68, 0x8065FBA8]
ac_animal_logo_misc.c:
.text: [0x804117D4, 0x80411A60]
ac_arrange_room.c:
.text: [0x80411A70, 0x80411F64]
.rodata: [0x80643A88, 0x80643A90]
.data: [0x8065FBD0, 0x8065FBF8]
ac_ball.c:
.text: [0x80411F64, 0x80413DD4]
.rodata: [0x80643A90, 0x80643B60]
include/ac_arrange_room.h
+1 -1
View File
@@ -19,7 +19,7 @@ typedef struct arrange_room_actor_clip_s {
struct arrange_room_actor_s {
ACTOR actor_class;
int _174;
u8* vram_segment;
u8* wall_data_p;
int wall_num;
u8* floor_data_p;
include/m_name_table.h
+1
View File
@@ -2548,6 +2548,7 @@ extern int mNT_check_unknown(mActor_name_t item_no);
#define ETC_MBG (ETC_START + 3)
#define ETC_BOXTRICK (ETC_START + 4)
#define ETC_BOXMANAGER (ETC_START + 5)
#define ETC_ARRANGE_ROOM (ETC_START + 6)
#define ETC_SNOWMAN_BALL_A (ETC_START + 13)
#define ETC_SNOWMAN_BALL_B (ETC_START + 14)
#define ETC_TRAIN_WINDOW (ETC_START + 17)
src/ac_arrange_room.c
+187
View File
@@ -0,0 +1,187 @@
#include "ac_arrange_room.h"
#include "m_common_data.h"
#include "m_malloc.h"
#include "m_rcp.h"
#include "sys_matrix.h"
static void aAR_Redma();
extern Gfx rom_myhome2_floor_model[];
extern Gfx rom_myhome2_wall_model[];
extern Gfx rom_myhome2_wall_modelT[];
static void Arrange_Room_Actor_ct(ACTOR* actor, GAME* game);
static void Arrange_Room_Actor_dt(ACTOR* actor, GAME* game);
static void Arrange_Room_Actor_move(ACTOR* actor, GAME* game);
static void Arrange_Room_Actor_draw(ACTOR* actor, GAME* game);
ACTOR_PROFILE Arrange_Room_Profile = {
mAc_PROFILE_ARRANGE_ROOM,
ACTOR_PART_FG,
ACTOR_STATE_NO_MOVE_WHILE_CULLED | ACTOR_STATE_NO_DRAW_WHILE_CULLED,
ETC_ARRANGE_ROOM,
ACTOR_OBJ_BANK_KEEP,
sizeof(ARRANGE_ROOM_ACTOR),
&Arrange_Room_Actor_ct,
&Arrange_Room_Actor_dt,
&Arrange_Room_Actor_move,
&Arrange_Room_Actor_draw,
NULL,
};
static void* aAR_SecureDmaRam(GAME* game, size_t size) {
zelda_malloc_align(size, 0x20);
}
static void aAR_SetClip(ACTOR* actor, int flag) {
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
if (flag != FALSE) {
arrange_room->clip.arrange_room_actor_p = arrange_room;
arrange_room->clip.redma_proc = aAR_Redma;
common_data.clip.arrange_room_clip = &arrange_room->clip;
} else {
common_data.clip.arrange_room_clip = NULL;
}
}
static void Arrange_Room_Actor_ct(ACTOR* actor, GAME* game) {
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
s16 wall_floor_num;
s16 wall_num;
s16 floor_num;
u8* segment;
void* data_p;
mNpc_RenewalNpcRoom(&wall_floor_num);
actor->actor_specific = wall_floor_num;
aAR_SetClip(actor, TRUE);
wall_num = (wall_floor_num >> 8) & 0xFF;
floor_num = (u8)(wall_floor_num);
if (floor_num < 0) {
floor_num = 0;
} else if (floor_num > 0x42) {
floor_num = 0x42;
}
if (wall_num < 0) {
wall_num = 0;
} else if (wall_num > 0x42) {
wall_num = 0x42;
}
arrange_room->vram_segment = NULL;
arrange_room->wall_data_p = NULL;
arrange_room->wall_num = wall_num;
arrange_room->floor_data_p = NULL;
arrange_room->floor_num = floor_num;
Common_Set(floor_idx, arrange_room->floor_num);
data_p = aAR_SecureDmaRam(game, 0x1020);
arrange_room->wall_data_p = data_p;
if (data_p != NULL) {
mRmTp_CopyWallData(arrange_room->wall_data_p, arrange_room->wall_num);
}
data_p = aAR_SecureDmaRam(game, 0x2020);
arrange_room->floor_data_p = data_p;
if (data_p != NULL) {
mRmTp_CopyFloorData(arrange_room->floor_data_p, arrange_room->floor_num);
}
}
static void Arrange_Room_Actor_dt(ACTOR* actor, GAME* game) {
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
aAR_SetClip(actor, FALSE);
if (arrange_room->wall_data_p != NULL) {
zelda_free(arrange_room->wall_data_p);
}
if (arrange_room->floor_data_p != NULL) {
zelda_free(arrange_room->floor_data_p);
}
}
static void aAR_DrawFloor(ACTOR* actor, GAME* game) {
u8* ptr;
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
GRAPH* graph;
ptr = arrange_room->floor_data_p;
_texture_z_light_fog_prim(game->graph);
graph = game->graph;
Matrix_translate(0.0f, 0.0f, 0.0f, 0);
Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
OPEN_DISP(graph);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_C, ptr);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_8, ptr + 0x20);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_9, ptr + 0x820);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_A, ptr + 0x1020);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_B, ptr + 0x1820);
gSPDisplayList(NEXT_POLY_OPA_DISP, rom_myhome2_floor_model);
CLOSE_DISP(graph);
}
static void aAR_DrawWall(ACTOR* actor, GAME* game) {
u8* ptr;
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
GRAPH* graph;
ptr = arrange_room->wall_data_p;
_texture_z_light_fog_prim(game->graph);
graph = game->graph;
Matrix_translate(0.0f, 0.0f, 0.0f, 0);
Matrix_scale(0.0625f, 0.0625f, 0.0625f, 1);
OPEN_DISP(graph);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_8, ptr + 0x20);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_9, ptr + 0x820);
gSPSegment(NEXT_POLY_OPA_DISP, G_MWO_SEGMENT_A, ptr);
gSPDisplayList(NEXT_POLY_OPA_DISP, rom_myhome2_wall_model);
gSPDisplayList(NEXT_POLY_OPA_DISP, rom_myhome2_wall_modelT);
CLOSE_DISP(graph);
}
static void Arrange_Room_Actor_draw(ACTOR* actor, GAME* game) {
ARRANGE_ROOM_ACTOR* arrange_room = (ARRANGE_ROOM_ACTOR*)actor;
GAME_PLAY* play = (GAME_PLAY*)game;
Global_kankyo_set_room_prim((GAME_PLAY*)game);
aAR_DrawFloor(&arrange_room->actor_class, &play->game);
aAR_DrawWall(&arrange_room->actor_class, &play->game);
}
static void Arrange_Room_Actor_move() {
}
static void aAR_Redma() {
aAR_Clip_c* clip = common_data.clip.arrange_room_clip;
ARRANGE_ROOM_ACTOR* arrange_room = clip->arrange_room_actor_p;
if (arrange_room != NULL) {
mRmTp_CopyWallData(arrange_room->wall_data_p, arrange_room->wall_num);
mRmTp_CopyFloorData(arrange_room->floor_data_p, arrange_room->floor_num);
}
}