z_parameter: Magic (#934)

* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
This commit is contained in:
engineer124
2022-09-14 12:49:17 -04:00
committed by GitHub
parent 85e141128b
commit 6451bcf158
41 changed files with 699 additions and 203 deletions
+10 -10
View File
@@ -325,7 +325,7 @@ asm/non_matchings/code/z_actor/func_800B9038.s,func_800B9038,0x800B9038,0x13
asm/non_matchings/code/z_actor/func_800B9084.s,func_800B9084,0x800B9084,0x5
asm/non_matchings/code/z_actor/func_800B9098.s,func_800B9098,0x800B9098,0x5
asm/non_matchings/code/z_actor/func_800B90AC.s,func_800B90AC,0x800B90AC,0x12
asm/non_matchings/code/z_actor/func_800B90F4.s,func_800B90F4,0x800B90F4,0xB
asm/non_matchings/code/z_actor/Actor_DeactivateLens.s,Actor_DeactivateLens,0x800B90F4,0xB
asm/non_matchings/code/z_actor/func_800B9120.s,func_800B9120,0x800B9120,0x14
asm/non_matchings/code/z_actor/Actor_InitContext.s,Actor_InitContext,0x800B9170,0x71
asm/non_matchings/code/z_actor/Actor_SpawnSetupActors.s,Actor_SpawnSetupActors,0x800B9334,0x56
@@ -335,8 +335,8 @@ asm/non_matchings/code/z_actor/Actor_Draw.s,Actor_Draw,0x800B9A04,0xC6
asm/non_matchings/code/z_actor/func_800B9D1C.s,func_800B9D1C,0x800B9D1C,0x48
asm/non_matchings/code/z_actor/Actor_DrawAllSetup.s,Actor_DrawAllSetup,0x800B9E3C,0x4
asm/non_matchings/code/z_actor/Actor_RecordUndrawnActor.s,Actor_RecordUndrawnActor,0x800B9E4C,0xE
asm/non_matchings/code/z_actor/func_800B9E84.s,func_800B9E84,0x800B9E84,0x1C
asm/non_matchings/code/z_actor/func_800B9EF4.s,func_800B9EF4,0x800B9EF4,0xF9
asm/non_matchings/code/z_actor/Actor_DrawLensOverlay.s,Actor_DrawLensOverlay,0x800B9E84,0x1C
asm/non_matchings/code/z_actor/Actor_DrawLensActors.s,Actor_DrawLensActors,0x800B9EF4,0xF9
asm/non_matchings/code/z_actor/func_800BA2D8.s,func_800BA2D8,0x800BA2D8,0x9
asm/non_matchings/code/z_actor/func_800BA2FC.s,func_800BA2FC,0x800BA2FC,0x4C
asm/non_matchings/code/z_actor/Actor_DrawAll.s,Actor_DrawAll,0x800BA42C,0xB4
@@ -1648,13 +1648,13 @@ asm/non_matchings/code/z_parameter/Health_ChangeBy.s,Health_ChangeBy,0x80115908,
asm/non_matchings/code/z_parameter/Health_GiveHearts.s,Health_GiveHearts,0x801159C0,0xB
asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s,Rupees_ChangeBy,0x801159EC,0xA
asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s,Inventory_ChangeAmmo,0x80115A14,0xC0
asm/non_matchings/code/z_parameter/Parameter_AddMagic.s,Parameter_AddMagic,0x80115D14,0x12
asm/non_matchings/code/z_parameter/func_80115D5C.s,func_80115D5C,0x80115D5C,0x16
asm/non_matchings/code/z_parameter/func_80115DB4.s,func_80115DB4,0x80115DB4,0xB5
asm/non_matchings/code/z_parameter/func_80116088.s,func_80116088,0x80116088,0x23
asm/non_matchings/code/z_parameter/func_80116114.s,func_80116114,0x80116114,0x8D
asm/non_matchings/code/z_parameter/func_80116348.s,func_80116348,0x80116348,0x174
asm/non_matchings/code/z_parameter/func_80116918.s,func_80116918,0x80116918,0x1B0
asm/non_matchings/code/z_parameter/Magic_Add.s,Magic_Add,0x80115D14,0x12
asm/non_matchings/code/z_parameter/Magic_Reset.s,Magic_Reset,0x80115D5C,0x16
asm/non_matchings/code/z_parameter/Magic_Consume.s,Magic_Consume,0x80115DB4,0xB5
asm/non_matchings/code/z_parameter/Magic_UpdateAddRequest.s,Magic_UpdateAddRequest,0x80116088,0x23
asm/non_matchings/code/z_parameter/Magic_FlashMeterBorder.s,Magic_FlashMeterBorder,0x80116114,0x8D
asm/non_matchings/code/z_parameter/Magic_Update.s,Magic_Update,0x80116348,0x174
asm/non_matchings/code/z_parameter/Magic_DrawMeter.s,Magic_DrawMeter,0x80116918,0x1B0
asm/non_matchings/code/z_parameter/func_80116FD8.s,func_80116FD8,0x80116FD8,0x38
asm/non_matchings/code/z_parameter/func_801170B8.s,func_801170B8,0x801170B8,0x12
asm/non_matchings/code/z_parameter/func_80117100.s,func_80117100,0x80117100,0x248
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
325 asm/non_matchings/code/z_actor/func_800B9084.s func_800B9084 0x800B9084 0x5
326 asm/non_matchings/code/z_actor/func_800B9098.s func_800B9098 0x800B9098 0x5
327 asm/non_matchings/code/z_actor/func_800B90AC.s func_800B90AC 0x800B90AC 0x12
328 asm/non_matchings/code/z_actor/func_800B90F4.s asm/non_matchings/code/z_actor/Actor_DeactivateLens.s func_800B90F4 Actor_DeactivateLens 0x800B90F4 0xB
329 asm/non_matchings/code/z_actor/func_800B9120.s func_800B9120 0x800B9120 0x14
330 asm/non_matchings/code/z_actor/Actor_InitContext.s Actor_InitContext 0x800B9170 0x71
331 asm/non_matchings/code/z_actor/Actor_SpawnSetupActors.s Actor_SpawnSetupActors 0x800B9334 0x56
335 asm/non_matchings/code/z_actor/func_800B9D1C.s func_800B9D1C 0x800B9D1C 0x48
336 asm/non_matchings/code/z_actor/Actor_DrawAllSetup.s Actor_DrawAllSetup 0x800B9E3C 0x4
337 asm/non_matchings/code/z_actor/Actor_RecordUndrawnActor.s Actor_RecordUndrawnActor 0x800B9E4C 0xE
338 asm/non_matchings/code/z_actor/func_800B9E84.s asm/non_matchings/code/z_actor/Actor_DrawLensOverlay.s func_800B9E84 Actor_DrawLensOverlay 0x800B9E84 0x1C
339 asm/non_matchings/code/z_actor/func_800B9EF4.s asm/non_matchings/code/z_actor/Actor_DrawLensActors.s func_800B9EF4 Actor_DrawLensActors 0x800B9EF4 0xF9
340 asm/non_matchings/code/z_actor/func_800BA2D8.s func_800BA2D8 0x800BA2D8 0x9
341 asm/non_matchings/code/z_actor/func_800BA2FC.s func_800BA2FC 0x800BA2FC 0x4C
342 asm/non_matchings/code/z_actor/Actor_DrawAll.s Actor_DrawAll 0x800BA42C 0xB4
1648 asm/non_matchings/code/z_parameter/Health_GiveHearts.s Health_GiveHearts 0x801159C0 0xB
1649 asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s Rupees_ChangeBy 0x801159EC 0xA
1650 asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s Inventory_ChangeAmmo 0x80115A14 0xC0
1651 asm/non_matchings/code/z_parameter/Parameter_AddMagic.s asm/non_matchings/code/z_parameter/Magic_Add.s Parameter_AddMagic Magic_Add 0x80115D14 0x12
1652 asm/non_matchings/code/z_parameter/func_80115D5C.s asm/non_matchings/code/z_parameter/Magic_Reset.s func_80115D5C Magic_Reset 0x80115D5C 0x16
1653 asm/non_matchings/code/z_parameter/func_80115DB4.s asm/non_matchings/code/z_parameter/Magic_Consume.s func_80115DB4 Magic_Consume 0x80115DB4 0xB5
1654 asm/non_matchings/code/z_parameter/func_80116088.s asm/non_matchings/code/z_parameter/Magic_UpdateAddRequest.s func_80116088 Magic_UpdateAddRequest 0x80116088 0x23
1655 asm/non_matchings/code/z_parameter/func_80116114.s asm/non_matchings/code/z_parameter/Magic_FlashMeterBorder.s func_80116114 Magic_FlashMeterBorder 0x80116114 0x8D
1656 asm/non_matchings/code/z_parameter/func_80116348.s asm/non_matchings/code/z_parameter/Magic_Update.s func_80116348 Magic_Update 0x80116348 0x174
1657 asm/non_matchings/code/z_parameter/func_80116918.s asm/non_matchings/code/z_parameter/Magic_DrawMeter.s func_80116918 Magic_DrawMeter 0x80116918 0x1B0
1658 asm/non_matchings/code/z_parameter/func_80116FD8.s func_80116FD8 0x80116FD8 0x38
1659 asm/non_matchings/code/z_parameter/func_801170B8.s func_801170B8 0x801170B8 0x12
1660 asm/non_matchings/code/z_parameter/func_80117100.s func_80117100 0x80117100 0x248