mirror of
https://github.com/zeldaret/mm.git
synced 2026-08-22 06:19:54 -04:00
Msgevent OK (#1637)
* Decompiled, some commands still unnamed * Use full weekevent reg names * Fix func_8094E69C * Fix Player_GetMask * Eventinf, mask worn, and item action argument formatting * decimal rupees * Times (day, hours, minutes) as decimal * msgEventScriptPos * Callbacks * Name final commands * Enum * Arrays * functions * Small cleanups * Clean up actors * Remove event from some variable names to make them shorter * Some more function renames * newline * Missed a few unks in commands * Update functions.txt * PlayerMask * MSGMODE_PAUSED * Script time macros * EnSob1_GetWelcome default * Whole bunch of renames * Format * Add CMD to commands * Update code_functions * structs for size * z64scripts.h * MsgEventCallback -> MsgScriptCallback * format * MsgEvent_RunScript stop * Remove cmd handler comment * cmd -> script in MsgEvent_RunScript --------- Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
This commit is contained in:
Derek Hensley
@@ -147,8 +147,8 @@ class TokenProperties:
|
||||
|
||||
tokenPropertiesDict: dict[TokenType, TokenProperties] = {
|
||||
# Schedule commands
|
||||
TokenType.IF_WEEKEVENTREG_S: TokenProperties(macro="SCHEDULE_CMD_CHECK_FLAG_S", cmdLength=0x04, isConditionalBranch=True, hasArguments=True, needsToInvert=True, isShort=True, shortVersion=TokenType.IF_WEEKEVENTREG_S, longVersion=TokenType.IF_WEEKEVENTREG_L),
|
||||
TokenType.IF_WEEKEVENTREG_L: TokenProperties(macro="SCHEDULE_CMD_CHECK_FLAG_L", cmdLength=0x05, isConditionalBranch=True, hasArguments=True, needsToInvert=True, shortVersion=TokenType.IF_WEEKEVENTREG_S, longVersion=TokenType.IF_WEEKEVENTREG_L),
|
||||
TokenType.IF_WEEKEVENTREG_S: TokenProperties(macro="SCHEDULE_CMD_CHECK_WEEK_EVENT_REG_S", cmdLength=0x04, isConditionalBranch=True, hasArguments=True, needsToInvert=True, isShort=True, shortVersion=TokenType.IF_WEEKEVENTREG_S, longVersion=TokenType.IF_WEEKEVENTREG_L),
|
||||
TokenType.IF_WEEKEVENTREG_L: TokenProperties(macro="SCHEDULE_CMD_CHECK_WEEK_EVENT_REG_L", cmdLength=0x05, isConditionalBranch=True, hasArguments=True, needsToInvert=True, shortVersion=TokenType.IF_WEEKEVENTREG_S, longVersion=TokenType.IF_WEEKEVENTREG_L),
|
||||
TokenType.IF_TIMERANGE_S: TokenProperties(macro="SCHEDULE_CMD_CHECK_TIME_RANGE_S", cmdLength=0x06, isConditionalBranch=True, hasArguments=True, needsToInvert=True, isShort=True, shortVersion=TokenType.IF_TIMERANGE_S, longVersion=TokenType.IF_TIMERANGE_L),
|
||||
TokenType.IF_TIMERANGE_L: TokenProperties(macro="SCHEDULE_CMD_CHECK_TIME_RANGE_L", cmdLength=0x07, isConditionalBranch=True, hasArguments=True, needsToInvert=True, shortVersion=TokenType.IF_TIMERANGE_S, longVersion=TokenType.IF_TIMERANGE_L),
|
||||
TokenType.RETURN_S: TokenProperties(macro="SCHEDULE_CMD_RET_VAL_S", cmdLength=0x02, hasArguments=True, isShort=True),
|
||||
|
||||
+71
-71
@@ -2009,58 +2009,58 @@
|
||||
0x8010A430:("Map_Init",),
|
||||
0x8010A54C:("Minimap_Draw",),
|
||||
0x8010A580:("Map_Update",),
|
||||
0x8010A760:("func_8010A760",),
|
||||
0x8010A7CC:("func_8010A7CC",),
|
||||
0x8010A814:("func_8010A814",),
|
||||
0x8010A85C:("func_8010A85C",),
|
||||
0x8010A8A4:("func_8010A8A4",),
|
||||
0x8010A8EC:("func_8010A8EC",),
|
||||
0x8010A990:("func_8010A990",),
|
||||
0x8010AA54:("func_8010AA54",),
|
||||
0x8010AB30:("func_8010AB30",),
|
||||
0x8010AB94:("func_8010AB94",),
|
||||
0x8010AC00:("func_8010AC00",),
|
||||
0x8010AD24:("func_8010AD24",),
|
||||
0x8010ADD4:("func_8010ADD4",),
|
||||
0x8010AE48:("func_8010AE48",),
|
||||
0x8010AECC:("func_8010AECC",),
|
||||
0x8010AF20:("func_8010AF20",),
|
||||
0x8010AF6C:("func_8010AF6C",),
|
||||
0x8010AF94:("func_8010AF94",),
|
||||
0x8010AFE0:("func_8010AFE0",),
|
||||
0x8010B010:("func_8010B010",),
|
||||
0x8010B06C:("func_8010B06C",),
|
||||
0x8010B0B4:("func_8010B0B4",),
|
||||
0x8010B0DC:("func_8010B0DC",),
|
||||
0x8010B108:("func_8010B108",),
|
||||
0x8010B140:("func_8010B140",),
|
||||
0x8010B180:("func_8010B180",),
|
||||
0x8010B1BC:("func_8010B1BC",),
|
||||
0x8010B22C:("func_8010B22C",),
|
||||
0x8010B284:("func_8010B284",),
|
||||
0x8010B2C0:("func_8010B2C0",),
|
||||
0x8010B300:("func_8010B300",),
|
||||
0x8010B434:("func_8010B434",),
|
||||
0x8010B4A4:("func_8010B4A4",),
|
||||
0x8010B520:("func_8010B520",),
|
||||
0x8010B664:("func_8010B664",),
|
||||
0x8010B7A8:("func_8010B7A8",),
|
||||
0x8010B828:("func_8010B828",),
|
||||
0x8010B878:("func_8010B878",),
|
||||
0x8010B8E4:("func_8010B8E4",),
|
||||
0x8010BB0C:("func_8010BB0C",),
|
||||
0x8010BB6C:("func_8010BB6C",),
|
||||
0x8010BBCC:("func_8010BBCC",),
|
||||
0x8010BC28:("func_8010BC28",),
|
||||
0x8010BC7C:("func_8010BC7C",),
|
||||
0x8010BD48:("func_8010BD48",),
|
||||
0x8010BD90:("func_8010BD90",),
|
||||
0x8010BDDC:("func_8010BDDC",),
|
||||
0x8010BE78:("func_8010BE78",),
|
||||
0x8010BEBC:("func_8010BEBC",),
|
||||
0x8010BEF0:("func_8010BEF0",),
|
||||
0x8010BF24:("func_8010BF24",),
|
||||
0x8010BF58:("func_8010BF58",),
|
||||
0x8010A760:("MsgEvent_CheckWeekEventReg",),
|
||||
0x8010A7CC:("MsgEvent_CheckGoron",),
|
||||
0x8010A814:("MsgEvent_CheckZora",),
|
||||
0x8010A85C:("MsgEvent_CheckDeku",),
|
||||
0x8010A8A4:("MsgEvent_CheckHuman",),
|
||||
0x8010A8EC:("MsgEvent_CheckTextChoice",),
|
||||
0x8010A990:("MsgEvent_OfferItem",),
|
||||
0x8010AA54:("MsgEvent_Autotalk",),
|
||||
0x8010AB30:("MsgEvent_CheckRupees",),
|
||||
0x8010AB94:("MsgEvent_CheckCallback",),
|
||||
0x8010AC00:("MsgEvent_CheckDay",),
|
||||
0x8010AD24:("MsgEvent_AwaitTextJump",),
|
||||
0x8010ADD4:("MsgEvent_AwaitText",),
|
||||
0x8010AE48:("MsgEvent_AwaitTextEnd",),
|
||||
0x8010AECC:("MsgEvent_BeginText",),
|
||||
0x8010AF20:("MsgEvent_ContinueText",),
|
||||
0x8010AF6C:("MsgEvent_Done",),
|
||||
0x8010AF94:("MsgEvent_SetWeekEventReg",),
|
||||
0x8010AFE0:("MsgEvent_CloseText",),
|
||||
0x8010B010:("MsgEvent_SetCollectible",),
|
||||
0x8010B06C:("MsgEvent_ChangeRupees",),
|
||||
0x8010B0B4:("MsgEvent_Pause",),
|
||||
0x8010B0DC:("MsgEvent_UnsetAutotalk",),
|
||||
0x8010B108:("MsgEvent_FocusToChild",),
|
||||
0x8010B140:("MsgEvent_FocusToSelf",),
|
||||
0x8010B180:("MsgEvent_Jump",),
|
||||
0x8010B1BC:("MsgEvent_CheckQuestItem",),
|
||||
0x8010B22C:("MsgEvent_CheckEventInf",),
|
||||
0x8010B284:("MsgEvent_SetEventInf",),
|
||||
0x8010B2C0:("MsgEvent_UnsetEventInf",),
|
||||
0x8010B300:("MsgEvent_CheckItemAction",),
|
||||
0x8010B434:("MsgEvent_CheckHasSong",),
|
||||
0x8010B4A4:("MsgEvent_CheckWornMask",),
|
||||
0x8010B520:("MsgEvent_CheckAfterTime",),
|
||||
0x8010B664:("MsgEvent_CheckBeforeTime",),
|
||||
0x8010B7A8:("MsgEvent_CheckSwitchFlag",),
|
||||
0x8010B828:("MsgEvent_SetSwitchFlag",),
|
||||
0x8010B878:("MsgEvent_CheckItem",),
|
||||
0x8010B8E4:("MsgEvent_CheckBetweenTime",),
|
||||
0x8010BB0C:("MsgEvent_CheckOnDay",),
|
||||
0x8010BB6C:("MsgEvent_CheckCallbackContinue",),
|
||||
0x8010BBCC:("MsgEvent_CheckHasPowderKeg",),
|
||||
0x8010BC28:("MsgEvent_DeleteItem",),
|
||||
0x8010BC7C:("MsgEvent_CheckCallbackMulti",),
|
||||
0x8010BD48:("MsgEvent_PlayerTalk",),
|
||||
0x8010BD90:("MsgEvent_NotebookEvent",),
|
||||
0x8010BDDC:("MsgEvent_AwaitTextDone",),
|
||||
0x8010BE78:("MsgEvent_Jump3",),
|
||||
0x8010BEBC:("MsgEvent_PlayDecide",),
|
||||
0x8010BEF0:("MsgEvent_PlayCancel",),
|
||||
0x8010BF24:("MsgEvent_PlayError",),
|
||||
0x8010BF58:("MsgEvent_RunScript",),
|
||||
0x8010C0C0:("Nmi_Init",),
|
||||
0x8010C164:("Nmi_SetPrenmiStart",),
|
||||
0x8010C19C:("Nmi_GetPrenmiHasStarted",),
|
||||
@@ -2499,8 +2499,8 @@
|
||||
0x80132338:("Entrance_GetSceneIdAbsolute",),
|
||||
0x80132374:("Entrance_GetSpawnNum",),
|
||||
0x801323A0:("Entrance_GetTransitionFlags",),
|
||||
0x801323D0:("Schedule_CheckFlagS",),
|
||||
0x80132428:("Schedule_CheckFlagL",),
|
||||
0x801323D0:("Schedule_CheckWeekEventRegS",),
|
||||
0x80132428:("Schedule_CheckWeekEventRegL",),
|
||||
0x80132494:("Schedule_CheckTimeRangeS",),
|
||||
0x801326B8:("Schedule_CheckTimeRangeL",),
|
||||
0x801328F0:("Schedule_ReturnValueL",),
|
||||
@@ -7123,7 +7123,7 @@
|
||||
0x8092C740:("func_8092C740",),
|
||||
0x8092C86C:("func_8092C86C",),
|
||||
0x8092C934:("func_8092C934",),
|
||||
0x8092C9BC:("func_8092C9BC",),
|
||||
0x8092C9BC:("EnDns_GetMsgScript",),
|
||||
0x8092CA74:("EnDns_GetCueType",),
|
||||
0x8092CAD0:("func_8092CAD0",),
|
||||
0x8092CB98:("func_8092CB98",),
|
||||
@@ -7592,7 +7592,7 @@
|
||||
0x8094E69C:("func_8094E69C",),
|
||||
0x8094EA34:("func_8094EA34",),
|
||||
0x8094EB1C:("func_8094EB1C",),
|
||||
0x8094EDBC:("func_8094EDBC",),
|
||||
0x8094EDBC:("EnGm_GetMsgScript",),
|
||||
0x8094EE84:("func_8094EE84",),
|
||||
0x8094EFC4:("func_8094EFC4",),
|
||||
0x8094F074:("func_8094F074",),
|
||||
@@ -9736,7 +9736,7 @@
|
||||
0x80A14EB0:("EnGo_Thaw",),
|
||||
0x80A14FC8:("EnGo_HandleSpringArrivalCutscene",),
|
||||
0x80A153FC:("EnGo_Snowball",),
|
||||
0x80A15684:("EnGo_GetMsgEventScript",),
|
||||
0x80A15684:("EnGo_GetMsgScript",),
|
||||
0x80A157C4:("EnGo_Talk",),
|
||||
0x80A1590C:("EnGo_Init",),
|
||||
0x80A15960:("EnGo_Destroy",),
|
||||
@@ -10564,7 +10564,7 @@
|
||||
0x80A5086C:("func_80A5086C",),
|
||||
0x80A50950:("func_80A50950",),
|
||||
0x80A50D40:("func_80A50D40",),
|
||||
0x80A50DF8:("func_80A50DF8",),
|
||||
0x80A50DF8:("EnDnh_GetMsgScript",),
|
||||
0x80A50E40:("func_80A50E40",),
|
||||
0x80A50EC0:("func_80A50EC0",),
|
||||
0x80A50F38:("func_80A50F38",),
|
||||
@@ -10600,7 +10600,7 @@
|
||||
0x80A52A78:("func_80A52A78",),
|
||||
0x80A52B68:("func_80A52B68",),
|
||||
0x80A52C6C:("func_80A52C6C",),
|
||||
0x80A52CF8:("func_80A52CF8",),
|
||||
0x80A52CF8:("EnDnq_GetMsgScript",),
|
||||
0x80A52D44:("func_80A52D44",),
|
||||
0x80A52DC8:("func_80A52DC8",),
|
||||
0x80A52FB8:("func_80A52FB8",),
|
||||
@@ -11233,7 +11233,7 @@
|
||||
0x80A86B0C:("func_80A86B0C",),
|
||||
0x80A86BAC:("func_80A86BAC",),
|
||||
0x80A86DB8:("func_80A86DB8",),
|
||||
0x80A871E0:("func_80A871E0",),
|
||||
0x80A871E0:("EnTru_GetMsgScript",),
|
||||
0x80A872AC:("func_80A872AC",),
|
||||
0x80A873B8:("func_80A873B8",),
|
||||
0x80A87400:("func_80A87400",),
|
||||
@@ -12468,7 +12468,7 @@
|
||||
0x80AE6488:("func_80AE6488",),
|
||||
0x80AE65F4:("func_80AE65F4",),
|
||||
0x80AE6704:("func_80AE6704",),
|
||||
0x80AE6880:("func_80AE6880",),
|
||||
0x80AE6880:("EnShn_GetMsgScript",),
|
||||
0x80AE68F0:("func_80AE68F0",),
|
||||
0x80AE69E8:("func_80AE69E8",),
|
||||
0x80AE6A64:("func_80AE6A64",),
|
||||
@@ -12740,7 +12740,7 @@
|
||||
0x80AF81E8:("func_80AF81E8",),
|
||||
0x80AF8348:("func_80AF8348",),
|
||||
0x80AF8478:("func_80AF8478",),
|
||||
0x80AF8540:("func_80AF8540",),
|
||||
0x80AF8540:("EnPm_GetMsgScript",),
|
||||
0x80AF86F0:("func_80AF86F0",),
|
||||
0x80AF87C4:("func_80AF87C4",),
|
||||
0x80AF8890:("func_80AF8890",),
|
||||
@@ -13376,7 +13376,7 @@
|
||||
0x80B2B874:("EnPst_HandleLetterDay1",),
|
||||
0x80B2B8F4:("EnPst_HandleLetterDay2",),
|
||||
0x80B2B974:("EnPst_ChooseBehaviour",),
|
||||
0x80B2BAA4:("EnPst_GetMsgEventScript",),
|
||||
0x80B2BAA4:("EnPst_GetMsgScript",),
|
||||
0x80B2BBFC:("EnPst_CheckTalk",),
|
||||
0x80B2BCF8:("EnPst_SetOfferItemModeOnScreen",),
|
||||
0x80B2BD30:("EnPst_ProcessScheduleOutput",),
|
||||
@@ -14025,7 +14025,7 @@
|
||||
0x80B54BC4:("EnAn_MsgEvent_MidnightMeeting",),
|
||||
0x80B54C5C:("EnAn_MsgEvent_Cooking",),
|
||||
0x80B54D18:("EnAn_MsgEvent_LaundryPool",),
|
||||
0x80B54DF4:("EnAn_GetMsgEventScript",),
|
||||
0x80B54DF4:("EnAn_GetMsgScript",),
|
||||
0x80B55180:("EnAn_CheckTalk",),
|
||||
0x80B552E4:("EnAn_IsCouplesMaskCsPlaying",),
|
||||
0x80B553AC:("EnAn_UpdateHeadRot",),
|
||||
@@ -15460,7 +15460,7 @@
|
||||
0x80BC0050:("func_80BC0050",),
|
||||
0x80BC00AC:("func_80BC00AC",),
|
||||
0x80BC01DC:("func_80BC01DC",),
|
||||
0x80BC045C:("func_80BC045C",),
|
||||
0x80BC045C:("EnNb_GetMsgScript",),
|
||||
0x80BC04FC:("func_80BC04FC",),
|
||||
0x80BC05A8:("func_80BC05A8",),
|
||||
0x80BC06C4:("func_80BC06C4",),
|
||||
@@ -15498,7 +15498,7 @@
|
||||
0x80BC213C:("func_80BC213C",),
|
||||
0x80BC2150:("func_80BC2150",),
|
||||
0x80BC21A8:("func_80BC21A8",),
|
||||
0x80BC2274:("func_80BC2274",),
|
||||
0x80BC2274:("EnJa_GetMsgScript",),
|
||||
0x80BC22F4:("func_80BC22F4",),
|
||||
0x80BC2388:("EnJa_Init",),
|
||||
0x80BC2498:("EnJa_Destroy",),
|
||||
@@ -15745,7 +15745,7 @@
|
||||
0x80BD30C0:("func_80BD30C0",),
|
||||
0x80BD3118:("func_80BD3118",),
|
||||
0x80BD3198:("func_80BD3198",),
|
||||
0x80BD3294:("func_80BD3294",),
|
||||
0x80BD3294:("EnAh_GetMsgScript",),
|
||||
0x80BD3320:("func_80BD3320",),
|
||||
0x80BD3374:("func_80BD3374",),
|
||||
0x80BD33FC:("func_80BD33FC",),
|
||||
@@ -16011,7 +16011,7 @@
|
||||
0x80BDE7FC:("func_80BDE7FC",),
|
||||
0x80BDE92C:("func_80BDE92C",),
|
||||
0x80BDEA14:("func_80BDEA14",),
|
||||
0x80BDEABC:("func_80BDEABC",),
|
||||
0x80BDEABC:("EnAl_GetMsgScript",),
|
||||
0x80BDEC2C:("func_80BDEC2C",),
|
||||
0x80BDED20:("func_80BDED20",),
|
||||
0x80BDEE5C:("func_80BDEE5C",),
|
||||
@@ -16046,7 +16046,7 @@
|
||||
0x80BE0C04:("func_80BE0C04",),
|
||||
0x80BE0D38:("func_80BE0D38",),
|
||||
0x80BE0D60:("func_80BE0D60",),
|
||||
0x80BE0E04:("func_80BE0E04",),
|
||||
0x80BE0E04:("EnTab_GetMsgScript",),
|
||||
0x80BE0F04:("func_80BE0F04",),
|
||||
0x80BE0FC4:("func_80BE0FC4",),
|
||||
0x80BE1060:("func_80BE1060",),
|
||||
@@ -16293,7 +16293,7 @@
|
||||
0x80BF16C8:("func_80BF16C8",),
|
||||
0x80BF1744:("func_80BF1744",),
|
||||
0x80BF17BC:("func_80BF17BC",),
|
||||
0x80BF1920:("func_80BF1920",),
|
||||
0x80BF1920:("EnIg_GetMsgScript",),
|
||||
0x80BF19A0:("func_80BF19A0",),
|
||||
0x80BF1A60:("func_80BF1A60",),
|
||||
0x80BF1AE0:("func_80BF1AE0",),
|
||||
@@ -17054,7 +17054,7 @@
|
||||
0x80C2247C:("func_80C2247C",),
|
||||
0x80C224D8:("func_80C224D8",),
|
||||
0x80C227E8:("func_80C227E8",),
|
||||
0x80C22880:("func_80C22880",),
|
||||
0x80C22880:("DmTag_GetMsgScript",),
|
||||
0x80C2291C:("func_80C2291C",),
|
||||
0x80C229AC:("func_80C229AC",),
|
||||
0x80C229EC:("DmTag_DoNothing",),
|
||||
|
||||
@@ -710,7 +710,7 @@ def null_or_ptr(w):
|
||||
# (name, vrom_st, vrom_end, vram_st, vram_end)
|
||||
def read_actor_ovl_tbl():
|
||||
actortbl = []
|
||||
with open(repo + "baseroms/n64-us/code","rb") as codefile:
|
||||
with open(repo + "extracted/n64-us/baserom/code","rb") as codefile:
|
||||
codefile.seek(0x109510) # actor overlay table offset into code
|
||||
entry = as_word_list(codefile.read(0x20))
|
||||
i = 0
|
||||
@@ -731,10 +731,10 @@ def resolve_symbol(address):
|
||||
for entry in actor_tbl:
|
||||
if address >= 0x80000000:
|
||||
if entry[3] <= address < entry[4]:
|
||||
return repo + "baserom" + os.sep + entry[0], address - entry[3]
|
||||
return repo + "extracted/n64-us/baserom" + os.sep + entry[0], address - entry[3]
|
||||
else:
|
||||
if entry[1] <= address < entry[2]:
|
||||
return repo + "baserom" + os.sep + entry[0], address - entry[1]
|
||||
return repo + "extracted/n64-us/baserom" + os.sep + entry[0], address - entry[1]
|
||||
else:
|
||||
raise RuntimeError('Symbol not found in actor overlay table file ranges. Are you sure the file is an actor overlay?')
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,8 +7,8 @@ import argparse, os, struct, math
|
||||
from actor_symbols import resolve_symbol
|
||||
|
||||
cmd_info = [
|
||||
('SCHEDULE_CMD_CHECK_FLAG_S', 0x04, '>Hb', (1, )),
|
||||
('SCHEDULE_CMD_CHECK_FLAG_L', 0x05, '>Hh', (1, )),
|
||||
('SCHEDULE_CMD_CHECK_WEEK_EVENT_REG_S', 0x04, '>Hb', (1, )),
|
||||
('SCHEDULE_CMD_CHECK_WEEK_EVENT_REG_L', 0x05, '>Hh', (1, )),
|
||||
('SCHEDULE_CMD_CHECK_TIME_RANGE_S', 0x06, '>BBBBb', (4, )),
|
||||
('SCHEDULE_CMD_CHECK_TIME_RANGE_L', 0x07, '>BBBBh', (4, )),
|
||||
('SCHEDULE_CMD_RET_VAL_L', 0x03, '>H', ( )),
|
||||
|
||||
@@ -1523,58 +1523,58 @@ asm/non_matchings/code/z_map_exp/Map_Destroy.s,Map_Destroy,0x8010A410,0x8
|
||||
asm/non_matchings/code/z_map_exp/Map_Init.s,Map_Init,0x8010A430,0x47
|
||||
asm/non_matchings/code/z_map_exp/Minimap_Draw.s,Minimap_Draw,0x8010A54C,0xD
|
||||
asm/non_matchings/code/z_map_exp/Map_Update.s,Map_Update,0x8010A580,0x78
|
||||
asm/non_matchings/code/z_msgevent/func_8010A760.s,func_8010A760,0x8010A760,0x1B
|
||||
asm/non_matchings/code/z_msgevent/func_8010A7CC.s,func_8010A7CC,0x8010A7CC,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010A814.s,func_8010A814,0x8010A814,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010A85C.s,func_8010A85C,0x8010A85C,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010A8A4.s,func_8010A8A4,0x8010A8A4,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010A8EC.s,func_8010A8EC,0x8010A8EC,0x29
|
||||
asm/non_matchings/code/z_msgevent/func_8010A990.s,func_8010A990,0x8010A990,0x31
|
||||
asm/non_matchings/code/z_msgevent/func_8010AA54.s,func_8010AA54,0x8010AA54,0x37
|
||||
asm/non_matchings/code/z_msgevent/func_8010AB30.s,func_8010AB30,0x8010AB30,0x19
|
||||
asm/non_matchings/code/z_msgevent/func_8010AB94.s,func_8010AB94,0x8010AB94,0x1B
|
||||
asm/non_matchings/code/z_msgevent/func_8010AC00.s,func_8010AC00,0x8010AC00,0x49
|
||||
asm/non_matchings/code/z_msgevent/func_8010AD24.s,func_8010AD24,0x8010AD24,0x2C
|
||||
asm/non_matchings/code/z_msgevent/func_8010ADD4.s,func_8010ADD4,0x8010ADD4,0x1D
|
||||
asm/non_matchings/code/z_msgevent/func_8010AE48.s,func_8010AE48,0x8010AE48,0x21
|
||||
asm/non_matchings/code/z_msgevent/func_8010AECC.s,func_8010AECC,0x8010AECC,0x15
|
||||
asm/non_matchings/code/z_msgevent/func_8010AF20.s,func_8010AF20,0x8010AF20,0x13
|
||||
asm/non_matchings/code/z_msgevent/func_8010AF6C.s,func_8010AF6C,0x8010AF6C,0xA
|
||||
asm/non_matchings/code/z_msgevent/func_8010AF94.s,func_8010AF94,0x8010AF94,0x13
|
||||
asm/non_matchings/code/z_msgevent/func_8010AFE0.s,func_8010AFE0,0x8010AFE0,0xC
|
||||
asm/non_matchings/code/z_msgevent/func_8010B010.s,func_8010B010,0x8010B010,0x17
|
||||
asm/non_matchings/code/z_msgevent/func_8010B06C.s,func_8010B06C,0x8010B06C,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010B0B4.s,func_8010B0B4,0x8010B0B4,0xA
|
||||
asm/non_matchings/code/z_msgevent/func_8010B0DC.s,func_8010B0DC,0x8010B0DC,0xB
|
||||
asm/non_matchings/code/z_msgevent/func_8010B108.s,func_8010B108,0x8010B108,0xE
|
||||
asm/non_matchings/code/z_msgevent/func_8010B140.s,func_8010B140,0x8010B140,0x10
|
||||
asm/non_matchings/code/z_msgevent/func_8010B180.s,func_8010B180,0x8010B180,0xF
|
||||
asm/non_matchings/code/z_msgevent/func_8010B1BC.s,func_8010B1BC,0x8010B1BC,0x1C
|
||||
asm/non_matchings/code/z_msgevent/func_8010B22C.s,func_8010B22C,0x8010B22C,0x16
|
||||
asm/non_matchings/code/z_msgevent/func_8010B284.s,func_8010B284,0x8010B284,0xF
|
||||
asm/non_matchings/code/z_msgevent/func_8010B2C0.s,func_8010B2C0,0x8010B2C0,0x10
|
||||
asm/non_matchings/code/z_msgevent/func_8010B300.s,func_8010B300,0x8010B300,0x4D
|
||||
asm/non_matchings/code/z_msgevent/func_8010B434.s,func_8010B434,0x8010B434,0x1C
|
||||
asm/non_matchings/code/z_msgevent/func_8010B4A4.s,func_8010B4A4,0x8010B4A4,0x1F
|
||||
asm/non_matchings/code/z_msgevent/func_8010B520.s,func_8010B520,0x8010B520,0x51
|
||||
asm/non_matchings/code/z_msgevent/func_8010B664.s,func_8010B664,0x8010B664,0x51
|
||||
asm/non_matchings/code/z_msgevent/func_8010B7A8.s,func_8010B7A8,0x8010B7A8,0x20
|
||||
asm/non_matchings/code/z_msgevent/func_8010B828.s,func_8010B828,0x8010B828,0x14
|
||||
asm/non_matchings/code/z_msgevent/func_8010B878.s,func_8010B878,0x8010B878,0x1B
|
||||
asm/non_matchings/code/z_msgevent/func_8010B8E4.s,func_8010B8E4,0x8010B8E4,0x8A
|
||||
asm/non_matchings/code/z_msgevent/func_8010BB0C.s,func_8010BB0C,0x8010BB0C,0x18
|
||||
asm/non_matchings/code/z_msgevent/func_8010BB6C.s,func_8010BB6C,0x8010BB6C,0x18
|
||||
asm/non_matchings/code/z_msgevent/func_8010BBCC.s,func_8010BBCC,0x8010BBCC,0x17
|
||||
asm/non_matchings/code/z_msgevent/func_8010BC28.s,func_8010BC28,0x8010BC28,0x15
|
||||
asm/non_matchings/code/z_msgevent/func_8010BC7C.s,func_8010BC7C,0x8010BC7C,0x33
|
||||
asm/non_matchings/code/z_msgevent/func_8010BD48.s,func_8010BD48,0x8010BD48,0x12
|
||||
asm/non_matchings/code/z_msgevent/func_8010BD90.s,func_8010BD90,0x8010BD90,0x13
|
||||
asm/non_matchings/code/z_msgevent/func_8010BDDC.s,func_8010BDDC,0x8010BDDC,0x27
|
||||
asm/non_matchings/code/z_msgevent/func_8010BE78.s,func_8010BE78,0x8010BE78,0x11
|
||||
asm/non_matchings/code/z_msgevent/func_8010BEBC.s,func_8010BEBC,0x8010BEBC,0xD
|
||||
asm/non_matchings/code/z_msgevent/func_8010BEF0.s,func_8010BEF0,0x8010BEF0,0xD
|
||||
asm/non_matchings/code/z_msgevent/func_8010BF24.s,func_8010BF24,0x8010BF24,0xD
|
||||
asm/non_matchings/code/z_msgevent/func_8010BF58.s,func_8010BF58,0x8010BF58,0x5A
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckWeekEventReg.s,MsgEvent_CheckWeekEventReg,0x8010A760,0x1B
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckGoron.s,MsgEvent_CheckGoron,0x8010A7CC,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckZora.s,MsgEvent_CheckZora,0x8010A814,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckDeku.s,MsgEvent_CheckDeku,0x8010A85C,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckHuman.s,MsgEvent_CheckHuman,0x8010A8A4,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckTextChoice.s,MsgEvent_CheckTextChoice,0x8010A8EC,0x29
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_OfferItem.s,MsgEvent_OfferItem,0x8010A990,0x31
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_Autotalk.s,MsgEvent_Autotalk,0x8010AA54,0x37
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckRupees.s,MsgEvent_CheckRupees,0x8010AB30,0x19
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckCallback.s,MsgEvent_CheckCallback,0x8010AB94,0x1B
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckDay.s,MsgEvent_CheckDay,0x8010AC00,0x49
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_AwaitTextJump.s,MsgEvent_AwaitTextJump,0x8010AD24,0x2C
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_AwaitText.s,MsgEvent_AwaitText,0x8010ADD4,0x1D
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_AwaitTextEnd.s,MsgEvent_AwaitTextEnd,0x8010AE48,0x21
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_BeginText.s,MsgEvent_BeginText,0x8010AECC,0x15
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_ContinueText.s,MsgEvent_ContinueText,0x8010AF20,0x13
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_Done.s,MsgEvent_Done,0x8010AF6C,0xA
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_SetWeekEventReg.s,MsgEvent_SetWeekEventReg,0x8010AF94,0x13
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CloseText.s,MsgEvent_CloseText,0x8010AFE0,0xC
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_SetCollectible.s,MsgEvent_SetCollectible,0x8010B010,0x17
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_ChangeRupees.s,MsgEvent_ChangeRupees,0x8010B06C,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_Pause.s,MsgEvent_Pause,0x8010B0B4,0xA
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_UnsetAutotalk.s,MsgEvent_UnsetAutotalk,0x8010B0DC,0xB
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_FocusToChild.s,MsgEvent_FocusToChild,0x8010B108,0xE
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_FocusToSelf.s,MsgEvent_FocusToSelf,0x8010B140,0x10
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_Jump.s,MsgEvent_Jump,0x8010B180,0xF
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckQuestItem.s,MsgEvent_CheckQuestItem,0x8010B1BC,0x1C
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckEventInf.s,MsgEvent_CheckEventInf,0x8010B22C,0x16
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_SetEventInf.s,MsgEvent_SetEventInf,0x8010B284,0xF
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_UnsetEventInf.s,MsgEvent_UnsetEventInf,0x8010B2C0,0x10
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckItemAction.s,MsgEvent_CheckItemAction,0x8010B300,0x4D
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckHasSong.s,MsgEvent_CheckHasSong,0x8010B434,0x1C
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckWornMask.s,MsgEvent_CheckWornMask,0x8010B4A4,0x1F
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckAfterTime.s,MsgEvent_CheckAfterTime,0x8010B520,0x51
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckBeforeTime.s,MsgEvent_CheckBeforeTime,0x8010B664,0x51
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckSwitchFlag.s,MsgEvent_CheckSwitchFlag,0x8010B7A8,0x20
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_SetSwitchFlag.s,MsgEvent_SetSwitchFlag,0x8010B828,0x14
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckItem.s,MsgEvent_CheckItem,0x8010B878,0x1B
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckBetweenTime.s,MsgEvent_CheckBetweenTime,0x8010B8E4,0x8A
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckOnDay.s,MsgEvent_CheckOnDay,0x8010BB0C,0x18
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckCallbackContinue.s,MsgEvent_CheckCallbackContinue,0x8010BB6C,0x18
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckHasPowderKeg.s,MsgEvent_CheckHasPowderKeg,0x8010BBCC,0x17
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_DeleteItem.s,MsgEvent_DeleteItem,0x8010BC28,0x15
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_CheckCallbackMulti.s,MsgEvent_CheckCallbackMulti,0x8010BC7C,0x33
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_PlayerTalk.s,MsgEvent_PlayerTalk,0x8010BD48,0x12
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_NotebookEvent.s,MsgEvent_NotebookEvent,0x8010BD90,0x13
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_AwaitTextDone.s,MsgEvent_AwaitTextDone,0x8010BDDC,0x27
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_Jump3.s,MsgEvent_Jump3,0x8010BE78,0x11
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_PlayDecide.s,MsgEvent_PlayDecide,0x8010BEBC,0xD
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_PlayCancel.s,MsgEvent_PlayCancel,0x8010BEF0,0xD
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_PlayError.s,MsgEvent_PlayError,0x8010BF24,0xD
|
||||
asm/non_matchings/code/z_msgevent/MsgEvent_RunScript.s,MsgEvent_RunScript,0x8010BF58,0x5A
|
||||
asm/non_matchings/code/z_nmi_buff/Nmi_Init.s,Nmi_Init,0x8010C0C0,0x29
|
||||
asm/non_matchings/code/z_nmi_buff/Nmi_SetPrenmiStart.s,Nmi_SetPrenmiStart,0x8010C164,0xE
|
||||
asm/non_matchings/code/z_nmi_buff/Nmi_GetPrenmiHasStarted.s,Nmi_GetPrenmiHasStarted,0x8010C19C,0x5
|
||||
|
||||
|
@@ -140,7 +140,7 @@ weekEventReg = {
|
||||
(16 << 8) | 0x20: "WEEKEVENTREG_16_20",
|
||||
(16 << 8) | 0x40: "WEEKEVENTREG_16_40",
|
||||
(16 << 8) | 0x80: "WEEKEVENTREG_16_80",
|
||||
(17 << 8) | 0x01: "WEEKEVENTREG_TALKED_EMPTY_BOAT_CRUISE",
|
||||
(17 << 8) | 0x01: "WEEKEVENTREG_TALKED_KOUME_KIOSK_EMPTY",
|
||||
(17 << 8) | 0x02: "WEEKEVENTREG_17_02",
|
||||
(17 << 8) | 0x04: "WEEKEVENTREG_17_04",
|
||||
(17 << 8) | 0x08: "WEEKEVENTREG_17_08",
|
||||
|
||||
Reference in New Issue
Block a user