mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
ovl_Bg_Dy_Yoseizo and related docs (#1390)
* Add ido setting to permuter * OK * Data imported & named, change spec * Some easy naming * Cleanup * More object stuff and enums * Document EnDyExtra * Document DemoGetitem * Document DemoEffect * Some work on Elforg * Elforg params macro, some more on Elfgrp * Defines for number of fairies * Tweak some flags wording * Label beam * Elfgrp: Name most of the stray fairy handling stuff * cleanup * fix typo * GreatFairyAnimation * name animations * BgDyYoseizo_TrainPlayer * Choose behaviour? * fix merge * format * self review * WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK * jenkins * review * Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c * review --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
co-authored by
Elliptic Ellipsis
Derek Hensley
engineer124
Elliptic Ellipsis
Derek Hensley
engineer124
parent
f6a2f4492a
commit
f08a69a2cb
+40
-40
@@ -6263,17 +6263,17 @@
|
||||
0x808CD238:("EnVm_Draw",),
|
||||
0x808CD740:("DemoEffect_Init",),
|
||||
0x808CD8E8:("DemoEffect_Destroy",),
|
||||
0x808CD940:("func_808CD940",),
|
||||
0x808CD998:("func_808CD998",),
|
||||
0x808CDAD0:("func_808CDAD0",),
|
||||
0x808CDBDC:("func_808CDBDC",),
|
||||
0x808CDCEC:("func_808CDCEC",),
|
||||
0x808CDD70:("func_808CDD70",),
|
||||
0x808CDDE0:("func_808CDDE0",),
|
||||
0x808CD940:("DemoEffect_WaitForObject",),
|
||||
0x808CD998:("DemoEffect_SetupTimewarp",),
|
||||
0x808CDAD0:("DemoEffect_SetPerVertexAlpha",),
|
||||
0x808CDBDC:("DemoEffect_FinishTimewarp",),
|
||||
0x808CDCEC:("DemoEffect_StartTimewarp",),
|
||||
0x808CDD70:("DemoEffect_ShrinkLight",),
|
||||
0x808CDDE0:("DemoEffect_ExpandLight",),
|
||||
0x808CDE54:("DemoEffect_Update",),
|
||||
0x808CDE78:("func_808CDE78",),
|
||||
0x808CDFF8:("func_808CDFF8",),
|
||||
0x808CE078:("func_808CE078",),
|
||||
0x808CDE78:("DemoEffect_OverrideLimbDrawTimewarp",),
|
||||
0x808CDFF8:("DemoEffect_DrawTimewarp",),
|
||||
0x808CE078:("DemoEffect_DrawLight",),
|
||||
0x808CE450:("DemoKankyo_SetupAction",),
|
||||
0x808CE45C:("func_808CE45C",),
|
||||
0x808CF06C:("func_808CF06C",),
|
||||
@@ -9573,9 +9573,9 @@
|
||||
0x80A07740:("func_80A07740",),
|
||||
0x80A0A8A0:("BgDyYoseizo_Init",),
|
||||
0x80A0A95C:("BgDyYoseizo_Destroy",),
|
||||
0x80A0A96C:("func_80A0A96C",),
|
||||
0x80A0A9E4:("func_80A0A9E4",),
|
||||
0x80A0AA40:("func_80A0AA40",),
|
||||
0x80A0A96C:("BgDyYoseizo_UpdateEyes",),
|
||||
0x80A0A9E4:("BgDyYoseizo_Bob",),
|
||||
0x80A0AA40:("BgDyYoseizo_SpawnEffects",),
|
||||
0x80A0AD50:("func_80A0AD50",),
|
||||
0x80A0AE1C:("func_80A0AE1C",),
|
||||
0x80A0AFDC:("func_80A0AFDC",),
|
||||
@@ -9587,14 +9587,14 @@
|
||||
0x80A0B5F0:("func_80A0B5F0",),
|
||||
0x80A0B75C:("func_80A0B75C",),
|
||||
0x80A0B834:("func_80A0B834",),
|
||||
0x80A0B8CC:("func_80A0B8CC",),
|
||||
0x80A0B8CC:("BgDyYoseizo_TrainPlayer",),
|
||||
0x80A0BB08:("func_80A0BB08",),
|
||||
0x80A0BC84:("BgDyYoseizo_Update",),
|
||||
0x80A0BCD8:("func_80A0BCD8",),
|
||||
0x80A0BD40:("func_80A0BD40",),
|
||||
0x80A0BE60:("func_80A0BE60",),
|
||||
0x80A0BF70:("func_80A0BF70",),
|
||||
0x80A0C270:("func_80A0C270",),
|
||||
0x80A0BCD8:("BgDyYoseizo_OverrideLimbDraw",),
|
||||
0x80A0BD40:("BgDyYoseizo_Draw",),
|
||||
0x80A0BE60:("BgDyYoseizo_SpawnEffect",),
|
||||
0x80A0BF70:("BgDyYoseizo_UpdateEffects",),
|
||||
0x80A0C270:("BgDyYoseizo_DrawEffects",),
|
||||
0x80A0C780:("EnBoj05_Init",),
|
||||
0x80A0C790:("EnBoj05_Destroy",),
|
||||
0x80A0C7A0:("EnBoj05_Update",),
|
||||
@@ -10266,16 +10266,16 @@
|
||||
0x80A38FB4:("EnRu_OverrideLimbdraw",),
|
||||
0x80A390F8:("EnRu_PostLimbdraw",),
|
||||
0x80A39204:("EnRu_Draw",),
|
||||
0x80A396B0:("func_80A396B0",),
|
||||
0x80A396B0:("EnElfgrp_SetCutscene",),
|
||||
0x80A3970C:("EnElfgrp_Init",),
|
||||
0x80A39BC0:("EnElfgrp_Destroy",),
|
||||
0x80A39BD0:("func_80A39BD0",),
|
||||
0x80A39C1C:("func_80A39C1C",),
|
||||
0x80A39CD4:("func_80A39CD4",),
|
||||
0x80A39DC8:("func_80A39DC8",),
|
||||
0x80A39F50:("func_80A39F50",),
|
||||
0x80A39FBC:("func_80A39FBC",),
|
||||
0x80A3A044:("func_80A3A044",),
|
||||
0x80A39BD0:("EnElfgrp_GetHeldFairiesCount",),
|
||||
0x80A39C1C:("EnElfgrp_GetFountainFairiesCount",),
|
||||
0x80A39CD4:("EnElfgrp_SetFountainFairiesCount",),
|
||||
0x80A39DC8:("EnElfgrp_SpawnStrayFairies",),
|
||||
0x80A39F50:("EnElfgrp_SummonStrayFairies",),
|
||||
0x80A39FBC:("EnElfgrp_SpinStrayFairies",),
|
||||
0x80A3A044:("EnElfgrp_VanishStrayFairies",),
|
||||
0x80A3A0AC:("func_80A3A0AC",),
|
||||
0x80A3A0F4:("func_80A3A0F4",),
|
||||
0x80A3A210:("func_80A3A210",),
|
||||
@@ -10284,8 +10284,8 @@
|
||||
0x80A3A484:("func_80A3A484",),
|
||||
0x80A3A4AC:("func_80A3A4AC",),
|
||||
0x80A3A520:("func_80A3A520",),
|
||||
0x80A3A600:("func_80A3A600",),
|
||||
0x80A3A610:("func_80A3A610",),
|
||||
0x80A3A600:("EnElfgrp_DoNothing",),
|
||||
0x80A3A610:("EnElfgrp_HealPlayer",),
|
||||
0x80A3A6F4:("func_80A3A6F4",),
|
||||
0x80A3A77C:("func_80A3A77C",),
|
||||
0x80A3A7FC:("func_80A3A7FC",),
|
||||
@@ -10546,8 +10546,8 @@
|
||||
0x80A4F4C8:("func_80A4F4C8",),
|
||||
0x80A4FA40:("DemoGetitem_Init",),
|
||||
0x80A4FB00:("DemoGetitem_Destroy",),
|
||||
0x80A4FB10:("func_80A4FB10",),
|
||||
0x80A4FB68:("func_80A4FB68",),
|
||||
0x80A4FB10:("DemoGetitem_Wait",),
|
||||
0x80A4FB68:("DemoGetitem_PerformCutsceneActions",),
|
||||
0x80A4FCCC:("DemoGetitem_Update",),
|
||||
0x80A4FCF0:("DemoGetitem_Draw",),
|
||||
0x80A4FDD0:("func_80A4FDD0",),
|
||||
@@ -10752,8 +10752,8 @@
|
||||
0x80A61040:("BgSpoutFire_Draw",),
|
||||
0x80A612B0:("EnDyExtra_Destroy",),
|
||||
0x80A612C0:("EnDyExtra_Init",),
|
||||
0x80A61334:("func_80A61334",),
|
||||
0x80A613C8:("func_80A613C8",),
|
||||
0x80A61334:("EnDyExtra_WaitForTrigger",),
|
||||
0x80A613C8:("EnDyExtra_Fall",),
|
||||
0x80A61470:("EnDyExtra_Update",),
|
||||
0x80A614C4:("EnDyExtra_Draw",),
|
||||
0x80A61810:("EnBal_Init",),
|
||||
@@ -12656,15 +12656,15 @@
|
||||
0x80AF3144:("EnTest7_Update",),
|
||||
0x80AF31D0:("func_80AF31D0",),
|
||||
0x80AF3248:("EnTest7_Draw",),
|
||||
0x80AF3910:("func_80AF3910",),
|
||||
0x80AF3910:("ObjLightblock_SpawnEffect",),
|
||||
0x80AF397C:("ObjLightblock_Init",),
|
||||
0x80AF3A80:("ObjLightblock_Destroy",),
|
||||
0x80AF3AC8:("func_80AF3AC8",),
|
||||
0x80AF3ADC:("func_80AF3ADC",),
|
||||
0x80AF3B8C:("func_80AF3B8C",),
|
||||
0x80AF3BA0:("func_80AF3BA0",),
|
||||
0x80AF3C18:("func_80AF3C18",),
|
||||
0x80AF3C34:("func_80AF3C34",),
|
||||
0x80AF3AC8:("ObjLightblock_SetupWait",),
|
||||
0x80AF3ADC:("ObjLightblock_Wait",),
|
||||
0x80AF3B8C:("ObjLightblock_SetupPlayCutscene",),
|
||||
0x80AF3BA0:("ObjLightblock_PlayCutscene",),
|
||||
0x80AF3C18:("ObjLightblock_SetupFadeAway",),
|
||||
0x80AF3C34:("ObjLightblock_FadeAway",),
|
||||
0x80AF3CC0:("ObjLightblock_Update",),
|
||||
0x80AF3CE4:("ObjLightblock_Draw",),
|
||||
0x80AF3F70:("func_80AF3F70",),
|
||||
|
||||
@@ -10574,27 +10574,11 @@
|
||||
0x80A0A88C:("D_80A0A88C","UNK_TYPE4","",0x4),
|
||||
0x80A0A890:("D_80A0A890","UNK_TYPE4","",0x4),
|
||||
0x80A0C4A0:("Bg_Dy_Yoseizo_InitVars","UNK_TYPE1","",0x1),
|
||||
0x80A0C4C0:("D_80A0C4C0","UNK_TYPE4","",0x4),
|
||||
0x80A0C4C4:("D_80A0C4C4","UNK_TYPE4","",0x4),
|
||||
0x80A0C4C8:("D_80A0C4C8","UNK_TYPE4","",0x4),
|
||||
0x80A0C4CC:("D_80A0C4CC","UNK_TYPE4","",0x4),
|
||||
0x80A0C4D0:("D_80A0C4D0","UNK_TYPE4","",0x4),
|
||||
0x80A0C4D8:("D_80A0C4D8","UNK_TYPE4","",0x4),
|
||||
0x80A0C4DC:("D_80A0C4DC","UNK_TYPE4","",0x4),
|
||||
0x80A0C4E0:("D_80A0C4E0","UNK_TYPE4","",0x4),
|
||||
0x80A0C4E4:("D_80A0C4E4","UNK_TYPE1","",0x1),
|
||||
0x80A0C4F8:("D_80A0C4F8","UNK_TYPE1","",0x1),
|
||||
0x80A0C50C:("D_80A0C50C","UNK_TYPE1","",0x1),
|
||||
0x80A0C514:("D_80A0C514","UNK_TYPE1","",0x1),
|
||||
0x80A0C540:("D_80A0C540","f32","",0x4),
|
||||
0x80A0C544:("D_80A0C544","f32","",0x4),
|
||||
0x80A0C548:("D_80A0C548","f32","",0x4),
|
||||
0x80A0C54C:("D_80A0C54C","f32","",0x4),
|
||||
0x80A0C550:("D_80A0C550","f32","",0x4),
|
||||
0x80A0C554:("D_80A0C554","f32","",0x4),
|
||||
0x80A0C558:("D_80A0C558","f32","",0x4),
|
||||
0x80A0C55C:("D_80A0C55C","f32","",0x4),
|
||||
0x80A0C560:("D_80A0C560","f32","",0x4),
|
||||
0x80A0C4C0:("sAnimations","AnimationHeader*","9",0x24),
|
||||
0x80A0C4E4:("sEffectPrimColors","Color_RGB8","6",0x12),
|
||||
0x80A0C4F8:("sEffectEnvColors","Color_RGB8","6",0x12),
|
||||
0x80A0C50C:("sMouthTextures","UNK_TYPE1","2",0x8),
|
||||
0x80A0C514:("sStretchFactors","f32","8",0x20),
|
||||
0x80A0C7C0:("En_Boj_05_InitVars","UNK_TYPE1","",0x1),
|
||||
0x80A10860:("sAnimationsBombShopkeeper","UNK_PTR","",0x4),
|
||||
0x80A10890:("En_Sob1_InitVars","UNK_TYPE1","",0x1),
|
||||
|
||||
@@ -189,7 +189,7 @@ weekEventReg = {
|
||||
(22 << 8) | 0x40: "WEEKEVENTREG_22_40",
|
||||
(22 << 8) | 0x80: "WEEKEVENTREG_22_80",
|
||||
(23 << 8) | 0x01: "WEEKEVENTREG_23_01",
|
||||
(23 << 8) | 0x02: "WEEKEVENTREG_23_02",
|
||||
(23 << 8) | 0x02: "WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK",
|
||||
(23 << 8) | 0x04: "WEEKEVENTREG_23_04",
|
||||
(23 << 8) | 0x08: "WEEKEVENTREG_23_08",
|
||||
(23 << 8) | 0x10: "WEEKEVENTREG_23_10",
|
||||
|
||||
Reference in New Issue
Block a user