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

Decompile and clean up some effect files (#342)

Browse Source 
* Decompile various effect files and cleanup z_effect.c

* Decompile z_eff_tire_mark.c and cleanup structs

* Small cleanups

* Apply most review suggestions

* Apply more review suggestions

* Change eff_shield_particle vertices to be extracted as an asset

* Add relevant effect functions to actorfixer.py
This commit is contained in:
Roman971
2021-12-27 02:51:16 +00:00
committed by GitHub
parent 6fba9aa388
commit 6c2f521373
23 changed files with 2198 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/sizes/code_functions.csv
+19 -19
View File
@@ -25,28 +25,28 @@ asm/non_matchings/code/z_en_item00/Item_DropCollectibleRandom.s,Item_DropCollect
asm/non_matchings/code/z_en_item00/func_800A8150.s,func_800A8150,0x800A8150,0xB
asm/non_matchings/code/z_en_item00/func_800A817C.s,func_800A817C,0x800A817C,0xA
asm/non_matchings/code/z_en_item00/func_800A81A4.s,func_800A81A4,0x800A81A4,0x13
asm/non_matchings/code/z_eff_blure/func_800A81F0.s,func_800A81F0,0x800A81F0,0xC9
asm/non_matchings/code/z_eff_blure/func_800A8514.s,func_800A8514,0x800A8514,0x11
asm/non_matchings/code/z_eff_blure/EffectBlure_Initcommon.s,EffectBlure_Initcommon,0x800A8558,0x2E
asm/non_matchings/code/z_eff_blure/EffectBlure_AddVertex.s,EffectBlure_AddVertex,0x800A81F0,0xC9
asm/non_matchings/code/z_eff_blure/EffectBlure_AddSpace.s,EffectBlure_AddSpace,0x800A8514,0x11
asm/non_matchings/code/z_eff_blure/EffectBlure_InitElements.s,EffectBlure_InitElements,0x800A8558,0x2E
asm/non_matchings/code/z_eff_blure/EffectBlure_Init1.s,EffectBlure_Init1,0x800A8610,0x44
asm/non_matchings/code/z_eff_blure/EffectBlure_Init2.s,EffectBlure_Init2,0x800A8720,0x4D
asm/non_matchings/code/z_eff_blure/EffectBlure_Destroy.s,EffectBlure_Destroy,0x800A8854,0x3
asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s,EffectBlure_Update,0x800A8860,0x106
asm/non_matchings/code/z_eff_blure/func_800A8C78.s,func_800A8C78,0x800A8C78,0x5C
asm/non_matchings/code/z_eff_blure/func_800A8DE8.s,func_800A8DE8,0x800A8DE8,0x145
asm/non_matchings/code/z_eff_blure/func_800A92FC.s,func_800A92FC,0x800A92FC,0xD
asm/non_matchings/code/z_eff_blure/func_800A9330.s,func_800A9330,0x800A9330,0x135
asm/non_matchings/code/z_eff_blure/func_800A9804.s,func_800A9804,0x800A9804,0x263
asm/non_matchings/code/z_eff_blure/func_800AA190.s,func_800AA190,0x800AA190,0xB4
asm/non_matchings/code/z_eff_blure/func_800AA460.s,func_800AA460,0x800AA460,0xE
asm/non_matchings/code/z_eff_blure/func_800AA498.s,func_800AA498,0x800AA498,0x9A
asm/non_matchings/code/z_eff_blure/func_800AA700.s,func_800AA700,0x800AA700,0x138
asm/non_matchings/code/z_eff_blure/func_800AABE0.s,func_800AABE0,0x800AABE0,0x143
asm/non_matchings/code/z_eff_blure/EffectBlure_UpdateFlags.s,EffectBlure_UpdateFlags,0x800A8C78,0x5C
asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s,EffectBlure_GetComputedValues,0x800A8DE8,0x145
asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSmooth.s,EffectBlure_SetupSmooth,0x800A92FC,0xD
asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemNoInterpolation.s,EffectBlure_DrawElemNoInterpolation,0x800A9330,0x135
asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s,EffectBlure_DrawElemHermiteInterpolation,0x800A9804,0x263
asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s,EffectBlure_DrawSmooth,0x800AA190,0xB4
asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimple.s,EffectBlure_SetupSimple,0x800AA460,0xE
asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimpleAlt.s,EffectBlure_SetupSimpleAlt,0x800AA498,0x9A
asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimpleVertices.s,EffectBlure_DrawSimpleVertices,0x800AA700,0x138
asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s,EffectBlure_DrawSimple,0x800AABE0,0x143
asm/non_matchings/code/z_eff_blure/EffectBlure_Draw.s,EffectBlure_Draw,0x800AB0EC,0x139
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Init.s,EffectShieldParticle_Init,0x800AB5D0,0x8E
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Destroy.s,EffectShieldParticle_Destroy,0x800AB808,0x23
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Update.s,EffectShieldParticle_Update,0x800AB894,0x59
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_CalculateColors.s,EffectShieldParticle_CalculateColors,0x800AB9F8,0x348
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_GetColors.s,EffectShieldParticle_GetColors,0x800AB9F8,0x348
asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Draw.s,EffectShieldParticle_Draw,0x800AC718,0x136
asm/non_matchings/code/z_eff_spark/EffectSpark_Init.s,EffectSpark_Init,0x800ACBF0,0xF7
asm/non_matchings/code/z_eff_spark/EffectSpark_Destroy.s,EffectSpark_Destroy,0x800ACFCC,0x3
@@ -60,15 +60,15 @@ asm/non_matchings/code/z_eff_ss_dead/func_800AE778.s,func_800AE778,0x800AE778,0x
asm/non_matchings/code/z_eff_ss_dead/func_800AE8EC.s,func_800AE8EC,0x800AE8EC,0x11
asm/non_matchings/code/z_eff_tire_mark/func_800AE930.s,func_800AE930,0x800AE930,0x185
asm/non_matchings/code/z_eff_tire_mark/func_800AEF44.s,func_800AEF44,0x800AEF44,0xB
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitParticle.s,EffectTireMark_InitParticle,0x800AEF70,0xC
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitElement.s,EffectTireMark_InitElement,0x800AEF70,0xC
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Init.s,EffectTireMark_Init,0x800AEFA0,0x29
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Destroy.s,EffectTireMark_Destroy,0x800AF044,0x3
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Update.s,EffectTireMark_Update,0x800AF050,0x8D
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitVertices.s,EffectTireMark_InitVertices,0x800AF284,0x23
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_SetVertices.s,EffectTireMark_SetVertices,0x800AF284,0x23
asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Draw.s,EffectTireMark_Draw,0x800AF310,0x100
asm/non_matchings/code/z_effect/Effect_GetContext.s,Effect_GetContext,0x800AF710,0x4
asm/non_matchings/code/z_effect/Effect_GetParams.s,Effect_GetParams,0x800AF720,0x57
asm/non_matchings/code/z_effect/Effect_InitCommon.s,Effect_InitCommon,0x800AF87C,0x5
asm/non_matchings/code/z_effect/Effect_GetGlobalCtx.s,Effect_GetGlobalCtx,0x800AF710,0x4
asm/non_matchings/code/z_effect/Effect_GetByIndex.s,Effect_GetByIndex,0x800AF720,0x57
asm/non_matchings/code/z_effect/Effect_InitStatus.s,Effect_InitStatus,0x800AF87C,0x5
asm/non_matchings/code/z_effect/Effect_Init.s,Effect_Init,0x800AF890,0x34
asm/non_matchings/code/z_effect/Effect_Add.s,Effect_Add,0x800AF960,0x71
asm/non_matchings/code/z_effect/Effect_DrawAll.s,Effect_DrawAll,0x800AFB24,0x4F
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
25 asm/non_matchings/code/z_en_item00/func_800A8150.s func_800A8150 0x800A8150 0xB
26 asm/non_matchings/code/z_en_item00/func_800A817C.s func_800A817C 0x800A817C 0xA
27 asm/non_matchings/code/z_en_item00/func_800A81A4.s func_800A81A4 0x800A81A4 0x13
28 asm/non_matchings/code/z_eff_blure/func_800A81F0.s asm/non_matchings/code/z_eff_blure/EffectBlure_AddVertex.s func_800A81F0 EffectBlure_AddVertex 0x800A81F0 0xC9
29 asm/non_matchings/code/z_eff_blure/func_800A8514.s asm/non_matchings/code/z_eff_blure/EffectBlure_AddSpace.s func_800A8514 EffectBlure_AddSpace 0x800A8514 0x11
30 asm/non_matchings/code/z_eff_blure/EffectBlure_Initcommon.s asm/non_matchings/code/z_eff_blure/EffectBlure_InitElements.s EffectBlure_Initcommon EffectBlure_InitElements 0x800A8558 0x2E
31 asm/non_matchings/code/z_eff_blure/EffectBlure_Init1.s EffectBlure_Init1 0x800A8610 0x44
32 asm/non_matchings/code/z_eff_blure/EffectBlure_Init2.s EffectBlure_Init2 0x800A8720 0x4D
33 asm/non_matchings/code/z_eff_blure/EffectBlure_Destroy.s EffectBlure_Destroy 0x800A8854 0x3
34 asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s EffectBlure_Update 0x800A8860 0x106
35 asm/non_matchings/code/z_eff_blure/func_800A8C78.s asm/non_matchings/code/z_eff_blure/EffectBlure_UpdateFlags.s func_800A8C78 EffectBlure_UpdateFlags 0x800A8C78 0x5C
36 asm/non_matchings/code/z_eff_blure/func_800A8DE8.s asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s func_800A8DE8 EffectBlure_GetComputedValues 0x800A8DE8 0x145
37 asm/non_matchings/code/z_eff_blure/func_800A92FC.s asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSmooth.s func_800A92FC EffectBlure_SetupSmooth 0x800A92FC 0xD
38 asm/non_matchings/code/z_eff_blure/func_800A9330.s asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemNoInterpolation.s func_800A9330 EffectBlure_DrawElemNoInterpolation 0x800A9330 0x135
39 asm/non_matchings/code/z_eff_blure/func_800A9804.s asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s func_800A9804 EffectBlure_DrawElemHermiteInterpolation 0x800A9804 0x263
40 asm/non_matchings/code/z_eff_blure/func_800AA190.s asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s func_800AA190 EffectBlure_DrawSmooth 0x800AA190 0xB4
41 asm/non_matchings/code/z_eff_blure/func_800AA460.s asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimple.s func_800AA460 EffectBlure_SetupSimple 0x800AA460 0xE
42 asm/non_matchings/code/z_eff_blure/func_800AA498.s asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimpleAlt.s func_800AA498 EffectBlure_SetupSimpleAlt 0x800AA498 0x9A
43 asm/non_matchings/code/z_eff_blure/func_800AA700.s asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimpleVertices.s func_800AA700 EffectBlure_DrawSimpleVertices 0x800AA700 0x138
44 asm/non_matchings/code/z_eff_blure/func_800AABE0.s asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s func_800AABE0 EffectBlure_DrawSimple 0x800AABE0 0x143
45 asm/non_matchings/code/z_eff_blure/EffectBlure_Draw.s EffectBlure_Draw 0x800AB0EC 0x139
46 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Init.s EffectShieldParticle_Init 0x800AB5D0 0x8E
47 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Destroy.s EffectShieldParticle_Destroy 0x800AB808 0x23
48 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Update.s EffectShieldParticle_Update 0x800AB894 0x59
49 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_CalculateColors.s asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_GetColors.s EffectShieldParticle_CalculateColors EffectShieldParticle_GetColors 0x800AB9F8 0x348
50 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Draw.s EffectShieldParticle_Draw 0x800AC718 0x136
51 asm/non_matchings/code/z_eff_spark/EffectSpark_Init.s EffectSpark_Init 0x800ACBF0 0xF7
52 asm/non_matchings/code/z_eff_spark/EffectSpark_Destroy.s EffectSpark_Destroy 0x800ACFCC 0x3
60 asm/non_matchings/code/z_eff_ss_dead/func_800AE8EC.s func_800AE8EC 0x800AE8EC 0x11
61 asm/non_matchings/code/z_eff_tire_mark/func_800AE930.s func_800AE930 0x800AE930 0x185
62 asm/non_matchings/code/z_eff_tire_mark/func_800AEF44.s func_800AEF44 0x800AEF44 0xB
63 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitParticle.s asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitElement.s EffectTireMark_InitParticle EffectTireMark_InitElement 0x800AEF70 0xC
64 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Init.s EffectTireMark_Init 0x800AEFA0 0x29
65 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Destroy.s EffectTireMark_Destroy 0x800AF044 0x3
66 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Update.s EffectTireMark_Update 0x800AF050 0x8D
67 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitVertices.s asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_SetVertices.s EffectTireMark_InitVertices EffectTireMark_SetVertices 0x800AF284 0x23
68 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Draw.s EffectTireMark_Draw 0x800AF310 0x100
69 asm/non_matchings/code/z_effect/Effect_GetContext.s asm/non_matchings/code/z_effect/Effect_GetGlobalCtx.s Effect_GetContext Effect_GetGlobalCtx 0x800AF710 0x4
70 asm/non_matchings/code/z_effect/Effect_GetParams.s asm/non_matchings/code/z_effect/Effect_GetByIndex.s Effect_GetParams Effect_GetByIndex 0x800AF720 0x57
71 asm/non_matchings/code/z_effect/Effect_InitCommon.s asm/non_matchings/code/z_effect/Effect_InitStatus.s Effect_InitCommon Effect_InitStatus 0x800AF87C 0x5
72 asm/non_matchings/code/z_effect/Effect_Init.s Effect_Init 0x800AF890 0x34
73 asm/non_matchings/code/z_effect/Effect_Add.s Effect_Add 0x800AF960 0x71
74 asm/non_matchings/code/z_effect/Effect_DrawAll.s Effect_DrawAll 0x800AFB24 0x4F