mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-23 00:29:50 -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:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user