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

EnMag OK and documented (#547)

Browse Source 
* Name textures in object_mag

* Corrections

* tabs -> spaces

* OK, data imported

* Remove obsolete comment

* Start documentation

* Defines for most texture sizes

* Name most static variables, add state enum

* Macros, name all the statics

* Couple of minor tweaks to other files

* Name some more effect stuff

* Fix kanfont data

* Name everything else, move macros

* Format

* Review
This commit is contained in:
EllipticEllipsis
2022-01-16 17:55:03 +00:00
committed by GitHub
parent b47941968d
commit 924fa9aadf
12 changed files with 1045 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+7 -7
View File
@@ -7992,14 +7992,14 @@
0x8096B260:("EnOkarinaEffect_Update",),
0x8096B310:("EnMag_Init",),
0x8096B5F4:("EnMag_Destroy",),
0x8096B604:("func_8096B604",),
0x8096B604:("EnMag_UpdateDisplayEffectColors",),
0x8096B94C:("EnMag_Update",),
0x8096C998:("func_8096C998",),
0x8096CBB0:("func_8096CBB0",),
0x8096CDC8:("func_8096CDC8",),
0x8096D230:("func_8096D230",),
0x8096D60C:("func_8096D60C",),
0x8096D74C:("func_8096D74C",),
0x8096C998:("EnMag_DrawTextureI8",),
0x8096CBB0:("EnMag_DrawTextureIA8",),
0x8096CDC8:("EnMag_DrawEffectTextures",),
0x8096D230:("EnMag_DrawImageRGBA32",),
0x8096D60C:("EnMag_DrawCharTexture",),
0x8096D74C:("EnMag_DrawInner",),
0x8096E868:("EnMag_Draw",),
0x8096EC40:("ElfMsg2_SetupAction",),
0x8096EC4C:("func_8096EC4C",),
tools/disasm/variables.txt
+21 -21
View File
@@ -8997,28 +8997,28 @@
0x8096AD3C:("jtbl_8096AD3C","UNK_PTR","",0x4),
0x8096B290:("En_Okarina_Effect_InitVars","UNK_TYPE1","",0x1),
0x8096B2B0:("D_8096B2B0","f32","",0x4),
0x8096E910:("D_8096E910","UNK_TYPE2","",0x2),
0x8096E914:("D_8096E914","UNK_TYPE2","",0x2),
0x8096E918:("D_8096E918","UNK_TYPE2","",0x2),
0x8096E91C:("D_8096E91C","UNK_TYPE2","",0x2),
0x8096E920:("D_8096E920","UNK_TYPE2","",0x2),
0x8096E910:("sInputDelayTimer","s16","",0x2),
0x8096E914:("sZeldaEffectColorTimer","s16","",0x2),
0x8096E918:("sZeldaEffectColorTargetIndex","s16","",0x2),
0x8096E91C:("sTextAlphaTargetIndex","s16","",0x2),
0x8096E920:("sTextAlphaTimer","s16","",0x2),
0x8096E924:("En_Mag_InitVars","UNK_TYPE1","",0x1),
0x8096E944:("D_8096E944","UNK_TYPE1","",0x1),
0x8096E948:("D_8096E948","UNK_TYPE1","",0x1),
0x8096E94C:("D_8096E94C","UNK_TYPE1","",0x1),
0x8096E950:("D_8096E950","UNK_TYPE1","",0x1),
0x8096E954:("D_8096E954","UNK_TYPE1","",0x1),
0x8096E958:("D_8096E958","UNK_TYPE2","",0x2),
0x8096E95C:("D_8096E95C","UNK_TYPE2","",0x2),
0x8096E960:("D_8096E960","UNK_TYPE2","",0x2),
0x8096E964:("D_8096E964","UNK_TYPE1","",0x1),
0x8096E970:("D_8096E970","UNK_TYPE4","",0x4),
0x8096E988:("D_8096E988","UNK_TYPE4","",0x4),
0x8096E9A0:("D_8096E9A0","UNK_TYPE4","",0x4),
0x8096E9B8:("D_8096E9B8","UNK_TYPE2","",0x2),
0x8096E9C4:("D_8096E9C4","UNK_TYPE2","",0x2),
0x8096E9D0:("D_8096E9D0","UNK_TYPE2","",0x2),
0x8096E9D4:("D_8096E9D4","UNK_TYPE1","",0x1),
0x8096E944:("sDisplayEffectPrimRedTargets","s16","[2]",0x4),
0x8096E948:("sDisplayEffectPrimGreenTargets","s16","[2]",0x4),
0x8096E94C:("sDisplayEffectPrimBlueTargets","s16","[2]",0x4),
0x8096E950:("sDisplayEffectEnvRedTargets","s16","[2]",0x4),
0x8096E954:("sDisplayEffectEnvBlueTargets","s16","[2]",0x4),
0x8096E958:("sAppearEffectPrimGreenTargets","s16","[2]",0x4),
0x8096E95C:("sAppearEffectEnvRedTargets","s16","[2]",0x4),
0x8096E960:("sAppearEffectEnvBlueTargets","s16","[2]",0x4),
0x8096E964:("pressStartFontIndices","u8","[10]",0x1),
0x8096E970:("sAppearEffectMaskTextures","TexturePtr","[6]",0x18),
0x8096E988:("sDisplayEffectMaskTextures","TexturePtr","[6]",0x18),
0x8096E9A0:("sEffectTextures","TexturePtr","[6]",0x18),
0x8096E9B8:("sEffectScrollVelocitySs","s16","[6]",0xC),
0x8096E9C4:("sEffectScrollVelocityTs","s16","[6]",0xC),
0x8096E9D0:("sTextAlpha","s16","",0x2),
0x8096E9D4:("sTextAlphaTargets","s16","[2]",0x4),
0x8096E9E0:("jtbl_8096E9E0","UNK_PTR","",0x4),
0x8096F090:("Elf_Msg2_InitVars","UNK_TYPE1","",0x1),
0x8096F0B0:("D_8096F0B0","UNK_TYPE1","",0x1),