mirror of https://github.com/zeldaret/oot.git
apply Jenkins fixes
https://jenkins.deco.mp/job/OOT/job/PR-2286/32/console
This commit is contained in:
parent
106cb1021b
commit
50acfc2428
|
|
@ -41,7 +41,8 @@ typedef struct GetItemEntry {
|
|||
#define CHEST_ANIM_SHORT 0
|
||||
#define CHEST_ANIM_LONG 1
|
||||
|
||||
#define GET_ITEM_NONE { ITEM_NONE, 0, 0, 0, OBJECT_INVALID }
|
||||
#define GET_ITEM_NONE \
|
||||
{ ITEM_NONE, 0, 0, 0, OBJECT_INVALID }
|
||||
|
||||
typedef struct ExplosiveInfo {
|
||||
/* 0x00 */ u8 itemId;
|
||||
|
|
@ -80,10 +81,10 @@ typedef enum AnimSfxType {
|
|||
|
||||
#define ANIMSFX_SHIFT_TYPE(type) ((type) << 11)
|
||||
|
||||
#define ANIMSFX_DATA(type, frame) ((ANIMSFX_SHIFT_TYPE(type) | ((frame) & 0x7FF)))
|
||||
#define ANIMSFX_DATA(type, frame) ((ANIMSFX_SHIFT_TYPE(type) | ((frame)&0x7FF)))
|
||||
|
||||
#define ANIMSFX_GET_TYPE(data) ((data) & 0x7800)
|
||||
#define ANIMSFX_GET_FRAME(data) ((data) & 0x7FF)
|
||||
#define ANIMSFX_GET_TYPE(data) ((data)&0x7800)
|
||||
#define ANIMSFX_GET_FRAME(data) ((data)&0x7FF)
|
||||
|
||||
typedef struct AnimSfxEntry {
|
||||
/* 0x00 */ u16 sfxId;
|
||||
|
|
|
|||
Loading…
Reference in New Issue