Document z_en_time_tag (#1140)

* time-tag docs

* simplify enums

* PR Reviews

* PR Suggestions

* small change

* small fix

* PR Suggestions

* add extra func ref

* rm raw text from first actor I decompiled

* Stock Pot Inn

* fix master merge
This commit is contained in:
engineer124
2023-03-16 13:47:38 +11:00
committed by GitHub
parent 2987390a20
commit a17949e730
104 changed files with 904 additions and 815 deletions
+17 -17
View File
@@ -2824,7 +2824,7 @@
0x80147564:("func_80147564",),
0x80147624:("Message_ShouldAdvance",),
0x80147734:("Message_ShouldAdvanceSilent",),
0x801477B4:("func_801477B4",),
0x801477B4:("Message_CloseTextbox",),
0x80147818:("func_80147818",),
0x80147F18:("func_80147F18",),
0x80148558:("func_80148558",),
@@ -2853,7 +2853,7 @@
0x80150D08:("func_80150D08",),
0x801514B0:("func_801514B0",),
0x801518B0:("Message_StartTextbox",),
0x80151938:("func_80151938",),
0x80151938:("Message_ContinueTextbox",),
0x80151A68:("func_80151A68",),
0x80151BB4:("func_80151BB4",),
0x80151C9C:("func_80151C9C",),
@@ -12021,21 +12021,21 @@
0x80AC9D10:("ObjOcarinalift_Draw",),
0x80AC9EA0:("EnTimeTag_Init",),
0x80AC9FC4:("EnTimeTag_Destroy",),
0x80AC9FD4:("func_80AC9FD4",),
0x80AC9FE4:("func_80AC9FE4",),
0x80ACA0A8:("func_80ACA0A8",),
0x80ACA12C:("func_80ACA12C",),
0x80ACA184:("func_80ACA184",),
0x80ACA208:("func_80ACA208",),
0x80ACA268:("func_80ACA268",),
0x80ACA348:("func_80ACA348",),
0x80ACA3C0:("func_80ACA3C0",),
0x80ACA418:("func_80ACA418",),
0x80ACA5F8:("func_80ACA5F8",),
0x80ACA714:("func_80ACA714",),
0x80ACA724:("func_80ACA724",),
0x80ACA7C4:("func_80ACA7C4",),
0x80ACA840:("func_80ACA840",),
0x80AC9FD4:("EnTimeTag_RooftopOath_DoNothing",),
0x80AC9FE4:("EnTimeTag_RooftopOath_Cutscene",),
0x80ACA0A8:("EnTimeTag_RooftopOath_Wait",),
0x80ACA12C:("EnTimeTag_SoaringEngraving_GetSong",),
0x80ACA184:("EnTimeTag_SoaringEngraving_StartCutscene",),
0x80ACA208:("EnTimeTag_SoaringEngraving_SubsequentInteraction",),
0x80ACA268:("EnTimeTag_SoaringEngraving_Wait",),
0x80ACA348:("EnTimeTag_Diary_AfterOcarina",),
0x80ACA3C0:("EnTimeTag_Diary_TeachEvanSongSnippets",),
0x80ACA418:("EnTimeTag_Diary_Cutscene",),
0x80ACA5F8:("EnTimeTag_Diary_Wait",),
0x80ACA714:("EnTimeTag_KickOut_DoNothing",),
0x80ACA724:("EnTimeTag_KickOut_Transition",),
0x80ACA7C4:("EnTimeTag_KickOut_WaitForTrigger",),
0x80ACA840:("EnTimeTag_KickOut_WaitForTime",),
0x80ACA9AC:("EnTimeTag_Update",),
0x80ACAB10:("func_80ACAB10",),
0x80ACABA8:("func_80ACABA8",),
+2
View File
@@ -304,6 +304,8 @@ wordReplace = {
"func_800B867C": "Actor_TextboxIsClosing",
"func_800BDC5C": "Actor_ChangeAnimationByInfo",
"Actor_ChangeAnimation": "Actor_ChangeAnimationByInfo",
"func_801477B4": "Message_CloseTextbox",
"func_80151938": "Message_ContinueTextbox",
"func_80152498": "Message_GetState",
"func_800B8898": "Actor_GetScreenPos",
"Audio_PlayActorSound2": "Actor_PlaySfx",
+2 -2
View File
@@ -2338,7 +2338,7 @@ asm/non_matchings/code/z_message/func_80147520.s,func_80147520,0x80147520,0x11
asm/non_matchings/code/z_message/func_80147564.s,func_80147564,0x80147564,0x30
asm/non_matchings/code/z_message/Message_ShouldAdvance.s,Message_ShouldAdvance,0x80147624,0x44
asm/non_matchings/code/z_message/Message_ShouldAdvanceSilent.s,Message_ShouldAdvanceSilent,0x80147734,0x20
asm/non_matchings/code/z_message/func_801477B4.s,func_801477B4,0x801477B4,0x19
asm/non_matchings/code/z_message/Message_CloseTextbox.s,Message_CloseTextbox,0x801477B4,0x19
asm/non_matchings/code/z_message/func_80147818.s,func_80147818,0x80147818,0x1C0
asm/non_matchings/code/z_message/func_80147F18.s,func_80147F18,0x80147F18,0x190
asm/non_matchings/code/z_message/func_80148558.s,func_80148558,0x80148558,0x190
@@ -2367,7 +2367,7 @@ asm/non_matchings/code/z_message/func_80150A84.s,func_80150A84,0x80150A84,0xA1
asm/non_matchings/code/z_message/func_80150D08.s,func_80150D08,0x80150D08,0x1EA
asm/non_matchings/code/z_message/func_801514B0.s,func_801514B0,0x801514B0,0x100
asm/non_matchings/code/z_message/Message_StartTextbox.s,Message_StartTextbox,0x801518B0,0x22
asm/non_matchings/code/z_message/func_80151938.s,func_80151938,0x80151938,0x4C
asm/non_matchings/code/z_message/Message_ContinueTextbox.s,Message_ContinueTextbox,0x80151938,0x4C
asm/non_matchings/code/z_message/func_80151A68.s,func_80151A68,0x80151A68,0x53
asm/non_matchings/code/z_message/func_80151BB4.s,func_80151BB4,0x80151BB4,0x3A
asm/non_matchings/code/z_message/func_80151C9C.s,func_80151C9C,0x80151C9C,0x42
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2338 asm/non_matchings/code/z_message/func_80147564.s func_80147564 0x80147564 0x30
2339 asm/non_matchings/code/z_message/Message_ShouldAdvance.s Message_ShouldAdvance 0x80147624 0x44
2340 asm/non_matchings/code/z_message/Message_ShouldAdvanceSilent.s Message_ShouldAdvanceSilent 0x80147734 0x20
2341 asm/non_matchings/code/z_message/func_801477B4.s asm/non_matchings/code/z_message/Message_CloseTextbox.s func_801477B4 Message_CloseTextbox 0x801477B4 0x19
2342 asm/non_matchings/code/z_message/func_80147818.s func_80147818 0x80147818 0x1C0
2343 asm/non_matchings/code/z_message/func_80147F18.s func_80147F18 0x80147F18 0x190
2344 asm/non_matchings/code/z_message/func_80148558.s func_80148558 0x80148558 0x190
2367 asm/non_matchings/code/z_message/func_80150D08.s func_80150D08 0x80150D08 0x1EA
2368 asm/non_matchings/code/z_message/func_801514B0.s func_801514B0 0x801514B0 0x100
2369 asm/non_matchings/code/z_message/Message_StartTextbox.s Message_StartTextbox 0x801518B0 0x22
2370 asm/non_matchings/code/z_message/func_80151938.s asm/non_matchings/code/z_message/Message_ContinueTextbox.s func_80151938 Message_ContinueTextbox 0x80151938 0x4C
2371 asm/non_matchings/code/z_message/func_80151A68.s func_80151A68 0x80151A68 0x53
2372 asm/non_matchings/code/z_message/func_80151BB4.s func_80151BB4 0x80151BB4 0x3A
2373 asm/non_matchings/code/z_message/func_80151C9C.s func_80151C9C 0x80151C9C 0x42
+2 -2
View File
@@ -508,8 +508,8 @@ weekEventReg = {
(62 << 8) | 0x20: "WEEKEVENTREG_62_20",
(62 << 8) | 0x40: "WEEKEVENTREG_62_40",
(62 << 8) | 0x80: "WEEKEVENTREG_62_80",
(63 << 8) | 0x01: "WEEKEVENTREG_63_01",
(63 << 8) | 0x02: "WEEKEVENTREG_63_02",
(63 << 8) | 0x01: "WEEKEVENTREG_KICKOUT_WAIT",
(63 << 8) | 0x02: "WEEKEVENTREG_KICKOUT_TIME_PASSED",
(63 << 8) | 0x04: "WEEKEVENTREG_63_04",
(63 << 8) | 0x08: "WEEKEVENTREG_63_08",
(63 << 8) | 0x10: "WEEKEVENTREG_63_10",