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

link f_furniture

Browse Source
This commit is contained in:
Prakxo
2024-03-10 14:52:44 +01:00
committed by Cuyler36
parent 709b46250b
commit fd36c255dd
122 changed files with 826 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_furniture.h
+21 -19
View File
@@ -61,30 +61,32 @@ enum {
};
enum {
aFTR_INTERACTION_STORAGE_DRAWERS, // dressers
aFTR_INTERACTION_STORAGE_DRAWERS = 1, // dressers
aFTR_INTERACTION_STORAGE_WARDROBE, // double doors
aFTR_INTERACTION_STORAGE_CLOSET, // single door
aFTR_INTERACTION_MUSIC_DISK,
aFTR_INTERACTION_NO_COLLISION,
aFTR_INTERACTION_HANIWA,
aFTR_INTERACTION_FISH,
aFTR_INTERACTION_INSECT,
aFTR_INTERACTION_MANNEKIN,
aFTR_INTERACTION_UMBRELLA,
aFTR_INTERACTION_FOSSIL,
aFTR_INTERACTION_FAMICOM,
aFTR_INTERACTION_START_DISABLED, // mainly used for TVs to be off when placed
aFTR_INTERACTION_STORAGE_CLOSET = 4, // single door
aFTR_INTERACTION_MUSIC_DISK = 8,
aFTR_INTERACTION_NO_COLLISION = 0x10,
aFTR_INTERACTION_HANIWA = 0x20,
aFTR_INTERACTION_FISH = 0x40,
aFTR_INTERACTION_INSECT = 0x80,
aFTR_INTERACTION_MANNEKIN = 0x100,
aFTR_INTERACTION_UMBRELLA = 0x200,
aFTR_INTERACTION_FOSSIL = 0x400,
aFTR_INTERACTION_FAMICOM = 0x800,
aFTR_INTERACTION_START_DISABLED = 0x1000, // mainly used for TVs to be off when placed
// there may be more types, but I didn't see any
aFTR_INTERACTION_NUM
aFTR_INTERACTION_FAMICOM_ITEM = 0x2000,
aFTR_INTERACTION_RADIO_AEROBICS = 0x4000,
aFTR_INTERACTION_TOGGLE = 0x8000,
aFTR_INTERACTION_NUM = 15,
};
enum {
aFTR_CONTACT_ACTION_CHAIR_UNIDIRECTIONAL, // only can sit from the front
aFTR_CONTACT_ACTION_CHAIR_MULTIDIRECTIONAL, // can sit from any direction
aFTR_CONTACT_ACTION_CHAIR_SOFA, // cam sit anywhere from the front
aFTR_CONTACT_ACTION_BED_SINGLE, // single bed (can't roll)
aFTR_CONTACT_ACTION_BED_DOUBLE, // double bed (can roll)
aFTR_CONTACT_ACTION_CHAIR_UNIDIRECTIONAL = 1, // only can sit from the front
aFTR_CONTACT_ACTION_CHAIR_MULTIDIRECTIONAL = 2, // can sit from any direction
aFTR_CONTACT_ACTION_CHAIR_SOFA = 4, // cam sit anywhere from the front
aFTR_CONTACT_ACTION_BED_SINGLE = 8, // single bed (can't roll)
aFTR_CONTACT_ACTION_BED_DOUBLE = 0x10, // double bed (can roll)
aFTR_CONTACT_ACTION_NUM
};
include/audio.h
+1 -1
View File
@@ -115,7 +115,7 @@ extern u16 sAdo_Get_WalkLabel(int type);
extern int sAdo_Get_KokeruLabel(int type);
extern void sAdo_SceneMode(u8 mode);
extern s8 sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos);
extern u8 sAdo_RoomIncectPos(u32 f, u16 u, xyz_t* pos);
extern void sAdo_FurnitureInstPos(u32 f, xyz_t* pos);
extern void sAdo_Set_ongenpos_refuse_fg(int state);
include/jaudio_NES/game64.h
+1 -1
View File
@@ -52,7 +52,7 @@ extern void Na_RoomType(u8);
extern void Na_Museum(u8);
extern void Na_SoftReset();
extern void Na_SceneMode(u8);
extern s8 Na_RoomIncectPos(int, u16, u16, f32);
extern u8 Na_RoomIncectPos(int, u16, u16, f32);
extern void Na_FurnitureInstPos(int, u16, f32);
extern int Na_GetSoundFrameCounter();
extern void Na_kazagurumaLevel(f32);