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

Fire and Light arrows (#710)

Browse Source 
* fire arrow OK

* Light arrows OK

* Format

* Assets

* Mtx Mode

* PR fixes

* pr fixes

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
This commit is contained in:
louist103
2022-03-25 22:51:41 -04:00
committed by GitHub
parent 9a41b76f35
commit 7d4aaef0cd
11 changed files with 505 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+8 -8
View File
@@ -7000,12 +7000,12 @@
0x80920340:("ArrowFire_SetupAction",),
0x8092034C:("ArrowFire_Init",),
0x809203F8:("ArrowFire_Destroy",),
0x80920440:("func_80920440",),
0x80920440:("FireArrow_ChargeAndWait",),
0x80920534:("FireArrow_Lerp",),
0x8092058C:("func_8092058C",),
0x809207A0:("func_809207A0",),
0x8092058C:("FireArrow_Hit",),
0x809207A0:("FireArrow_Fly",),
0x809208F4:("ArrowFire_Update",),
0x80920948:("func_80920948",),
0x80920948:("FireArrow_SetQuadVerticies",),
0x80920A24:("ArrowFire_Draw",),
0x80922430:("ArrowIce_SetupAction",),
0x8092243C:("ArrowIce_Init",),
@@ -7019,10 +7019,10 @@
0x80924300:("ArrowLight_SetupAction",),
0x8092430C:("ArrowLight_Init",),
0x80924388:("ArrowLight_Destroy",),
0x809243AC:("func_809243AC",),
0x809244A0:("func_809244A0",),
0x809244F8:("func_809244F8",),
0x809246C4:("func_809246C4",),
0x809243AC:("ArrowLight_Charge",),
0x809244A0:("ArrowLight_Lerp",),
0x809244F8:("ArrowLight_Hit",),
0x809246C4:("ArrowLight_Fly",),
0x80924818:("ArrowLight_Update",),
0x8092486C:("ArrowLight_Draw",),
0x809261B0:("ObjKibako_SpawnCollectible",),
tools/disasm/variables.txt
+8 -9
View File
@@ -7992,15 +7992,14 @@
0x8092024C:("D_8092024C","UNK_TYPE1","",0x1),
0x80920268:("D_80920268","UNK_TYPE1","",0x1),
0x80920290:("jtbl_80920290","UNK_PTR","",0x4),
0x80920DF0:("arrowFireTexture1","u8","[2048]",0x800),
0x809215F0:("arrowFireTexture2","u8","[2048]",0x800),
0x80921DF0:("arrowFireVertices","F3DVertex","[43]",0x2b0),
0x80921FF0:("D_80921FF0","UNK_TYPE1","",0x1),
0x809220A0:("D_809220A0","Gfx","[22]",0xb0),
0x80922150:("D_80922150","Gfx","[24]",0xc0),
0x80920DF0:("gFireArrowTex","u8","[2048]",0x800),
0x809215F0:("gFireArrowMaskTex","u8","[2048]",0x800),
0x80921DF0:("gFireArrowVtx","F3DVertex","[43]",0x2b0),
0x809220A0:("gIceArrowMaterialDL","Gfx","[22]",0xb0),
0x80922150:("gIceArrowModelDL","Gfx","[24]",0xc0),
0x80922210:("Arrow_Fire_InitVars","ActorInit","",0x20),
0x80922230:("D_80922230","UNK_TYPE1","",0x1),
0x80922280:("fireArrowActorInitVars","ActorInitVar","[1]",0x4),
0x80922230:("sQuadInit","UNK_TYPE1","",0x1),
0x80922280:("sInitChain","ActorInitVar","[1]",0x4),
0x80922284:("D_80922284","Vec3f","",0xc),
0x80922290:("D_80922290","Vec3f","",0xc),
0x8092229C:("D_8092229C","Vec3f","",0xc),
@@ -8041,7 +8040,7 @@
0x80925F10:("D_80925F10","UNK_TYPE1","",0x1),
0x80925FC0:("D_80925FC0","UNK_TYPE1","",0x1),
0x80926080:("Arrow_Light_InitVars","UNK_TYPE1","",0x1),
0x809260A0:("D_809260A0","UNK_TYPE1","",0x1),
0x809260A0:("sInitChain","UNK_TYPE1","",0x1),
0x809260B0:("D_809260B0","char","[]",0x1),
0x809260B8:("D_809260B8","f32","",0x4),
0x809260BC:("D_809260BC","f32","",0x4),