diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index f9ef4c3d3b..82e91605bd 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -24,8 +24,8 @@
-
-
+
+
@@ -51,8 +51,9 @@
-
+
+
diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml
index 43601ef9ba..ccc5c21365 100644
--- a/assets/xml/objects/object_bba.xml
+++ b/assets/xml/objects/object_bba.xml
@@ -17,15 +17,15 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml
index 0aab07b21a..5c33ea778f 100644
--- a/assets/xml/objects/object_bob.xml
+++ b/assets/xml/objects/object_bob.xml
@@ -17,15 +17,15 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_bombiwa.xml b/assets/xml/objects/object_bombiwa.xml
index b0b5628c4d..26ab6b4f33 100644
--- a/assets/xml/objects/object_bombiwa.xml
+++ b/assets/xml/objects/object_bombiwa.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml
index 712d4b4959..f7d5ecead7 100644
--- a/assets/xml/objects/object_bw.xml
+++ b/assets/xml/objects/object_bw.xml
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/assets/xml/objects/object_cob.xml b/assets/xml/objects/object_cob.xml
index 78b7327aa5..ba051cfa74 100644
--- a/assets/xml/objects/object_cob.xml
+++ b/assets/xml/objects/object_cob.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml
index c5d2688d06..83804ccaf4 100644
--- a/assets/xml/objects/object_cs.xml
+++ b/assets/xml/objects/object_cs.xml
@@ -44,17 +44,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml
index cc437a3762..1524c7a26c 100644
--- a/assets/xml/objects/object_daiku.xml
+++ b/assets/xml/objects/object_daiku.xml
@@ -4,18 +4,18 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml
index d036cf564b..683bcc68d4 100644
--- a/assets/xml/objects/object_ds2.xml
+++ b/assets/xml/objects/object_ds2.xml
@@ -10,17 +10,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_du.xml b/assets/xml/objects/object_du.xml
index 5982f84810..44bbd1aa04 100644
--- a/assets/xml/objects/object_du.xml
+++ b/assets/xml/objects/object_du.xml
@@ -40,20 +40,20 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -63,19 +63,19 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml
index f6e74eca1a..f5ad4f6da0 100644
--- a/assets/xml/objects/object_fish.xml
+++ b/assets/xml/objects/object_fish.xml
@@ -91,20 +91,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml
index 31a8779e99..82c449e3de 100644
--- a/assets/xml/objects/object_fu.xml
+++ b/assets/xml/objects/object_fu.xml
@@ -19,22 +19,22 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml
index dbf0f96a21..d54542740c 100644
--- a/assets/xml/objects/object_ganon.xml
+++ b/assets/xml/objects/object_ganon.xml
@@ -24,18 +24,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/assets/xml/objects/object_ganon2.xml b/assets/xml/objects/object_ganon2.xml
index 1c646c3bd9..8b66cfcc2d 100644
--- a/assets/xml/objects/object_ganon2.xml
+++ b/assets/xml/objects/object_ganon2.xml
@@ -57,22 +57,23 @@
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml
index ca5d682a2c..90dc7cf68e 100644
--- a/assets/xml/objects/object_ge1.xml
+++ b/assets/xml/objects/object_ge1.xml
@@ -43,17 +43,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -62,7 +62,7 @@
-
+
diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml
index 343abdfc7c..a1dbd18f40 100644
--- a/assets/xml/objects/object_geldb.xml
+++ b/assets/xml/objects/object_geldb.xml
@@ -17,12 +17,12 @@
-
-
-
+
+
+
-
+
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index 6a041d2448..ba3f440907 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -51,25 +51,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml
index 0697c2af1c..152d57c7b9 100644
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -66,9 +66,11 @@
-
-
-
+
+
+
+
+
diff --git a/assets/xml/objects/object_horse.xml b/assets/xml/objects/object_horse.xml
index dbfdea96d6..c9fe4635cd 100644
--- a/assets/xml/objects/object_horse.xml
+++ b/assets/xml/objects/object_horse.xml
@@ -51,9 +51,9 @@
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_horse_link_child.xml b/assets/xml/objects/object_horse_link_child.xml
index 3901215f60..8002b048d0 100644
--- a/assets/xml/objects/object_horse_link_child.xml
+++ b/assets/xml/objects/object_horse_link_child.xml
@@ -14,8 +14,8 @@
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml
index da11d57fb3..cf5d06e1a2 100644
--- a/assets/xml/objects/object_hs.xml
+++ b/assets/xml/objects/object_hs.xml
@@ -16,17 +16,17 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml
index 707269caf7..a628a113a4 100644
--- a/assets/xml/objects/object_im.xml
+++ b/assets/xml/objects/object_im.xml
@@ -1,76 +1,79 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 66295f90d9..4660b601ce 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -4,114 +4,124 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,5 +134,9 @@
+
+
+
+
diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml
index 1ae5113cfe..c1f544704e 100644
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -56,23 +56,24 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index f1dc335d43..49e0ad4edb 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -120,28 +120,28 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -182,20 +182,20 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml
index 5e6d058fa3..63eeb38950 100644
--- a/assets/xml/objects/object_ma1.xml
+++ b/assets/xml/objects/object_ma1.xml
@@ -26,25 +26,25 @@
-
+
-
-
+
+
-
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml
index 7c1286645b..ce5910fb80 100644
--- a/assets/xml/objects/object_ma2.xml
+++ b/assets/xml/objects/object_ma2.xml
@@ -1,68 +1,75 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml
index 34733090c5..0b4aaae8aa 100644
--- a/assets/xml/objects/object_mk.xml
+++ b/assets/xml/objects/object_mk.xml
@@ -17,16 +17,16 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml
index edd870330d..834afe5ef0 100644
--- a/assets/xml/objects/object_mm.xml
+++ b/assets/xml/objects/object_mm.xml
@@ -10,7 +10,7 @@
-
-
+
+
diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml
index 59425adb8d..bc63d2ed38 100644
--- a/assets/xml/objects/object_mori_objects.xml
+++ b/assets/xml/objects/object_mori_objects.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml
index 49c0cae1f1..7251ff7212 100644
--- a/assets/xml/objects/object_mu.xml
+++ b/assets/xml/objects/object_mu.xml
@@ -6,12 +6,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -44,16 +44,16 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml
index 2e0c7f1003..c4b560cc0a 100644
--- a/assets/xml/objects/object_nb.xml
+++ b/assets/xml/objects/object_nb.xml
@@ -50,41 +50,41 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_oA1.xml b/assets/xml/objects/object_oA1.xml
index 212a3aca7e..1d665f1010 100644
--- a/assets/xml/objects/object_oA1.xml
+++ b/assets/xml/objects/object_oA1.xml
@@ -55,12 +55,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_oE1.xml b/assets/xml/objects/object_oE1.xml
index f03afa5844..4d5b1663fe 100644
--- a/assets/xml/objects/object_oE1.xml
+++ b/assets/xml/objects/object_oE1.xml
@@ -55,12 +55,12 @@
-
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_oE10.xml b/assets/xml/objects/object_oE10.xml
index 3edb545b91..04ce914372 100644
--- a/assets/xml/objects/object_oE10.xml
+++ b/assets/xml/objects/object_oE10.xml
@@ -2,11 +2,11 @@
-
-
-
+
+
+
-
+
diff --git a/assets/xml/objects/object_oE11.xml b/assets/xml/objects/object_oE11.xml
index 0e5e1db057..04f6f186da 100644
--- a/assets/xml/objects/object_oE11.xml
+++ b/assets/xml/objects/object_oE11.xml
@@ -2,11 +2,11 @@
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_oE12.xml b/assets/xml/objects/object_oE12.xml
index 7937759ce6..a5fa39fd25 100644
--- a/assets/xml/objects/object_oE12.xml
+++ b/assets/xml/objects/object_oE12.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/assets/xml/objects/object_oE1s.xml b/assets/xml/objects/object_oE1s.xml
index b6dc068458..2409ad3111 100644
--- a/assets/xml/objects/object_oE1s.xml
+++ b/assets/xml/objects/object_oE1s.xml
@@ -21,15 +21,15 @@
-
+
-
+
-
+
diff --git a/assets/xml/objects/object_oE2.xml b/assets/xml/objects/object_oE2.xml
index 875812fa23..af62ad6d11 100644
--- a/assets/xml/objects/object_oE2.xml
+++ b/assets/xml/objects/object_oE2.xml
@@ -55,12 +55,12 @@
-
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_oE3.xml b/assets/xml/objects/object_oE3.xml
index b56e60aea1..95227da384 100644
--- a/assets/xml/objects/object_oE3.xml
+++ b/assets/xml/objects/object_oE3.xml
@@ -55,13 +55,13 @@
-
+
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_oE4.xml b/assets/xml/objects/object_oE4.xml
index 06913315a3..ae48d2adef 100644
--- a/assets/xml/objects/object_oE4.xml
+++ b/assets/xml/objects/object_oE4.xml
@@ -55,11 +55,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml
index 5f7f55c061..584019568a 100644
--- a/assets/xml/objects/object_oE4s.xml
+++ b/assets/xml/objects/object_oE4s.xml
@@ -19,13 +19,13 @@
-
+
-
+
-
+
diff --git a/assets/xml/objects/object_oE5.xml b/assets/xml/objects/object_oE5.xml
index 6d11801f37..b5bd5b6e53 100644
--- a/assets/xml/objects/object_oE5.xml
+++ b/assets/xml/objects/object_oE5.xml
@@ -48,12 +48,12 @@
-
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_oE6.xml b/assets/xml/objects/object_oE6.xml
index 249146a45c..95bb602b6b 100644
--- a/assets/xml/objects/object_oE6.xml
+++ b/assets/xml/objects/object_oE6.xml
@@ -2,11 +2,11 @@
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_oE7.xml b/assets/xml/objects/object_oE7.xml
index e3b3b8e171..b3e588d4c2 100644
--- a/assets/xml/objects/object_oE7.xml
+++ b/assets/xml/objects/object_oE7.xml
@@ -2,11 +2,11 @@
-
-
-
+
+
+
-
+
diff --git a/assets/xml/objects/object_oE8.xml b/assets/xml/objects/object_oE8.xml
index e7bea5c122..be5de24947 100644
--- a/assets/xml/objects/object_oE8.xml
+++ b/assets/xml/objects/object_oE8.xml
@@ -2,11 +2,11 @@
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_oE9.xml b/assets/xml/objects/object_oE9.xml
index 9d39ac89be..8ea7ee18c7 100644
--- a/assets/xml/objects/object_oE9.xml
+++ b/assets/xml/objects/object_oE9.xml
@@ -2,11 +2,11 @@
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml
index 5ab83c9647..7c3029443c 100644
--- a/assets/xml/objects/object_os.xml
+++ b/assets/xml/objects/object_os.xml
@@ -11,18 +11,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml
index 129c2a1a80..78480cd76d 100644
--- a/assets/xml/objects/object_ossan.xml
+++ b/assets/xml/objects/object_ossan.xml
@@ -1,11 +1,12 @@
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml
index fa423e5297..625ab83a10 100644
--- a/assets/xml/objects/object_rl.xml
+++ b/assets/xml/objects/object_rl.xml
@@ -13,26 +13,28 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml
index ef160d17b3..1da1488afe 100644
--- a/assets/xml/objects/object_rs.xml
+++ b/assets/xml/objects/object_rs.xml
@@ -10,15 +10,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/assets/xml/objects/object_ru1.xml b/assets/xml/objects/object_ru1.xml
index d4227792d5..3d413619ff 100644
--- a/assets/xml/objects/object_ru1.xml
+++ b/assets/xml/objects/object_ru1.xml
@@ -42,18 +42,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml
index b83a5b5798..a19446453b 100644
--- a/assets/xml/objects/object_sa.xml
+++ b/assets/xml/objects/object_sa.xml
@@ -67,34 +67,33 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/assets/xml/objects/object_sd.xml b/assets/xml/objects/object_sd.xml
index cf85ef91b4..66324bf55f 100644
--- a/assets/xml/objects/object_sd.xml
+++ b/assets/xml/objects/object_sd.xml
@@ -44,27 +44,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml
index fce169032d..5bc2bfb6bf 100644
--- a/assets/xml/objects/object_spot07_object.xml
+++ b/assets/xml/objects/object_spot07_object.xml
@@ -3,12 +3,12 @@
-
+
-
+
diff --git a/assets/xml/objects/object_spot17_obj.xml b/assets/xml/objects/object_spot17_obj.xml
index eee4172d77..02b5db5620 100644
--- a/assets/xml/objects/object_spot17_obj.xml
+++ b/assets/xml/objects/object_spot17_obj.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml
index 4a1249af05..fea66d4b84 100644
--- a/assets/xml/objects/object_ssh.xml
+++ b/assets/xml/objects/object_ssh.xml
@@ -2,14 +2,14 @@
-
-
-
+
+
+
-
-
+
+
-
+
diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml
index 595e4aa0d0..1fd9f315ff 100644
--- a/assets/xml/objects/object_ta.xml
+++ b/assets/xml/objects/object_ta.xml
@@ -1,70 +1,72 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml
index 4c935d2118..73f3dcb1e2 100644
--- a/assets/xml/objects/object_toryo.xml
+++ b/assets/xml/objects/object_toryo.xml
@@ -2,20 +2,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml
index fbac8018c7..c5dc4f6b0f 100644
--- a/assets/xml/objects/object_tr.xml
+++ b/assets/xml/objects/object_tr.xml
@@ -26,23 +26,23 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/assets/xml/objects/object_ts.xml b/assets/xml/objects/object_ts.xml
index 08a5e71122..011b19a6d3 100644
--- a/assets/xml/objects/object_ts.xml
+++ b/assets/xml/objects/object_ts.xml
@@ -2,14 +2,14 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/assets/xml/objects/object_ydan_objects.xml b/assets/xml/objects/object_ydan_objects.xml
index dab7962ecf..f46d6f657b 100644
--- a/assets/xml/objects/object_ydan_objects.xml
+++ b/assets/xml/objects/object_ydan_objects.xml
@@ -5,15 +5,15 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/assets/xml/objects/object_zf.xml b/assets/xml/objects/object_zf.xml
index 3b04cc12c1..7f20eb7866 100644
--- a/assets/xml/objects/object_zf.xml
+++ b/assets/xml/objects/object_zf.xml
@@ -1,14 +1,14 @@
-
-
+
+
-
+
-
+
diff --git a/assets/xml/objects/object_zl2.xml b/assets/xml/objects/object_zl2.xml
index 71be043317..9af0a65270 100644
--- a/assets/xml/objects/object_zl2.xml
+++ b/assets/xml/objects/object_zl2.xml
@@ -5,23 +5,23 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 43319e055b..77465760ef 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -65,11 +65,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
index 6903405e21..8d265a3cb0 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
@@ -288,13 +288,13 @@ void BgJyaMegami_Update(Actor* thisx, GlobalContext* globalCtx) {
}
static void* sRightSideCrumbles[] = {
- gMeagmiRightCrumble1Tex, gMeagmiRightCrumble2Tex, gMeagmiRightCrumble3Tex,
- gMeagmiRightCrumble4Tex, gMeagmiRightCrumble5Tex,
+ gMegamiRightCrumble1Tex, gMegamiRightCrumble2Tex, gMegamiRightCrumble3Tex,
+ gMegamiRightCrumble4Tex, gMegamiRightCrumble5Tex,
};
static void* sLeftSideCrumbles[] = {
- gMeagmiLeftCrumble1Tex, gMeagmiLeftCrumble2Tex, gMeagmiLeftCrumble3Tex,
- gMeagmiLeftCrumble4Tex, gMeagmiLeftCrumble5Tex,
+ gMegamiLeftCrumble1Tex, gMegamiLeftCrumble2Tex, gMegamiLeftCrumble3Tex,
+ gMegamiLeftCrumble4Tex, gMegamiLeftCrumble5Tex,
};
void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
index 23a2ef1183..ea059fce59 100644
--- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
@@ -8,7 +8,12 @@
#include "vt.h"
#include "objects/object_zo/object_zo.h"
#include "objects/object_ec/object_ec.h"
+#include "objects/object_ma2/object_ma2.h"
+#include "objects/object_in/object_in.h"
+#include "objects/object_ge1/object_ge1.h"
+#include "objects/object_fu/object_fu.h"
#include "objects/object_fish/object_fish.h"
+#include "objects/object_ta/object_ta.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "objects/object_ma2/object_ma2.h"
#include "objects/object_in/object_in.h"
@@ -258,12 +263,12 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur
func_80093D18(gfxCtx);
- if (eyeTexture != 0) {
+ if (eyeTexture != NULL) {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture));
}
- if (arg3 != 0) {
+ if (arg3 != NULL) {
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(arg3));
}
@@ -353,7 +358,7 @@ void DemoEc_SetNpcActionPosRot(DemoEc* this, GlobalContext* globalCtx, s32 actio
void DemoEc_InitIngo(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
- DemoEc_InitSkelAnime(this, globalCtx, &object_in_Skel_013B88);
+ DemoEc_InitSkelAnime(this, globalCtx, &gIngoSkel);
DemoEc_UseAnimationObject(this, globalCtx);
DemoEc_ChangeAnimation(this, &gDemoEcIngoAnim, 0, 0.0f, false);
func_8096D64C(this, globalCtx);
@@ -369,12 +374,12 @@ void DemoEc_UpdateIngo(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawIngo(DemoEc* this, GlobalContext* globalCtx) {
- DemoEc_DrawSkeleton(this, globalCtx, &object_in_Tex_004390, &object_in_Tex_004350, 0, 0);
+ DemoEc_DrawSkeleton(this, globalCtx, &gIngoEyeClosed2Tex, &gIngoRedTex, 0, 0);
}
void DemoEc_InitTalon(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
- DemoEc_InitSkelAnime(this, globalCtx, &object_ta_Skel_00B7B8);
+ DemoEc_InitSkelAnime(this, globalCtx, &gTalonSkel);
DemoEc_UseAnimationObject(this, globalCtx);
DemoEc_ChangeAnimation(this, &gDemoEcTalonAnim, 0, 0.0f, false);
func_8096D64C(this, globalCtx);
@@ -390,7 +395,7 @@ void DemoEc_UpdateTalon(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawTalon(DemoEc* this, GlobalContext* globalCtx) {
- DemoEc_DrawSkeleton(this, globalCtx, &object_ta_Tex_0076C0, &object_ta_Tex_007AC0, NULL, NULL);
+ DemoEc_DrawSkeleton(this, globalCtx, &gTalonEyeClosed2Tex, &gTalonRedTex, NULL, NULL);
}
void DemoEc_InitWindmillMan(DemoEc* this, GlobalContext* globalCtx) {
@@ -673,7 +678,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
return object_daiku_DL_005880;
default:
osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST);
- return 0;
+ return NULL;
}
}
@@ -1143,9 +1148,9 @@ void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) {
void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
- DemoEc_InitSkelAnime(this, globalCtx, &object_ma2_Skel_008D90);
+ DemoEc_InitSkelAnime(this, globalCtx, &gMalonAdultSkel);
DemoEc_UseAnimationObject(this, globalCtx);
- DemoEc_ChangeAnimation(this, &object_ma2_Anim_009EE0, 0, 0.0f, false);
+ DemoEc_ChangeAnimation(this, &gMalonAdultSingAnim, 0, 0.0f, false);
func_8096D5D4(this, globalCtx);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
this->updateMode = EC_UPDATE_MALON;
@@ -1160,11 +1165,11 @@ void DemoEc_UpdateMalon(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawMalon(DemoEc* this, GlobalContext* globalCtx) {
- static void* eyeTextures[] = { object_ma2_Tex_002570, object_ma2_Tex_002C70, object_ma2_Tex_003070 };
+ static void* eyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
- DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &object_ma2_Tex_003770, NULL, NULL);
+ DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, gMalonAdultMouthHappyTex, NULL, NULL);
}
static DemoEcInitFunc sInitFuncs[] = {
diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
index f050b65d30..ac2f28282c 100644
--- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
+++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
@@ -191,7 +191,7 @@ void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) {
}
}
-s32 DemoGo_FrameUpdateMatrix(DemoGo* this) {
+s32 DemoGo_UpdateSkelAnime(DemoGo* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -278,7 +278,7 @@ void func_8097D088(DemoGo* this, GlobalContext* globalCtx) {
s32 something;
func_8097CA30(this, globalCtx);
- something = DemoGo_FrameUpdateMatrix(this);
+ something = DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097CF20(this, globalCtx, something);
}
@@ -287,7 +287,7 @@ void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CCC0(this);
func_8097CA30(this, globalCtx);
- DemoGo_FrameUpdateMatrix(this);
+ DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
func_8097CF9C(this);
@@ -296,7 +296,7 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CC08(this);
func_8097CA30(this, globalCtx);
- DemoGo_FrameUpdateMatrix(this);
+ DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
}
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 16565c5e7f..4c7eae054e 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -29,7 +29,7 @@ void func_80985830(DemoIm* this, GlobalContext* globalCtx);
void func_80985C10(DemoIm* this, GlobalContext* globalCtx);
void func_80985C40(DemoIm* this, GlobalContext* globalCtx);
void func_80985C94(DemoIm* this, GlobalContext* globalCtx);
-void func_80985CE8(DemoIm* this, GlobalContext* globalCtx);
+void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx);
void func_809863BC(DemoIm* this, GlobalContext* globalCtx);
void func_809863DC(DemoIm* this, GlobalContext* globalCtx);
void func_80986430(DemoIm* this, GlobalContext* globalCtx);
@@ -51,13 +51,13 @@ void func_80987288(DemoIm* this, GlobalContext* globalCtx);
void func_809872A8(DemoIm* this, GlobalContext* globalCtx);
void func_809872F0(DemoIm* this, GlobalContext* globalCtx);
void func_80987330(DemoIm* this, GlobalContext* globalCtx);
-void func_8098764C(DemoIm* this, GlobalContext* globalCtx);
-void func_80987658(DemoIm* this, GlobalContext* globalCtx);
+void DemoIm_DrawNothing(DemoIm* this, GlobalContext* globalCtx);
+void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx);
-static void* D_80987830[] = {
- 0x06007210,
- 0x06007D50,
- 0x06008150,
+static void* sEyeTextures[] = {
+ gImpaEyeOpenTex,
+ gImpaEyeHalfTex,
+ gImpaEyeClosedTex,
};
static u32 D_8098783C = 0;
@@ -87,9 +87,9 @@ static DemoImActionFunc sActionFuncs[] = {
static Vec3f D_809887D8 = { 0.0f, 10.0f, 0.0f };
static DemoImDrawFunc sDrawFuncs[] = {
- func_8098764C,
- func_80987658,
- func_80985CE8,
+ DemoIm_DrawNothing,
+ DemoIm_DrawSolid,
+ DemoIm_DrawTranslucent,
};
const ActorInit Demo_Im_InitVars = {
@@ -106,23 +106,23 @@ const ActorInit Demo_Im_InitVars = {
void func_80984BE0(DemoIm* this) {
s32 pad[3];
- s16* unk_25E = &this->unk_25E;
- s16* unk_25C = &this->unk_25C;
+ s16* blinkTimer = &this->blinkTimer;
+ s16* eyeIndex = &this->eyeIndex;
- if (DECR(*unk_25E) == 0) {
- *unk_25E = Rand_S16Offset(0x3C, 0x3C);
+ if (DECR(*blinkTimer) == 0) {
+ *blinkTimer = Rand_S16Offset(60, 60);
}
- *unk_25C = *unk_25E;
- if (*unk_25C >= 3) {
- *unk_25C = 0;
+ *eyeIndex = *blinkTimer;
+ if (*eyeIndex >= 3) {
+ *eyeIndex = 0;
}
}
void func_80984C68(DemoIm* this) {
this->action = 7;
this->drawConfig = 0;
- this->unk_26C = 0;
+ this->alpha = 0;
this->unk_270 = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_268 = 0.0f;
@@ -145,20 +145,20 @@ void func_80984C8C(DemoIm* this, GlobalContext* globalCtx) {
}
}
-void func_80984D00(Actor* thisx, GlobalContext* globalCtx) {
+void DemoIm_InitCollider(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit);
}
-void func_80984D4C(Actor* thisx, GlobalContext* globalCtx) {
+void DemoIm_DestroyCollider(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
-void func_80984D74(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_UpdateCollider(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[5];
Collider_UpdateCylinder(&this->actor, &this->collider);
@@ -207,55 +207,56 @@ void func_80984F94(DemoIm* this, GlobalContext* globalCtx) {
func_80034A14(&this->actor, &this->unk_2D4, kREG(17) + 0xC, 4);
}
-void func_80985018(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_UpdateBgCheckInfo(DemoIm* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
-s32 func_80985060(DemoIm* this) {
+s32 DemoIm_UpdateSkelAnime(DemoIm* this) {
return SkelAnime_Update(&this->skelAnime);
}
-s32 func_80985080(GlobalContext* globalCtx) {
+s32 DemoIm_IsCsStateIdle(GlobalContext* globalCtx) {
if (globalCtx->csCtx.state == CS_STATE_IDLE) {
- return 1;
+ return true;
+ } else {
+ return false;
}
- return 0;
}
-CsCmdActorAction* func_809850A0(GlobalContext* globalCtx, s32 actionIdx) {
+CsCmdActorAction* DemoIm_GetNpcAction(GlobalContext* globalCtx, s32 actionIdx) {
s32 pad[2];
CsCmdActorAction* ret = NULL;
- if (!func_80985080(globalCtx)) {
+ if (!DemoIm_IsCsStateIdle(globalCtx)) {
ret = globalCtx->csCtx.npcActions[actionIdx];
}
return ret;
}
s32 func_809850E8(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
if (npcAction->action == action) {
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
s32 func_80985134(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
if (npcAction->action != action) {
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
void func_80985180(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -266,7 +267,7 @@ void func_80985180(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
}
void func_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -276,27 +277,28 @@ void func_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
}
}
-void func_80985280(DemoIm* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 transitionRate, s32 arg4) {
+void DemoIm_ChangeAnim(DemoIm* this, AnimationHeader* animHeaderSeg, u8 animMode, f32 transitionRate,
+ s32 playBackwards) {
f32 frameCount = Animation_GetLastFrame(animHeaderSeg);
f32 playbackSpeed;
- f32 unk0;
- f32 fc;
+ f32 startFrame;
+ f32 endFrame;
- if (arg4 == 0) {
- unk0 = 0.0f;
- fc = frameCount;
+ if (!playBackwards) {
+ startFrame = 0.0f;
+ endFrame = frameCount;
playbackSpeed = 1.0f;
} else {
- fc = 0.0f;
- unk0 = frameCount;
+ endFrame = 0.0f;
+ startFrame = frameCount;
playbackSpeed = -1.0f;
}
- Animation_Change(&this->skelAnime, animHeaderSeg, playbackSpeed, unk0, fc, arg2, transitionRate);
+ Animation_Change(&this->skelAnime, animHeaderSeg, playbackSpeed, startFrame, endFrame, animMode, transitionRate);
}
void func_80985310(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->actor.shape.yOffset = -10000.0f;
}
@@ -341,8 +343,8 @@ void func_8098544C(DemoIm* this, GlobalContext* globalCtx) {
void func_809854DC(DemoIm* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) &&
(globalCtx->csCtx.npcActions[5]->action == 2)) {
- Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
+ Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
+ ANIMMODE_LOOP, 0.0f);
this->action = 2;
this->drawConfig = 1;
func_80985358(this, globalCtx);
@@ -359,16 +361,16 @@ void func_8098557C(DemoIm* this) {
void func_809855A8(DemoIm* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) &&
(globalCtx->csCtx.npcActions[5]->action == 3)) {
- Animation_Change(&this->skelAnime, &object_im_Anim_000710, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_000710), ANIMMODE_ONCE, 4.0f);
+ Animation_Change(&this->skelAnime, &gImpaRaiseArmsAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaRaiseArmsAnim),
+ ANIMMODE_ONCE, 4.0f);
this->action = 4;
}
}
void func_80985640(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
- Animation_Change(&this->skelAnime, &object_im_Anim_000AFC, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_000AFC), ANIMMODE_LOOP, 0.0f);
+ Animation_Change(&this->skelAnime, &gImpaPresentShadowMedallionAnim, 1.0f, 0.0f,
+ Animation_GetLastFrame(&gImpaPresentShadowMedallionAnim), ANIMMODE_LOOP, 0.0f);
this->action = 5;
}
}
@@ -391,14 +393,14 @@ void func_80985718(DemoIm* this, GlobalContext* globalCtx) {
void func_80985738(DemoIm* this, GlobalContext* globalCtx) {
func_80985430(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_8098557C(this);
}
void func_80985770(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809855A8(this, globalCtx);
}
@@ -406,27 +408,27 @@ void func_80985770(DemoIm* this, GlobalContext* globalCtx) {
void func_809857B0(DemoIm* this, GlobalContext* globalCtx) {
s32 sp1C;
- func_80985018(this, globalCtx);
- sp1C = func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ sp1C = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80985640(this, sp1C);
}
void func_809857F0(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809856AC(this, globalCtx);
}
void func_80985830(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
}
void func_80985860(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 7;
this->actor.shape.shadowAlpha = 0;
}
@@ -435,18 +437,18 @@ void func_809858A8(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T);
}
-void func_809858C8(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_SpawnLightBall(DemoIm* this, GlobalContext* globalCtx) {
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.world.pos.x,
(kREG(17) + 24.0f) + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 6);
}
void func_80985948(DemoIm* this, GlobalContext* globalCtx) {
if (func_809850E8(this, globalCtx, 4, 5)) {
- Animation_Change(&this->skelAnime, &object_im_Anim_011C08, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_011C08), ANIMMODE_ONCE, 0.0f);
+ Animation_Change(&this->skelAnime, &gImpaPrepareSealGanonAnim, 1.0f, 0.0f,
+ Animation_GetLastFrame(&gImpaPrepareSealGanonAnim), ANIMMODE_ONCE, 0.0f);
this->action = 8;
this->drawConfig = 2;
- this->unk_26C = 0;
+ this->alpha = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_268 = 0.0f;
func_809858A8();
@@ -463,7 +465,7 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) {
this->action = 9;
this->drawConfig = 1;
*unk_268 = kREG(5) + 10.0f;
- this->unk_26C = this->actor.shape.shadowAlpha = alpha;
+ this->alpha = this->actor.shape.shadowAlpha = alpha;
return;
}
} else {
@@ -472,24 +474,24 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) {
this->action = 7;
this->drawConfig = 0;
*unk_268 = 0.0f;
- this->unk_26C = 0;
+ this->alpha = 0;
this->actor.shape.shadowAlpha = 0;
return;
}
}
- this->actor.shape.shadowAlpha = this->unk_26C = (*unk_268 / (kREG(5) + 10.0f)) * 255.0f;
+ this->actor.shape.shadowAlpha = this->alpha = (*unk_268 / (kREG(5) + 10.0f)) * 255.0f;
}
void func_80985B34(DemoIm* this, GlobalContext* globalCtx) {
if (func_80985134(this, globalCtx, 4, 5)) {
- Animation_Change(&this->skelAnime, &object_im_Anim_012218, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_012218), ANIMMODE_ONCE, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaSealGanonAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaSealGanonAnim),
+ ANIMMODE_ONCE, -8.0f);
this->action = 8;
this->drawConfig = 2;
this->unk_268 = kREG(5) + 10.0f;
- this->unk_26C = 255;
+ this->alpha = 255;
if (this->unk_270 == 0) {
- func_809858C8(this, globalCtx);
+ DemoIm_SpawnLightBall(this, globalCtx);
this->unk_270 = 1;
}
this->actor.shape.shadowAlpha = 0xFF;
@@ -502,34 +504,34 @@ void func_80985C10(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985C40(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809859E0(this, globalCtx);
func_80984C8C(this, globalCtx);
}
void func_80985C94(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80985B34(this, globalCtx);
func_80984C8C(this, globalCtx);
}
-void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[2];
- s16 unk_25C = this->unk_25C;
- void* sp68 = D_80987830[unk_25C];
+ s16 eyeIndex = this->eyeIndex;
+ void* eyeTex = sEyeTextures[eyeIndex];
SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 281);
func_80093D84(globalCtx->state.gfxCtx);
- gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68));
- gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68));
- gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_26C);
+ gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTex));
+ gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTex));
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
@@ -539,7 +541,7 @@ void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985E60(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 10;
this->unk_280 = 1;
}
@@ -553,8 +555,8 @@ void func_80985EAC(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985EF4(DemoIm* this) {
- if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_im_Anim_01182C) - 1.0f)) {
- func_80985060(this);
+ if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&gImpaWhistlingAnim) - 1.0f)) {
+ DemoIm_UpdateSkelAnime(this);
}
}
@@ -564,8 +566,8 @@ void func_80985F54(DemoIm* this) {
}
void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
- Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
+ Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
+ ANIMMODE_LOOP, 0.0f);
func_80985180(this, globalCtx, 5);
this->action = 11;
this->drawConfig = 1;
@@ -573,15 +575,15 @@ void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
void func_80985FE8(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
- Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaWhistlingAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaWhistlingAnim),
+ ANIMMODE_LOOP, -8.0f);
}
}
void func_8098604C(DemoIm* this) {
- f32 frameCount = Animation_GetLastFrame(&object_im_Anim_010EE0);
+ f32 frameCount = Animation_GetLastFrame(&gImpaStartWhistlingAnim);
- Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaStartWhistlingAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f);
this->action = 12;
this->drawConfig = 1;
this->unk_2D0 = 1;
@@ -594,21 +596,21 @@ void func_809860C8(DemoIm* this) {
void func_809860DC(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
- Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
+ ANIMMODE_LOOP, -8.0f);
this->unk_2D0 = 0;
}
}
void func_80986148(DemoIm* this) {
- Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, -1.0f, Animation_GetLastFrame(&object_im_Anim_010EE0),
- 0.0f, ANIMMODE_ONCE, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaStartWhistlingAnim, -1.0f,
+ Animation_GetLastFrame(&gImpaStartWhistlingAnim), 0.0f, ANIMMODE_ONCE, -8.0f);
this->action = 14;
this->drawConfig = 1;
}
void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -620,8 +622,8 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
func_80986148(this);
break;
case 7:
- Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaWhistlingAnim, 1.0f, 0.0f,
+ Animation_GetLastFrame(&gImpaWhistlingAnim), ANIMMODE_LOOP, -8.0f);
this->action = 12;
break;
default:
@@ -633,7 +635,7 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
}
void func_8098629C(DemoIm* this, GlobalContext* globalCtx) {
- if (func_80985080(globalCtx)) {
+ if (DemoIm_IsCsStateIdle(globalCtx)) {
this->action = 21;
this->drawConfig = 1;
this->unk_280 = 1;
@@ -641,7 +643,7 @@ void func_8098629C(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809862E0(DemoIm* this, GlobalContext* globalCtx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -676,8 +678,8 @@ void func_809863BC(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809863DC(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80985EAC(this, globalCtx);
func_80984BE0(this);
func_809862E0(this, globalCtx);
@@ -686,8 +688,8 @@ void func_809863DC(DemoIm* this, GlobalContext* globalCtx) {
void func_80986430(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
- func_80985018(this, globalCtx);
- sp24 = func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ sp24 = DemoIm_UpdateSkelAnime(this);
func_80985EAC(this, globalCtx);
func_80984BE0(this);
func_80985FE8(this, sp24);
@@ -695,7 +697,7 @@ void func_80986430(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986494(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
func_80985EF4(this);
func_80984BE0(this);
func_809861C4(this, globalCtx);
@@ -704,15 +706,15 @@ void func_80986494(DemoIm* this, GlobalContext* globalCtx) {
void func_809864D4(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
- func_80985018(this, globalCtx);
- sp24 = func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ sp24 = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809860DC(this, sp24);
func_8098629C(this, globalCtx);
}
void func_8098652C(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 15;
}
@@ -755,22 +757,22 @@ void func_80986700(DemoIm* this) {
}
void func_80986710(DemoIm* this, GlobalContext* globalCtx) {
- Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
+ Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
+ ANIMMODE_LOOP, 0.0f);
func_80985180(this, globalCtx, 5);
this->action = 16;
this->drawConfig = 1;
}
void func_80986794(DemoIm* this) {
- Animation_Change(&this->skelAnime, &object_im_Anim_0014E4, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_im_Anim_0014E4), ANIMMODE_ONCE, -8.0f);
+ Animation_Change(&this->skelAnime, &gImpaThrowDekuNutAnim, 1.0f, 0.0f,
+ Animation_GetLastFrame(&gImpaThrowDekuNutAnim), ANIMMODE_ONCE, -8.0f);
this->action = 17;
this->drawConfig = 1;
}
void func_8098680C(DemoIm* this, GlobalContext* globalCtx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -803,8 +805,8 @@ void func_809868E8(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986908(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_8098680C(this, globalCtx);
}
@@ -812,8 +814,8 @@ void func_80986908(DemoIm* this, GlobalContext* globalCtx) {
void func_80986948(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
- func_80985018(this, globalCtx);
- sp24 = func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ sp24 = DemoIm_UpdateSkelAnime(this);
func_80986570(this, globalCtx);
func_80984BE0(this);
func_809865F8(this, globalCtx, sp24);
@@ -821,7 +823,7 @@ void func_80986948(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809869B0(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 18;
this->actor.shape.shadowAlpha = 0;
}
@@ -832,9 +834,10 @@ s32 func_809869F8(DemoIm* this, GlobalContext* globalCtx) {
f32 thisPosX = this->actor.world.pos.x;
if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && (!(this->actor.flags & 0x40))) {
- return 1;
+ return true;
+ } else {
+ return false;
}
- return 0;
}
s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) {
@@ -843,9 +846,10 @@ s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) {
f32 thisPosX = this->actor.world.pos.x;
if ((thisPosX - (kREG(17) + 130.0f) < playerPosX) && (!Gameplay_InCsMode(globalCtx))) {
- return 1;
+ return true;
+ } else {
+ return false;
}
- return 0;
}
s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) {
@@ -854,9 +858,9 @@ s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) {
this->actor.textId = 0x708E;
func_8002F2F4(&this->actor, globalCtx);
} else {
- return 1;
+ return true;
}
- return 0;
+ return false;
}
void func_80986B2C(GlobalContext* globalCtx) {
@@ -934,8 +938,8 @@ void func_80986D40(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986DC8(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
this->actor.flags &= ~0x9;
@@ -946,20 +950,20 @@ void func_80986E20(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986E40(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
- func_80984D74(this, globalCtx);
+ DemoIm_UpdateCollider(this, globalCtx);
func_80986BE4(this, func_80986AD0(this, globalCtx));
}
void func_80986EAC(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984F94(this, globalCtx);
- func_80984D74(this, globalCtx);
+ DemoIm_UpdateCollider(this, globalCtx);
func_80986B2C(globalCtx);
}
@@ -968,11 +972,11 @@ void func_80986F08(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986F28(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
- func_80984D74(this, globalCtx);
+ DemoIm_UpdateCollider(this, globalCtx);
func_80986C30(this, globalCtx);
}
@@ -981,17 +985,17 @@ void func_80986F88(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986FA8(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
this->actor.flags &= ~0x9;
- func_80984D74(this, globalCtx);
+ DemoIm_UpdateCollider(this, globalCtx);
func_80986CFC(this, globalCtx);
}
void func_80987018(DemoIm* this, GlobalContext* globalCtx) {
- func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 27;
this->drawConfig = 0;
this->actor.shape.shadowAlpha = 0;
@@ -1006,9 +1010,9 @@ void func_80987064(DemoIm* this) {
temp = kREG(17) + 10.0f;
if (*unk_268 >= temp) {
- this->actor.shape.shadowAlpha = this->unk_26C = alpha;
+ this->actor.shape.shadowAlpha = this->alpha = alpha;
} else {
- this->actor.shape.shadowAlpha = this->unk_26C = (*unk_268 / temp) * 255.0f;
+ this->actor.shape.shadowAlpha = this->alpha = (*unk_268 / temp) * 255.0f;
}
}
@@ -1026,18 +1030,18 @@ void func_80987128(DemoIm* this) {
}
void func_80987174(DemoIm* this) {
- func_80985280(this, &object_im_Anim_0101C8, 2, -8.0f, 0);
+ DemoIm_ChangeAnim(this, &object_im_Anim_0101C8, ANIMMODE_ONCE, -8.0f, false);
this->action = 30;
}
void func_809871B4(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
- func_80985280(this, &object_im_Anim_00FB10, 0, 0.0f, 0);
+ DemoIm_ChangeAnim(this, &object_im_Anim_00FB10, ANIMMODE_LOOP, 0.0f, false);
}
}
void func_809871E8(DemoIm* this, GlobalContext* globalCtx) {
- CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
+ CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -1064,16 +1068,16 @@ void func_80987288(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809872A8(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80987064(this);
func_80987128(this);
}
void func_809872F0(DemoIm* this, GlobalContext* globalCtx) {
- func_80985018(this, globalCtx);
- func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809871E8(this, globalCtx);
}
@@ -1081,8 +1085,8 @@ void func_809872F0(DemoIm* this, GlobalContext* globalCtx) {
void func_80987330(DemoIm* this, GlobalContext* globalCtx) {
s32 sp1C;
- func_80985018(this, globalCtx);
- sp1C = func_80985060(this);
+ DemoIm_UpdateBgCheckInfo(this, globalCtx);
+ sp1C = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809871B4(this, sp1C);
}
@@ -1101,9 +1105,8 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
- func_80984D00(thisx, globalCtx);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_im_Skel_00F788, NULL, this->jointTable, this->morphTable,
- 17);
+ DemoIm_InitCollider(thisx, globalCtx);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gImpaSkel, NULL, this->jointTable, this->morphTable, 17);
thisx->flags &= ~1;
switch (this->actor.params) {
@@ -1128,7 +1131,7 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void DemoIm_Destroy(Actor* thisx, GlobalContext* globalCtx) {
- func_80984D4C(thisx, globalCtx);
+ DemoIm_DestroyCollider(thisx, globalCtx);
}
s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
@@ -1140,19 +1143,19 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
Vec3s* unk_2D4_unk_08 = &this->unk_2D4.unk_08;
switch (limbIndex) {
- case 9:
+ case IMPA_LIMB_CHEST:
rot->x += unk_2D4_unk_0E->y;
rot->y -= unk_2D4_unk_0E->x;
break;
- case 16:
+ case IMPA_LIMB_HEAD:
rot->x += unk_2D4_unk_08->y;
rot->z += unk_2D4_unk_08->x;
break;
}
}
- if ((*unk_2D0 != 0) && (limbIndex == 15)) {
- *dList = object_im_DL_00EDE8;
+ if ((*unk_2D0 != 0) && (limbIndex == IMPA_LIMB_RIGHT_HAND)) {
+ *dList = gImpaHandPointingDL;
}
return false;
@@ -1161,7 +1164,7 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
void DemoIm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
DemoIm* this = THIS;
- if (limbIndex == 16) {
+ if (limbIndex == IMPA_LIMB_HEAD) {
Vec3f sp28 = D_809887D8;
Vec3f dest;
@@ -1175,21 +1178,21 @@ void DemoIm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}
}
-void func_8098764C(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_DrawNothing(DemoIm* this, GlobalContext* globalCtx) {
}
-void func_80987658(DemoIm* this, GlobalContext* globalCtx) {
+void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[2];
- s16 unk_25C = this->unk_25C;
- void* sp68 = D_80987830[unk_25C];
+ s16 eyeIndex = this->eyeIndex;
+ void* eyeTexture = sEyeTextures[eyeIndex];
SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im.c", 904);
func_80093D18(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68));
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture));
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
index 3832d11d2d..12e898e27c 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h
@@ -9,17 +9,38 @@ struct DemoIm;
typedef void (*DemoImActionFunc)(struct DemoIm*, GlobalContext*);
typedef void (*DemoImDrawFunc)(struct DemoIm*, GlobalContext*);
+typedef enum {
+ /* 0x00 */ IMPA_LIMB_NONE,
+ /* 0x01 */ IMPA_LIMB_ROOT,
+ /* 0x02 */ IMPA_LIMB_TORSO,
+ /* 0x03 */ IMPA_LIMB_LEFT_THIGH,
+ /* 0x04 */ IMPA_LIMB_LEFT_LEG,
+ /* 0x05 */ IMPA_LIMB_LEFT_FOOT,
+ /* 0x06 */ IMPA_LIMB_RIGHT_THIGH,
+ /* 0x07 */ IMPA_LIMB_RIGHT_LEG,
+ /* 0x08 */ IMPA_LIMB_RIGHT_FOOT,
+ /* 0x09 */ IMPA_LIMB_CHEST,
+ /* 0x0A */ IMPA_LIMB_LEFT_SHOULDER,
+ /* 0x0B */ IMPA_LIMB_LEFT_ARM,
+ /* 0x0C */ IMPA_LIMB_LEFT_HAND,
+ /* 0x0D */ IMPA_LIMB_RIGHT_SHOULDER,
+ /* 0x0E */ IMPA_LIMB_RIGHT_ARM,
+ /* 0x0F */ IMPA_LIMB_RIGHT_HAND,
+ /* 0x10 */ IMPA_LIMB_HEAD,
+ /* 0x11 */ IMPA_LIMB_MAX
+} ImpaLimb;
+
typedef struct DemoIm {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
- /* 0x0190 */ Vec3s jointTable[17];
- /* 0x01F6 */ Vec3s morphTable[17];
- /* 0x025C */ s16 unk_25C;
- /* 0x025E */ s16 unk_25E;
+ /* 0x0190 */ Vec3s jointTable[IMPA_LIMB_MAX];
+ /* 0x01F6 */ Vec3s morphTable[IMPA_LIMB_MAX];
+ /* 0x025C */ s16 eyeIndex;
+ /* 0x025E */ s16 blinkTimer;
/* 0x0260 */ s32 action;
/* 0x0264 */ s32 drawConfig;
/* 0x0268 */ f32 unk_268;
- /* 0x026C */ s32 unk_26C;
+ /* 0x026C */ s32 alpha;
/* 0x0270 */ s32 unk_270;
/* 0x0274 */ s32 unk_274;
/* 0x0278 */ f32 unk_278;
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 36a268d1a3..28d3e6a6dc 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -156,7 +156,7 @@ void func_8098E5C8(DemoSa* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
-s32 DemoSa_FrameUpdateMatrix(DemoSa* this) {
+s32 DemoSa_UpdateSkelAnime(DemoSa* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -325,30 +325,30 @@ void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx) {
func_8098E944(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098EA3C(this);
}
void func_8098EC28(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098EA68(this, globalCtx);
}
void func_8098EC60(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- func_8098EB00(this, DemoSa_FrameUpdateMatrix(this));
+ func_8098EB00(this, DemoSa_UpdateSkelAnime(this));
}
void func_8098EC94(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098EB6C(this, globalCtx);
}
void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
}
void func_8098ECF4(DemoSa* this, GlobalContext* globalCtx) {
@@ -442,7 +442,7 @@ void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098EEFC(this, globalCtx);
func_8098E554(this, globalCtx);
@@ -450,7 +450,7 @@ void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F16C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098EDB0(this);
func_8098F050(this, globalCtx);
func_8098E554(this, globalCtx);
@@ -489,7 +489,7 @@ void func_8098F390(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
}
@@ -578,7 +578,7 @@ void func_8098F714(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F480(this);
func_8098F544(this);
@@ -586,14 +586,14 @@ void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F77C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
@@ -602,7 +602,7 @@ void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx) {
s32 sp1C;
func_8098E5C8(this, globalCtx);
- sp1C = DemoSa_FrameUpdateMatrix(this);
+ sp1C = DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F610(this, sp1C);
}
@@ -726,26 +726,26 @@ void func_8098FC44(DemoSa* this, GlobalContext* globalCtx) {
void func_8098FC64(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098F8F8(this);
func_8098FA2C(this);
}
void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- DemoSa_FrameUpdateMatrix(this);
+ DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
- func_8098FB34(this, DemoSa_FrameUpdateMatrix(this));
+ func_8098FB34(this, DemoSa_UpdateSkelAnime(this));
func_8098FB68(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 4a7f95176f..39a649706f 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -457,9 +457,10 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(GlobalContext* globalCtx, EnGo2* this) {
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
return 0x3027;
} else {
- return CUR_UPG_VALUE(UPG_STRENGTH) != 0
- ? 0x302C
- : !Flags_GetSwitch(globalCtx, 0x1B) ? 0x3017 : gSaveContext.infTable[15] & 0x100 ? 0x3019 : 0x3018;
+ return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
+ : !Flags_GetSwitch(globalCtx, 0x1B) ? 0x3017
+ : gSaveContext.infTable[15] & 0x100 ? 0x3019
+ : 0x3018;
}
}
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 1c8f1eabf8..e19acfb3ce 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -75,27 +75,27 @@ static AnimationHeader* D_80A7B918[] = {
&object_in_Anim_01646C, &object_in_Anim_0175D0, &object_in_Anim_017B58, &object_in_Anim_018C38,
};
-static Gfx* sAlternateOutfitDLs[] = {
+static Gfx* sAdultEraDLs[] = {
NULL,
NULL,
- object_in_DL_013688,
- object_in_DL_0137C0,
- object_in_DL_013910,
- object_in_DL_0132B8,
- object_in_DL_0133F0,
- object_in_DL_013540,
- object_in_DL_013100,
- object_in_DL_011758,
- object_in_DL_012AC0,
- object_in_DL_012BF0,
- object_in_DL_012D20,
- object_in_DL_012480,
- object_in_DL_0125B0,
- object_in_DL_0126E0,
- object_in_DL_011AD8,
- object_in_DL_012350,
- object_in_DL_012220,
- object_in_DL_012120,
+ gIngoAdultEraLeftThighDL,
+ gIngoAdultEraLeftLegDL,
+ gIngoAdultEraLeftFootDL,
+ gIngoAdultEraRightThighDL,
+ gIngoAdultEraRightLegDL,
+ gIngoAdultEraRightFootDL,
+ gIngoAdultEraTorsoDL,
+ gIngoAdultEraChestDL,
+ gIngoAdultEraLeftShoulderDL,
+ gIngoAdultEraLeftArmDL,
+ gIngoAdultEraLeftHandDL,
+ gIngoAdultEraRightShoulderDL,
+ gIngoAdultEraRightArmDL,
+ gIngoAdultEraRightHandDL,
+ gIngoAdultEraHeadDL,
+ gIngoAdultEraLeftEyebrowDL,
+ gIngoAdultEraRightEyebrowDL,
+ gIngoAdultEraMustacheDL,
};
u16 func_80A78FB0(GlobalContext* globalCtx) {
@@ -180,20 +180,21 @@ u16 func_80A79168(GlobalContext* globalCtx, Actor* thisx) {
}
s16 func_80A791CC(GlobalContext* globalCtx, Actor* thisx) {
- s32 temp_var = 0;
+ s32 ret = 0;
+
switch (thisx->textId) {
case 0x2045:
gSaveContext.infTable[9] |= 0x80;
break;
case 0x203E:
- temp_var = 2;
+ ret = 2;
break;
case 0x203F:
gSaveContext.eventChkInf[1] |= 2;
gSaveContext.infTable[9] |= 0x10;
break;
}
- return temp_var;
+ return ret;
}
s16 func_80A7924C(GlobalContext* globalCtx, Actor* thisx) {
@@ -259,6 +260,7 @@ s16 func_80A7924C(GlobalContext* globalCtx, Actor* thisx) {
s16 func_80A7949C(GlobalContext* globalCtx, Actor* thisx) {
s32 phi_v1 = 1;
+
if (thisx->textId == 0x2035) {
Rupees_ChangeBy(-10);
thisx->textId = 0x205C;
@@ -385,20 +387,13 @@ s32 func_80A79830(EnIn* this, GlobalContext* globalCtx) {
return 0;
}
-void func_80A79A2C(EnIn* this) {
- s16 phi_v1;
-
- if (this->unk_1EE != 3) {
- if (this->unk_1EA == 0) {
- phi_v1 = 0;
- } else {
- phi_v1 = --this->unk_1EA;
- }
- if (phi_v1 == 0) {
- this->unk_1EE++;
- if (this->unk_1EE >= 3) {
- this->unk_1EA = Rand_S16Offset(30, 30);
- this->unk_1EE = 0;
+void EnIn_UpdateEyes(EnIn* this) {
+ if (this->eyeIndex != 3) {
+ if (DECR(this->blinkTimer) == 0) {
+ this->eyeIndex++;
+ if (this->eyeIndex >= 3) {
+ this->blinkTimer = Rand_S16Offset(30, 30);
+ this->eyeIndex = 0;
}
}
}
@@ -503,8 +498,7 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->ingoObjBankIndex) || this->actor.params <= 0) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in_Skel_013B88, NULL, this->jointTable,
- this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gIngoSkel, NULL, this->jointTable, this->morphTable, 20);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
@@ -531,7 +525,7 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) {
break;
case 4:
func_80A796EC(this, 8);
- this->unk_1EE = 3;
+ this->eyeIndex = 3;
this->actionFunc = func_80A7A4BC;
break;
case 0:
@@ -915,7 +909,7 @@ void EnIn_Update(Actor* thisx, GlobalContext* globalCtx) {
}
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
}
- func_80A79A2C(this);
+ EnIn_UpdateEyes(this);
this->actionFunc(this, globalCtx);
if (this->actionFunc != func_80A7A304) {
func_80A79AB4(this, globalCtx);
@@ -938,24 +932,24 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnIn* this = THIS;
Vec3s sp2C;
- if (this->actor.params > 0 && limbIndex != 16) {
- if (sAlternateOutfitDLs[limbIndex] != NULL) {
- *dList = sAlternateOutfitDLs[limbIndex];
+ if (this->actor.params > 0 && limbIndex != INGO_HEAD_LIMB) {
+ if (sAdultEraDLs[limbIndex] != NULL) {
+ *dList = sAdultEraDLs[limbIndex];
}
}
- if (limbIndex == 16) {
+ if (limbIndex == INGO_HEAD_LIMB) {
Matrix_Translate(1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
sp2C = this->unk_308.unk_08;
Matrix_RotateZ(BINANG_TO_RAD(sp2C.x), MTXMODE_APPLY);
Matrix_RotateX(BINANG_TO_RAD(sp2C.y), MTXMODE_APPLY);
Matrix_Translate(-1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
- if (limbIndex == 9) {
+ if (limbIndex == INGO_CHEST_LIMB) {
sp2C = this->unk_308.unk_0E;
Matrix_RotateX(BINANG_TO_RAD(sp2C.x), MTXMODE_APPLY);
Matrix_RotateY(BINANG_TO_RAD(sp2C.y), MTXMODE_APPLY);
}
- if (limbIndex == 9 || limbIndex == 10 || limbIndex == 13) {
+ if (limbIndex == INGO_CHEST_LIMB || limbIndex == INGO_LEFT_SHOULDER_LIMB || limbIndex == INGO_RIGHT_SHOULDER_LIMB) {
rot->y += Math_SinS(this->unk_330[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_330[limbIndex].z) * 200.0f;
}
@@ -967,29 +961,31 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
Vec3f D_80A7B9A8 = { 1600.0, 0.0f, 0.0f };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2335);
- if (limbIndex == 16) {
+
+ if (limbIndex == INGO_HEAD_LIMB) {
Matrix_MultVec3f(&D_80A7B9A8, &this->actor.focus.pos);
this->actor.focus.rot = this->actor.world.rot;
}
- if (limbIndex == 12 && this->skelAnime.animation == &object_in_Anim_014CA8) {
- gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007A20);
+ if (limbIndex == INGO_LEFT_HAND_LIMB && this->skelAnime.animation == &object_in_Anim_014CA8) {
+ gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraBasketDL);
}
- if (limbIndex == 15 && this->skelAnime.animation == &object_in_Anim_014CA8) {
- gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007BF8);
+ if (limbIndex == INGO_RIGHT_HAND_LIMB && this->skelAnime.animation == &object_in_Anim_014CA8) {
+ gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraPitchForkDL);
}
+
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2365);
}
void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static void* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0,
- object_in_Tex_004390 };
+ static void* eyeTextures[] = { gIngoEyeOpenTex, gIngoEyeHalfTex, gIngoEyeClosedTex, gIngoEyeClosed2Tex };
+
EnIn* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384);
if (this->actionFunc != func_80A79FB0) {
func_80093D18(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A7B9B4[this->unk_1EE]));
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_in_Tex_0034D0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gIngoHeadGradient2Tex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, EnIn_OverrideLimbDraw, EnIn_PostLimbDraw, &this->actor);
}
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index 19d7f026b7..5777c21f7c 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -8,6 +8,30 @@ struct EnIn;
typedef void (*EnInActionFunc)(struct EnIn*, GlobalContext*);
+typedef enum {
+ /* 0x00 */ INGO_LIMB_NONE,
+ /* 0x01 */ INGO_LIMB_ROOT,
+ /* 0x02 */ INGO_LEFT_THIGH_LIMB,
+ /* 0x03 */ INGO_LEFT_LEG_LIMB,
+ /* 0x04 */ INGO_LEFT_FOOT_LIMB,
+ /* 0x05 */ INGO_RIGHT_THIGH_LIMB,
+ /* 0x06 */ INGO_RIGHT_LEG_LIMB,
+ /* 0x07 */ INGO_RIGHT_FOOT_LIMB,
+ /* 0x08 */ INGO_TORSO_LIMB,
+ /* 0x09 */ INGO_CHEST_LIMB,
+ /* 0x0A */ INGO_LEFT_SHOULDER_LIMB,
+ /* 0x0B */ INGO_LEFT_ARM_LIMB,
+ /* 0x0C */ INGO_LEFT_HAND_LIMB,
+ /* 0x0D */ INGO_RIGHT_SHOULDER_LIMB,
+ /* 0x0E */ INGO_RIGHT_ARM_LIMB,
+ /* 0x0F */ INGO_RIGHT_HAND_LIMB,
+ /* 0x10 */ INGO_HEAD_LIMB,
+ /* 0x11 */ INGO_LEFT_EYEBROW_LIMB,
+ /* 0x12 */ INGO_RIGHTEYEBROW_LIMB,
+ /* 0x13 */ INGO_MUSTACHE_LIMB,
+ /* 0x14 */ INGO_LIMB_MAX
+} IngoLimb;
+
typedef struct EnIn {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@@ -17,17 +41,17 @@ typedef struct EnIn {
/* 0x01E4 */ s8 ingoObjBankIndex;
/* 0x01E6 */ s16 animationIdx;
/* 0x01E8 */ s16 unk_1E8;
- /* 0x01EA */ s16 unk_1EA;
+ /* 0x01EA */ s16 blinkTimer;
/* 0x01EC */ s16 unk_1EC;
- /* 0x01EE */ s16 unk_1EE;
+ /* 0x01EE */ s16 eyeIndex;
/* 0x01F0 */ s16 camId;
/* 0x01F2 */ s16 activeCamId;
/* 0x01F4 */ char unk_1F4[0x4];
/* 0x01F8 */ s16 unk_1F8;
/* 0x01FA */ s16 unk_1FA;
/* 0x01FC */ s16 unk_1FC;
- /* 0x01FE */ Vec3s jointTable[20];
- /* 0x0276 */ Vec3s morphTable[20];
+ /* 0x01FE */ Vec3s jointTable[INGO_LIMB_MAX];
+ /* 0x0276 */ Vec3s morphTable[INGO_LIMB_MAX];
/* 0x02F0 */ f32 unk_2F0;
/* 0x02F4 */ f32 unk_2F4;
/* 0x02F8 */ f32 unk_2F8;
@@ -35,7 +59,7 @@ typedef struct EnIn {
/* 0x0300 */ f32 unk_300;
/* 0x0304 */ f32 unk_304;
/* 0x0308 */ struct_80034A14_arg1 unk_308;
- /* 0x0330 */ Vec3s unk_330[20];
+ /* 0x0330 */ Vec3s unk_330[INGO_LIMB_MAX];
} EnIn; // size = 0x03A8
#endif
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
index b9ff7184b1..b25f880e2d 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@@ -15,7 +15,7 @@ s16 func_80AA1A38(GlobalContext* globalCtx, Actor* this);
void func_80AA1AE4(EnMa2* this, GlobalContext* globalCtx);
s32 func_80AA1C68(EnMa2* this);
-void func_80AA1CC0(EnMa2* this);
+void EnMa2_UpdateEyes(EnMa2* this);
void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx);
void func_80AA2018(EnMa2* this, GlobalContext* globalCtx);
void func_80AA204C(EnMa2* this, GlobalContext* globalCtx);
@@ -56,10 +56,10 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
-static struct_D_80AA1678 D_80AA2858[] = {
- { 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f },
- { 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f },
- { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f },
+static struct_D_80AA1678 sAnimationInfo[] = {
+ { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
+ { &gMalonAdultStandStillAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
};
u16 func_80AA19A0(GlobalContext* globalCtx, Actor* thisx) {
@@ -118,7 +118,7 @@ void func_80AA1AE4(EnMa2* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
- if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) {
+ if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &gMalonAdultSingAnim)) {
phi_a3 = 1;
} else {
phi_a3 = 0;
@@ -155,39 +155,39 @@ u16 func_80AA1B58(EnMa2* this, GlobalContext* globalCtx) {
}
s32 func_80AA1C68(EnMa2* this) {
- if (this->skelAnime.animation != &object_ma2_Anim_009EE0) {
+ if (this->skelAnime.animation != &gMalonAdultSingAnim) {
return 0;
}
if (this->unk_1E0.unk_00 != 0) {
return 0;
}
- this->unk_20C = 0;
- if (this->unk_20E != 2) {
+ this->blinkTimer = 0;
+ if (this->eyeIndex != 2) {
return 0;
}
- this->unk_210 = 2;
+ this->mouthIndex = 2;
return 1;
}
-void func_80AA1CC0(EnMa2* this) {
- if ((!func_80AA1C68(this)) && (DECR(this->unk_20C) == 0)) {
- this->unk_20E += 1;
- if (this->unk_20E >= 3) {
- this->unk_20C = Rand_S16Offset(0x1E, 0x1E);
- this->unk_20E = 0;
+void EnMa2_UpdateEyes(EnMa2* this) {
+ if ((!func_80AA1C68(this)) && (DECR(this->blinkTimer) == 0)) {
+ this->eyeIndex += 1;
+ if (this->eyeIndex >= 3) {
+ this->blinkTimer = Rand_S16Offset(30, 30);
+ this->eyeIndex = 0;
}
}
}
-void func_80AA1D44(EnMa2* this, s32 idx) {
- f32 frameCount = Animation_GetLastFrame(D_80AA2858[idx].animation);
+void EnMa2_ChangeAnim(EnMa2* this, s32 idx) {
+ f32 frameCount = Animation_GetLastFrame(sAnimationInfo[idx].animation);
- Animation_Change(&this->skelAnime, D_80AA2858[idx].animation, 1.0f, 0.0f, frameCount, D_80AA2858[idx].mode,
- D_80AA2858[idx].transitionRate);
+ Animation_Change(&this->skelAnime, sAnimationInfo[idx].animation, 1.0f, 0.0f, frameCount, sAnimationInfo[idx].mode,
+ sAnimationInfo[idx].transitionRate);
}
void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx) {
- if (this->skelAnime.animation == &object_ma2_Anim_009EE0) {
+ if (this->skelAnime.animation == &gMalonAdultSingAnim) {
if (this->unk_1E0.unk_00 == 0) {
if (this->unk_20A != 0) {
func_800F6584(0);
@@ -207,25 +207,25 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
switch (func_80AA1B58(this, globalCtx)) {
case 1:
- func_80AA1D44(this, 2);
+ EnMa2_ChangeAnim(this, 2);
this->actionFunc = func_80AA2018;
break;
case 2:
- func_80AA1D44(this, 3);
+ EnMa2_ChangeAnim(this, 3);
this->actionFunc = func_80AA204C;
break;
case 3:
if (gSaveContext.infTable[8] & 0x2000) {
- func_80AA1D44(this, 0);
+ EnMa2_ChangeAnim(this, 0);
} else {
- func_80AA1D44(this, 3);
+ EnMa2_ChangeAnim(this, 3);
}
this->actionFunc = func_80AA2018;
break;
@@ -307,7 +307,7 @@ void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
SkelAnime_Update(&this->skelAnime);
- func_80AA1CC0(this);
+ EnMa2_UpdateEyes(this);
this->actionFunc(this, globalCtx);
func_80AA1DB4(this, globalCtx);
func_80AA1AE4(this, globalCtx);
@@ -321,22 +321,23 @@ s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnMa2* this = THIS;
Vec3s vec;
- if ((limbIndex == 3) || (limbIndex == 6)) {
+ if ((limbIndex == MALON_ADULT_LEFT_THIGH_LIMB) || (limbIndex == MALON_ADULT_RIGHT_THIGH_LIMB)) {
*dList = NULL;
}
- if (limbIndex == 18) {
+ if (limbIndex == MALON_ADULT_HEAD_LIMB) {
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
vec = this->unk_1E0.unk_08;
Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
- if (limbIndex == 11) {
+ if (limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) {
vec = this->unk_1E0.unk_0E;
Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
}
- if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) {
+ if ((limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) || (limbIndex == MALON_ADULT_LEFT_SHOULDER_LIMB) ||
+ (limbIndex == MALON_ADULT_RIGHT_SHOULDER_LIMB)) {
rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f;
}
@@ -349,27 +350,20 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 904);
- if (limbIndex == 18) {
+ if (limbIndex == MALON_ADULT_HEAD_LIMB) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
- if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) {
- gSPDisplayList(POLY_OPA_DISP++, object_ma2_DL_005420);
+ if ((limbIndex == MALON_ADULT_LEFT_HAND_LIMB) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
+ gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 927);
}
void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static void* D_80AA28B4[] = {
- 0x06002970,
- 0x06003570,
- 0x06003770,
- };
- static void* D_80AA28C0[] = {
- 0x06002570,
- 0x06002C70,
- 0x06003070,
- };
+ static void* sMouthTextures[] = { gMalonAdultMouthNeutralTex, gMalonAdultMouthSadTex, gMalonAdultMouthHappyTex };
+ static void* sEyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
+
EnMa2* this = THIS;
Camera* camera;
f32 someFloat;
@@ -382,8 +376,8 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA28B4[this->unk_210]));
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA28C0[this->unk_20E]));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex]));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMa2_OverrideLimbDraw, EnMa2_PostLimbDraw, this);
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
index ee954ee9e3..6d95e2f905 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
@@ -8,6 +8,29 @@ struct EnMa2;
typedef void (*EnMa2ActionFunc)(struct EnMa2*, GlobalContext*);
+typedef enum {
+ /* 0x00 */ MALON_ADULT_LIMB_NONE,
+ /* 0x01 */ MALON_ADULT_ROOT_LIMB,
+ /* 0x02 */ MALON_ADULT_LOWER_CONTROL_LIMB,
+ /* 0x03 */ MALON_ADULT_LEFT_THIGH_LIMB,
+ /* 0x04 */ MALON_ADULT_LEFT_LEG_LIMB,
+ /* 0x05 */ MALON_ADULT_LEFT_FOOT_LIMB,
+ /* 0x06 */ MALON_ADULT_RIGHT_THIGH_LIMB,
+ /* 0x07 */ MALON_ADULT_RIGHT_LEG_LIMB,
+ /* 0x08 */ MALON_ADULT_RIGHT_FOOT_LIMB,
+ /* 0x09 */ MALON_ADULT_TORSO_LIMB,
+ /* 0x0A */ MALON_ADULT_DRESS_LIMB,
+ /* 0x0B */ MALON_ADULT_CHEST_AND_NECK_LIMB,
+ /* 0x0C */ MALON_ADULT_LEFT_SHOULDER_LIMB,
+ /* 0x0D */ MALON_ADULT_LEFT_ARM_LIMB,
+ /* 0x0E */ MALON_ADULT_LEFT_HAND_LIMB,
+ /* 0x0F */ MALON_ADULT_RIGHT_SHOULDER_LIMB,
+ /* 0x10 */ MALON_ADULT_RIGHT_ARM_LIMB,
+ /* 0x11 */ MALON_ADULT_RIGHT_HAND_LIMB,
+ /* 0x12 */ MALON_ADULT_HEAD_LIMB,
+ /* 0x13 */ MALON_ADULT_LIMB_MAX
+} AdultMalonLimb;
+
typedef struct EnMa2 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@@ -16,10 +39,10 @@ typedef struct EnMa2 {
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;
/* 0x020A */ s16 unk_20A;
- /* 0x020C */ s16 unk_20C;
- /* 0x020E */ s16 unk_20E;
- /* 0x0210 */ s16 unk_210;
- /* 0x0212 */ Vec3s unk_212[0x13];
+ /* 0x020C */ s16 blinkTimer;
+ /* 0x020E */ s16 eyeIndex;
+ /* 0x0210 */ s16 mouthIndex;
+ /* 0x0212 */ Vec3s unk_212[MALON_ADULT_LIMB_MAX];
} EnMa2; // size = 0x0284
#endif
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
index da02dad5a1..d0deea76f2 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
@@ -22,8 +22,8 @@ s16 func_80AA2BD4(GlobalContext* globalCtx, Actor* this);
void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2F28(EnMa3* this);
-void func_80AA2F80(EnMa3* this);
-void func_80AA3004(EnMa3* this, s32 arg1);
+void EnMa3_UpdateEyes(EnMa3* this);
+void EnMa3_ChangeAnim(EnMa3* this, s32 arg1);
void func_80AA3200(EnMa3* this, GlobalContext* globalCtx);
const ActorInit En_Ma3_InitVars = {
@@ -60,10 +60,10 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
-static struct_D_80AA1678 D_80AA3848[] = {
- { 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f },
- { 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f },
- { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f },
+static struct_D_80AA1678 sAnimationInfo[] = {
+ { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
+ { &gMalonAdultStandStillAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
};
u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) {
@@ -177,7 +177,7 @@ void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
- if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) {
+ if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &gMalonAdultSingAnim)) {
phi_a3 = 1;
} else {
phi_a3 = 0;
@@ -202,35 +202,35 @@ s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx) {
}
s32 func_80AA2F28(EnMa3* this) {
- if (this->skelAnime.animation != &object_ma2_Anim_009EE0) {
+ if (this->skelAnime.animation != &gMalonAdultSingAnim) {
return 0;
}
if (this->unk_1E0.unk_00 != 0) {
return 0;
}
- this->unk_20C = 0;
- if (this->unk_20E != 2) {
+ this->blinkTimer = 0;
+ if (this->eyeIndex != 2) {
return 0;
}
- this->unk_210 = 2;
+ this->mouthIndex = 2;
return 1;
}
-void func_80AA2F80(EnMa3* this) {
- if ((!func_80AA2F28(this)) && (DECR(this->unk_20C) == 0)) {
- this->unk_20E += 1;
- if (this->unk_20E >= 3) {
- this->unk_20C = Rand_S16Offset(0x1E, 0x1E);
- this->unk_20E = 0;
+void EnMa3_UpdateEyes(EnMa3* this) {
+ if ((!func_80AA2F28(this)) && (DECR(this->blinkTimer) == 0)) {
+ this->eyeIndex += 1;
+ if (this->eyeIndex >= 3) {
+ this->blinkTimer = Rand_S16Offset(30, 30);
+ this->eyeIndex = 0;
}
}
}
-void func_80AA3004(EnMa3* this, s32 idx) {
- f32 frameCount = Animation_GetLastFrame(D_80AA3848[idx].animation);
+void EnMa3_ChangeAnim(EnMa3* this, s32 idx) {
+ f32 frameCount = Animation_GetLastFrame(sAnimationInfo[idx].animation);
- Animation_Change(&this->skelAnime, D_80AA3848[idx].animation, 1.0f, 0.0f, frameCount, D_80AA3848[idx].mode,
- D_80AA3848[idx].transitionRate);
+ Animation_Change(&this->skelAnime, sAnimationInfo[idx].animation, 1.0f, 0.0f, frameCount, sAnimationInfo[idx].mode,
+ sAnimationInfo[idx].transitionRate);
}
void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -238,18 +238,18 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
switch (func_80AA2EC8(this, globalCtx)) {
case 0:
- func_80AA3004(this, 0);
+ EnMa3_ChangeAnim(this, 0);
this->actionFunc = func_80AA3200;
break;
case 1:
- func_80AA3004(this, 0);
+ EnMa3_ChangeAnim(this, 0);
this->actionFunc = func_80AA3200;
break;
case 2:
@@ -283,7 +283,7 @@ void EnMa3_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
SkelAnime_Update(&this->skelAnime);
- func_80AA2F80(this);
+ EnMa3_UpdateEyes(this);
this->actionFunc(this, globalCtx);
func_80AA2E54(this, globalCtx);
func_800343CC(globalCtx, &this->actor, &this->unk_1E0.unk_00, (f32)this->collider.dim.radius + 150.0f,
@@ -303,22 +303,23 @@ s32 EnMa3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnMa3* this = THIS;
Vec3s vec;
- if ((limbIndex == 3) || (limbIndex == 6)) {
+ if ((limbIndex == MALON_ADULT_LIMB_LEFT_THIGH) || (limbIndex == MALON_ADULT_LIMB_RIGHT_THIGH)) {
*dList = NULL;
}
- if (limbIndex == 18) {
+ if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
vec = this->unk_1E0.unk_08;
Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
- if (limbIndex == 11) {
+ if (limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) {
vec = this->unk_1E0.unk_0E;
Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
}
- if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) {
+ if ((limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) || (limbIndex == MALON_ADULT_LIMB_LEFT_SHOULDER) ||
+ (limbIndex == MALON_ADULT_LIMB_RIGHT_SHOULDER)) {
rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f;
}
@@ -331,27 +332,20 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 927);
- if (limbIndex == 18) {
+ if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
- if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) {
- gSPDisplayList(POLY_OPA_DISP++, &object_ma2_DL_005420);
+
+ if ((limbIndex == MALON_ADULT_LIMB_LEFT_HAND) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
+ gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 950);
}
void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static void* D_80AA38A4[] = {
- 0x06002970,
- 0x06003570,
- 0x06003770,
- };
- static void* D_80AA38B0[] = {
- 0x06002570,
- 0x06002C70,
- 0x06003070,
- };
+ static void* sMouthTextures[] = { gMalonAdultMouthNeutralTex, gMalonAdultMouthSadTex, gMalonAdultMouthHappyTex };
+ static void* sEyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
EnMa3* this = THIS;
Camera* camera;
f32 someFloat;
@@ -364,8 +358,8 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA38A4[this->unk_210]));
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA38B0[this->unk_20E]));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex]));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMa3_OverrideLimbDraw, EnMa3_PostLimbDraw, this);
diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
index 6a9ff10b92..9d4d248b0f 100644
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
@@ -8,6 +8,29 @@ struct EnMa3;
typedef void (*EnMa3ActionFunc)(struct EnMa3*, GlobalContext*);
+typedef enum {
+ /* 0x00 */ MALON_ADULT_LIMB_NONE,
+ /* 0x01 */ MALON_ADULT_LIMB_ROOT,
+ /* 0x02 */ MALON_ADULT_LIMB_LOWER_CONTROL,
+ /* 0x03 */ MALON_ADULT_LIMB_LEFT_THIGH,
+ /* 0x04 */ MALON_ADULT_LIMB_LEFT_LEG,
+ /* 0x05 */ MALON_ADULT_LIMB_LEFT_FOOT,
+ /* 0x06 */ MALON_ADULT_LIMB_RIGHT_THIGH,
+ /* 0x07 */ MALON_ADULT_LIMB_RIGHT_LEG,
+ /* 0x08 */ MALON_ADULT_LIMB_RIGHT_FOOT,
+ /* 0x09 */ MALON_ADULT_LIMB_TORSO,
+ /* 0x0A */ MALON_ADULT_LIMB_DRESS,
+ /* 0x0B */ MALON_ADULT_LIMB_CHEST_AND_NECK,
+ /* 0x0C */ MALON_ADULT_LIMB_LEFT_SHOULDER,
+ /* 0x0D */ MALON_ADULT_LIMB_LEFT_ARM,
+ /* 0x0E */ MALON_ADULT_LIMB_LEFT_HAND,
+ /* 0x0F */ MALON_ADULT_LIMB_RIGHT_SHOULDER,
+ /* 0x10 */ MALON_ADULT_LIMB_RIGHT_ARM,
+ /* 0x11 */ MALON_ADULT_LIMB_RIGHT_HAND,
+ /* 0x12 */ MALON_ADULT_LIMB_HEAD,
+ /* 0x13 */ MALON_ADULT_LIMB_MAX
+} AdultMalonLimb;
+
typedef struct EnMa3 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@@ -16,10 +39,10 @@ typedef struct EnMa3 {
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;
/* 0x020A */ s16 unk_20A;
- /* 0x020C */ s16 unk_20C;
- /* 0x020E */ s16 unk_20E;
- /* 0x0210 */ s16 unk_210;
- /* 0x0212 */ Vec3s unk_212[0x13];
+ /* 0x020C */ s16 blinkTimer;
+ /* 0x020E */ s16 eyeIndex;
+ /* 0x0210 */ s16 mouthIndex;
+ /* 0x0212 */ Vec3s unk_212[MALON_ADULT_LIMB_MAX];
} EnMa3; // size = 0x0284
#endif
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 43f243f1e5..53c753bdf7 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -226,7 +226,7 @@ void func_80AB1284(EnNb* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4);
}
-s32 EnNb_FrameUpdateMatrix(EnNb* this) {
+s32 EnNb_UpdateSkelAnime(EnNb* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -414,14 +414,14 @@ void EnNb_SetupChamberWarp(EnNb* this, GlobalContext* globalCtx) {
void EnNb_ComeUp(EnNb* this, GlobalContext* globalCtx) {
EnNb_ComeUpImpl(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupDefaultChamberIdle(this);
}
void func_80AB193C(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupArmRaise(this, globalCtx);
}
@@ -430,21 +430,21 @@ void EnNb_RaiseArm(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
func_80AB1284(this, globalCtx);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupRaisedArmTransition(this, animFinished);
}
void func_80AB19BC(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupMedallion(this, globalCtx);
}
void func_80AB19FC(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
}
@@ -528,7 +528,7 @@ void EnNb_Hide(EnNb* this, GlobalContext* globalCtx) {
void EnNb_Fade(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckToFade(this, globalCtx);
func_80AB1210(this, globalCtx);
@@ -536,7 +536,7 @@ void EnNb_Fade(EnNb* this, GlobalContext* globalCtx) {
void EnNb_CreateLightOrb(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupLightOrb(this, globalCtx);
func_80AB1210(this, globalCtx);
@@ -676,7 +676,7 @@ void EnNb_MovingInPortal(EnNb* this, GlobalContext* globalCtx) {
EnNb_PlayCrySFX(this, globalCtx);
EnNb_PlayAgonySFX(this, globalCtx);
EnNb_UpdateEyes(this);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_CheckKidnapCsMode(this, globalCtx);
}
@@ -684,7 +684,7 @@ void EnNb_SuckedInByPortal(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_SetRaisedArmCaptureAnim(this, animFinished);
EnNb_SetPosInPortal(this, globalCtx);
EnNb_CheckKidnapCsMode(this, globalCtx);
@@ -900,7 +900,7 @@ void EnNb_Kneel(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfKneeling(this, animFinished);
EnNb_PlayKneelingOnGroundSFX(this);
func_80AB2688(this, globalCtx);
@@ -912,7 +912,7 @@ void EnNb_LookRight(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfLookingRight(this, animFinished);
EnNb_PlayLookRightSFX(this);
func_80AB2688(this, globalCtx);
@@ -924,7 +924,7 @@ void EnNb_LookLeft(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfLookLeft(this, animFinished);
func_80AB2688(this, globalCtx);
func_80AB1284(this, globalCtx);
@@ -936,7 +936,7 @@ void EnNb_Run(EnNb* this, GlobalContext* globalCtx) {
EnNb_PlayKnuckleDefeatSFX(this, globalCtx);
EnNb_UpdateEyes(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_PlayLookLeftSFX(this);
func_80AB2688(this, globalCtx);
func_80AB1284(this, globalCtx);
@@ -1078,7 +1078,7 @@ void EnNb_CheckCreditsCsMode(EnNb* this, GlobalContext* globalCtx) {
void EnNb_CreditsFade(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetAlphaInCredits(this);
EnNb_SetupCreditsSit(this);
@@ -1086,7 +1086,7 @@ void EnNb_CreditsFade(EnNb* this, GlobalContext* globalCtx) {
void func_80AB3428(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckCreditsCsModeImpl(this, globalCtx);
}
@@ -1095,7 +1095,7 @@ void EnNb_LookUp(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
func_80AB1284(this, globalCtx);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckIfLookingUp(this, animFinished);
}
@@ -1311,7 +1311,7 @@ void func_80AB3B7C(EnNb* this, GlobalContext* globalCtx) {
void EnNb_WaitForNotice(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckNoticed(this, globalCtx);
}
@@ -1321,7 +1321,7 @@ void EnNb_StandUpAfterNotice(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupIdleCrawlspace(this, animFinished);
}
@@ -1330,7 +1330,7 @@ void EnNb_BlockCrawlspace(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3838(this, globalCtx);
}
@@ -1339,7 +1339,7 @@ void EnNb_InitCrawlspaceDialogue(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetTextIdAsChild(this, globalCtx);
}
@@ -1352,7 +1352,7 @@ void EnNb_FollowPath(EnNb* this, GlobalContext* globalCtx) {
EnNb_UpdateCollider(this, globalCtx);
func_80AB36DC(this, globalCtx);
func_80AB10C4(this);
- animFinished = EnNb_FrameUpdateMatrix(this);
+ animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3A7C(this, globalCtx, animFinished);
}
@@ -1361,7 +1361,7 @@ void func_80AB3DB0(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3B04(this, globalCtx);
}
@@ -1370,7 +1370,7 @@ void func_80AB3E10(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB1040(this, globalCtx);
- EnNb_FrameUpdateMatrix(this);
+ EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3B7C(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index 6671165496..94b5bb73e8 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -379,7 +379,7 @@ void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 transit
Animation_Change(&this->skelAnime, animHeader, playbackSpeed, unk0, fc, arg2, transitionRate);
}
-s32 EnRu1_FrameUpdateMatrix(EnRu1* this) {
+s32 EnRu1_UpdateSkelAnime(EnRu1* this) {
// why?
if (this->action != 32) {
return SkelAnime_Update(&this->skelAnime);
@@ -696,7 +696,7 @@ void func_80AEC070(EnRu1* this, GlobalContext* globalCtx, UNK_TYPE arg2) {
void func_80AEC0B4(EnRu1* this, GlobalContext* globalCtx) {
func_80AEB89C(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEBC84(this, globalCtx);
func_80AEBC30(globalCtx);
func_80AEBD1C(this, globalCtx);
@@ -708,7 +708,7 @@ void func_80AEC100(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AEC130(EnRu1* this, GlobalContext* globalCtx) {
- s32 something = EnRu1_FrameUpdateMatrix(this);
+ s32 something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEBB3C(this);
@@ -718,7 +718,7 @@ void func_80AEC130(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEB974(this, globalCtx);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEB50C(this, globalCtx);
func_80AEBEC8(this, globalCtx);
}
@@ -726,7 +726,7 @@ void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEB50C(this, globalCtx);
@@ -738,7 +738,7 @@ void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC244(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
func_80AEBA2C(this, globalCtx);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
@@ -751,7 +751,7 @@ void func_80AEC244(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC2C0(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEB50C(this, globalCtx);
@@ -933,7 +933,7 @@ void func_80AECAB4(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx) {
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC8B8(this, globalCtx);
@@ -942,7 +942,7 @@ void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECB18(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC93C(this, something);
@@ -950,7 +950,7 @@ void func_80AECB18(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECB60(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC40C(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@@ -960,7 +960,7 @@ void func_80AECB60(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC4CC(this);
func_80AEC6E4(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@@ -970,7 +970,7 @@ void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECC1C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC4F4(this);
func_80AEC6E4(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@@ -1142,29 +1142,29 @@ void func_80AED324(EnRu1* this, GlobalContext* globalCtx) {
void func_80AED344(EnRu1* this, GlobalContext* globalCtx) {
func_80AECE04(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AED110(this);
}
void func_80AED374(EnRu1* this, GlobalContext* globalCtx) {
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AED154(this, globalCtx);
}
void func_80AED3A4(EnRu1* this, GlobalContext* globalCtx) {
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AED19C(this, func_80AECF6C(this, globalCtx));
}
void func_80AED3E0(EnRu1* this, GlobalContext* globalCtx) {
func_80AEAECC(this, globalCtx);
- func_80AED218(this, EnRu1_FrameUpdateMatrix(this));
+ func_80AED218(this, EnRu1_UpdateSkelAnime(this));
}
void func_80AED414(EnRu1* this, GlobalContext* globalCtx) {
func_80AECE20(this, globalCtx);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
}
void func_80AED44C(EnRu1* this, GlobalContext* globalCtx) {
@@ -1696,7 +1696,7 @@ void func_80AEEBD4(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAC54(this, globalCtx);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEBB4(this, globalCtx);
func_80AEE488(this, globalCtx);
@@ -1710,7 +1710,7 @@ void func_80AEEC5C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
func_80AEDFF4(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEE568(this, globalCtx);
func_80AED624(this, globalCtx);
@@ -1721,7 +1721,7 @@ void func_80AEECF0(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
func_80AEE050(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEB24(this, globalCtx);
func_80AED624(this, globalCtx);
@@ -1731,7 +1731,7 @@ void func_80AEED58(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
Actor_MoveForward(&this->actor);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEAC8(this, globalCtx);
func_80AED624(this, globalCtx);
@@ -1740,7 +1740,7 @@ void func_80AEED58(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx) {
func_80AED8DC(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
EnRu1_UpdateEyes(this);
@@ -1750,7 +1750,7 @@ void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEE34(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
EnRu1_UpdateEyes(this);
@@ -1762,7 +1762,7 @@ void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
func_80AEDFF4(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AED738(this, globalCtx);
func_80AED624(this, globalCtx);
@@ -1770,7 +1770,7 @@ void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEF08(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEE628(this, globalCtx);
@@ -1861,7 +1861,7 @@ void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx) {
s32 cond;
func_80AEEF68(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAC10(this, globalCtx);
func_80AEAECC(this, globalCtx);
@@ -1872,7 +1872,7 @@ void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF354(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEFEC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEF188(this, globalCtx);
@@ -1882,7 +1882,7 @@ void func_80AEF3A8(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
func_80AED83C(this);
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
func_80AEF080(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
@@ -2029,7 +2029,7 @@ void func_80AEF99C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF9D8(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF624(this, globalCtx);
func_80AEB220(this, globalCtx);
@@ -2041,7 +2041,7 @@ void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEB364(this, globalCtx);
func_80AEAECC(this, globalCtx);
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
func_80AEF4E0(this);
func_80AEF5B8(this);
func_80AEF40C(this);
@@ -2052,7 +2052,7 @@ void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFAAC(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
func_80AEF79C(this, globalCtx);
func_80AEB220(this, globalCtx);
}
@@ -2062,7 +2062,7 @@ void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
- something = EnRu1_FrameUpdateMatrix(this);
+ something = EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF820(this, something);
func_80AEB220(this, globalCtx);
@@ -2071,7 +2071,7 @@ void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF890(this, globalCtx);
func_80AEB220(this, globalCtx);
@@ -2080,7 +2080,7 @@ void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFBC8(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF540(this);
func_80AEF930(this, globalCtx);
@@ -2158,7 +2158,7 @@ void func_80AEFE9C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEF68(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAC10(this, globalCtx);
func_80AEAECC(this, globalCtx);
@@ -2167,7 +2167,7 @@ void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFF40(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEFEC(this, globalCtx);
- EnRu1_FrameUpdateMatrix(this);
+ EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEFE9C(this, globalCtx);
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index dbd5479b36..33e668355e 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -170,7 +170,7 @@ void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4);
}
-s32 EnRu2_FrameUpdateMatrix(EnRu2* this) {
+s32 EnRu2_UpdateSkelAnime(EnRu2* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -342,14 +342,14 @@ void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2978(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2B94(this);
}
void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2BC0(this, globalCtx);
}
@@ -358,21 +358,21 @@ void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) {
UNK_TYPE something;
func_80AF2744(this, globalCtx);
- something = EnRu2_FrameUpdateMatrix(this);
+ something = EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2C54(this, something);
}
void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2C68(this, globalCtx);
}
void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
}
@@ -453,7 +453,7 @@ void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2F58(this, globalCtx);
func_80AF26D0(this, globalCtx);
@@ -461,7 +461,7 @@ void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF30AC(this, globalCtx);
func_80AF26D0(this, globalCtx);
@@ -569,7 +569,7 @@ void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF33E0(this);
func_80AF34A4(this);
@@ -577,7 +577,7 @@ void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF3564(this, globalCtx);
}
@@ -586,7 +586,7 @@ void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) {
UNK_TYPE something;
func_80AF2744(this, globalCtx);
- something = EnRu2_FrameUpdateMatrix(this);
+ something = EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF3530(this, something);
}
@@ -716,7 +716,7 @@ void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
func_80AF259C(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF38D0(this, globalCtx);
@@ -724,7 +724,7 @@ void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF390C(this, globalCtx);
@@ -732,7 +732,7 @@ void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF39DC(this, globalCtx);
@@ -740,7 +740,7 @@ void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF3ADC(this, globalCtx);
@@ -749,7 +749,7 @@ void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) {
func_80AF37CC(this);
func_80AF2744(this, globalCtx);
- EnRu2_FrameUpdateMatrix(this);
+ EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF3B74(this, globalCtx);
diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index 10566262c3..0bab11f511 100644
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -65,20 +65,8 @@ static ColliderCylinderInit sCylinderInit = {
{ 30, 40, 0, { 0, 0, 0 } },
};
-static Vec3f D_80B16E7C = {
- 1100.0f,
- 1000.0f,
- 0.0f,
-};
-
-static void* D_80B16E88[] = {
- object_ta_Tex_007F80,
- object_ta_Tex_006EC0,
- object_ta_Tex_0072C0,
-};
-
void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) {
- this->unk_25C = arg1;
+ this->actionFunc = arg1;
this->unk_260 = arg2;
}
@@ -116,8 +104,8 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ta_Skel_00B7B8, &object_ta_Anim_001C94, this->jointTable,
- this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gTalonSkel, &gTalonStandAnim, this->jointTable, this->morphTable,
+ 17);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -125,7 +113,7 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_2E0 = 0;
this->unk_2CE = 0;
this->unk_2E2 = 0;
- this->unk_2B6 = 20;
+ this->blinkTimer = 20;
this->unk_2B0 = func_80B166CC;
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
@@ -142,14 +130,14 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_Kill(&this->actor);
} else if (gSaveContext.eventChkInf[6] & 0x400) {
func_80B13AA0(this, func_80B14CAC, func_80B167C0);
- this->unk_2B4 = 0;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
- this->unk_2E4 = &object_ta_Anim_001C94;
+ this->eyeIndex = 0;
+ Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
+ this->currentAnimation = &gTalonStandAnim;
} else {
func_80B13AA0(this, func_80B14754, func_80B167FC);
- this->unk_2B4 = 2;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
- this->unk_2E4 = &object_ta_Anim_00CD50;
+ this->eyeIndex = 2;
+ Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
+ this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
break;
@@ -164,9 +152,9 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
osSyncPrintf(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST);
} else {
func_80B13AA0(this, func_80B14D98, func_80B167C0);
- this->unk_2B4 = 0;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
- this->unk_2E4 = &object_ta_Anim_001C94;
+ this->eyeIndex = 0;
+ Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
+ this->currentAnimation = &gTalonStandAnim;
}
break;
default:
@@ -176,14 +164,14 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_Kill(&this->actor);
} else if (gSaveContext.eventChkInf[1] & 0x8) {
func_80B13AA0(this, func_80B14C18, func_80B167C0);
- this->unk_2B4 = 0;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
- this->unk_2E4 = &object_ta_Anim_001C94;
+ this->eyeIndex = 0;
+ Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
+ this->currentAnimation = &gTalonStandAnim;
} else {
func_80B13AA0(this, func_80B14634, func_80B167FC);
- this->unk_2B4 = 2;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
- this->unk_2E4 = &object_ta_Anim_00CD50;
+ this->eyeIndex = 2;
+ Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
+ this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
} else if (globalCtx->sceneNum == SCENE_SOUKO) {
@@ -196,42 +184,42 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
if (IS_DAY) {
this->actor.flags |= 0x10;
this->unk_2C4[0] = this->unk_2C4[1] = this->unk_2C4[2] = 7;
- this->unk_2B8[0] = (EnNiw*)Actor_Spawn(
+ this->superCuccos[0] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x + 5.0f,
this->actor.world.pos.y + 3.0f, this->actor.world.pos.z + 26.0f, 0, 0, 0, 0xD);
- this->unk_2B8[1] = (EnNiw*)Actor_Spawn(
+ this->superCuccos[1] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x - 20.0f,
this->actor.world.pos.y + 40.0f, this->actor.world.pos.z - 30.0f, 0, 0, 0, 0xD);
- this->unk_2B8[2] = (EnNiw*)Actor_Spawn(
+ this->superCuccos[2] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x + 20.0f,
this->actor.world.pos.y + 40.0f, this->actor.world.pos.z - 30.0f, 0, 0, 0, 0xD);
func_80B13AAC(this, globalCtx);
if (gSaveContext.eventInf[0] & 0x400) {
func_80B13AA0(this, func_80B16608, func_80B16938);
- Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 0.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 0.0f);
gSaveContext.eventInf[0] &= ~0x400;
} else {
func_80B13AA0(this, func_80B16504, func_80B16854);
- this->unk_2B4 = 0;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_0017E8);
- this->unk_2E4 = &object_ta_Anim_0017E8;
+ this->eyeIndex = 0;
+ Animation_PlayOnce(&this->skelAnime, &gTalonSitSleepingAnim);
+ this->currentAnimation = &gTalonSitSleepingAnim;
}
} else {
func_80B13AA0(this, func_80B146F8, func_80B167FC);
- this->unk_2B4 = 2;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
- this->unk_2E4 = &object_ta_Anim_00CD50;
+ this->eyeIndex = 2;
+ Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
+ this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
}
} else {
func_80B13AA0(this, func_80B14634, func_80B167FC);
- this->unk_2B4 = 2;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
- this->unk_2E4 = &object_ta_Anim_00CD50;
+ this->eyeIndex = 2;
+ Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
+ this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
break;
@@ -306,11 +294,12 @@ void func_80B1448C(EnTa* this, GlobalContext* globalCtx) {
void func_80B144D8(EnTa* this, GlobalContext* globalCtx) {
if (Actor_TextboxIsClosing(&this->actor, globalCtx)) {
func_80B14410(this);
- this->unk_2B6 = 1;
+ this->blinkTimer = 1;
this->unk_2B0 = func_80B16700;
}
+
if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) {
- this->unk_2B4 = 1;
+ this->eyeIndex = 1;
func_80B13AA0(this, func_80B1448C, func_80B167C0);
}
func_80B14248(this);
@@ -324,8 +313,8 @@ void func_80B14570(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B144D8, func_80B167C0);
this->unk_2CE = 3;
this->unk_2CC = 60;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00E3D8);
- this->unk_2E4 = &object_ta_Anim_001C94;
+ Animation_PlayOnce(&this->skelAnime, &gTalonWakeUpAnim);
+ this->currentAnimation = &gTalonStandAnim;
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE);
}
}
@@ -476,8 +465,8 @@ void func_80B14B6C(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B14AF4, func_80B167C0);
this->unk_2CC = 5;
gSaveContext.eventChkInf[1] |= 0x10;
- Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CF28);
- this->unk_2E4 = &object_ta_Anim_00C858;
+ Animation_PlayOnce(&this->skelAnime, &gTalonRunTransitionAnim);
+ this->currentAnimation = &gTalonRunAnim;
}
this->unk_2E0 |= 1;
}
@@ -558,19 +547,19 @@ void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) {
void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
func_80B13AA0(this, arg1, func_80B16854);
- this->unk_2B4 = 2;
- Animation_Change(&this->skelAnime, &object_ta_Anim_0017E8, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_ta_Anim_0017E8), ANIMMODE_ONCE, -5.0f);
+ this->eyeIndex = 2;
+ Animation_Change(&this->skelAnime, &gTalonSitSleepingAnim, 1.0f, 0.0f,
+ Animation_GetLastFrame(&gTalonSitSleepingAnim), ANIMMODE_ONCE, -5.0f);
this->unk_2E2 = 0;
- this->unk_2E4 = &object_ta_Anim_0017E8;
+ this->currentAnimation = &gTalonSitSleepingAnim;
}
void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) {
- this->unk_2B4 = 1;
+ this->eyeIndex = 1;
func_80B13AA0(this, arg1, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, -5.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gTalonSitWakeUpAnim),
+ ANIMMODE_ONCE, -5.0f);
}
void func_80B15034(EnTa* this, GlobalContext* globalCtx) {
@@ -589,7 +578,7 @@ s32 func_80B150AC(EnTa* this, GlobalContext* globalCtx, s32 idx) {
if (player->stateFlags1 & 0x800) {
interactRangeActor = player->interactRangeActor;
if (interactRangeActor != NULL && interactRangeActor->id == ACTOR_EN_NIW &&
- interactRangeActor == &this->unk_2B8[idx]->actor) {
+ interactRangeActor == &this->superCuccos[idx]->actor) {
return true;
}
}
@@ -602,33 +591,33 @@ void func_80B15100(EnTa* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
s32 unk_2CA;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
this->unk_2E0 &= ~0x10;
Message_CloseTextbox(globalCtx);
unk_2CA = this->unk_2CA;
- this->unk_25C = func_80B154FC;
- this->unk_2B8[unk_2CA]->actor.gravity = 0.1f;
- this->unk_2B8[unk_2CA]->actor.velocity.y = 0.0f;
- this->unk_2B8[unk_2CA]->actor.speedXZ = 0.0f;
- this->unk_2B8[unk_2CA]->actor.parent = NULL;
+ this->actionFunc = func_80B154FC;
+ this->superCuccos[unk_2CA]->actor.gravity = 0.1f;
+ this->superCuccos[unk_2CA]->actor.velocity.y = 0.0f;
+ this->superCuccos[unk_2CA]->actor.speedXZ = 0.0f;
+ this->superCuccos[unk_2CA]->actor.parent = NULL;
- if (player->interactRangeActor == &this->unk_2B8[unk_2CA]->actor) {
+ if (player->interactRangeActor == &this->superCuccos[unk_2CA]->actor) {
player->interactRangeActor = NULL;
}
- if (player->heldActor == &this->unk_2B8[unk_2CA]->actor) {
+ if (player->heldActor == &this->superCuccos[unk_2CA]->actor) {
player->heldActor = NULL;
}
player->stateFlags1 &= ~0x800;
- this->unk_2B8[unk_2CA] = NULL;
+ this->superCuccos[unk_2CA] = NULL;
}
this->unk_2E0 |= 1;
}
void func_80B15260(EnTa* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {
- this->unk_25C = func_80B15100;
+ this->actionFunc = func_80B15100;
this->actor.flags &= ~0x10000;
} else {
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
@@ -636,25 +625,25 @@ void func_80B15260(EnTa* this, GlobalContext* globalCtx) {
this->unk_2E0 |= 1;
}
-s32 func_80B152D0(EnTa* this, GlobalContext* globalCtx) {
- s32 ct;
+s32 EnTa_GetSuperCuccosCount(EnTa* this, GlobalContext* globalCtx) {
+ s32 count;
s32 i;
- for (ct = 0, i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
- if (this->unk_2B8[i] != NULL) {
- ct++;
+ for (count = 0, i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
+ if (this->superCuccos[i] != NULL) {
+ count++;
}
}
- return ct;
+ return count;
}
void func_80B15308(EnTa* this) {
if (this->unk_2E0 & 0x10) {
if (this->unk_2E0 & 0x100) {
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f);
this->unk_2E0 &= ~0x100;
} else {
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f);
this->unk_2E0 |= 0x100;
}
this->unk_2E0 &= ~0x10;
@@ -688,7 +677,7 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
globalCtx->sceneLoadFlag = 0x14;
gSaveContext.eventInf[0] |= 0x400;
- this->unk_25C = func_80B153D4;
+ this->actionFunc = func_80B153D4;
this->unk_2CC = 22;
}
}
@@ -696,10 +685,10 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
s32 i;
- for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
- if (this->unk_2B8[i] != NULL) {
- if (this->unk_2B8[i]->actor.gravity > -2.0f) {
- this->unk_2B8[i]->actor.gravity -= 0.03f;
+ for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
+ if (this->superCuccos[i] != NULL) {
+ if (this->superCuccos[i]->actor.gravity > -2.0f) {
+ this->superCuccos[i]->actor.gravity -= 0.03f;
}
if (func_80B150AC(this, globalCtx, i)) {
@@ -707,17 +696,17 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
this->unk_2C4[i]--;
} else {
this->unk_2CA = i;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
- -10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
this->unk_2E0 &= ~0x10;
- switch (func_80B152D0(this, globalCtx)) {
+ switch (EnTa_GetSuperCuccosCount(this, globalCtx)) {
case 1:
gSaveContext.timer1State = 0;
func_8002DF54(globalCtx, &this->actor, 1);
+
Message_StartTextbox(globalCtx, 0x2084, &this->actor);
- this->unk_25C = func_80B15424;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
+ this->actionFunc = func_80B15424;
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
-10.0f);
this->unk_2E0 &= ~0x10;
this->unk_2E0 &= ~0x100;
@@ -735,7 +724,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE);
break;
}
- this->unk_25C = func_80B15260;
+ this->actionFunc = func_80B15260;
this->actor.flags |= 0x10000;
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
return;
@@ -757,11 +746,11 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
gSaveContext.timer1State = 0;
func_8002DF54(globalCtx, &this->actor, 1);
Message_StartTextbox(globalCtx, 0x2081, &this->actor);
- this->unk_25C = func_80B15424;
+ this->actionFunc = func_80B15424;
func_80B14E28(this, globalCtx);
gSaveContext.eventInf[0] &= ~0x100;
this->unk_2E0 |= 0x80;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
this->unk_2E0 &= ~0x10;
this->unk_2E0 &= ~0x100;
}
@@ -773,28 +762,28 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) {
s32 i;
if (this->unk_2CC > 35) {
- for (i = 1; i < ARRAY_COUNT(this->unk_2B8); i++) {
- if (this->unk_2B8[i] != NULL) {
- Math_SmoothStepToS(&this->unk_2B8[i]->actor.world.rot.y, i * -10000 - 3000, 2, 0x800, 0x100);
- this->unk_2B8[i]->actor.shape.rot.y = this->unk_2B8[i]->actor.world.rot.y;
+ for (i = 1; i < ARRAY_COUNT(this->superCuccos); i++) {
+ if (this->superCuccos[i] != NULL) {
+ Math_SmoothStepToS(&this->superCuccos[i]->actor.world.rot.y, i * -10000 - 3000, 2, 0x800, 0x100);
+ this->superCuccos[i]->actor.shape.rot.y = this->superCuccos[i]->actor.world.rot.y;
}
}
} else if (this->unk_2CC == 35) {
- for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
+ for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
this->unk_2C4[i] = (s32)(Rand_CenteredFloat(6.0f) + 10.0f);
- if (this->unk_2B8[i] != NULL) {
- EnNiw* niw = this->unk_2B8[i];
+ if (this->superCuccos[i] != NULL) {
+ EnNiw* niw = this->superCuccos[i];
niw->unk_308 = 1;
niw->actor.gravity = 0.0f;
}
}
} else {
- for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
+ for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
if (this->unk_2CC < 35 - this->unk_2C4[i]) {
- if (this->unk_2B8[i] != NULL) {
- if (this->unk_2B8[i]->actor.gravity > -2.0f) {
- this->unk_2B8[i]->actor.gravity -= 0.03f;
+ if (this->superCuccos[i] != NULL) {
+ if (this->superCuccos[i]->actor.gravity > -2.0f) {
+ this->superCuccos[i]->actor.gravity -= 0.03f;
}
}
}
@@ -804,9 +793,9 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2CC == 0) {
func_80B13AA0(this, func_80B154FC, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
+ Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
func_8002DF54(globalCtx, &this->actor, 7);
}
}
@@ -815,8 +804,8 @@ void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) {
func_80B13AA0(this, func_80B1585C, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 1.0f,
- Animation_GetLastFrame(&object_ta_Anim_00BF38), ANIMMODE_ONCE, 0.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 1.0f,
+ Animation_GetLastFrame(&gTalonSitHandsUpAnim), ANIMMODE_ONCE, 0.0f);
this->unk_2CC = 50;
func_80088B34(0x1E);
func_800F5ACC(NA_BGM_MINI_GAME_2);
@@ -836,7 +825,7 @@ void func_80B15BF8(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2E0 & 0x10) {
func_80B13AA0(this, func_80B15AD4, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
this->unk_2CC = 5;
}
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
@@ -849,7 +838,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2E0 & 0x10) {
func_80B13AA0(this, func_80B15BF8, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
}
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
this->unk_2E0 |= 0x20;
@@ -860,7 +849,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
void func_80B15D90(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B15CC8, func_80B16938);
this->unk_2E0 &= ~0x10;
- Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
+ Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
Message_ContinueTextbox(globalCtx, 0x2080);
this->unk_2E0 &= ~0x20;
}
@@ -876,7 +865,7 @@ void func_80B15E28(EnTa* this, GlobalContext* globalCtx) {
void func_80B15E80(EnTa* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) {
this->actor.parent = NULL;
- this->unk_25C = func_80B15E28;
+ this->actionFunc = func_80B15E28;
if (!(this->unk_2E0 & 0x2)) {
gSaveContext.itemGetInf[0] |= 4;
}
@@ -1048,13 +1037,13 @@ void func_80B16608(EnTa* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {
switch (this->actor.textId) {
case 0x2085:
- this->unk_25C = func_80B161C0;
+ this->actionFunc = func_80B161C0;
break;
case 0x2086:
- this->unk_25C = func_80B162E8;
+ this->actionFunc = func_80B162E8;
break;
case 0x2088:
- this->unk_25C = func_80B1642C;
+ this->actionFunc = func_80B1642C;
break;
}
this->actor.flags &= ~0x10000;
@@ -1066,50 +1055,50 @@ void func_80B16608(EnTa* this, GlobalContext* globalCtx) {
}
void func_80B166CC(EnTa* this) {
- s16 temp_v0 = this->unk_2B6 - 1;
+ s16 temp_v0 = this->blinkTimer - 1;
if (temp_v0 != 0) {
- this->unk_2B6 = temp_v0;
+ this->blinkTimer = temp_v0;
} else {
this->unk_2B0 = func_80B16700;
}
}
void func_80B16700(EnTa* this) {
- s16 temp2B6 = this->unk_2B6 - 1;
+ s16 blinkTimer = this->blinkTimer - 1;
- if (temp2B6 != 0) {
- this->unk_2B6 = temp2B6;
+ if (blinkTimer != 0) {
+ this->blinkTimer = blinkTimer;
} else {
- s16 temp2B4 = this->unk_2B4 + 1;
- s16 temp2B6 = 3;
+ s16 nextEyeIndex = this->eyeIndex + 1;
+ s16 blinkTimer = 3;
- if (temp2B4 >= temp2B6) {
- this->unk_2B4 = 0;
+ if (nextEyeIndex >= blinkTimer) {
+ this->eyeIndex = 0;
if (this->unk_2CE > 0) {
this->unk_2CE--;
- temp2B6 = 1;
+ blinkTimer = 1;
} else {
- temp2B6 = (s32)(Rand_ZeroOne() * 60.0f) + 20;
+ blinkTimer = (s32)(Rand_ZeroOne() * 60.0f) + 20;
}
- this->unk_2B6 = temp2B6;
+ this->blinkTimer = blinkTimer;
this->unk_2B0 = func_80B166CC;
} else {
- this->unk_2B4 = temp2B4;
- this->unk_2B6 = 1;
+ this->eyeIndex = nextEyeIndex;
+ this->blinkTimer = 1;
}
}
}
void func_80B167C0(EnTa* this) {
if (SkelAnime_Update(&this->skelAnime)) {
- Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
+ Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
}
}
void func_80B167FC(EnTa* this) {
if (SkelAnime_Update(&this->skelAnime)) {
- Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
+ Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SLEEP);
}
this->unk_2E0 |= 0xC;
@@ -1120,14 +1109,14 @@ void func_80B16854(EnTa* this) {
this->unk_2E2--;
} else {
if (SkelAnime_Update(&this->skelAnime)) {
- Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
+ Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
this->unk_2E2 = Rand_ZeroFloat(100.0f) + 100.0f;
}
if (this->skelAnime.curFrame < 96.0f && this->skelAnime.curFrame >= 53.0f) {
- this->unk_2B4 = 1;
+ this->eyeIndex = 1;
} else {
- this->unk_2B4 = 2;
+ this->eyeIndex = 2;
}
this->unk_2E0 |= 8;
}
@@ -1152,7 +1141,7 @@ void EnTa_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_MoveForward(&this->actor);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
this->unk_260(this);
- this->unk_25C(this, globalCtx);
+ this->actionFunc(this, globalCtx);
if (!(this->unk_2E0 & 4)) {
this->unk_2B0(this);
@@ -1200,6 +1189,11 @@ s32 EnTa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnTa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
+ static Vec3f D_80B16E7C = {
+ 1100.0f,
+ 1000.0f,
+ 0.0f,
+ };
EnTa* this = THIS;
if (limbIndex == 15) {
@@ -1208,6 +1202,11 @@ void EnTa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ static void* eyeTextures[] = {
+ gTalonEyeOpenTex,
+ gTalonEyeHalfTex,
+ gTalonEyeClosedTex,
+ };
EnTa* this = THIS;
s32 pad;
@@ -1215,8 +1214,8 @@ void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800943C8(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80B16E88[this->unk_2B4]));
- gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&object_ta_Tex_006DC0));
+ gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
+ gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&gTalonHeadSkinTex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnTa_OverrideLimbDraw, EnTa_PostLimbDraw, this);
diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
index 94f3adc314..8429ad7abc 100644
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h
@@ -16,13 +16,13 @@ typedef struct EnTa {
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[17];
/* 0x01F6 */ Vec3s morphTable[17];
- /* 0x025C */ EnTaActionFunc unk_25C;
+ /* 0x025C */ EnTaActionFunc actionFunc;
/* 0x0260 */ EnTaUnkFunc unk_260;
/* 0x0264 */ ColliderCylinder collider;
/* 0x02B0 */ EnTaUnkFunc unk_2B0;
- /* 0x02B4 */ s16 unk_2B4;
- /* 0x02B6 */ s16 unk_2B6;
- /* 0x02B8 */ EnNiw* unk_2B8[3];
+ /* 0x02B4 */ s16 eyeIndex;
+ /* 0x02B6 */ s16 blinkTimer;
+ /* 0x02B8 */ EnNiw* superCuccos[3];
/* 0x02C4 */ s16 unk_2C4[3];
/* 0x02CA */ u8 unk_2CA;
/* 0x02CC */ s16 unk_2CC;
@@ -33,7 +33,7 @@ typedef struct EnTa {
/* 0x02DA */ Vec3s unk_2DA;
/* 0x02E0 */ u16 unk_2E0;
/* 0x02E2 */ s16 unk_2E2;
- /* 0x02E4 */ AnimationHeader* unk_2E4;
+ /* 0x02E4 */ AnimationHeader* currentAnimation;
} EnTa; // size = 0x02E8
#endif
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index f1b3d30c38..092602797b 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -53,7 +53,7 @@ static EnViewerInitData sInitData[] = {
{ OBJECT_HORSE_ZELDA, OBJECT_HORSE_ZELDA, 1, 0, ENVIEWER_SHADOW_HORSE, 20, ENVIEWER_DRAW_HORSE, &gHorseZeldaSkel,
&gHorseZeldaGallopingAnim },
/* ENVIEWER_TYPE_1_IMPA */
- { OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_IMPA, &object_im_Skel_00F788,
+ { OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_IMPA, &gImpaSkel,
&object_opening_demo1_Anim_0029CC },
/* ENVIEWER_TYPE_2_ZELDA */
{ OBJECT_ZL4, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_ZELDA, &gChildZeldaSkel,
@@ -669,15 +669,15 @@ void EnViewer_DrawZelda(EnViewer* this, GlobalContext* globalCtx) {
s32 EnViewer_ImpaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
void* thisx) {
if (limbIndex == 16) {
- *dList = object_im_DL_00D0D8;
+ *dList = gImpaHeadMaskedDL;
}
return false;
}
void EnViewer_DrawImpa(EnViewer* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1717);
- gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210));
- gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210));
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gImpaEyeOpenTex));
+ gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gImpaEyeOpenTex));
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);
SkelAnime_DrawFlexOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable,
diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index b1247a780d..c31620829b 100644
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -208,7 +208,7 @@ void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
-s32 EnZl2_FrameUpdateMatrix(EnZl2* this) {
+s32 EnZl2_UpdateSkelAnime(EnZl2* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -987,7 +987,7 @@ void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -996,7 +996,7 @@ void func_80B50C40(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FDD4(this);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B500E0(this, globalCtx);
func_80B503DC(this, globalCtx);
}
@@ -1005,7 +1005,7 @@ void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1013,13 +1013,13 @@ void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B4EA40(this);
- func_80B50488(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B50488(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50D50(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1027,14 +1027,14 @@ void func_80B50D94(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B4EAF4(this);
- func_80B5053C(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B5053C(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1042,14 +1042,14 @@ void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- func_80B505D4(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B505D4(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50E90(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1057,7 +1057,7 @@ void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1065,7 +1065,7 @@ void func_80B50F38(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1074,7 +1074,7 @@ void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1082,14 +1082,14 @@ void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- func_80B5073C(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B5073C(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51034(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1097,14 +1097,14 @@ void func_80B51080(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- func_80B507E8(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B507E8(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B510CC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1112,14 +1112,14 @@ void func_80B51118(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- func_80B50880(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B50880(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51164(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@@ -1127,13 +1127,13 @@ void func_80B511B0(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
- func_80B50928(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B50928(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B511FC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B5008C(this);
func_80B50A04(this, globalCtx);
}
@@ -1142,7 +1142,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE48(this);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B500E0(this, globalCtx);
func_80B5008C(this);
func_80B50A04(this, globalCtx);
@@ -1151,7 +1151,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B501E8(this, globalCtx);
func_80B509A0(this, globalCtx);
}
@@ -1377,7 +1377,7 @@ void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B51418(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B51948(this, globalCtx);
}
@@ -1385,7 +1385,7 @@ void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- func_80B51644(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B51644(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@@ -1393,7 +1393,7 @@ void func_80B51B44(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5149C(this, globalCtx);
- func_80B516D0(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B516D0(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@@ -1401,7 +1401,7 @@ void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B514F8(this, globalCtx);
- func_80B5175C(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B5175C(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@@ -1409,13 +1409,13 @@ void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5146C(this, globalCtx);
- func_80B517E0(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B517E0(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51C64(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B51948(this, globalCtx);
}
@@ -1423,7 +1423,7 @@ void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5154C(this, globalCtx);
- func_80B5187C(this, EnZl2_FrameUpdateMatrix(this));
+ func_80B5187C(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@@ -1542,7 +1542,7 @@ void func_80B52098(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
- EnZl2_FrameUpdateMatrix(this);
+ EnZl2_UpdateSkelAnime(this);
func_80B51D24(this, globalCtx);
func_80B51F38(this, globalCtx);
func_80B51DA4(this, globalCtx);
diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
index 27b5c78e1c..2e736bfdc1 100644
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@@ -199,7 +199,7 @@ void func_80B538B0(EnZl3* this) {
}
}
-s32 EnZl3_FrameUpdateMatrix(EnZl3* this) {
+s32 EnZl3_UpdateSkelAnime(EnZl3* this) {
return SkelAnime_Update(&this->skelAnime);
}
@@ -956,7 +956,7 @@ void func_80B55444(EnZl3* this, GlobalContext* globalCtx) {
void func_80B55550(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B550F0(this);
func_80B55444(this, globalCtx);
}
@@ -974,7 +974,7 @@ void func_80B55604(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
func_80B55144(this);
- func_80B552A8(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B552A8(this, EnZl3_UpdateSkelAnime(this));
func_80B55054(this);
func_80B55444(this, globalCtx);
}
@@ -983,7 +983,7 @@ void func_80B5566C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55334(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55334(this, EnZl3_UpdateSkelAnime(this));
func_80B55444(this, globalCtx);
}
@@ -991,7 +991,7 @@ void func_80B556CC(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B553B4(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B553B4(this, EnZl3_UpdateSkelAnime(this));
func_80B55444(this, globalCtx);
}
@@ -999,7 +999,7 @@ void func_80B5572C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B55444(this, globalCtx);
}
@@ -1372,7 +1372,7 @@ void func_80B56658(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@@ -1380,7 +1380,7 @@ void func_80B566AC(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55B04(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55B04(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -1388,7 +1388,7 @@ void func_80B5670C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55B78(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55B78(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -1398,7 +1398,7 @@ void func_80B5676C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- something = EnZl3_FrameUpdateMatrix(this);
+ something = EnZl3_UpdateSkelAnime(this);
func_80B559C4(this);
func_80B55C4C(this, something);
}
@@ -1408,7 +1408,7 @@ void func_80B567CC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@@ -1418,7 +1418,7 @@ void func_80B5682C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55CCC(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55CCC(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B55D00(this, globalCtx);
}
@@ -1429,7 +1429,7 @@ void func_80B568B4(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B55DB0(this, globalCtx);
}
@@ -1437,7 +1437,7 @@ void func_80B5691C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55E48(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55E48(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -1445,7 +1445,7 @@ void func_80B5697C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55EBC(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55EBC(this, EnZl3_UpdateSkelAnime(this));
func_80B5585C(this);
func_80B564A8(this, globalCtx);
}
@@ -1456,7 +1456,7 @@ void func_80B569E4(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55F38(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55F38(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B55F6C(this, globalCtx);
}
@@ -1469,7 +1469,7 @@ void func_80B56A68(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- something = EnZl3_FrameUpdateMatrix(this);
+ something = EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
func_80B56090(this, something);
}
@@ -1480,7 +1480,7 @@ void func_80B56AE0(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B55F38(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B55F38(this, EnZl3_UpdateSkelAnime(this));
func_80B56108(this, globalCtx);
}
@@ -1488,7 +1488,7 @@ void func_80B56B54(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@@ -1497,7 +1497,7 @@ void func_80B56BA8(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B561E0(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B561E0(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B56214(this, globalCtx);
}
@@ -1507,7 +1507,7 @@ void func_80B56C24(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B562F4(this, globalCtx);
}
@@ -1515,7 +1515,7 @@ void func_80B56C84(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B5638C(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B5638C(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -1523,7 +1523,7 @@ void func_80B56CE4(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B56400(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B56400(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -1531,7 +1531,7 @@ void func_80B56D44(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B56474(this, EnZl3_FrameUpdateMatrix(this));
+ func_80B56474(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@@ -2283,7 +2283,7 @@ void func_80B58D50(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B57EAC(this, globalCtx);
}
@@ -2292,7 +2292,7 @@ void func_80B58DB0(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B57EEC(this, globalCtx);
}
@@ -2302,7 +2302,7 @@ void func_80B58E10(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B57F1C(this, globalCtx);
}
@@ -2312,7 +2312,7 @@ void func_80B58E7C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58014(this, globalCtx);
func_80B536B4(this);
}
@@ -2324,7 +2324,7 @@ void func_80B58EF4(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58214(this, globalCtx);
}
@@ -2335,7 +2335,7 @@ void func_80B58F6C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58268(this, globalCtx);
}
@@ -2346,7 +2346,7 @@ void func_80B58FDC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B582C8(this, globalCtx);
}
@@ -2357,7 +2357,7 @@ void func_80B5904C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B584B4(this, globalCtx);
}
@@ -2368,7 +2368,7 @@ void func_80B590BC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58624(this, globalCtx);
}
@@ -2379,7 +2379,7 @@ void func_80B5912C(EnZl3* this, GlobalContext* globalCtx) {
func_80B5366C(this, globalCtx);
func_80B56E38(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B57CB4(this, globalCtx);
func_80B57D60(this, globalCtx);
func_80B58A1C(this, globalCtx);
@@ -2392,7 +2392,7 @@ void func_80B591BC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58A50(this, globalCtx);
}
@@ -2404,7 +2404,7 @@ void func_80B5922C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58AAC(this, globalCtx);
}
@@ -2416,7 +2416,7 @@ void func_80B592A8(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &gZelda2Anime2Anim_003D20);
+ func_80B57AAC(this, EnZl3_UpdateSkelAnime(this), &gZelda2Anime2Anim_003D20);
func_80B56DEC(this);
func_80B58AAC(this, globalCtx);
}
@@ -2429,7 +2429,7 @@ void func_80B59340(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
- func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &gZelda2Anime2Anim_009FBC);
+ func_80B57AAC(this, EnZl3_UpdateSkelAnime(this), &gZelda2Anime2Anim_009FBC);
func_80B58AAC(this, globalCtx);
}
@@ -2441,7 +2441,7 @@ void func_80B593D0(EnZl3* this, GlobalContext* globalCtx) {
func_80B56E38(this, globalCtx);
Actor_SetFocus(&this->actor, 60.0f);
EnZl3_UpdateEyes(this);
- EnZl3_FrameUpdateMatrix(this);
+ EnZl3_UpdateSkelAnime(this);
func_80B58C08(this, globalCtx);
}