Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 04:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MSCRIPT_CMD_UNSET_EVENT_INF command (#1660)

Browse Source
This commit is contained in:
Derek Hensley 2024-07-27 14:40:28 -07:00 committed by GitHub
parent 1685597d9a
commit 6f5352e6c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64msgevent.h
View File

@ -441,7 +441,7 @@ typedef struct {
#define MSCRIPT_CMD_SET_EVENT_INF(flag) \
MSCRIPT_CMD_ID_SET_EVENT_INF, SCRIPT_UNPACK_8(((flag) >> 4)), SCRIPT_UNPACK_8((1 << ((flag) & 0xF)))
#define MSCRIPT_CMD_EVENT_INF(flag) \
#define MSCRIPT_CMD_UNSET_EVENT_INF(flag) \
MSCRIPT_CMD_ID_UNSET_EVENT_INF, SCRIPT_UNPACK_8(((flag) >> 4)), SCRIPT_UNPACK_8((1 << ((flag) & 0xF)))
#define MSCRIPT_CMD_CHECK_ITEM_ACTION(itemAction, skipEqual, skipDefault, skipContinue) \

20
src/overlays/actors/ovl_En_Dnh/z_en_dnh.c
View File

@ -104,9 +104,9 @@ MsgScript D_80A51250[] = {
/* 0x00BD 0x03 */ MSCRIPT_CMD_BEGIN_TEXT(0x086E),
/* 0x00C0 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_25_20),
/* 0x00C3 0x03 */ MSCRIPT_CMD_SET_EVENT_INF(EVENTINF_35),
/* 0x00C6 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_36),
/* 0x00C9 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_37),
/* 0x00CC 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_40),
/* 0x00C6 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_36),
/* 0x00C9 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_37),
/* 0x00CC 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_40),
/* 0x00CF 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x00D0 0x01 */ MSCRIPT_CMD_CLOSE_TEXT(),
/* 0x00D1 0x03 */ MSCRIPT_CMD_CHECK_CALLBACK(0x0),
@ -150,9 +150,9 @@ MsgScript D_80A51250[] = {
/* 0x011A 0x03 */ MSCRIPT_CMD_BEGIN_TEXT(0x0876),
/* 0x011D 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_25_20),
/* 0x0120 0x03 */ MSCRIPT_CMD_SET_EVENT_INF(EVENTINF_35),
/* 0x0123 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_36),
/* 0x0126 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_37),
/* 0x0129 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_40),
/* 0x0123 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_36),
/* 0x0126 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_37),
/* 0x0129 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_40),
/* 0x012C 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x012D 0x01 */ MSCRIPT_CMD_CLOSE_TEXT(),
/* 0x012E 0x03 */ MSCRIPT_CMD_CHECK_CALLBACK(0x0),
@ -209,10 +209,10 @@ MsgScript D_80A5138C[] = {
/* 0x0069 0x03 */ MSCRIPT_CMD_JUMP(0x0070 - 0x006C),
/* 0x006C 0x03 */ MSCRIPT_CMD_BEGIN_TEXT(0x0877),
/* 0x006F 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0070 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_35),
/* 0x0073 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_36),
/* 0x0076 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_37),
/* 0x0079 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_40),
/* 0x0070 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_35),
/* 0x0073 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_36),
/* 0x0076 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_37),
/* 0x0079 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_40),
/* 0x007C 0x01 */ MSCRIPT_CMD_UNSET_AUTOTALK(),
/* 0x007D 0x01 */ MSCRIPT_CMD_DONE(),
};

2
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View File

@ -75,7 +75,7 @@ MsgScript D_80BC1464[] = {
/* 0x004F 0x01 */ MSCRIPT_CMD_PAUSE(),
/* 0x0050 0x03 */ MSCRIPT_CMD_CHECK_CALLBACK(0x010C - 0x0053),
/* 0x0053 0x01 */ MSCRIPT_CMD_PLAY_DECIDE(),
/* 0x0054 0x03 */ MSCRIPT_CMD_EVENT_INF(EVENTINF_42),
/* 0x0054 0x03 */ MSCRIPT_CMD_UNSET_EVENT_INF(EVENTINF_42),
/* 0x0057 0x03 */ MSCRIPT_CMD_BEGIN_TEXT(0x290B),
/* 0x005A 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x005B 0x05 */ MSCRIPT_CMD_CHECK_WORN_MASK(PLAYER_MASK_ALL_NIGHT, 0x0064 - 0x0060),

2
tools/overlayhelpers/mscriptdis.py
View File

@ -36,7 +36,7 @@ cmd_info = [
('MSCRIPT_CMD_CHECK_QUEST_ITEM', 0x05, '', '>Hh', (1,)),
('MSCRIPT_CMD_CHECK_EVENT_INF', 0x05, '', '>Hh', (1,)),
('MSCRIPT_CMD_SET_EVENT_INF', 0x03, '', '>H', ()),
('MSCRIPT_CMD_EVENT_INF', 0x03, '', '>H', ()),
('MSCRIPT_CMD_UNSET_EVENT_INF', 0x03, '', '>H', ()),
('MSCRIPT_CMD_CHECK_ITEM_ACTION', 0x09, '', '>Hhhh', (1,2,3)),
('MSCRIPT_CMD_CHECK_HAS_SONG', 0x05, '', '>Hh', (1,)),
('MSCRIPT_CMD_CHECK_WORN_MASK', 0x05, '', '>Hh', (1,)),