diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2024-03-13 16:48:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 18:48:03 -0300 |
| commit | 01e87f1680d9713bd89147c3834f49fa3fa11d67 (patch) | |
| tree | 4a0a106cab05c4ac79abdefbb49d42daf52da692 /include/sf64object.h | |
| parent | 976539b8c0cfc2a45ba82f8c6f1f705f257c09e3 (diff) | |
Colpoly factory and Torch fixes + sonicdcer's ast_sector_X (#164)
* a start
* some things
* format
* hitboxes
* soon
* fixes and such
* Torch
* one fix
Diffstat (limited to 'include/sf64object.h')
| -rw-r--r-- | include/sf64object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sf64object.h b/include/sf64object.h index bed3194a..f394684a 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -288,9 +288,9 @@ typedef struct { /* 0x18C */ Vec3f vwork[30]; } Actor; // size = 0x2F4 -#define EVENT_CMD(opcode, arg1, arg2) (((opcode) & 0x7F << 9) & (arg1 & 0x1FF)), arg2 +#define EVENT_CMD(opcode, arg1, arg2) ((((opcode) & 0x7F) << 9) | ((arg1) & 0x1FF)), (arg2) -typedef enum { +typedef enum EventOpcode { /* 0 */ EVOP_0, /* 1 */ EVOP_1, /* 2 */ EVOP_2, @@ -330,13 +330,13 @@ typedef enum { /* 116 */ EVOP_116 = 116, /* 118 */ EVOP_118 = 118, /* 119 */ EVOP_119, - /* 120 */ EVOP_120, + /* 120 */ EVOP_120, // play message. arg1 is portrait, arg2 is message ID /* 121 */ EVOP_121, /* 122 */ EVOP_122, /* 124 */ EVOP_124 = 124, /* 125 */ EVOP_125, /* 126 */ EVOP_126, - /* 127 */ EVOP_127, + /* 127 */ EVOP_127, // stop script } EventOpcode; typedef enum ObjectId { |