izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

DmChar08 OK (#1085)

Browse Source 
* progress

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* Fix makefile and add non matching to spec

* did some git stuff

* Git being a problem as usual

* format

* PR fixes

* PR fixes

* PR fixes

* Merge master and fixes

* going to merge play

* merged in the big one

* docs

* PR fixes

* format

* Clean up

* transition

* Better init

* Glitchy animations

* PR

* Format

* PR comments

* Missed one

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* fix conflicts

* Fix conflicts

* format

* PR

Co-authored-by: louist103 <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Derek Hensley
2022-10-06 21:46:58 -03:00
committed by GitHub
co-authored by louist103 louist103 Anghelo Carvajal
parent 589925ce3e
commit 8e6843f04e
9 changed files with 1230 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+10 -10
View File
@@ -11629,12 +11629,12 @@
0x80AAEABC:("DmChar07_DoNothing",),
0x80AAEACC:("DmChar07_Update",),
0x80AAEAF0:("DmChar07_Draw",),
0x80AAF050:("func_80AAF050",),
0x80AAF15C:("func_80AAF15C",),
0x80AAF050:("DmChar08_UpdateEyes",),
0x80AAF15C:("DmChar08_ChangeAnimation",),
0x80AAF1F8:("DmChar08_Init",),
0x80AAF5D8:("DmChar08_Destroy",),
0x80AAF610:("func_80AAF610",),
0x80AAF79C:("func_80AAF79C",),
0x80AAF610:("DmChar08_WaitForSong",),
0x80AAF79C:("DmChar08_SetupAppearCs",),
0x80AAF884:("func_80AAF884",),
0x80AAF8F4:("func_80AAF8F4",),
0x80AAFA18:("func_80AAFA18",),
@@ -11642,19 +11642,19 @@
0x80AAFAE4:("func_80AAFAE4",),
0x80AAFB04:("func_80AAFB04",),
0x80AAFB94:("func_80AAFB94",),
0x80AAFBA4:("func_80AAFBA4",),
0x80AAFBA4:("DmChar08_SpawnBubbles",),
0x80AAFCCC:("func_80AAFCCC",),
0x80AAFE78:("func_80AAFE78",),
0x80AAFE78:("DmChar08_DoNothing",),
0x80AAFE88:("func_80AAFE88",),
0x80AB01E8:("func_80AB01E8",),
0x80AB023C:("func_80AB023C",),
0x80AB032C:("func_80AB032C",),
0x80AB096C:("func_80AB096C",),
0x80AB0A10:("func_80AB0A10",),
0x80AB0A10:("DmChar08_UpdateCollision",),
0x80AB0CC8:("DmChar08_Update",),
0x80AB0E3C:("func_80AB0E3C",),
0x80AB0E7C:("func_80AB0E7C",),
0x80AB0F90:("func_80AB0F90",),
0x80AB0E3C:("DmChar08_OverrideLimbDraw",),
0x80AB0E7C:("DmChar08_PostLimbDraw",),
0x80AB0F90:("DmChar08_TransformLimbDraw",),
0x80AB1124:("DmChar08_Draw",),
0x80AB1E10:("DmChar09_ChangeAnim",),
0x80AB1EAC:("DmChar09_Init",),
tools/disasm/variables.txt
+15 -15
View File
@@ -12659,21 +12659,21 @@
0x80AAE960:("Dm_Char06_InitVars","UNK_TYPE1","",0x1),
0x80AAEFF0:("Dm_Char07_InitVars","UNK_TYPE1","",0x1),
0x80AB1370:("Dm_Char08_InitVars","UNK_TYPE1","",0x1),
0x80AB1390:("D_80AB1390","UNK_TYPE1","",0x1),
0x80AB1398:("D_80AB1398","UNK_TYPE1","",0x1),
0x80AB13A0:("D_80AB13A0","UNK_TYPE1","",0x1),
0x80AB14D0:("D_80AB14D0","UNK_TYPE1","",0x1),
0x80AB1600:("D_80AB1600","UNK_TYPE2","",0x2),
0x80AB1648:("D_80AB1648","UNK_TYPE2","",0x2),
0x80AB1690:("D_80AB1690","UNK_TYPE1","",0x1),
0x80AB1390:("D_80AB1390","CamData","",0x8),
0x80AB1398:("D_80AB1398","SurfaceType","",0x8),
0x80AB13A0:("D_80AB13A0","CollisionPoly","19",0xCC),
0x80AB14D0:("sTurtleGreatBayTempleColPolygons2","CollisionPoly[]","19",0xCC),
0x80AB1600:("D_80AB1600","Vec3s[]","12",0x48),
0x80AB1648:("D_80AB1648","Vec3s[]","12",0x48),
0x80AB1690:("sTurtleGreatBayTempleCol","CollisionHeader","",0x2C),
0x80AB16A8:("D_80AB16A8","UNK_PTR","",0x4),
0x80AB16BC:("D_80AB16BC","UNK_TYPE1","",0x1),
0x80AB1764:("D_80AB1764","UNK_TYPE1","",0x1),
0x80AB1770:("D_80AB1770","UNK_TYPE2","",0x2),
0x80AB1774:("D_80AB1774","UNK_TYPE1","",0x1),
0x80AB1778:("D_80AB1778","UNK_TYPE1","",0x1),
0x80AB177C:("D_80AB177C","UNK_TYPE4","",0x4),
0x80AB1788:("D_80AB1788","UNK_TYPE1","",0x1),
0x80AB16BC:("sLargeTurtleAnimationInfo","AnimationInfo[]","0x7",0xE0),
0x80AB1764:("sInitChain","InitChainEntry","",0x1),
0x80AB1770:("D_80AB1770","s16","",0x2),
0x80AB1774:("sLargeTurtleBubblePrimColor","Color_RGBA8","",0x4),
0x80AB1778:("sLargeTurtleBubbleEnvColor","Color_RGBA8","",0x4),
0x80AB177C:("sLargeTurtleBubbelAccel","Vec3f","",0xC),
0x80AB1788:("sLargeTurtleEyeTextures","TexturePtr","9",0x1),
0x80AB17B0:("jtbl_80AB17B0","UNK_PTR","",0x4),
0x80AB17C8:("D_80AB17C8","f32","",0x4),
0x80AB17CC:("D_80AB17CC","f32","",0x4),
@@ -14305,7 +14305,7 @@
0x80B3FE50:("D_80B3FE50","f32","",0x4),
0x80B3FE54:("D_80B3FE54","f32","",0x4),
0x80B3FE58:("D_80B3FE58","UNK_TYPE1","",0x1),
0x80B3FE70:("D_80B3FE70","UNK_TYPE1","",0x1),
0x80B3FE70:("sEyeTextures","TexturePtr[]","0x9",0x4),
0x80B3FE90:("D_80B3FE90","f32","",0x4),
0x80B3FE94:("D_80B3FE94","f32","",0x4),
0x80B40760:("Bg_Goron_Oyu_InitVars","UNK_TYPE1","",0x1),