1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-22 05:14:47 +00:00
oot/asm/non_matchings/overlays/actors
Kenix3 353684c638
ovl_demo_effect 100% OK (#466)
* Fully decompiles demo_effect actor.

* Formats z_demo_effect.c

* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE

* Implements OPEN_DISPS macros for all draw functions.

* Fixes ugly float values

* Removes unnecessary union structs in the DemoEffect actor struct

* Renames DemoEffect SkelAnimeCurve member to skelCurve

* Names initObjectBankIndex DemoEffect struct member

* Renames jewel display list holders

* Renames initialization function pointers to initUpdateFunc and initDrawFunc

* Renames primitive and environment color DemoEffect struct members.

* Fixes a couple missed floats.

* Renames most draw and update functions.

* Finishes naming all update functions.

* Adds additional SFX defines.

* Renames the rest of the functions

* Renames all external object display lists and vertex references

* Renames DemoEffect global data variables

* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too

* Fixes DemoEffect Timewarp_Timeblock documentation.

* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal

* Converts DemoEffect hex to decimal where appopriate

* Names the rest of DemoEffect struct members.

* Names DemoEffect triforceSpot crystalLightOpacity

* Adds DemoEffect enums for light effect color and god lgt types.

* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow

* Fixes compiler warning in DemoEffect_JewelSparkle

* Renames DemoEffect_MedalSparkle argument

* Reformatting DemoEffect struct offset comments.

* Formats z_demo_effect

* Updates DemoEffect oGfxCtx to use the new macros.

* Adds comments detailing what each function in the DemoEffect system does.

* Removes z_demo_effect.data.s

* Renames DemoEffect global variables and sets them to static

* Removes pointer from DemoEffect function references

* Removes unncecessary default: break; statements in DemoEffect

* Converts rotation values to hex in DemoEffect

* DemoEffect effectFlags now uses ~1 rather than 65534

* DemoEffect_DrawGodLgt now uses a cleaner conditional statement

* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11

* DemoEffect now uses VT macros.

* Converts DemoEffect colors to hex.

* Changes M_PI / 32768.0f to M_PI / 0x8000

* Updates demo_effect enums to be all caps

* ovl_demo_effect reloc info is now included via build process rather than included from original asm

* Adds param packing macro

* DemoEffect struct unions are now typedef'd outside of the main struct

* Reformats DemoEffect sJewelSparkleColors

* Removes an if(globalCtx){} in DemoEffect_Init

* Removes ActorFunc cast in DemoEffect_Wait

* Removes unncessary comment in DemoEffect_MedalSparkle

* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256

* Removes unnecessary comment in DemoEffect_SetJewelColor

* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime

* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime

* Converts a while to for loop in DemoEffect_JewelSparkle

* Moves stack variables in DemoEffect_UpdateDust to a new line for each one

* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel

* Removes unnecessary comment in DemoEffect_DrawCrystalLight

* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt

* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.

* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-07 12:48:29 -05:00
..
ovl_Bg_Bombwall z_collision_check.c (#73) 2020-04-25 22:43:35 -04:00
ovl_Bg_Breakwall rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96) 2020-04-28 00:14:27 -04:00
ovl_Bg_Dy_Yoseizo SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_Bg_Gnd_Firemeiro
ovl_Bg_Gnd_Iceblock Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_Bg_Haka_Gate decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Haka_Huta Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_Bg_Haka_Sgami Decompile most effect files in "code" (#144) 2020-05-18 14:24:00 -04:00
ovl_Bg_Haka_Ship attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Haka_Zou All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Hidan_Hamstep attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Hidan_Hrock z_collision_check.c (#73) 2020-04-25 22:43:35 -04:00
ovl_Bg_Hidan_Kowarerukabe All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Hidan_Rock decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Hidan_Sekizou decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Hidan_Sima decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Ice_Objects Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_Bg_Ice_Shelter z_collision_check.c (#73) 2020-04-25 22:43:35 -04:00
ovl_Bg_Jya_Bigmirror attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Jya_Cobra attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Jya_Haheniron All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Jya_Ironobj All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Mizu_Bwall z_collision_check.c (#73) 2020-04-25 22:43:35 -04:00
ovl_Bg_Mizu_Movebg attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Relay_Objects Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_Bg_Spot00_Hanebasi decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Spot02_Objects All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Spot06_Objects All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Bg_Spot07_Taki
ovl_Bg_Spot08_Iceblock attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Bg_Sst_Floor decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Bg_Toki_Hikari
ovl_Bg_Vb_Sima
ovl_Bg_Ydan_Sp All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Boss_Dodongo decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Fd decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Fd2 decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Ganon decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Ganon2 decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Ganondrof decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Goma decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Mo decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Sst decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Tw decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Boss_Va decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Demo_6K decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Demo_Du SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_Demo_Ext Split remaining unsplit asm files and migrate more rodata (#277) 2020-07-19 21:08:50 -04:00
ovl_Demo_Gj All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Demo_Ik SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_Demo_Kankyo attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Demo_Kekkai All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Demo_Tre_Lgt Split remaining unsplit asm files and migrate more rodata (#277) 2020-07-19 21:08:50 -04:00
ovl_Door_Killer SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_Door_Warp1 decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Efc_Erupc
ovl_Eff_Dust
ovl_En_Am SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Anubice SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Anubice_Fire All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Arrow SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ba Bomb Related Effect Overlays (#283) 2020-07-28 15:49:00 -04:00
ovl_En_Bb decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Bdfire z_lights.c OK (#343) 2020-09-05 09:45:10 -04:00
ovl_En_Bigokuta decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Bili decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Bom_Chu All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Brob SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Bubble All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Bw SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Clear_Tag decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Cs SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Daiku ovl_En_Daiku OK and documented (#422) 2020-12-03 16:58:05 -05:00
ovl_En_Daiku_Kakariko SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Dekubaba SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Dekunuts SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Diving_Game decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Dnt_Demo Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_En_Dnt_Jiji SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Dnt_Nomal SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Dodojr SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Du SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Eiyer SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Elf Three new matching functions (#492) 2020-11-19 16:49:08 -05:00
ovl_En_Encount2 attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_En_Ex_Item attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_En_fHG decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Fhg_Fire All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Fire_Rock All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Fish SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Fr SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Fz All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_G_Switch All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Ganon_Mant
ovl_En_Gb SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ge1 SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ge2 SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ge3 SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_GeldB SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Go decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Go2 decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Goma SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Holl decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Honotrap decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Horse decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Horse_Game_Check Math3D and olib updates (#315) 2020-08-17 15:42:08 -04:00
ovl_En_Hy SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_In decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Jj SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Jsjutan
ovl_En_Kanban All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Ko decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_M_Thunder z_lights.c OK (#343) 2020-09-05 09:45:10 -04:00
ovl_En_Mk SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Mm SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Mm2 SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Mu SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ny All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Ossan SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Owl SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Peehat SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Po_Sisters Matched EnPoRelay, DemoGt, one more in EnPoSisters, and cleanup BgBdanSwitch (#513) 2020-12-06 12:06:56 -05:00
ovl_En_River_Sound
ovl_En_Sa SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Sda
ovl_En_Shopnuts SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Skb SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Skj SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Sth SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Stream
ovl_En_Sw SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Syateki_Itm attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_En_Syateki_Man SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Ta decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Test SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Tg SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Tite SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Torch2 SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Toryo SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Tp All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Tr decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Trap All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Tubo_Trap All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Vali decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Vb_Ball attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_En_Viewer SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Weiyer SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Wf SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Wood02 attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_En_Xc SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Yabusame_Mark All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_En_Zf SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_En_Zl3 Decompiled ovl_En_Zl3 (2 non-matchings) (#491) 2020-12-01 20:48:54 -05:00
ovl_En_Zl4 decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Zo SkelAnime "Skeleton" Documentation Pass (#497) 2020-12-01 22:19:56 -05:00
ovl_Fishing decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Item_Shield All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_kaleido_scope Decompile z_sram.c (#431) 2020-10-11 13:45:08 -04:00
ovl_Magic_Fire z_collision_check.c (#73) 2020-04-25 22:43:35 -04:00
ovl_Mir_Ray Decompile Player (#387) 2020-09-18 21:45:39 -04:00
ovl_Obj_Bean decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_Obj_Hamishi All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Obj_Kibako2 All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Obj_Lift All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Obj_Mure attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Obj_Mure2 attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Obj_Mure3 attchaedA/attachedB renamed to parent/child (#358) 2020-08-29 18:25:16 -04:00
ovl_Obj_Tsubo All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) 2020-09-29 20:18:46 -04:00
ovl_Obj_Warp2block Math3D and olib updates (#315) 2020-08-17 15:42:08 -04:00
ovl_Object_Kankyo Split remaining unsplit asm files and migrate more rodata (#277) 2020-07-19 21:08:50 -04:00
ovl_player_actor En_Elf Decompiled (#432) 2020-10-28 13:02:35 -04:00