From f4904ab79381b3f47535c09ef42b51f4683db2bc Mon Sep 17 00:00:00 2001 From: Tom Overton Date: Fri, 21 Oct 2022 17:36:32 -0700 Subject: [PATCH] Document object_boss01 (Odolwa) (#1132) * Document limbs * Finish object * Forgot this translation * Respond to all reviews --- assets/xml/objects/object_boss01.xml | 413 +++++++++++++----------- assets/xml/objects/object_bsmask.xml | 2 +- assets/xml/objects/object_ob.xml | 12 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 2 +- 4 files changed, 236 insertions(+), 193 deletions(-) diff --git a/assets/xml/objects/object_boss01.xml b/assets/xml/objects/object_boss01.xml index 89cc97a7e0..08730f0345 100644 --- a/assets/xml/objects/object_boss01.xml +++ b/assets/xml/objects/object_boss01.xml @@ -1,189 +1,232 @@  + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bsmask.xml b/assets/xml/objects/object_bsmask.xml index ea94aa89eb..0e7a349cb0 100644 --- a/assets/xml/objects/object_bsmask.xml +++ b/assets/xml/objects/object_bsmask.xml @@ -18,7 +18,7 @@ - + diff --git a/assets/xml/objects/object_ob.xml b/assets/xml/objects/object_ob.xml index d2390fc395..aa95db9bcc 100644 --- a/assets/xml/objects/object_ob.xml +++ b/assets/xml/objects/object_ob.xml @@ -3,7 +3,7 @@ - + @@ -18,16 +18,16 @@ - - + + - - - + + + diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index fa8cebd06b..51296413ee 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -60,7 +60,7 @@ static ColliderCylinderInit sCylinderInit = { }; static Gfx* D_8096ABCC[] = { - gMoonChildMajorasMaskDL, gMoonChildOdalwasMaskDL, gMoonChildGohtsMaskDL, + gMoonChildMajorasMaskDL, gMoonChildOdolwasMaskDL, gMoonChildGohtsMaskDL, gMoonChildGyorgsMaskDL, gMoonChildTwinmoldsMaskDL, };