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

Improve ac_train_door, ac_train_window & rename private

Browse Source
This commit is contained in:
Cuyler36
2024-07-04 17:52:37 -04:00
parent 8ae5a30c9f
commit bfea3513e6
39 changed files with 9460 additions and 10620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_train_door.h
+9 -11
View File
@@ -9,18 +9,17 @@
extern "C" {
#endif
#define aTRD_JOINT_NUM 5
typedef struct traindoor_s {
ACTOR actor_class;
u8 pad [0x17C - 0x174];
cKF_SkeletonInfo_R_c keyframe;
u8 pad2 [0x210 - 0x1ed];
s_xyz work;
u8 pad3 [0x22e - 0x216];
s_xyz target;
u8 pad4[0x24c - 0x234];
int idle;
}TRAINDOOR_ACTOR;
/* 0x000 */ ACTOR actor_class;
/* 0x178 */ u8 pad[0x17C - 0x174];
/* 0x17C */ cKF_SkeletonInfo_R_c keyframe;
/* 0x1EC */ u8 pad2[0x210 - 0x1EC];
/* 0x210 */ s_xyz work[aTRD_JOINT_NUM];
/* 0x22E */ s_xyz target[aTRD_JOINT_NUM];
/* 0x24C */ int open_flag;
} TRAINDOOR_ACTOR;
extern ACTOR_PROFILE TrainDoor_Profile;
@@ -29,4 +28,3 @@ extern ACTOR_PROFILE TrainDoor_Profile;
#endif
#endif
include/ac_train_window.h
+2 -4
View File
@@ -15,8 +15,7 @@ typedef int (*TRAIN_WINDOW_DRAW_TYPE)(ACTOR*, GAME*);
#define CRV_DEBUG_GREEN_VALUE 89
#define CRV_DEBUG_BLUE_VALUE 90
typedef struct train_window_s{
typedef struct train_window_s {
ACTOR actor_class;
TRAIN_WINDOW_DRAW_TYPE draw_type;
s16 pallete_id;
@@ -34,7 +33,7 @@ typedef struct train_window_s{
f32 scroll_speed;
s_xyz pos;
f32 lod_factor;
}TRAIN_WINDOW_ACTOR;
} TRAIN_WINDOW_ACTOR;
extern ACTOR_PROFILE Train_Window_Profile;
@@ -43,4 +42,3 @@ extern ACTOR_PROFILE Train_Window_Profile;
#endif
#endif
include/audio_defs.h
+3
View File
@@ -115,6 +115,9 @@ typedef enum audio_sound_effects {
NA_SE_TOILE_CHAIR_SIT = 0x410,
NA_SE_TRAINDOOR0 = 0x412,
NA_SE_TRAINDOOR1,
NA_SE_BED_IN = 0x415,
NA_SE_BED_NEGAERI,
NA_SE_BED_OUT,
include/m_common_data.h
+1 -1
View File
@@ -86,7 +86,7 @@ typedef struct Save_s {
/* 0x00001A */ u16
copy_protect; /* 'unique' value between [1, 65520] used for copy protection (see mCD_get_land_copyProtect) */
/* 0x00001C */ u8 pad_1C[4];
/* 0x000020 */ Private_c private[PLAYER_NUM]; /* player data */
/* 0x000020 */ Private_c private_data[PLAYER_NUM]; /* player data */
/* 0x009120 */ mLd_land_info_c land_info; /* town name & id */
/* 0x00912C */ mNtc_board_post_c noticeboard[mNtc_BOARD_POST_COUNT]; /* noticeboard posts */
/* 0x009CE4 */ u8 pad_9CE4[4];