mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Anju objects (#1444)

Browse Source 
* bring over the objects from the other branch

* kafeis mask

* use symbols

* dman naming after assets

* stateFlags

* remaining stuff

* anim array bug

* Name everything in DmGm after DmAn

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED

* undef

* format

* idk

* ing

* format

* name animations from an4, thanks emil!

* emptydl

* disbelief

* review

* format

* Update assets/xml/objects/object_mask_kerfay.xml

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Anghelo Carvajal
2023-10-23 02:03:16 -03:00
committed by GitHub
parent a468be77d5
commit 1e19cfe869
17 changed files with 576 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+16 -16
View File
@@ -16941,19 +16941,19 @@
0x80C1C130:("DmAl_Draw",),
0x80C1C410:("DmAn_UpdateSkelAnime",),
0x80C1C4D8:("DmAn_ChangeAnim",),
0x80C1C5B4:("func_80C1C5B4",),
0x80C1C62C:("func_80C1C62C",),
0x80C1C83C:("func_80C1C83C",),
0x80C1C8E8:("func_80C1C8E8",),
0x80C1C958:("func_80C1C958",),
0x80C1CAB0:("DmAn_HandleCutscene",),
0x80C1C5B4:("DmAn_Blink",),
0x80C1C62C:("DmAn_UpdateHeadRot",),
0x80C1C83C:("DmAn_UpdateAttention",),
0x80C1C8E8:("DmAn_FindAnjusMotherActor",),
0x80C1C958:("DmAn_WaitForObject",),
0x80C1CAB0:("DmAn_HandleCouplesMaskCs",),
0x80C1CC80:("DmAn_DoNothing",),
0x80C1CC90:("DmAn_Init",),
0x80C1CCE4:("DmAn_Destroy",),
0x80C1CCF4:("DmAn_Update",),
0x80C1CD80:("func_80C1CD80",),
0x80C1CEFC:("func_80C1CEFC",),
0x80C1D0B0:("func_80C1D0B0",),
0x80C1CD80:("DmAn_PostLimbDraw",),
0x80C1CEFC:("DmAn_TransformLimbDraw",),
0x80C1D0B0:("DmAn_Draw",),
0x80C1D410:("DmAh_ChangeAnim",),
0x80C1D458:("func_80C1D458",),
0x80C1D4D0:("func_80C1D4D0",),
@@ -17102,19 +17102,19 @@
0x80C23F6C:("EnEndingHero6_Draw",),
0x80C24360:("DmGm_UpdateSkelAnime",),
0x80C24428:("DmGm_ChangeAnim",),
0x80C24504:("func_80C24504",),
0x80C2457C:("func_80C2457C",),
0x80C2478C:("func_80C2478C",),
0x80C24838:("func_80C24838",),
0x80C248A8:("func_80C248A8",),
0x80C24A00:("DmGm_HandleCutscene",),
0x80C24504:("DmGm_Blink",),
0x80C2457C:("DmGm_UpdateHeadRot",),
0x80C2478C:("DmGm_UpdateAttention",),
0x80C24838:("DmGm_FindAnjusMotherActor",),
0x80C248A8:("DmGm_WaitForObject",),
0x80C24A00:("DmGm_HandleCouplesMaskCs",),
0x80C24BD0:("DmGm_DoNothing",),
0x80C24BE0:("DmGm_Init",),
0x80C24C34:("DmGm_Destroy",),
0x80C24C44:("DmGm_Update",),
0x80C24CD0:("DmGm_PostLimbDraw",),
0x80C24E4C:("DmGm_TransformLimbDraw",),
0x80C25000:("func_80C25000",),
0x80C25000:("DmGm_Draw",),
0x80C25360:("func_80C25360",),
0x80C253D0:("func_80C253D0",),
0x80C255DC:("ObjSwprize_Init",),
tools/disasm/variables.txt
+4 -4
View File
@@ -16414,8 +16414,8 @@
0x80C1D2C8:("D_80C1D2C8","UNK_TYPE1","",0x1),
0x80C1D2D4:("D_80C1D2D4","UNK_TYPE1","",0x1),
0x80C1D2DC:("D_80C1D2DC","UNK_TYPE1","",0x1),
0x80C1D2E8:("D_80C1D2E8","UNK_TYPE4","",0x4),
0x80C1D2F4:("D_80C1D2F4","UNK_TYPE1","",0x1),
0x80C1D2E8:("sMouthTextures","UNK_TYPE4","",0x4),
0x80C1D2F4:("sEyeTextures","UNK_TYPE1","",0x1),
0x80C1D310:("jtbl_80C1D310","UNK_PTR","",0x4),
0x80C1DDC0:("Dm_Ah_InitVars","UNK_TYPE1","",0x1),
0x80C1DDE0:("D_80C1DDE0","UNK_PTR","",0x4),
@@ -16501,8 +16501,8 @@
0x80C25218:("D_80C25218","UNK_TYPE1","",0x1),
0x80C25224:("D_80C25224","UNK_TYPE1","",0x1),
0x80C2522C:("D_80C2522C","UNK_TYPE1","",0x1),
0x80C25238:("D_80C25238","UNK_TYPE4","",0x4),
0x80C25244:("D_80C25244","UNK_TYPE1","",0x1),
0x80C25238:("sMouthTextures","UNK_TYPE4","",0x4),
0x80C25244:("sEyeTextures","UNK_TYPE1","",0x1),
0x80C25260:("jtbl_80C25260","UNK_PTR","",0x4),
0x80C257D0:("Obj_Swprize_InitVars","UNK_TYPE1","",0x1),
0x80C257F0:("D_80C257F0","UNK_TYPE1","",0x1),
tools/weekeventregconvert.py
+1 -1
View File
@@ -418,7 +418,7 @@ weekEventReg = {
(51 << 8) | 0x08: "WEEKEVENTREG_51_08",
(51 << 8) | 0x10: "WEEKEVENTREG_51_10",
(51 << 8) | 0x20: "WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT",
(51 << 8) | 0x40: "WEEKEVENTREG_51_40",
(51 << 8) | 0x40: "WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED",
(51 << 8) | 0x80: "WEEKEVENTREG_51_80",
(52 << 8) | 0x01: "WEEKEVENTREG_ESCORTED_CREMIA",
(52 << 8) | 0x02: "WEEKEVENTREG_52_02",