mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 13:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Documented object_sth and object_ahg, both used by EnSth (Moon gazer who wants to buy Ocean spiderhouse) (#1169)

Browse Source 
* object_sth/object_ahg: docs

* Ssh: formatter

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Oops missed one

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Seth: fixes

* Sth: more requested changes

* Apply suggestions from code review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Sth/Ahg: requested changes

* Apply suggestions from code review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Sth: further function name requested changes

* Sth: minor note

* Sth: fix animation name

* Sth: forgot to rename saved flag

* Seth: change ocean wallet week reg name

* Sth: some requested changes

* Sth: fixed week event reg, added more

* Sth/Ssh/Si: changed from two defines to 1

* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed

* Sth/Ssh/Sekihi: requested changes and some weekregflag docs

* Sekihi: fix missing header for skull count

* Sekihi: moved flag description to z64save

* Sekihi: moved flag description to z64save

* Sth: removed flag

* Update include/z64save.h

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
This commit is contained in:
Isghj
2023-03-07 15:54:12 -08:00
committed by GitHub
parent 2cce8f6767
commit e50ab59cf7
16 changed files with 547 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+24 -24
View File
@@ -14252,30 +14252,30 @@
0x80B66BDC:("ObjHariko_Draw",),
0x80B66D30:("EnSth_Init",),
0x80B67010:("EnSth_Destroy",),
0x80B6703C:("func_80B6703C",),
0x80B670A4:("func_80B670A4",),
0x80B67148:("func_80B67148",),
0x80B671A0:("func_80B671A0",),
0x80B67208:("func_80B67208",),
0x80B672A4:("func_80B672A4",),
0x80B67348:("func_80B67348",),
0x80B67458:("func_80B67458",),
0x80B67540:("func_80B67540",),
0x80B677BC:("func_80B677BC",),
0x80B67838:("func_80B67838",),
0x80B678A8:("func_80B678A8",),
0x80B67958:("func_80B67958",),
0x80B67984:("func_80B67984",),
0x80B67AB4:("func_80B67AB4",),
0x80B67B50:("func_80B67B50",),
0x80B67C1C:("func_80B67C1C",),
0x80B67DA0:("func_80B67DA0",),
0x80B67E20:("func_80B67E20",),
0x80B67E78:("EnSth_Update",),
0x80B680A8:("func_80B680A8",),
0x80B681E8:("func_80B681E8",),
0x80B68310:("func_80B68310",),
0x80B6849C:("func_80B6849C",),
0x80B6703C:("EnSth_CanSpeakToPlayer",),
0x80B670A4:("EnSth_ChangeAnim",),
0x80B67148:("EnSth_GetInitialPanicText",),
0x80B671A0:("EnSth_HandlePanicConversation",),
0x80B67208:("EnSth_PanicIdle",),
0x80B672A4:("EnSth_GetInitialOceansideSpiderHouseText",),
0x80B67348:("EnSth_PostOceanspiderhouseReward",),
0x80B67458:("EnSth_GiveOceansideSpiderHouseReward",),
0x80B67540:("EnSth_HandleOceansideSpiderHouseConversation",),
0x80B677BC:("EnSth_OceansideSpiderHouseIdle",),
0x80B67838:("EnSth_HandleMoonLookingConversation",),
0x80B678A8:("EnSth_MoonLookingIdle",),
0x80B67958:("EnSth_DefaultIdle",),
0x80B67984:("EnSth_GetInitialSwampSpiderHouseText",),
0x80B67AB4:("EnSth_TalkAfterSwampSpiderHouseGiveMask",),
0x80B67B50:("EnSth_SwampSpiderHouseGiveMask",),
0x80B67C1C:("EnSth_HandleSwampSpiderHouseConversation",),
0x80B67DA0:("EnSth_SwampSpiderHouseIdle",),
0x80B67E20:("EnSth_UpdateOceansideSpiderHouseWaitForTokens",),
0x80B67E78:("EnSth_UpdateWaitForObject",),
0x80B680A8:("EnSth_Update",),
0x80B681E8:("EnSth_OverrideLimbDraw",),
0x80B68310:("EnSth_PostLimbDraw",),
0x80B6849C:("EnSth_Draw",),
0x80B6D660:("BgSinkaiKabe_Init",),
0x80B6D9EC:("BgSinkaiKabe_Destroy",),
0x80B6DA20:("BgSinkaiKabe_WaitForPlayer",),
tools/weekeventregconvert.py
+5 -5
View File
@@ -113,9 +113,9 @@ weekEventReg = {
(13 << 8) | 0x04: "WEEKEVENTREG_13_04",
(13 << 8) | 0x08: "WEEKEVENTREG_13_08",
(13 << 8) | 0x10: "WEEKEVENTREG_13_10",
(13 << 8) | 0x20: "WEEKEVENTREG_13_20",
(13 << 8) | 0x40: "WEEKEVENTREG_13_40",
(13 << 8) | 0x80: "WEEKEVENTREG_13_80",
(13 << 8) | 0x20: "WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN",
(13 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_OCEANSIDE_WALLET_UPGRADE",
(13 << 8) | 0x80: "WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_COLLECTED_REWARD",
(14 << 8) | 0x01: "WEEKEVENTREG_14_01",
(14 << 8) | 0x02: "WEEKEVENTREG_14_02",
(14 << 8) | 0x04: "WEEKEVENTREG_14_04",
@@ -279,10 +279,10 @@ weekEventReg = {
(34 << 8) | 0x01: "WEEKEVENTREG_34_01",
(34 << 8) | 0x02: "WEEKEVENTREG_34_02",
(34 << 8) | 0x04: "WEEKEVENTREG_34_04",
(34 << 8) | 0x08: "WEEKEVENTREG_34_08",
(34 << 8) | 0x08: "WEEKEVENTREG_SWAMP_SPIDER_HOUSE_TALKED",
(34 << 8) | 0x10: "WEEKEVENTREG_34_10",
(34 << 8) | 0x20: "WEEKEVENTREG_34_20",
(34 << 8) | 0x40: "WEEKEVENTREG_34_40",
(34 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_MASK_OF_TRUTH",
(34 << 8) | 0x80: "WEEKEVENTREG_34_80",
(35 << 8) | 0x01: "WEEKEVENTREG_35_01",
(35 << 8) | 0x02: "WEEKEVENTREG_35_02",