diff --git a/ZAPDTR/docs/zapd_extraction_xml_reference.md b/ZAPDTR/docs/zapd_extraction_xml_reference.md index 06b95bb57..36d040c29 100644 --- a/ZAPDTR/docs/zapd_extraction_xml_reference.md +++ b/ZAPDTR/docs/zapd_extraction_xml_reference.md @@ -489,7 +489,7 @@ Current supported types are `Vec3s`, `Vec3i` or `Vec3f`. - Example: ```xml - + ``` @@ -497,7 +497,7 @@ Current supported types are `Vec3s`, `Vec3i` or `Vec3f`. Will be extracted as: ```c -Vec3s D_04002040[24] = { +Vec3s gLinkPauseChildDekuShieldJointTable[24] = { { -37, 2346, 93 }, { 0, 11995, 0 }, { -16385, -305, -16333 }, diff --git a/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml index a58e6ae09..972baf88a 100644 --- a/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml +++ b/soh/assets/xml/GC_NMQ_D/code/fbdemo_circle.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_NMQ_D/objects/gameplay_field_keep.xml index 28fa975d7..011e8f7fc 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_field_keep.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_field_keep.xml @@ -27,8 +27,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml index 45c669307..fbcec6f37 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/gameplay_keep.xml @@ -8,598 +8,599 @@ - - - - + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -654,15 +655,15 @@ - - - + + + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ahg.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ahg.xml index a32c00914..4d37b1b11 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ahg.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ahg.xml @@ -1,5 +1,6 @@ - + + @@ -18,21 +19,21 @@ + - - - - - - - - - - + + + + + + + + - - + + + @@ -49,10 +50,11 @@ - - - - + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml index c69656043..25ad7af35 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ani.xml @@ -2,7 +2,7 @@ - + @@ -35,11 +35,11 @@ - - - + + + - + @@ -47,9 +47,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_bji.xml b/soh/assets/xml/GC_NMQ_D/objects/object_bji.xml index e6b6c4221..c665b6b00 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_bji.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_bji.xml @@ -1,5 +1,6 @@ + @@ -18,18 +19,17 @@ + - - - - - + + + + + - - diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_boj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_boj.xml index 4cc39906e..4be4764ab 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_boj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_boj.xml @@ -1,5 +1,6 @@ - + + @@ -17,18 +18,19 @@ - + + - - - - + + + + - + - + @@ -46,13 +48,14 @@ - - - - - - - + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_cne.xml b/soh/assets/xml/GC_NMQ_D/objects/object_cne.xml index ce9c16082..0c14d0bc5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_cne.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_cne.xml @@ -1,51 +1,53 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_d_hsblock.xml b/soh/assets/xml/GC_NMQ_D/objects/object_d_hsblock.xml index b9111b38b..4bb50c2b4 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_d_hsblock.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_d_hsblock.xml @@ -1,7 +1,7 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_dy_obj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_dy_obj.xml index 4d141d546..5e792edb5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_dy_obj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_dy_obj.xml @@ -65,8 +65,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ganon.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ganon.xml index 96adabb2b..79cba2ab3 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ganon.xml @@ -1,96 +1,106 @@ + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ganon2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ganon2.xml index 8b66cfcc2..93f3a05e5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ganon2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ganon2.xml @@ -1,158 +1,174 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime1.xml index 6021fdd9b..b1016299b 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime1.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime1.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime2.xml index 96121689e..f05c72ded 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime2.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime2.xml @@ -1,21 +1,22 @@ + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime3.xml index 2af1e94f9..53403ec7b 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime3.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_ganon_anime3.xml @@ -1,13 +1,17 @@ + - - - - - - - - - + + + + + + + + + + + + - + \ No newline at end of file diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_gndd.xml b/soh/assets/xml/GC_NMQ_D/objects/object_gndd.xml index 96e264c34..8bf5d770c 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_gndd.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_gndd.xml @@ -1,96 +1,106 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_haka_door.xml b/soh/assets/xml/GC_NMQ_D/objects/object_haka_door.xml index 753492445..1376d0356 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_haka_door.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_haka_door.xml @@ -2,8 +2,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml index 5c54244bb..fe0405d9d 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_hidan_objects.xml @@ -79,8 +79,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_human.xml b/soh/assets/xml/GC_NMQ_D/objects/object_human.xml index c52398446..05795cb33 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_human.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_human.xml @@ -4,10 +4,13 @@ + + + @@ -15,18 +18,21 @@ - + - - - - + + + + + + + - + @@ -34,48 +40,47 @@ - - - - - - - - - + + + + + + + + + + + + - - - + - - - + - + - + - + - + @@ -85,22 +90,22 @@ - + - + - + - + @@ -110,30 +115,30 @@ - - - - + + + + - - - + + + - + - - - - + + + + @@ -141,21 +146,25 @@ + + - - - + + + + + - + @@ -163,10 +172,10 @@ - - - - + + + + @@ -189,7 +198,7 @@ - + @@ -198,16 +207,10 @@ - - - - - - diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_kz.xml b/soh/assets/xml/GC_NMQ_D/objects/object_kz.xml index 20aeec4d9..4624fefdb 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_kz.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_kz.xml @@ -2,8 +2,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml index 2f3cd943c..c3af97de6 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml @@ -240,7 +240,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml index 0c80fb780..85e70d8eb 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml @@ -51,10 +51,10 @@ - + - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_niw.xml b/soh/assets/xml/GC_NMQ_D/objects/object_niw.xml index a74cbe7da..4eafec956 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_niw.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_niw.xml @@ -30,8 +30,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml index c4f3a41f8..09a35dbd1 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_oF1d_map.xml @@ -1,5 +1,5 @@ - + @@ -12,24 +12,26 @@ - + - + + + - - - - + + + + - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_oF1s.xml b/soh/assets/xml/GC_NMQ_D/objects/object_oF1s.xml index 11359eff5..fe41dde63 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_oF1s.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_oF1s.xml @@ -1,10 +1,6 @@ - - - - - @@ -22,32 +18,26 @@ - --> - - + - diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_rd.xml b/soh/assets/xml/GC_NMQ_D/objects/object_rd.xml index 05fa416d7..22c7d3373 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_rd.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_rd.xml @@ -1,106 +1,124 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_sd.xml b/soh/assets/xml/GC_NMQ_D/objects/object_sd.xml index c72efeae1..fb58428c3 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_sd.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_sd.xml @@ -47,7 +47,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml index 3abdd610f..686a96de5 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_skj.xml @@ -1,7 +1,7 @@ - - + + @@ -16,14 +16,13 @@ - + - + - - + @@ -31,16 +30,15 @@ - + - + - + - @@ -48,11 +46,11 @@ - + - + @@ -66,4 +64,4 @@ - + \ No newline at end of file diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_st.xml b/soh/assets/xml/GC_NMQ_D/objects/object_st.xml index fe617cf14..983b9e2ea 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_st.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_st.xml @@ -33,8 +33,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml index 638dd6f95..b3b33fccf 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml @@ -1,52 +1,52 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/backgrounds.xml b/soh/assets/xml/GC_NMQ_D/textures/backgrounds.xml index 474734e71..c60ff57a8 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/backgrounds.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/backgrounds.xml @@ -1,246 +1,246 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - \ No newline at end of file + diff --git a/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml index bd4173431..4fd642c7c 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/parameter_static.xml @@ -53,8 +53,8 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/place_title_cards.xml b/soh/assets/xml/GC_NMQ_D/textures/place_title_cards.xml index c1771d4c8..c87051d62 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/place_title_cards.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/place_title_cards.xml @@ -215,9 +215,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/textures/skyboxes.xml b/soh/assets/xml/GC_NMQ_D/textures/skyboxes.xml index 9ff554c94..104ffb2a3 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/skyboxes.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/skyboxes.xml @@ -1,113 +1,113 @@ - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml index a3add03bc..5c598c8b4 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_field_keep.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_field_keep.xml index 28fa975d7..011e8f7fc 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_field_keep.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_field_keep.xml @@ -27,8 +27,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml index 45c669307..fbcec6f37 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/gameplay_keep.xml @@ -8,598 +8,599 @@ - - - - + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -654,15 +655,15 @@ - - - + + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ahg.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ahg.xml index a32c00914..4d37b1b11 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ahg.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ahg.xml @@ -1,5 +1,6 @@ - + + @@ -18,21 +19,21 @@ + - - - - - - - - - - + + + + + + + + - - + + + @@ -49,10 +50,11 @@ - - - - + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml index c69656043..25ad7af35 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ani.xml @@ -2,7 +2,7 @@ - + @@ -35,11 +35,11 @@ - - - + + + - + @@ -47,9 +47,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bji.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bji.xml index e6b6c4221..c665b6b00 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bji.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_bji.xml @@ -1,5 +1,6 @@ + @@ -18,18 +19,17 @@ + - - - - - + + + + + - - diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_boj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_boj.xml index 4cc39906e..4be4764ab 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_boj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_boj.xml @@ -1,5 +1,6 @@ - + + @@ -17,18 +18,19 @@ - + + - - - - + + + + - + - + @@ -46,13 +48,14 @@ - - - - - - - + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_cne.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_cne.xml index ce9c16082..0c14d0bc5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_cne.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_cne.xml @@ -1,51 +1,53 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dy_obj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dy_obj.xml index 4d141d546..5e792edb5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dy_obj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_dy_obj.xml @@ -65,8 +65,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon.xml index 96adabb2b..79cba2ab3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon.xml @@ -1,96 +1,106 @@ + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon2.xml index 8b66cfcc2..93f3a05e5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon2.xml @@ -1,158 +1,174 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime1.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime1.xml index 6021fdd9b..b1016299b 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime1.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime1.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime2.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime2.xml index 96121689e..180e5995c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime2.xml @@ -1,21 +1,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime3.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime3.xml index 2af1e94f9..be4c4dcb1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime3.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon_anime3.xml @@ -1,13 +1,13 @@ - - - - - - - - - + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gndd.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gndd.xml index 96e264c34..8bf5d770c 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gndd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_gndd.xml @@ -1,96 +1,106 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_haka_door.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_haka_door.xml index 753492445..1376d0356 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_haka_door.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_haka_door.xml @@ -2,8 +2,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml index 5c54244bb..fe0405d9d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_hidan_objects.xml @@ -79,8 +79,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_human.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_human.xml index c52398446..05795cb33 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_human.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_human.xml @@ -4,10 +4,13 @@ + + + @@ -15,18 +18,21 @@ - + - - - - + + + + + + + - + @@ -34,48 +40,47 @@ - - - - - - - - - + + + + + + + + + + + + - - - + - - - + - + - + - + - + @@ -85,22 +90,22 @@ - + - + - + - + @@ -110,30 +115,30 @@ - - - - + + + + - - - + + + - + - - - - + + + + @@ -141,21 +146,25 @@ + + - - - + + + + + - + @@ -163,10 +172,10 @@ - - - - + + + + @@ -189,7 +198,7 @@ - + @@ -198,16 +207,10 @@ - - - - - - diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_kz.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_kz.xml index 20aeec4d9..4624fefdb 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_kz.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_kz.xml @@ -2,8 +2,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml index 2f3cd943c..49f439271 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml @@ -188,7 +188,7 @@ - + @@ -240,7 +240,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_niw.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_niw.xml index a74cbe7da..4eafec956 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_niw.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_niw.xml @@ -30,8 +30,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml index c4f3a41f8..09a35dbd1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1d_map.xml @@ -1,5 +1,5 @@ - + @@ -12,24 +12,26 @@ - + - + + + - - - - + + + + - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1s.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1s.xml index 11359eff5..fe41dde63 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1s.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_oF1s.xml @@ -1,10 +1,6 @@ - - - - - @@ -22,32 +18,26 @@ - --> - - + - diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rd.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rd.xml index 05fa416d7..22c7d3373 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_rd.xml @@ -1,106 +1,124 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sd.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sd.xml index c72efeae1..fb58428c3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sd.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_sd.xml @@ -47,7 +47,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml index 3abdd610f..686a96de5 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_skj.xml @@ -1,7 +1,7 @@ - - + + @@ -16,14 +16,13 @@ - + - + - - + @@ -31,16 +30,15 @@ - + - + - + - @@ -48,11 +46,11 @@ - + - + @@ -66,4 +64,4 @@ - + \ No newline at end of file diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_st.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_st.xml index fe617cf14..983b9e2ea 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_st.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_st.xml @@ -33,8 +33,8 @@ - - + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml index 9f0e6e1f4..ef5da89c1 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml @@ -1,52 +1,52 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/backgrounds.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/backgrounds.xml index 474734e71..c60ff57a8 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/backgrounds.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/backgrounds.xml @@ -1,246 +1,246 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - \ No newline at end of file + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml index bd4173431..2df06512f 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/parameter_static.xml @@ -53,8 +53,8 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/place_title_cards.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/place_title_cards.xml index c1771d4c8..188661b41 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/place_title_cards.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/place_title_cards.xml @@ -215,9 +215,9 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/skyboxes.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/skyboxes.xml index 9ff554c94..104ffb2a3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/skyboxes.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/skyboxes.xml @@ -1,113 +1,113 @@ - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 7b230a8ee..f4fda54a1 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -885,7 +885,7 @@ void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCt texture = gFairysFountainTitleCardENGTex; break; case SCENE_HAKAANA_OUKE: - texture = gRoyalFamilysTumbTitleCardENGTex; + texture = gRoyalFamilysTombTitleCardENGTex; break; case SCENE_SYATEKIJYOU: texture = gShootingGalleryTitleCardENGTex; diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c index 60c3a7ee4..203f3c3c9 100644 --- a/soh/src/code/z_draw.c +++ b/soh/src/code/z_draw.c @@ -371,7 +371,7 @@ DrawItemTableEntry sDrawItemTable[] = { // kokiri sword, OBJECT_GI_SWORD_1 { GetItem_DrawOpa0, { gGiKokiriSwordDL } }, // gold skulltula token, OBJECT_ST - { GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } }, + { GetItem_DrawSkullToken, { gSkulltulaTokenDL, gSkulltulaTokenFlameDL } }, { GetItem_DrawJewelKokiri, { gGiKokiriEmeraldGemDL, gGiKokiriEmeraldSettingDL } }, { GetItem_DrawJewelGoron, { gGiGoronRubyGemDL, gGiGoronRubySettingDL } }, diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c index 5c8f688fa..b9e71d7ab 100644 --- a/soh/src/code/z_fbdemo_circle.c +++ b/soh/src/code/z_fbdemo_circle.c @@ -43,16 +43,16 @@ void TransitionCircle_Start(void* thisx) { switch (this->effect) { case 1: - this->texture = sCircleWipeWaveTex; + this->texture = sTransCircleWaveTex; break; case 2: - this->texture = sCircleWipeRippleTex; + this->texture = sTransCircleRippleTex; break; case 3: - this->texture = sCircleWipeStarburstTex; + this->texture = sTransCircleStarburstTex; break; default: - this->texture = sCircleWipeDefaultTex; + this->texture = sTransCircleNormalTex; break; } diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index cc954feed..57742cd19 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3168,11 +3168,11 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMagicBorder.r, sMagicBorder.g, sMagicBorder.b, interfaceCtx->magicAlpha); - OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicBarEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10); + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10); - OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicBarMidTex, 24, 16, PosX_MidEnd, magicBarY, gSaveContext.unk_13F4, 16, 1 << 10, 1 << 10); + OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, PosX_MidEnd, magicBarY, gSaveContext.unk_13F4, 16, 1 << 10, 1 << 10); - gDPLoadTextureBlock(OVERLAY_DISP++, gMagicBarEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 16, 0, + gDPLoadTextureBlock(OVERLAY_DISP++, gMagicMeterEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPWideTextureRectangle(OVERLAY_DISP++, ((rMagicBarX + gSaveContext.unk_13F4) + 8) << 2, magicBarY << 2, @@ -3192,7 +3192,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_yellow.r, magicbar_yellow.g, magicbar_yellow.b, interfaceCtx->magicAlpha); } - gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicBarFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, + gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -3219,7 +3219,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha); } - gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicBarFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, + gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 99425bd8d..7246df326 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1494,7 +1494,7 @@ u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) { gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800); gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800); - SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_003238, 9, + SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_link_normal_wait, 9, ptr, ptr, PLAYER_LIMB_MAX); return size + 0x8800 + 0x90; @@ -1676,20 +1676,20 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime, uintptr_t* PauseMenuAnimSet[15][4] = { { 0, 0, 0, 0 }, // 0 = none // IDLE // Two Handed // No shield // Kid Hylian Shield - { gPlayerAnim_003238, gPlayerAnim_002BE0, gPlayerAnim_003240, gPlayerAnim_003240 }, // Idle - { gPlayerAnim_003200, gPlayerAnim_003200, gPlayerAnim_003200, gPlayerAnim_003200 }, // Idle look around - { gPlayerAnim_0033E0, gPlayerAnim_0033E0, gPlayerAnim_0033E0, gPlayerAnim_0033E0 }, // Idle Belt - { gPlayerAnim_003418, gPlayerAnim_003418, gPlayerAnim_003418, gPlayerAnim_003418 }, // Idle shield adjust - { gPlayerAnim_003420, gPlayerAnim_003428, gPlayerAnim_003420, gPlayerAnim_003420 }, // Idle test sword - { gPlayerAnim_0033F0, gPlayerAnim_0033F0, gPlayerAnim_0033F0, gPlayerAnim_0033F0 }, // Idle yawn - { gPlayerAnim_0025D0, gPlayerAnim_002BD0, gPlayerAnim_0025D0, gPlayerAnim_0025D0 }, // Battle Stance - { gPlayerAnim_003290, gPlayerAnim_002BF8, gPlayerAnim_003290, gPlayerAnim_003290 }, // Walking (No shield) - { gPlayerAnim_003268, gPlayerAnim_002BF8, gPlayerAnim_003268, gPlayerAnim_003268 }, // Walking (Holding shield) - { gPlayerAnim_003138, gPlayerAnim_002B40, gPlayerAnim_003138, gPlayerAnim_003138 }, // Running (No shield) - { gPlayerAnim_003140, gPlayerAnim_002B40, gPlayerAnim_003140, gPlayerAnim_003140 }, // Running (Holding shield) - { gPlayerAnim_0031A8, gPlayerAnim_0031A8, gPlayerAnim_0031A8, gPlayerAnim_0031A8 }, // Hand on hip - { gPlayerAnim_002AF0, gPlayerAnim_002928, gPlayerAnim_002AF0, gPlayerAnim_002AF0 }, // Spin Charge - { gPlayerAnim_002820, gPlayerAnim_002820, gPlayerAnim_002820, gPlayerAnim_002820 }, // Look at hand + { gPlayerAnim_link_normal_wait, gPlayerAnim_link_fighter_wait_long, gPlayerAnim_link_normal_wait_free, gPlayerAnim_link_normal_wait_free }, // Idle + { gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f }, // Idle look around + { gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f }, // Idle Belt + { gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f }, // Idle shield adjust + { gPlayerAnim_link_wait_itemD1_20f, gPlayerAnim_link_wait_itemD2_20f, gPlayerAnim_link_wait_itemD1_20f, gPlayerAnim_link_wait_itemD1_20f }, // Idle test sword + { gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f }, // Idle yawn + { gPlayerAnim_link_anchor_waitR, gPlayerAnim_link_fighter_waitR_long, gPlayerAnim_link_anchor_waitR, gPlayerAnim_link_anchor_waitR }, // Battle Stance + { gPlayerAnim_link_normal_walk_free, gPlayerAnim_link_fighter_walk_long, gPlayerAnim_link_normal_walk_free, gPlayerAnim_link_normal_walk_free }, // Walking (No shield) + { gPlayerAnim_link_normal_walk, gPlayerAnim_link_fighter_walk_long, gPlayerAnim_link_normal_walk, gPlayerAnim_link_normal_walk }, // Walking (Holding shield) + { gPlayerAnim_link_normal_run, gPlayerAnim_link_fighter_run_long, gPlayerAnim_link_normal_run, gPlayerAnim_link_normal_run }, // Running (No shield) + { gPlayerAnim_link_normal_run_free, gPlayerAnim_link_fighter_run_long, gPlayerAnim_link_normal_run_free, gPlayerAnim_link_normal_run_free }, // Running (Holding shield) + { gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait }, // Hand on hip + { gPlayerAnim_link_fighter_power_kiru_wait, gPlayerAnim_link_fighter_Lpower_kiru_wait, gPlayerAnim_link_fighter_power_kiru_wait, gPlayerAnim_link_fighter_power_kiru_wait }, // Spin Charge + { gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait }, // Look at hand }; s16 AnimArraySize = ARRAY_COUNT(PauseMenuAnimSet); @@ -1848,10 +1848,10 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime, anim = PauseMenuAnimSet[SelectedAnim][EquipedStance]; - //anim = gPlayerAnim_003428; // Use for biggoron sword? + //anim = gPlayerAnim_link_wait_itemD2_20f; // Use for biggoron sword? if (CVar_GetS32("gPauseTriforce", 0)) { - anim = gPlayerAnim_002D00; + anim = gPlayerAnim_link_magic_kaze2; sword = 0; shield = 0; } @@ -1871,17 +1871,17 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime, if (!LINK_IS_ADULT) { if (shield == PLAYER_SHIELD_DEKU) { - srcTable = D_040020D0; + srcTable = gLinkPauseChildDekuShieldJointTable; } else { - srcTable = D_04002040; + srcTable = gLinkPauseChildJointTable; } } else { if (sword == 3) { - srcTable = D_04002160; + srcTable = gLinkPauseAdultBgsJointTable; } else if (shield != PLAYER_SHIELD_NONE) { - srcTable = D_04002280; + srcTable = gLinkPauseAdultShieldJointTable; } else { - srcTable = D_040021F0; + srcTable = gLinkPauseAdultJointTable; } } diff --git a/soh/src/code/z_vr_box.c b/soh/src/code/z_vr_box.c index 4b5b5be72..6a3ebb1dd 100644 --- a/soh/src/code/z_vr_box.c +++ b/soh/src/code/z_vr_box.c @@ -467,7 +467,7 @@ static const char* sSBVRFine0Tex[] = static const char* sSBVRFine0Pal[] = { - gSunriseSkyboxTlut + gSunriseSkyboxTLUT }; static const char* sSBVRFine1Tex[] = @@ -477,7 +477,7 @@ static const char* sSBVRFine1Tex[] = static const char* sSBVRFine1Pal[] = { - gDaySkyboxTlut + gDaySkyboxTLUT }; static const char* sSBVRFine2Tex[] = @@ -487,7 +487,7 @@ static const char* sSBVRFine2Tex[] = static const char* sSBVRFine2Pal[] = { - gSunsetSkyboxTlut + gSunsetSkyboxTLUT }; static const char* sSBVRFine3Tex[] = @@ -497,7 +497,7 @@ static const char* sSBVRFine3Tex[] = static const char* sSBVRFine3Pal[] = { - gNightSkyboxTlut + gNightSkyboxTLUT }; static const char* sSBVRCloud0Tex[] = @@ -507,7 +507,7 @@ static const char* sSBVRCloud0Tex[] = static const char* sSBVRCloud0Pal[] = { - gSunriseOvercastSkyboxTlut + gSunriseOvercastSkyboxTLUT }; static const char* sSBVRCloud1Tex[] = @@ -517,7 +517,7 @@ static const char* sSBVRCloud1Tex[] = static const char* sSBVRCloud1Pal[] = { - gDayOvercastSkyboxTlut + gDayOvercastSkyboxTLUT }; static const char* sSBVRCloud2Tex[] = @@ -527,7 +527,7 @@ static const char* sSBVRCloud2Tex[] = static const char* sSBVRCloud2Pal[] = { - gSunsetOvercastSkyboxTlut + gSunsetOvercastSkyboxTLUT }; static const char* sSBVRCloud3Tex[] = @@ -537,7 +537,7 @@ static const char* sSBVRCloud3Tex[] = static const char* sSBVRCloud3Pal[] = { - gNightOvercastSkyboxTlut + gNightOvercastSkyboxTLUT }; static const char* sSBVRHoly0Tex[] = @@ -547,7 +547,7 @@ static const char* sSBVRHoly0Tex[] = static const char* sSBVRHoly0Pal[] = { - gHoly0SkyboxTlut + gHoly0SkyboxTLUT }; @@ -656,8 +656,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gBazaarBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gBazaar2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; case SKYBOX_HOUSE_LINK: @@ -668,10 +668,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gLinksHouse3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gLinksHouse4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4TLUT, 16, 16); break; case SKYBOX_OVERCAST_SUNSET: LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gSunsetOvercastSkybox1Tex, 128, 64, 0x0); @@ -680,7 +680,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gSunsetOvercastSkybox4Tex, 128, 64, 0x6000); LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gSunsetOvercastSkybox5Tex, 128, 128, 0x8000); - LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTlut, 16, 8); + LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTLUT, 16, 8); break; case SKYBOX_MARKET_ADULT: skyboxCtx->unk_140 = 1; @@ -690,10 +690,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gMarketRuins3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gMarketRuins4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4TLUT, 16, 16); break; case SKYBOX_CUTSCENE_MAP: LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gHoly0Skybox1Tex, 128, 64, 0x0); @@ -703,7 +703,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gHoly0Skybox5Tex, 128, 128, 0x8000); LoadSkyboxTexAtOffset(skyboxCtx, 0, 5, gHoly0Skybox6Tex, 128, 128, 0xC000); - LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTlut, 16, 8); + LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTLUT, 16, 8); LoadSkyboxTexAtOffset(skyboxCtx, 1, 0, gHoly1Skybox1Tex, 128, 64, 0x0); LoadSkyboxTexAtOffset(skyboxCtx, 1, 1, gHoly1Skybox2Tex, 128, 64, 0x2000); @@ -713,7 +713,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTexAtOffset(skyboxCtx, 1, 5, gHoly1Skybox6Tex, 128, 128, 0xC000); - LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTlut, 16, 8); + LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTLUT, 16, 8); break; case SKYBOX_MARKET_CHILD_DAY: skyboxCtx->unk_140 = 1; @@ -723,10 +723,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gMarketDay3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gMarketDay4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4TLUT, 16, 16); break; case SKYBOX_MARKET_CHILD_NIGHT: skyboxCtx->unk_140 = 1; @@ -736,10 +736,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gMarketNight3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gMarketNight4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4TLUT, 16, 16); break; case SKYBOX_HAPPY_MASK_SHOP: skyboxCtx->unk_140 = 1; @@ -747,8 +747,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gMaskShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gMaskShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -760,10 +760,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gKnowItAllBrosHouse3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gKnowItAllBrosHouse4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4TLUT, 16, 16); break; case SKYBOX_HOUSE_OF_TWINS: skyboxCtx->unk_140 = 2; @@ -772,9 +772,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 1, gHouseOfTwins2BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 2, gHouseOfTwins3BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3TLUT, 16, 16); break; case SKYBOX_STABLES: skyboxCtx->unk_140 = 1; @@ -784,10 +784,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gStable3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gStable4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gStableBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gStableBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gStableBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gStableBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gStableBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gStableBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gStableBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gStableBg4TLUT, 16, 16); break; case SKYBOX_HOUSE_KAKARIKO: skyboxCtx->unk_140 = 1; @@ -797,10 +797,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersHouse3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gCarpentersHouse4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4TLUT, 16, 16); break; case SKYBOX_KOKIRI_SHOP: skyboxCtx->unk_140 = 1; @@ -808,8 +808,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gKokiriShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gKokiriShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -819,8 +819,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gGoronShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gGoronShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -830,8 +830,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gZoraShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gZoraShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -841,8 +841,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gKakPotionShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gKakPotionShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -852,8 +852,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gMarketPotionShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gMarketPotionShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -863,8 +863,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 0, gBombchuShopBgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 1, gBombchuShop2BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2TLUT, 16, 16); skyboxCtx->rot.y = 0.8f; break; @@ -876,10 +876,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gRichardsHouse3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gRichardsHouse4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4TLUT, 16, 16); break; case SKYBOX_HOUSE_IMPA: skyboxCtx->unk_140 = 1; @@ -889,10 +889,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 2, gCowHouse3BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 3, gCowHouse4BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4TLUT, 16, 16); break; case SKYBOX_TENT: skyboxCtx->unk_140 = 2; @@ -901,9 +901,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersTent2BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersTent3BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3TLUT, 16, 16); break; case SKYBOX_HOUSE_MIDO: skyboxCtx->unk_140 = 2; @@ -912,9 +912,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 1, gMidosHouse2BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 2, gMidosHouse3BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3TLUT, 16, 16); break; case SKYBOX_HOUSE_SARIA: skyboxCtx->unk_140 = 2; @@ -923,9 +923,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 1, gSariasHouse2BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 2, gSariasHouse3BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3TLUT, 16, 16); break; case SKYBOX_HOUSE_ALLEY: skyboxCtx->unk_140 = 2; @@ -934,9 +934,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox LoadSkyboxTex(skyboxCtx, 0, 1, gBackAlleyHouse2BgTex, 256, 256, 256, 256); LoadSkyboxTex(skyboxCtx, 0, 2, gBackAlleyHouse3BgTex, 256, 256, 256, 256); - LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2Tlut, 16, 16); - LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3Tlut, 16, 16); + LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2TLUT, 16, 16); + LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3TLUT, 16, 16); break; default: break; diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index e04755a34..901afd330 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -1045,7 +1045,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { if (particle->alive == 1) { if (phi_s3 == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleAppearDL)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleMaterialDL)); gDPPipeSync(POLY_XLU_DISP++); phi_s3++; @@ -1062,7 +1062,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleAliveDL)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleModelDL)); } FrameInterpolation_RecordCloseChild(); diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 81a5b9132..6e564f756 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -352,7 +352,7 @@ void BossGanon_Init(Actor* thisx, GlobalContext* globalCtx2) { Actor_ProcessInitChain(thisx, sInitChain); ActorShape_Init(&thisx->shape, 0, NULL, 0); Actor_SetScale(thisx, 0.01f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gDorfSkel, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGanondorfSkel, NULL, NULL, NULL, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, thisx, &sDorfCylinderInit); @@ -481,7 +481,7 @@ void BossGanon_SetupIntroCutscene(BossGanon* this, GlobalContext* globalCtx) { this->unk_198 = 1; this->animBankIndex = animBankIndex; gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[animBankIndex].segment); - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_005FFC, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfPlayOrganAnim, 0.0f); } else { this->actionFunc = BossGanon_SetupIntroCutscene; } @@ -565,7 +565,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { this->csTimer = 0; player->actor.world.pos.z = 20.0f; this->useOpenHand = false; - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_0089F8, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfStandBackwardsAnim, -5.0f); this->fwork[GDF_FWORK_1] = 1000.0f; BossGanon_SetIntroCsCamera(this, 11); this->unk_198 = 2; @@ -805,12 +805,12 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { if (this->csTimer == 30) { Audio_QueueSeqCmd(0x100100FF); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_004F64); - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_004F64, -5.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfStopPlayingOrganAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfStopPlayingOrganAnim, -5.0f); } if ((this->csTimer > 30) && Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_006AF4, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfLeanOnOrganAnim, 0.0f); this->fwork[GDF_FWORK_1] = 1000.0f; } @@ -850,12 +850,12 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { if (this->csTimer <= 20) { if (this->csTimer == 20) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_004304, -5.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_004304); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfStandUpFromOrganAnim, -5.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfStandUpFromOrganAnim); } } else if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { Message_StartTextbox(globalCtx, 0x70CA, NULL); - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_0089F8, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfStandBackwardsAnim, -5.0f); this->fwork[GDF_FWORK_1] = 1000.0f; } @@ -869,8 +869,8 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { this->envLightMode = 3; if (this->csTimer == 20) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_001F58, -5.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_001F58); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfTurnAroundAnim, -5.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfTurnAroundAnim); } if (this->csTimer > 10) { @@ -905,7 +905,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { this->csCamEye.z += 6.0f; if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1] - 5.0f)) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_003018, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfStandIdleAnim, -5.0f); this->fwork[GDF_FWORK_1] = 1000.0f; } @@ -916,7 +916,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { this->csState = 19; this->csTimer = 0; Message_StartTextbox(globalCtx, 0x70CC, NULL); - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_007268, -5.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfRaiseHandStartAnim, -5.0f); this->triforceType = GDF_TRIFORCE_DORF; this->fwork[GDF_TRIFORCE_SCALE] = 10.0f; this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f; @@ -952,7 +952,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { } if (this->csTimer == 17) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_007A64, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfRaiseHandLoopAnim, -5.0f); } if ((this->csTimer > 80) && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE)) { @@ -1067,7 +1067,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { if (this->csTimer == 20) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp3Anim, 0.0f); SkelAnime_Update(&this->skelAnime); this->actor.shape.yOffset = 0.0f; sBossGanonCape->attachShouldersTimer = 18.0f; @@ -1082,7 +1082,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) { if (!(gSaveContext.eventChkInf[7] & 0x100)) { TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, - SEGMENTED_TO_VIRTUAL(gDorfTitleCardTex), 160, 180, 128, 40, false); + SEGMENTED_TO_VIRTUAL(gGanondorfTitleCardTex), 160, 180, 128, 40, false); } gSaveContext.eventChkInf[7] |= 0x100; @@ -1169,8 +1169,8 @@ void BossGanon_SetupDeathCutscene(BossGanon* this, GlobalContext* globalCtx) { this->unk_198 = 1; this->animBankIndex = animBankIndex; gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[animBankIndex].segment); - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_00EA00, 0.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_00EA00); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfDefeatedStartAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfDefeatedStartAnim); this->unk_508 = 0.0f; } } @@ -1182,8 +1182,8 @@ void BossGanon_SetupTowerCutscene(BossGanon* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, animBankIndex)) { this->animBankIndex = animBankIndex; gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[animBankIndex].segment); - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_00EA00, 0.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_00EA00); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfDefeatedStartAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfDefeatedStartAnim); this->actionFunc = BossGanon_DeathAndTowerCutscene; this->csTimer = 0; this->csState = 100; @@ -1202,7 +1202,7 @@ void BossGanon_ShatterWindows(u8 windowShatterState) { for (i = 0; i < 2048; i++) { if ((tex1[i] != 0) && (Rand_ZeroOne() < 0.03f)) { - if ((((u8*)gDorfWindowShatterTemplateTex)[i] == 0) || (windowShatterState == GDF_WINDOW_SHATTER_FULL)) { + if ((((u8*)gGanondorfWindowShatterTemplateTex)[i] == 0) || (windowShatterState == GDF_WINDOW_SHATTER_FULL)) { tex1[i] = tex2[i] = 1; } } @@ -1282,7 +1282,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) this->csCamAt.z = this->unk_1FC.z; if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_00F19C, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfDefeatedLoopAnim, 0.0f); this->csState = 2; this->csTimer = 0; } @@ -1328,8 +1328,8 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) if ((this->fwork[GDF_FWORK_1] > 100.0f) && (this->csTimer > 100) && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE)) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_00B668, 0.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_00B668); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfVomitStartAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfVomitStartAnim); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_TOKETU); } else { if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1] - 16.0f)) { @@ -1352,7 +1352,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) } if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_00BE38, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfVomitLoopAnim, 0.0f); this->csState = 4; this->csTimer = 0; } @@ -1375,8 +1375,8 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) if ((this->csTimer > 70) && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE)) { this->csState = 6; this->csTimer = 0; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_010298, 0.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_010298); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfYellStartAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfYellStartAnim); this->csCamMovementScale = 0.05f; this->csCamMaxStepScale = 0.0f; @@ -1407,7 +1407,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) Math_ApproachF(&this->csCamMaxStepScale, 0.2f, 1.0f, 0.01f); if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime2_Anim_010514, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfYellLoopAnim, 0.0f); this->csState = 7; this->csTimer = 0; this->unk_2E8 = 0; @@ -1521,8 +1521,8 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx) this->csCamIndex = Gameplay_CreateSubCamera(globalCtx); Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT); Gameplay_ChangeCameraStatus(globalCtx, this->csCamIndex, CAM_STAT_ACTIVE); - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime2_Anim_00ADDC, 0.0f); - this->fwork[1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_00EA00); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfCollapseAnim, 0.0f); + this->fwork[1] = Animation_GetLastFrame(&gGanondorfDefeatedStartAnim); this->csState = 101; this->skelAnime.playSpeed = 0.0f; sBossGanonZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 0.0f, @@ -1889,8 +1889,8 @@ void BossGanon_PoundFloor(BossGanon* this, GlobalContext* globalCtx) { Math_ApproachF(&this->actor.velocity.y, 20.0f, 1.0f, 1.0f); if (this->timers[0] == 14) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfPoundAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfPoundAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfPoundAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfPoundAnim, 0.0f); this->actor.velocity.y = 0.0f; } @@ -1932,8 +1932,8 @@ void BossGanon_PoundFloor(BossGanon* this, GlobalContext* globalCtx) { this->envLightMode = 1; if (this->timers[0] == 0) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfPoundEndAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfPoundEndAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfPoundEndAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfPoundEndAnim, 0.0f); this->unk_1C2 = 3; this->unk_19F = 1; this->actor.velocity.y = 0.0f; @@ -1945,8 +1945,8 @@ void BossGanon_PoundFloor(BossGanon* this, GlobalContext* globalCtx) { Math_ApproachF(&this->actor.velocity.y, 20.0f, 1.0f, 1.0f); if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp3Anim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfGetUp3Anim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp3Anim, 0.0f); SkelAnime_Update(&this->skelAnime); sBossGanonCape->attachShouldersTimer = 18.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE); @@ -2015,16 +2015,16 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) { switch (this->unk_1C2) { case 0: if (this->timers[0] == 0) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicChargeStartAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBigMagicChargeStartAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicChargeStartAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBigMagicChargeStartAnim, 0.0f); this->unk_1C2 = 1; } break; case 1: if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicChargeHoldAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfBigMagicChargeHoldAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicChargeHoldAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfBigMagicChargeHoldAnim, 0.0f); this->unk_1C2 = 2; this->timers[0] = 100; } @@ -2046,8 +2046,8 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) { } if (this->timers[0] == 0) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicWindupAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBigMagicWindupAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicWindupAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBigMagicWindupAnim, 0.0f); this->unk_1C2 = 3; this->timers[0] = 6; this->timers[1] = 15; @@ -2146,8 +2146,8 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) { } if (this->timers[1] == 0) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicThrowAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfBigMagicThrowAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicThrowAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfBigMagicThrowAnim, 0.0f); this->unk_1C2 = 4; this->unk_288 = 0.0f; this->unk_290 = 0.0f; @@ -2175,8 +2175,8 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) { } if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicThrowEndAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfBigMagicThrowEndAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicThrowEndAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfBigMagicThrowEndAnim, 0.0f); this->unk_1C2 = 5; } break; @@ -2193,7 +2193,7 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_SetupWait(BossGanon* this, GlobalContext* globalCtx) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - Animation_MorphToLoop(&this->skelAnime, &gDorfFloatAnim, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfFloatAnim, -10.0f); this->actionFunc = BossGanon_Wait; this->fwork[GDF_FWORK_0] = 0.0f; this->timers[0] = (s16)Rand_ZeroFloat(64.0f) + 30; @@ -2258,8 +2258,8 @@ void BossGanon_Wait(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_SetupChargeLightBall(BossGanon* this, GlobalContext* globalCtx) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfChargeLightBallAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfChargeLightBallAnim, -3.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfChargeLightBallAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfChargeLightBallAnim, -3.0f); this->actionFunc = BossGanon_ChargeLightBall; this->timers[0] = 25; } @@ -2305,13 +2305,13 @@ void BossGanon_ChargeLightBall(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_SetupPlayTennis(BossGanon* this, GlobalContext* globalCtx) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfThrowAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfThrowAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfThrowAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfThrowAnim, 0.0f); this->actionFunc = BossGanon_PlayTennis; } void BossGanon_PlayTennis(BossGanon* this, GlobalContext* globalCtx) { - static AnimationHeader* volleyAnims[] = { &gDorfVolleyLeftAnim, &gDorfVolleyRightAnim }; + static AnimationHeader* volleyAnims[] = { &gGanondorfVolleyLeftAnim, &gGanondorfVolleyRightAnim }; static s16 capeRightArmDurations[] = { 26, 20 }; s16 rand; @@ -2324,7 +2324,7 @@ void BossGanon_PlayTennis(BossGanon* this, GlobalContext* globalCtx) { if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->unk_1C2 = 1; - Animation_MorphToLoop(&this->skelAnime, &gDorfFloatAnim, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfFloatAnim, 0.0f); } if (this->skelAnime.curFrame <= 12.0f) { @@ -2373,8 +2373,8 @@ void BossGanon_PlayTennis(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_SetupBlock(BossGanon* this, GlobalContext* globalCtx) { if ((this->actionFunc != BossGanon_Block) || (this->unk_1C2 != 0)) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBlockAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBlockAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBlockAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBlockAnim, 0.0f); this->actionFunc = BossGanon_Block; } @@ -2395,8 +2395,8 @@ void BossGanon_Block(BossGanon* this, GlobalContext* globalCtx) { if (this->unk_1C2 == 0) { if (this->timers[0] == 0) { this->unk_1C2 = 1; - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBlockReleaseAnim, 0.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBlockReleaseAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBlockReleaseAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBlockReleaseAnim); SkelAnime_Update(&this->skelAnime); sBossGanonCape->attachShouldersTimer = 15.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE); @@ -2422,8 +2422,8 @@ void BossGanon_SetupHitByLightBall(BossGanon* this, GlobalContext* globalCtx) { s16 i; BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicHitAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBigMagicHitAnim, 0); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfBigMagicHitAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBigMagicHitAnim, 0); this->timers[0] = 70; sBossGanonCape->attachRightArmTimer = sBossGanonCape->attachLeftArmTimer = 0; @@ -2450,16 +2450,16 @@ void BossGanon_HitByLightBall(BossGanon* this, GlobalContext* globalCtx) { BossGanonEff_SpawnShock(globalCtx, 1500.0f, GDF_SHOCK_DORF_YELLOW); if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfLightArrowWaitAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfLightArrowWaitAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfLightArrowWaitAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfLightArrowWaitAnim, 0.0f); this->unk_1C2 = 1; } } else if (this->unk_1C2 == 1) { BossGanonEff_SpawnShock(globalCtx, 1000.0f, GDF_SHOCK_DORF_YELLOW); if (this->timers[0] == 0) { - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp3Anim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfGetUp3Anim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp3Anim, 0.0f); this->unk_1C2 = 2; SkelAnime_Update(&this->skelAnime); sBossGanonCape->attachShouldersTimer = 18.0f; @@ -2494,8 +2494,8 @@ void BossGanon_SetupVulnerable(BossGanon* this, GlobalContext* globalCtx) { if (this->actionFunc != BossGanon_Vulnerable) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfLightArrowHitAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfLightArrowHitAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfLightArrowHitAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfLightArrowHitAnim, 0.0f); sBossGanonCape->attachRightArmTimer = sBossGanonCape->attachLeftArmTimer = 0; this->actionFunc = BossGanon_Vulnerable; @@ -2553,16 +2553,16 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { case 0: if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->unk_1C2 = 1; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfLightEnergyHitAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfLightEnergyHitAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfLightEnergyHitAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfLightEnergyHitAnim, 0.0f); } break; case 1: if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->unk_1C2 = 2; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfKneelVulnerableAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfKneelVulnerableAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfDownedAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfDownedAnim, 0.0f); } break; @@ -2574,8 +2574,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { this->actor.world.pos.y = 40.0f; this->actor.velocity.y = 0.0f; this->unk_1C2 = 3; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfLandAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfLandAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfLandAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfLandAnim, 0.0f); this->timers[0] = 70; this->actor.flags |= ACTOR_FLAG_10; } @@ -2588,8 +2588,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->unk_1C2 = 4; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfVulnerableAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfVulnerableAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfVulnerableAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfVulnerableAnim, 0.0f); } break; @@ -2600,8 +2600,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { if (this->timers[0] == 0) { this->unk_1C2 = 5; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp1Anim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp1Anim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfGetUp1Anim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp1Anim, 0.0f); this->unk_2D4 = 80; for (i = 1; i < 15; i++) { @@ -2619,8 +2619,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->unk_1C2 = 6; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp2Anim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp2Anim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfGetUp2Anim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp2Anim, 0.0f); sBossGanonCape->minDist = 20.0f; this->unk_19F = 1; } @@ -2638,8 +2638,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { case 7: this->envLightMode = 0; Math_ApproachF(&this->actor.world.pos.y, 150.0f, 0.05f, 30.0f); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp3Anim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfGetUp3Anim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfGetUp3Anim, 0.0f); this->unk_1C2 = 8; SkelAnime_Update(&this->skelAnime); sBossGanonCape->attachShouldersTimer = 18.0f; @@ -2672,8 +2672,8 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_SetupDamaged(BossGanon* this, GlobalContext* globalCtx) { BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1); - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfDamageAnim); - Animation_MorphToPlayOnce(&this->skelAnime, &gDorfDamageAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfDamageAnim); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfDamageAnim, 0.0f); this->actionFunc = BossGanon_Damaged; } @@ -2690,8 +2690,8 @@ void BossGanon_Damaged(BossGanon* this, GlobalContext* globalCtx) { if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) { this->actionFunc = BossGanon_Vulnerable; this->unk_1C2 = 4; - this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfVulnerableAnim); - Animation_MorphToLoop(&this->skelAnime, &gDorfVulnerableAnim, 0.0f); + this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gGanondorfVulnerableAnim); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfVulnerableAnim, 0.0f); } } @@ -3210,7 +3210,7 @@ s32 BossGanon_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL switch (limbIndex) { case 10: if (this->useOpenHand) { - *dList = gDorfOpenHandDL; + *dList = gGanondorfRightHandOpenDL; } break; @@ -3282,7 +3282,7 @@ void BossGanon_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList Matrix_MultVec3f(&D_808E4DB8, &this->unk_208); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL)); CLOSE_DISPS(globalCtx->state.gfxCtx); } else if (limbIndex == 6) { @@ -3363,7 +3363,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); if (this->unk_2E8 != 0) { Player* player = GET_PLAYER(globalCtx); @@ -3378,7 +3378,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); FrameInterpolation_RecordCloseChild(); } @@ -3403,9 +3403,9 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { (this->unk_1A2 + i) * -15, 32, 64)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 128); - gSPDisplayList(POLY_XLU_DISP++, gDorfShockGlowDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockGlowDL); } else { - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); } FrameInterpolation_RecordCloseChild(); @@ -3433,7 +3433,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 100, 255, 0, 0); } - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); Matrix_Translate(this->unk_260.x, this->unk_260.y, this->unk_260.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); @@ -3441,7 +3441,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { Matrix_RotateZ(this->unk_258, 1); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); alpha = ((this->unk_1A2 % 2) != 0) ? 100 : 80; gDPPipeSync(POLY_XLU_DISP++); @@ -3450,7 +3450,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { Matrix_Scale(this->handLightBallScale * 0.75f, 1.0f, this->handLightBallScale * 0.75f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightCoreDL); } CLOSE_DISPS(gfxCtx); @@ -3478,7 +3478,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_Scale(this->unk_28C, this->unk_28C, this->unk_28C, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightFlecksDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightFlecksDL); // background circle texture Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); @@ -3490,19 +3490,19 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { gSPSegment( POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, 0, this->unk_1A2 * -4, 0x20, 0x20)); - gSPDisplayList(POLY_XLU_DISP++, gDorfBigMagicBGCircleDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfBigMagicBGCircleDL); // yellow background dot gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 150, 170, 0, (s8)this->unk_288); gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x20, 1, this->unk_1A2 * 2, this->unk_1A2 * -0x14, 0x40, 0x40)); - gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfDotDL); // light ball material gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 100, 0); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); // light ball geometry Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); @@ -3511,7 +3511,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_RotateZ((this->unk_1A2 * 10.0f) / 1000.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); BossGanon_InitRand(this->unk_1AA + 1, 0x71AC, 0x263A); Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); @@ -3534,7 +3534,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_Scale(4.0f, 4.0f, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightRayTriDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightRayTriDL); Matrix_Pop(); @@ -3589,7 +3589,7 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) { Matrix_Scale(this->fwork[GDF_TRIFORCE_SCALE], this->fwork[GDF_TRIFORCE_SCALE], 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfTriforceDL)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfTriforceDL)); Matrix_Pop(); @@ -3624,7 +3624,7 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) { MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfVortexDL)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfVortexDL)); Matrix_Pop(); @@ -3798,10 +3798,10 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob Matrix_Scale(0.95000005f, 1.0f, 0.95000005f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gDorfShadowSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gGanondorfShadowSetupDL); gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); - gSPDisplayList(POLY_OPA_DISP++, gDorfShadowModelDL); + gSPDisplayList(POLY_OPA_DISP++, gGanondorfShadowModelDL); CLOSE_DISPS(gfxCtx); } @@ -3822,7 +3822,7 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 50, 0, 0, 900, 1099); } - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDorfEyeTex)); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gGanondorfNormalEyeTex)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, BossGanon_OverrideLimbDraw, BossGanon_PostLimbDraw, &this->actor); @@ -4167,10 +4167,10 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->actor.scale.x * 0.75f, 1.0f, this->actor.scale.z * 0.75f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightCoreDL); Matrix_Pop(); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[GDF_FWORK_1]); @@ -4186,7 +4186,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); Matrix_Pop(); FrameInterpolation_RecordCloseChild(); @@ -4196,7 +4196,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * 3.1416f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); } CLOSE_DISPS(globalCtx->state.gfxCtx); @@ -4309,7 +4309,7 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); for (i = 9; i >= 0; i--) { temp = (s16)(((this->unk_1A6 - i) + 0xF) % 15); @@ -4320,7 +4320,7 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) { Matrix_RotateZ(((2.0f * (i * M_PI)) / 10.0f) + BINANG_TO_RAD(this->actor.shape.rot.z), MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); } CLOSE_DISPS(globalCtx->state.gfxCtx); @@ -4573,9 +4573,9 @@ void func_808E2544(Actor* thisx, GlobalContext* globalCtx) { } static Gfx* sBigMagicLightStreakDLists[] = { - gDorfLightStreak12DL, gDorfLightStreak11DL, gDorfLightStreak10DL, gDorfLightStreak9DL, - gDorfLightStreak8DL, gDorfLightStreak7DL, gDorfLightStreak6DL, gDorfLightStreak5DL, - gDorfLightStreak4DL, gDorfLightStreak3DL, gDorfLightStreak2DL, gDorfLightStreak1DL, + gGanondorfLightStreak12DL, gGanondorfLightStreak11DL, gGanondorfLightStreak10DL, gGanondorfLightStreak9DL, + gGanondorfLightStreak8DL, gGanondorfLightStreak7DL, gGanondorfLightStreak6DL, gGanondorfLightStreak5DL, + gGanondorfLightStreak4DL, gGanondorfLightStreak3DL, gGanondorfLightStreak2DL, gGanondorfLightStreak1DL, }; void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { @@ -4612,9 +4612,9 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); CLOSE_DISPS(globalCtx->state.gfxCtx); } @@ -4819,9 +4819,9 @@ void BossGanon_UpdateEffects(GlobalContext* globalCtx) { } static void* sLightningTextures[] = { - gDorfLightning1Tex, gDorfLightning1Tex, gDorfLightning2Tex, gDorfLightning3Tex, gDorfLightning4Tex, - gDorfLightning5Tex, gDorfLightning6Tex, gDorfLightning7Tex, gDorfLightning8Tex, gDorfLightning9Tex, - gDorfLightning10Tex, gDorfLightning11Tex, gDorfLightning12Tex, + gGanondorfLightning1Tex, gGanondorfLightning1Tex, gGanondorfLightning2Tex, gGanondorfLightning3Tex, gGanondorfLightning4Tex, + gGanondorfLightning5Tex, gGanondorfLightning6Tex, gGanondorfLightning7Tex, gGanondorfLightning8Tex, gGanondorfLightning9Tex, + gGanondorfLightning10Tex, gGanondorfLightning11Tex, gGanondorfLightning12Tex, }; static u8 sLightningPrimColors[] = { @@ -4851,7 +4851,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { FrameInterpolation_RecordOpenChild(eff, eff->epoch); gDPPipeSync(POLY_OPA_DISP++); if (flag == 0) { - gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardMaterialDL); + gSPDisplayList(POLY_OPA_DISP++, gGanondorfWindowShardMaterialDL); flag++; } if ((eff->timer & 7) != 0) { @@ -4865,7 +4865,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateX(eff->unk_44, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardModelDL); + gSPDisplayList(POLY_OPA_DISP++, gGanondorfWindowShardModelDL); FrameInterpolation_RecordCloseChild(); } } @@ -4879,7 +4879,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); if (flag == 0) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); flag++; } gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, eff->alpha); @@ -4889,7 +4889,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); FrameInterpolation_RecordCloseChild(); } } @@ -4903,7 +4903,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); if (flag == 0) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightBallMaterialDL); flag++; } gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, eff->alpha); @@ -4915,7 +4915,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfSquareDL); FrameInterpolation_RecordCloseChild(); } } @@ -4943,7 +4943,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfShockDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockDL); FrameInterpolation_RecordCloseChild(); } } @@ -4967,7 +4967,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer])); - gSPDisplayList(POLY_XLU_DISP++, gDorfLightningDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfLightningDL); FrameInterpolation_RecordCloseChild(); } } @@ -4987,7 +4987,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfImpactDarkDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfImpactDarkDL); FrameInterpolation_RecordCloseChild(); } } @@ -5007,7 +5007,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfImpactLightDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfImpactLightDL); FrameInterpolation_RecordCloseChild(); } } @@ -5028,7 +5028,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { (eff->scale * 200.0f) / 1500.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfShockwaveDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfShockwaveDL); FrameInterpolation_RecordCloseChild(); } } @@ -5049,7 +5049,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL); + gSPDisplayList(POLY_XLU_DISP++, gGanondorfDotDL); FrameInterpolation_RecordCloseChild(); } } diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index fa827932f..ac6b8e62e 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -169,7 +169,7 @@ void BossGanon2_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_InitJntSph(globalCtx, &this->unk_444); Collider_SetJntSph(globalCtx, &this->unk_444, &this->actor, &sJntSphInit2, this->unk_864); BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON, false); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gDorfSkel, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGanondorfSkel, NULL, NULL, NULL, 0); func_808FD5C4(this, globalCtx); this->actor.naviEnemyId = 0x3E; this->actor.gravity = 0.0f; @@ -242,7 +242,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { player->actor.world.pos.y = 1086.0f; player->actor.world.pos.z = -186.0f; player->actor.shape.rot.y = -0x5000; - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime3_Anim_002168, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfBurstOutAnim, 0.0f); globalCtx->envCtx.unk_D8 = 0.0f; // fake, tricks the compiler into allocating more stack if (zero) { @@ -427,8 +427,8 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_398 == 50) { this->unk_398 = 0; this->unk_39C = 12; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_002168, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_002168); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfBurstOutAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanondorfBurstOutAnim); this->actor.world.pos.x = this->actor.world.pos.z = -200.0f; this->actor.world.pos.y = 1009.0f; this->actor.shape.yOffset = 7000.0f; @@ -460,7 +460,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { this->unk_3B0.y = this->actor.world.pos.y + 70.0f; } if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime3_Anim_002E6C, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfFloatingHeavyBreathingAnim, 0.0f); this->unk_39C = 14; this->unk_398 = 0; this->actor.world.pos.x = -200.0f; @@ -512,12 +512,12 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { Math_ApproachF(&this->unk_3B0.y, this->actor.world.pos.y + 77.0f, 0.05f, 5.0f); if (this->unk_398 >= 50) { if (this->unk_398 == 50) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_000BFC, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_000BFC); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfShowTriforceStartAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanondorfShowTriforceStartAnim); this->unk_314 = 3; } if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon_anime3_Anim_003F38, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanondorfShowTriforceLoopAnim, 0.0f); this->unk_194 = 1000.0f; } } @@ -527,8 +527,8 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_398 == 140) { this->unk_39C = 16; this->unk_398 = 0; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_003754, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_003754); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfTransformStartAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanondorfTransformStartAnim); this->unk_339 = 55; globalCtx->envCtx.unk_D8 = 1.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_CASBREAK); @@ -549,7 +549,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { this->unk_1B4 = 0.0f; SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_0028A8, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanondorfTransformEndAnim, 0.0f); this->unk_194 = 1000.0f; } Math_ApproachF(&this->unk_3A4.x, (this->actor.world.pos.x + 200.0f) - 90.0f, 0.1f, 6.3999996f); @@ -573,7 +573,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { this->unk_337 = 2; BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON2, false); SkelAnime_Free(&this->skelAnime, globalCtx); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ganon2_Skel_025970, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGanonSkel, NULL, NULL, NULL, 0); BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON_ANIME3, false); func_8002DF54(globalCtx, &this->actor, 0x54); this->unk_314 = 3; @@ -595,7 +595,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_398 == 25) { this->unk_39C = 18; this->unk_398 = 0; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_010380, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonUncurlAndFlailAnim, 0.0f); this->skelAnime.playSpeed = 0.0f; this->unk_3A4.x = ((this->actor.world.pos.x + 500.0f) - 350.0f) - 50.0f; this->unk_3A4.y = this->actor.world.pos.y; @@ -658,7 +658,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { this->unk_398 = 0; this->unk_420 = 10.0f; this->actor.velocity.y = 0.0f; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_010380, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonUncurlAndFlailAnim, 0.0f); func_808FD4D4(this, globalCtx, 0, 3); func_800A9F6C(0.0f, 0xC8, 0x14, 0x14); } @@ -691,7 +691,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_398 == 80) { BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON2, false); TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, - SEGMENTED_TO_VIRTUAL(object_ganon2_Tex_021A90), 160, 180, 128, 40, true); + SEGMENTED_TO_VIRTUAL(gGanonTitleCardTex), 160, 180, 128, 40, true); //It has translation but they are all the same. they all say "GANON" only } this->unk_3A4.x = ((this->actor.world.pos.x + 500.0f) - 350.0f) + 100.0f; @@ -860,8 +860,8 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) { if ((this->unk_398 > 40) && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE)) { this->unk_39C = 29; this->unk_398 = 0; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon_anime3_Anim_0147E0, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon_anime3_Anim_0147E0); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonRoarAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonRoarAnim); this->actor.shape.yOffset = 0.0f; this->actor.world.pos.y = 1086.0f; this->actor.gravity = -1.0f; @@ -1059,7 +1059,7 @@ void func_808FFDB0(BossGanon2* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, objectIdx)) { gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment); - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_00FFE4, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonGuardIdleAnim, -10.0f); this->actionFunc = func_808FFEBC; if (this->unk_334 != 0) { @@ -1097,7 +1097,7 @@ void func_808FFEBC(BossGanon2* this, GlobalContext* globalCtx) { } void func_808FFF90(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_00FFE4, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonGuardIdleAnim, -10.0f); this->actionFunc = func_808FFFE0; this->unk_1A2[0] = 40; } @@ -1122,8 +1122,8 @@ void func_808FFFE0(BossGanon2* this, GlobalContext* globalCtx) { } void func_809000A0(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_026510, -2.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_026510); + Animation_MorphToLoop(&this->skelAnime, &gGanonStunStartAnim, -2.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonStunStartAnim); this->unk_1AC = 0; this->actionFunc = func_80900104; } @@ -1136,15 +1136,15 @@ void func_80900104(BossGanon2* this, GlobalContext* globalCtx) { case 0: if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { this->unk_1AC = 1; - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_026AF4, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonStunLoopAnim, 0.0f); this->unk_1A2[0] = 80; } break; case 1: if (this->unk_1A2[0] == 0) { this->unk_1AC = 2; - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_027824, -5.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_027824); + Animation_MorphToLoop(&this->skelAnime, &gGanonStunEndAnim, -5.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonStunEndAnim); } break; case 2: @@ -1156,8 +1156,8 @@ void func_80900104(BossGanon2* this, GlobalContext* globalCtx) { } void func_80900210(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_00DFF0, -3.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_00DFF0); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDamageAnim, -3.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonDamageAnim); this->actionFunc = func_8090026C; } @@ -1171,7 +1171,7 @@ void func_8090026C(BossGanon2* this, GlobalContext* globalCtx) { } void func_809002CC(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_00E8EC, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonGuardWalkAnim, -10.0f); this->actionFunc = func_80900344; this->unk_338 = 0; this->unk_1A2[0] = 100; @@ -1196,7 +1196,7 @@ void func_80900344(BossGanon2* this, GlobalContext* globalCtx) { } if (this->actor.xzDistToPlayer < 200.0f) { this->unk_338 = 0; - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_00E8EC, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonGuardWalkAnim, -10.0f); } else { this->skelAnime.playSpeed = ((this->actor.xzDistToPlayer - 300.0f) * 0.005f) + 1.0f; if (this->skelAnime.playSpeed > 2.0f) { @@ -1211,7 +1211,7 @@ void func_80900344(BossGanon2* this, GlobalContext* globalCtx) { phi_f0 = 2.0f; if (this->actor.xzDistToPlayer >= 200.0f) { this->unk_338 = 1; - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_0353C0, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonWalkAnim, -10.0f); } } @@ -1230,12 +1230,12 @@ void func_80900344(BossGanon2* this, GlobalContext* globalCtx) { void func_80900580(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_311 == 0) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_00ADD0, -5.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_00ADD0); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonLeftSwordSwingAnim, -5.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonLeftSwordSwingAnim); this->unk_198 = (this->unk_194 - 15.0f) - 5.0f; } else { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_00CAF8, -5.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_00CAF8); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonRightSwordSwingAnim, -5.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonRightSwordSwingAnim); this->unk_198 = (this->unk_194 - 15.0f) - 5.0f; } @@ -1282,8 +1282,8 @@ void func_80900650(BossGanon2* this, GlobalContext* globalCtx) { } void func_80900818(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_02A848, -5.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_02A848); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDownedStartAnim, -5.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonDownedStartAnim); this->actionFunc = func_80900890; this->unk_1AC = 0; this->unk_39C = 0; @@ -1406,7 +1406,7 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) { switch (this->unk_1AC) { case 0: if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_034278, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonDownedLoopAnim, 0.0f); this->unk_1AC = 1; } break; @@ -1420,8 +1420,8 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) { temp_f12 = -200.0f - player->actor.world.pos.z; if (sqrtf(SQ(temp_f2) + SQ(temp_f12)) <= 784.0f) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_0334F8, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_0334F8); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonGetUpAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonGetUpAnim); this->unk_1AC = 2; this->unk_1A2[0] = 40; Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_ROAR); @@ -1445,8 +1445,8 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) { } void func_80901020(BossGanon2* this, GlobalContext* globalCtx) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_02A848, -5.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_02A848); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDownedStartAnim, -5.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonDownedStartAnim); this->actionFunc = func_8090120C; this->unk_1AC = 0; this->unk_39C = 0; @@ -1667,8 +1667,8 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) { Gameplay_ChangeCameraStatus(globalCtx, this->unk_39E, CAM_STAT_ACTIVE); this->unk_39C = 7; this->unk_398 = 0; - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_003B1C, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_003B1C); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonFinalBlowAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonFinalBlowAnim); globalCtx->startPlayerCutscene(globalCtx, &this->actor, 0x61); } else { break; @@ -1733,8 +1733,8 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) { case 75: this->unk_339 = 23; if (this->unk_398 == 55) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_007288, 0.0f); - this->unk_194 = Animation_GetLastFrame(&object_ganon2_Anim_007288); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDeadStartAnim, 0.0f); + this->unk_194 = Animation_GetLastFrame(&gGanonDeadStartAnim); func_8002DF54(globalCtx, &this->actor, 0x62); this->unk_39C = 8; this->unk_398 = 1000; @@ -1758,7 +1758,7 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) { globalCtx->envCtx.unk_D8 = 0.0f; } if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_ganon2_Anim_008EB8, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDeadLoopAnim, 0.0f); this->unk_398 = 0; this->unk_194 = 1000.0f; } @@ -1842,7 +1842,7 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) { switch (this->unk_1AC) { case 0: if (Animation_OnFrame(&this->skelAnime, this->unk_194)) { - Animation_MorphToLoop(&this->skelAnime, &object_ganon2_Anim_034278, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &gGanonDownedLoopAnim, 0.0f); this->unk_1AC = 1; } break; @@ -2747,7 +2747,7 @@ void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL)); CLOSE_DISPS(globalCtx->state.gfxCtx); } else if (limbIndex == 10) { @@ -2795,8 +2795,8 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { switch (this->unk_337) { case 0: BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON, true); - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_ganon_Tex_00A8E0)); - gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_ganon_Tex_00A8E0)); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gGanondorfEmptyEyeTex)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGanondorfEmptyEyeTex)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, BossGanon2_PostLimbDraw2, this); break; diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c index b1e0ced46..635a20f68 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c @@ -290,9 +290,9 @@ static s8 D_80907144[] = { static Vec3f D_80907164 = { 800.0f, 420.0f, 100.0f }; static void* sEyeTextures[] = { - object_ganon2_Tex_01E188, - object_ganon2_Tex_01E988, - object_ganon2_Tex_01EA08, + gGanonEyeOpenTex, + gGanonEyeHalfTex, + gGanonEyeClosedTex, }; static Vec3f D_8090717C = { 0.0f, -2000.0f, 0.0f }; diff --git a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index dfe31118c..2e0215108 100644 --- a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -547,9 +547,9 @@ void DemoEc_UpdateBeardedMan(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_DrawBeardedMan(DemoEc* this, GlobalContext* globalCtx) { static void* eyeTextures[] = { - object_ahg_Tex_0005FC, - object_ahg_Tex_0006FC, - object_ahg_Tex_0007FC, + object_ahg_Tex_00057C, + object_ahg_Tex_00067C, + object_ahg_Tex_00077C, }; static u8 color1[] = { 255, 255, 255, 255 }; static u8 color2[] = { 255, 255, 255, 255 }; diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c index 67dbfbfa7..ea76f68e7 100644 --- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -64,7 +64,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), }; -static AnimationHeader* D_809FCECC[] = { &gDoor3Anim, &gDoor1Anim, &gDoor4Anim, &gDoor2Anim }; +static AnimationHeader* D_809FCECC[] = { &gDoorAdultOpeningLeftAnim, &gDoorChildOpeningLeftAnim, &gDoorAdultOpeningRightAnim, &gDoorChildOpeningRightAnim }; static u8 sDoorAnimOpenFrames[] = { 25, 25, 25, 25 }; @@ -72,10 +72,10 @@ static u8 sDoorAnimCloseFrames[] = { 60, 70, 60, 70 }; static Gfx* D_809FCEE4[5][2] = { { gDoorLeftDL, gDoorRightDL }, - { gFireTempleDoorWithHandleFrontDL, gFireTempleDoorWithHandleBackDL }, + { gFireTempleDoorWithHandleLeftDL, gFireTempleDoorWithHandleRightDL }, { gWaterTempleDoorLeftDL, gWaterTempleDoorRightDL }, - { object_haka_door_DL_0013B8, object_haka_door_DL_001420 }, - { gFieldDoor1DL, gFieldDoor2DL }, + { gShadowDoorLeftDL, gShadowDoorRightDL }, + { gFieldDoorLeftDL, gFieldDoorRightDL }, }; void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx2) { @@ -89,7 +89,7 @@ void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx2) { objectInfo = &sDoorInfo[0]; Actor_ProcessInitChain(&this->actor, sInitChain); - SkelAnime_Init(globalCtx, &this->skelAnime, &gDoorSkel, &gDoor3Anim, this->jointTable, this->morphTable, 5); + SkelAnime_Init(globalCtx, &this->skelAnime, &gDoorSkel, &gDoorAdultOpeningLeftAnim, this->jointTable, this->morphTable, 5); for (i = 0; i < ARRAY_COUNT(sDoorInfo) - 2; i++, objectInfo++) { if (globalCtx->sceneNum == objectInfo->sceneNum) { break; diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 5c2340ce7..eaeef86c7 100644 --- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -69,7 +69,7 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; // NULL-terminated arrays of eye textures static void* sEyeTexturesAOB[] = { gDogLadyEyeOpenTex, gDogLadyEyeHalfTex, gDogLadyEyeClosedTex, NULL }; -static void* sEyeTexturesAHG7[] = { object_ahg_Tex_0005FC, object_ahg_Tex_0006FC, object_ahg_Tex_0007FC, NULL }; +static void* sEyeTexturesAHG7[] = { object_ahg_Tex_00057C, object_ahg_Tex_00067C, object_ahg_Tex_00077C, NULL }; static void* sEyeTexturesBBA[] = { object_bba_Tex_0004C8, NULL }; static void* sEyeTexturesBJI13[] = { object_bji_Tex_0005FC, object_bji_Tex_0009FC, object_bji_Tex_000DFC, NULL }; static void* sEyeTexturesBOJ2[] = { object_boj_Tex_0005FC, object_boj_Tex_0006FC, object_boj_Tex_0007FC, NULL }; @@ -112,8 +112,8 @@ static EnHyHeadInfo sHeadInfo[] = { /* ENHY_HEAD_AHG_8 */ { OBJECT_AHG, object_ahg_DL_005508, NULL }, /* ENHY_HEAD_AHG_9 */ { OBJECT_AHG, object_ahg_DL_005728, NULL }, /* ENHY_HEAD_BBA */ { OBJECT_BBA, object_bba_DL_002948, sEyeTexturesBBA }, - /* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, object_cne_DL_001300, NULL }, - /* ENHY_HEAD_CNE_12 */ { OBJECT_CNE, object_cne_DL_002860, NULL }, + /* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, gCneHeadBrownHairDL, NULL }, + /* ENHY_HEAD_CNE_12 */ { OBJECT_CNE, gCneHeadOrangeHairDL, NULL }, /* ENHY_HEAD_BJI_13 */ { OBJECT_BJI, object_bji_DL_002560, sEyeTexturesBJI13 }, /* ENHY_HEAD_BJI_14 */ { OBJECT_BJI, object_bji_DL_003F68, NULL }, /* ENHY_HEAD_COB */ { OBJECT_COB, object_cob_DL_001300, NULL }, @@ -141,7 +141,7 @@ static EnHySkeletonInfo sSkeletonInfo[] = { /* ENHY_SKEL_BOJ */ { OBJECT_BOJ, &object_boj_Skel_0000F0 }, /* ENHY_SKEL_AHG */ { OBJECT_AHG, &object_ahg_Skel_0000F0 }, /* ENHY_SKEL_BBA */ { OBJECT_BBA, &object_bba_Skel_0000F0 }, - /* ENHY_SKEL_CNE */ { OBJECT_CNE, &object_cne_Skel_0000F0 }, + /* ENHY_SKEL_CNE */ { OBJECT_CNE, &gCneSkel }, /* ENHY_SKEL_BJI */ { OBJECT_BJI, &object_bji_Skel_0000F0 }, /* ENHY_SKEL_COB */ { OBJECT_COB, &object_cob_Skel_0021F8 }, }; diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 82c52f724..f136e3bf0 100644 --- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1206,7 +1206,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { if (feather->type == 1) { FrameInterpolation_RecordOpenChild(feather, feather->epoch); if (!flag) { - gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAppearDL); + gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherMaterialDL); flag++; } Matrix_Translate(feather->pos.x, feather->pos.y, feather->pos.z, MTXMODE_NEW); @@ -1216,7 +1216,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); + gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherModelDL); FrameInterpolation_RecordCloseChild(); } } diff --git a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 5a1beea42..5e240e788 100644 --- a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -143,11 +143,11 @@ void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) { } if (thisx->params >= -1) { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_00E778, &object_rd_Anim_0087D0, + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gRedeadSkel, &gGibdoRedeadIdleAnim, this->jointTable, this->morphTable, 26); thisx->naviEnemyId = 0x2A; } else { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_003DD8, &object_rd_Anim_0087D0, + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGibdoSkel, &gGibdoRedeadIdleAnim, this->jointTable, this->morphTable, 26); thisx->naviEnemyId = 0x2D; } @@ -197,9 +197,9 @@ void func_80AE2630(GlobalContext* globalCtx, Actor* thisx, s32 arg2) { void func_80AE269C(EnRd* this) { if (this->actor.params != 2) { - Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_0087D0, -6.0f); + Animation_MorphToLoop(&this->skelAnime, &gGibdoRedeadIdleAnim, -6.0f); } else { - Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_005D98); + Animation_PlayLoop(&this->skelAnime, &gGibdoRedeadSobbingAnim); } this->unk_31B = 0; @@ -216,9 +216,9 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { if ((this->actor.params == 2) && (0.0f == this->skelAnime.curFrame)) { if (Rand_ZeroOne() >= 0.5f) { - Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_005D98); + Animation_PlayLoop(&this->skelAnime, &gGibdoRedeadSobbingAnim); } else { - Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_0057AC); + Animation_PlayLoop(&this->skelAnime, &gGibdoRedeadWipingTearsAnim); } } else { this->unk_30C--; @@ -261,7 +261,7 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2970(EnRd* this) { - Animation_Change(&this->skelAnime, &object_rd_Anim_0087D0, 0, 0, Animation_GetLastFrame(&object_rd_Anim_0087D0), + Animation_Change(&this->skelAnime, &gGibdoRedeadIdleAnim, 0, 0, Animation_GetLastFrame(&gGibdoRedeadIdleAnim), ANIMMODE_LOOP, -6.0f); this->unk_31B = 11; this->unk_30C = 6; @@ -296,8 +296,8 @@ void func_80AE2A10(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2B90(EnRd* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 1.0f, 4.0f, - Animation_GetLastFrame(&object_rd_Anim_00EFDC), ANIMMODE_LOOP_INTERP, -4.0f); + Animation_Change(&this->skelAnime, &gGibdoRedeadWalkAnim, 1.0f, 4.0f, + Animation_GetLastFrame(&gGibdoRedeadWalkAnim), ANIMMODE_LOOP_INTERP, -4.0f); this->actor.speedXZ = 0.4f; this->unk_31B = 4; EnRd_SetupAction(this, func_80AE2C1C); @@ -366,7 +366,7 @@ void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2F50(EnRd* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 0.5f, 0, Animation_GetLastFrame(&object_rd_Anim_00EFDC), + Animation_Change(&this->skelAnime, &gGibdoRedeadWalkAnim, 0.5f, 0, Animation_GetLastFrame(&gGibdoRedeadWalkAnim), ANIMMODE_LOOP_INTERP, -4.0f); this->unk_31B = 2; EnRd_SetupAction(this, func_80AE2FD0); @@ -415,7 +415,7 @@ void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx) { } void func_80AE31DC(EnRd* this) { - Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 0.5f, 0, Animation_GetLastFrame(&object_rd_Anim_00EFDC), + Animation_Change(&this->skelAnime, &gGibdoRedeadWalkAnim, 0.5f, 0, Animation_GetLastFrame(&gGibdoRedeadWalkAnim), ANIMMODE_LOOP_INTERP, -4.0f); this->unk_31B = 3; this->unk_305 = 1; @@ -461,7 +461,7 @@ void func_80AE3260(EnRd* this, GlobalContext* globalCtx) { } void func_80AE33F0(EnRd* this) { - Animation_PlayOnce(&this->skelAnime, &object_rd_Anim_004ADC); + Animation_PlayOnce(&this->skelAnime, &gGibdoRedeadGrabStartAnim); this->unk_30C = this->unk_304 = 0; this->unk_319 = 200; this->unk_31B = 8; @@ -479,7 +479,7 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { switch (this->unk_304) { case 1: - Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_004268); + Animation_PlayLoop(&this->skelAnime, &gGibdoRedeadGrabAttackAnim); this->unk_304++; globalCtx->damagePlayer(globalCtx, -8); func_800AA000(this->actor.xzDistToPlayer, 0xFF, 1, 0xC); @@ -489,8 +489,8 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { Math_SmoothStepToS(&this->unk_310, 0, 1, 0x5DC, 0); case 2: if (!(player->stateFlags2 & 0x80)) { - Animation_Change(&this->skelAnime, &object_rd_Anim_0046F8, 0.5f, 0.0f, - Animation_GetLastFrame(&object_rd_Anim_0046F8), ANIMMODE_ONCE_INTERP, 0.0f); + Animation_Change(&this->skelAnime, &gGibdoRedeadGrabEndAnim, 0.5f, 0.0f, + Animation_GetLastFrame(&gGibdoRedeadGrabEndAnim), ANIMMODE_ONCE_INTERP, 0.0f); this->unk_304++; this->unk_31B = 4; return; @@ -540,8 +540,8 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { } void func_80AE37BC(EnRd* this) { - Animation_Change(&this->skelAnime, &object_rd_Anim_004F94, 0.0f, 0.0f, - Animation_GetLastFrame(&object_rd_Anim_004F94), ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &gGibdoRedeadLookBackAnim, 0.0f, 0.0f, + Animation_GetLastFrame(&gGibdoRedeadLookBackAnim), ANIMMODE_ONCE, 0.0f); this->unk_31B = 7; EnRd_SetupAction(this, func_80AE3834); } @@ -565,7 +565,7 @@ void func_80AE3834(EnRd* this, GlobalContext* globalCtx) { } void func_80AE392C(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_008040, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGibdoRedeadStandUpAnim, -4.0f); this->unk_31B = 5; EnRd_SetupAction(this, func_80AE3978); } @@ -581,7 +581,7 @@ void func_80AE3978(EnRd* this, GlobalContext* globalCtx) { } void func_80AE39D4(EnRd* this) { - Animation_Change(&this->skelAnime, &object_rd_Anim_008040, -1.0f, Animation_GetLastFrame(&object_rd_Anim_008040), + Animation_Change(&this->skelAnime, &gGibdoRedeadStandUpAnim, -1.0f, Animation_GetLastFrame(&gGibdoRedeadStandUpAnim), 0.0f, ANIMMODE_ONCE, -4.0f); this->unk_31B = 6; EnRd_SetupAction(this, func_80AE3A54); @@ -594,7 +594,7 @@ void func_80AE3A54(EnRd* this, GlobalContext* globalCtx) { } void func_80AE3A8C(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_0074F0, -6.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGibdoRedeadDamageAnim, -6.0f); if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = -2.0f; @@ -632,7 +632,7 @@ void func_80AE3B18(EnRd* this, GlobalContext* globalCtx) { } void func_80AE3C20(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_006E88, -1.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gGibdoRedeadDeathAnim, -1.0f); this->unk_31B = 10; this->unk_30C = 300; this->actor.flags &= ~ACTOR_FLAG_0; diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c index cded4c801..8fe5e268c 100644 --- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1633,7 +1633,7 @@ void EnSkj_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Matrix_RotateZYX(-0x4000, 0, 0, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gSKJskullMaskDL); + gSPDisplayList(POLY_OPA_DISP++, gSkullKidSkullMaskDL); Matrix_Pop(); } @@ -1645,7 +1645,7 @@ Gfx* EnSkj_TranslucentDL(GraphicsContext* gfxCtx, u32 alpha) { Gfx* dListHead; //! @bug This only allocates space for 1 command but uses 3 - dList = dListHead = Graph_Alloc(gfxCtx, sizeof(Gfx)); + dList = dListHead = Graph_Alloc(gfxCtx, sizeof(Gfx) * 3); gDPSetRenderMode(dListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gDPSetEnvColor(dListHead++, 0, 0, 0, alpha); gSPEndDisplayList(dListHead++); diff --git a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 0a1b2e954..45763284e 100644 --- a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -106,7 +106,7 @@ void EnSkjneedle_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gSKJNeedleDL); + gSPDisplayList(POLY_OPA_DISP++, gSkullKidNeedleDL); CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index a21e47ab7..64eba93a8 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -771,7 +771,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { for (i = 0; i < 5; i++, ptr++) { if (ptr->unk_00 == 1) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAppearDL); + gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherMaterialDL); flag++; } @@ -784,7 +784,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); + gSPDisplayList(POLY_XLU_DISP++, gCuccoEffectFeatherModelDL); FrameInterpolation_RecordCloseChild(); } } diff --git a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index bf4956f35..bf0442880 100644 --- a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -59,26 +59,26 @@ static EnViewerInitData sInitData[] = { { OBJECT_ZL4, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_ZELDA, &gChildZeldaSkel, &object_opening_demo1_Anim_000450 }, /* ENVIEWER_TYPE_3_GANONDORF */ - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &object_gndd_Skel_0119E8, - &object_gndd_Anim_002928 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gYoungGanondorfSkel, + &gYoungGanondorfHorsebackIdleAnim }, /* ENVIEWER_TYPE_4_HORSE_GANONDORF */ { OBJECT_HORSE_GANON, OBJECT_HORSE_GANON, 1, 0, ENVIEWER_SHADOW_HORSE, 20, ENVIEWER_DRAW_HORSE, &gHorseGanonSkel, &gHorseGanonRearingAnim }, /* ENVIEWER_TYPE_5_GANONDORF */ - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &object_gndd_Skel_0119E8, - &object_gndd_Anim_0005B4 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gYoungGanondorfSkel, + &gYoungGanondorfHorsebackRideAnim }, /* ENVIEWER_TYPE_6_HORSE_GANONDORF */ { OBJECT_HORSE_GANON, OBJECT_HORSE_GANON, 1, 0, ENVIEWER_SHADOW_HORSE, 20, ENVIEWER_DRAW_HORSE, &gHorseGanonSkel, &gHorseGanonGallopingAnim }, /* ENVIEWER_TYPE_7_GANONDORF */ - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &object_gndd_Skel_0119E8, - &object_gndd_Anim_004260 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gYoungGanondorfSkel, + &gYoungGanondorfArmsCrossedAnim }, /* ENVIEWER_TYPE_8_GANONDORF */ - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &object_gndd_Skel_0119E8, - &object_gndd_Anim_0050A8 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gYoungGanondorfSkel, + &gYoungGanondorfWalkAnim }, /* ENVIEWER_TYPE_9_GANONDORF */ - { OBJECT_GANON, OBJECT_GANON, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gDorfSkel, - &object_ganon_Anim_011348 }, + { OBJECT_GANON, OBJECT_GANON, 1, -6, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_GANONDORF, &gGanondorfSkel, + &gGanondorfEndingFloatAnim }, }; static EnGanonMant* sGanondorfCape; @@ -282,8 +282,8 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL) { if (globalCtx->csCtx.npcActions[1]->action == 2 && sTimer == 0) { if (type == ENVIEWER_TYPE_3_GANONDORF) { - if (this->skin.skelAnime.animation != &object_gndd_Anim_002928) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_002928, 1.0f); + if (this->skin.skelAnime.animation != &gYoungGanondorfHorsebackIdleAnim) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gYoungGanondorfHorsebackIdleAnim, 1.0f); } } else if (this->skin.skelAnime.animation != &gHorseGanonIdleAnim) { Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gHorseGanonIdleAnim, 1.0f); @@ -291,8 +291,8 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) { } else if (globalCtx->csCtx.npcActions[1]->action == 1) { sTimer = 100; if (type == ENVIEWER_TYPE_3_GANONDORF) { - if (this->skin.skelAnime.animation != &object_gndd_Anim_001D28) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_001D28, 1.0f); + if (this->skin.skelAnime.animation != &gYoungGanondorfHorsebackRearAnim) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gYoungGanondorfHorsebackRearAnim, 1.0f); } } else if (this->skin.skelAnime.animation != &gHorseGanonRearingAnim) { Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gHorseGanonRearingAnim, 1.0f); @@ -301,44 +301,44 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) { switch (this->state) { case 0: if (globalCtx->csCtx.npcActions[1]->action == 4) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_000F54, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysStartAnim, -5.0f); this->state++; } break; case 1: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0014F4, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim, -5.0f); this->state++; } break; case 2: if (globalCtx->csCtx.npcActions[1]->action == 5) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_0008A0, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfHorsebackMagicChargeUpStartAnim, -5.0f); this->state++; } break; case 3: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_000BC8, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackMagicChargeUpLoopAnim, -5.0f); this->state++; } break; case 4: if (globalCtx->csCtx.npcActions[1]->action == 11) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0014F4, -20.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackLookSidewaysLoopAnim, -20.0f); this->state++; } break; case 5: if (globalCtx->csCtx.npcActions[1]->action == 8) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_002928, -15.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfHorsebackIdleAnim, -15.0f); this->state++; } break; case 6: if (globalCtx->csCtx.npcActions[1]->action == 12) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_VOICE_DEMO); - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_0005B4, 3.0f); + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gYoungGanondorfHorsebackRideAnim, 3.0f); this->state++; } break; @@ -432,13 +432,13 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 7) { Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_004534, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfLaughStartAnim, -5.0f); this->state++; } break; case 1: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0048B0, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfLaughLoopAnim, -5.0f); this->state++; } break; @@ -448,26 +448,26 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) { case 0: if (globalCtx->csCtx.state != CS_STATE_IDLE) { if (globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 9) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_0050A8, 1.0f); + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gYoungGanondorfWalkAnim, 1.0f); this->state++; } } break; case 1: if (globalCtx->csCtx.npcActions[1]->action == 10) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_003284, -10.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfKneelStartAnim, -10.0f); this->state++; } break; case 2: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_003D84, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &gYoungGanondorfKneelLoopAnim, -5.0f); this->state++; } break; case 3: if (globalCtx->csCtx.npcActions[1]->action == 4) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_003428, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &gYoungGanondorfKneelLookSidewaysAnim, -5.0f); this->state++; } break; @@ -490,13 +490,13 @@ s32 EnViewer_Ganondorf3OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, if (gSaveContext.sceneSetupIndex == 4) { if (globalCtx->csCtx.frames >= 400) { if (limbIndex == 5) { - *dList = object_gndd_DL_00E1A8; + *dList = gYoungGanondorfOpenLeftHandDL; } } } else { if (globalCtx->csCtx.frames >= 1510 && globalCtx->csCtx.frames <= 1650) { if (limbIndex == 5) { - *dList = object_gndd_DL_00E1A8; + *dList = gYoungGanondorfOpenLeftHandDL; } } } @@ -509,7 +509,7 @@ void EnViewer_Ganondorf9PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gf func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGanondorfEyesDL)); CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -536,23 +536,23 @@ void EnViewer_DrawGanondorf(EnViewer* this, GlobalContext* globalCtx) { } if (frames + 1127 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F178)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F178)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeOpenTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeOpenTex)); } else if (frames + 1128 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F378)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F378)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeHalfTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeHalfTex)); } else if (frames + 1129 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F578)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F578)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeClosedTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeClosedTex)); } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F778)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F778)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeLookingDownTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gYoungGanondorfEyeLookingDownTex)); } } else if (type == ENVIEWER_TYPE_9_GANONDORF) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_ganon_Tex_00A4E0)); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gGanondorfCrazedEyeTex)); } if (type == ENVIEWER_TYPE_9_GANONDORF) { diff --git a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 666ea9403..6f899621f 100644 --- a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -43,7 +43,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), }; -static CollisionHeader* sCollisionHeaders[] = { &gHookshotTargetCol, &gHookshotTargetCol, &gHookshotPostCol }; +static CollisionHeader* sCollisionHeaders[] = { &gHookshotPostCol, &gHookshotPostCol, &gHookshotTargetCol }; static Color_RGB8 sFireTempleColor = { 165, 125, 55 }; diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index faaa032f6..e6162b5a5 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -392,15 +392,16 @@ static PlayerAgeProperties sAgeProperties[] = { }, 0, 0x80, - &gPlayerAnim_002718, - &gPlayerAnim_002720, - &gPlayerAnim_002838, - &gPlayerAnim_002E70, - &gPlayerAnim_002E78, - { &gPlayerAnim_002E80, &gPlayerAnim_002E88, &gPlayerAnim_002D90, &gPlayerAnim_002D98 }, - { &gPlayerAnim_002D70, &gPlayerAnim_002D78 }, - { &gPlayerAnim_002E50, &gPlayerAnim_002E58 }, - { &gPlayerAnim_002E68, &gPlayerAnim_002E60 }, + &gPlayerAnim_link_demo_Tbox_open, + &gPlayerAnim_link_demo_back_to_past, + &gPlayerAnim_link_demo_return_to_past, + &gPlayerAnim_link_normal_climb_startA, + &gPlayerAnim_link_normal_climb_startB, + { &gPlayerAnim_link_normal_climb_upL, &gPlayerAnim_link_normal_climb_upR, &gPlayerAnim_link_normal_Fclimb_upL, + &gPlayerAnim_link_normal_Fclimb_upR }, + { &gPlayerAnim_link_normal_Fclimb_sideL, &gPlayerAnim_link_normal_Fclimb_sideR }, + { &gPlayerAnim_link_normal_climb_endAL, &gPlayerAnim_link_normal_climb_endAR }, + { &gPlayerAnim_link_normal_climb_endBR, &gPlayerAnim_link_normal_climb_endBL }, }, { 40.0f, @@ -443,15 +444,16 @@ static PlayerAgeProperties sAgeProperties[] = { }, 0x20, 0, - &gPlayerAnim_002318, - &gPlayerAnim_002360, - &gPlayerAnim_0023A8, - &gPlayerAnim_0023E0, - &gPlayerAnim_0023E8, - { &gPlayerAnim_0023F0, &gPlayerAnim_0023F8, &gPlayerAnim_002D90, &gPlayerAnim_002D98 }, - { &gPlayerAnim_002D70, &gPlayerAnim_002D78 }, - { &gPlayerAnim_0023C0, &gPlayerAnim_0023C8 }, - { &gPlayerAnim_0023D8, &gPlayerAnim_0023D0 }, + &gPlayerAnim_clink_demo_Tbox_open, + &gPlayerAnim_clink_demo_goto_future, + &gPlayerAnim_clink_demo_return_to_future, + &gPlayerAnim_clink_normal_climb_startA, + &gPlayerAnim_clink_normal_climb_startB, + { &gPlayerAnim_clink_normal_climb_upL, &gPlayerAnim_clink_normal_climb_upR, &gPlayerAnim_link_normal_Fclimb_upL, + &gPlayerAnim_link_normal_Fclimb_upR }, + { &gPlayerAnim_link_normal_Fclimb_sideL, &gPlayerAnim_link_normal_Fclimb_sideR }, + { &gPlayerAnim_clink_normal_climb_endAL, &gPlayerAnim_clink_normal_climb_endAR }, + { &gPlayerAnim_clink_normal_climb_endBR, &gPlayerAnim_clink_normal_climb_endBL }, }, }; @@ -484,157 +486,438 @@ static u16 D_8085361C[] = { static LinkAnimationHeader* D_80853914[PLAYER_ANIMGROUP_MAX][PLAYER_ANIMTYPE_MAX] = { /* PLAYER_ANIMGROUP_0 */ - { &gPlayerAnim_003240, &gPlayerAnim_003238, &gPlayerAnim_003238, &gPlayerAnim_002BE0, &gPlayerAnim_003240, - &gPlayerAnim_003240 }, - /* PLAYER_ANIMGROUP_1 */ - { &gPlayerAnim_003290, &gPlayerAnim_003268, &gPlayerAnim_003268, &gPlayerAnim_002BF8, &gPlayerAnim_003290, - &gPlayerAnim_003290 }, - /* PLAYER_ANIMGROUP_2 */ - { &gPlayerAnim_003140, &gPlayerAnim_002B38, &gPlayerAnim_003138, &gPlayerAnim_002B40, &gPlayerAnim_003140, - &gPlayerAnim_003140 }, - /* PLAYER_ANIMGROUP_3 */ - { &gPlayerAnim_002E98, &gPlayerAnim_0029E8, &gPlayerAnim_002E98, &gPlayerAnim_0029F0, &gPlayerAnim_002E98, - &gPlayerAnim_002E98 }, - /* PLAYER_ANIMGROUP_4 */ - { &gPlayerAnim_002FB0, &gPlayerAnim_002FA8, &gPlayerAnim_002FB0, &gPlayerAnim_002A40, &gPlayerAnim_002FB0, - &gPlayerAnim_002FB0 }, - /* PLAYER_ANIMGROUP_5 */ - { &gPlayerAnim_003220, &gPlayerAnim_002590, &gPlayerAnim_002590, &gPlayerAnim_002BC0, &gPlayerAnim_003220, - &gPlayerAnim_003220 }, - /* PLAYER_ANIMGROUP_6 */ - { &gPlayerAnim_003230, &gPlayerAnim_0025D0, &gPlayerAnim_0025D0, &gPlayerAnim_002BD0, &gPlayerAnim_003230, - &gPlayerAnim_003230 }, - /* PLAYER_ANIMGROUP_7 */ - { &gPlayerAnim_002BB0, &gPlayerAnim_0031F8, &gPlayerAnim_0031F8, &gPlayerAnim_002BB0, &gPlayerAnim_002BB0, - &gPlayerAnim_002BB0 }, - /* PLAYER_ANIMGROUP_8 */ - { &gPlayerAnim_003088, &gPlayerAnim_002A70, &gPlayerAnim_002A70, &gPlayerAnim_003088, &gPlayerAnim_003088, - &gPlayerAnim_003088 }, - /* PLAYER_ANIMGROUP_9 */ - { &gPlayerAnim_002750, &gPlayerAnim_002748, &gPlayerAnim_002748, &gPlayerAnim_002750, &gPlayerAnim_002750, - &gPlayerAnim_002750 }, - /* PLAYER_ANIMGROUP_10 */ - { &gPlayerAnim_002330, &gPlayerAnim_002330, &gPlayerAnim_002330, &gPlayerAnim_002330, &gPlayerAnim_002330, - &gPlayerAnim_002330 }, - /* PLAYER_ANIMGROUP_11 */ - { &gPlayerAnim_002760, &gPlayerAnim_002758, &gPlayerAnim_002758, &gPlayerAnim_002760, &gPlayerAnim_002760, - &gPlayerAnim_002760 }, - /* PLAYER_ANIMGROUP_12 */ - { &gPlayerAnim_002338, &gPlayerAnim_002338, &gPlayerAnim_002338, &gPlayerAnim_002338, &gPlayerAnim_002338, - &gPlayerAnim_002338 }, - /* PLAYER_ANIMGROUP_13 */ - { &gPlayerAnim_002E08, &gPlayerAnim_002E00, &gPlayerAnim_002E00, &gPlayerAnim_002E08, &gPlayerAnim_002E08, - &gPlayerAnim_002E08 }, - /* PLAYER_ANIMGROUP_14 */ - { &gPlayerAnim_003028, &gPlayerAnim_003020, &gPlayerAnim_003020, &gPlayerAnim_003028, &gPlayerAnim_003028, - &gPlayerAnim_003028 }, - /* PLAYER_ANIMGROUP_15 */ - { &gPlayerAnim_003170, &gPlayerAnim_003168, &gPlayerAnim_003168, &gPlayerAnim_003170, &gPlayerAnim_003170, - &gPlayerAnim_003170 }, - /* PLAYER_ANIMGROUP_16 */ - { &gPlayerAnim_003038, &gPlayerAnim_003030, &gPlayerAnim_003030, &gPlayerAnim_002A68, &gPlayerAnim_003038, - &gPlayerAnim_003038 }, - /* PLAYER_ANIMGROUP_17 */ - { &gPlayerAnim_002FC0, &gPlayerAnim_002FB8, &gPlayerAnim_002FB8, &gPlayerAnim_002FC8, &gPlayerAnim_002FC0, - &gPlayerAnim_002FC0 }, - /* PLAYER_ANIMGROUP_18 */ - { &gPlayerAnim_003278, &gPlayerAnim_003270, &gPlayerAnim_003270, &gPlayerAnim_002BE8, &gPlayerAnim_003278, - &gPlayerAnim_003278 }, - /* PLAYER_ANIMGROUP_19 */ - { &gPlayerAnim_003288, &gPlayerAnim_003280, &gPlayerAnim_003280, &gPlayerAnim_002BF0, &gPlayerAnim_003288, - &gPlayerAnim_003288 }, - /* PLAYER_ANIMGROUP_20 */ - { &gPlayerAnim_002EB8, &gPlayerAnim_002EA0, &gPlayerAnim_002EA0, &gPlayerAnim_002EB8, &gPlayerAnim_0026C8, - &gPlayerAnim_002EB8 }, - /* PLAYER_ANIMGROUP_21 */ - { &gPlayerAnim_002ED8, &gPlayerAnim_002ED0, &gPlayerAnim_002ED0, &gPlayerAnim_002ED8, &gPlayerAnim_0026D0, - &gPlayerAnim_002ED8 }, - /* PLAYER_ANIMGROUP_22 */ - { &gPlayerAnim_002EB0, &gPlayerAnim_002EA8, &gPlayerAnim_002EA8, &gPlayerAnim_002EB0, &gPlayerAnim_002EB0, - &gPlayerAnim_002EB0 }, - /* PLAYER_ANIMGROUP_23 */ - { &gPlayerAnim_003190, &gPlayerAnim_003188, &gPlayerAnim_003188, &gPlayerAnim_002B68, &gPlayerAnim_003190, - &gPlayerAnim_003190 }, - /* PLAYER_ANIMGROUP_24 */ - { &gPlayerAnim_003178, &gPlayerAnim_002568, &gPlayerAnim_002568, &gPlayerAnim_002B58, &gPlayerAnim_003178, - &gPlayerAnim_003178 }, - /* PLAYER_ANIMGROUP_25 */ - { &gPlayerAnim_003180, &gPlayerAnim_002570, &gPlayerAnim_002570, &gPlayerAnim_002B60, &gPlayerAnim_003180, - &gPlayerAnim_003180 }, - /* PLAYER_ANIMGROUP_26 */ - { &gPlayerAnim_002D60, &gPlayerAnim_002D58, &gPlayerAnim_002D58, &gPlayerAnim_002D60, &gPlayerAnim_002D60, - &gPlayerAnim_002D60 }, - /* PLAYER_ANIMGROUP_27 */ - { &gPlayerAnim_002BB8, &gPlayerAnim_003218, &gPlayerAnim_003218, &gPlayerAnim_002BB8, &gPlayerAnim_002BB8, - &gPlayerAnim_002BB8 }, - /* PLAYER_ANIMGROUP_28 */ - { &gPlayerAnim_002BC8, &gPlayerAnim_003228, &gPlayerAnim_003228, &gPlayerAnim_002BC8, &gPlayerAnim_002BC8, - &gPlayerAnim_002BC8 }, - /* PLAYER_ANIMGROUP_29 */ - { &gPlayerAnim_0031C8, &gPlayerAnim_0031C0, &gPlayerAnim_0031C0, &gPlayerAnim_0031C8, &gPlayerAnim_0031C8, - &gPlayerAnim_0031C8 }, - /* PLAYER_ANIMGROUP_30 */ - { &gPlayerAnim_003118, &gPlayerAnim_003110, &gPlayerAnim_003110, &gPlayerAnim_003118, &gPlayerAnim_003118, - &gPlayerAnim_003118 }, - /* PLAYER_ANIMGROUP_31 */ - { &gPlayerAnim_002DE8, &gPlayerAnim_002DE8, &gPlayerAnim_002DE8, &gPlayerAnim_002DE8, &gPlayerAnim_002DE8, - &gPlayerAnim_002DE8 }, - /* PLAYER_ANIMGROUP_32 */ - { &gPlayerAnim_002E30, &gPlayerAnim_002E18, &gPlayerAnim_002E18, &gPlayerAnim_002E30, &gPlayerAnim_002E30, - &gPlayerAnim_002E30 }, - /* PLAYER_ANIMGROUP_33 */ - { &gPlayerAnim_002E40, &gPlayerAnim_002E38, &gPlayerAnim_002E38, &gPlayerAnim_002E40, &gPlayerAnim_002E40, - &gPlayerAnim_002E40 }, - /* PLAYER_ANIMGROUP_34 */ - { &gPlayerAnim_002E28, &gPlayerAnim_002E20, &gPlayerAnim_002E20, &gPlayerAnim_002E28, &gPlayerAnim_002E28, - &gPlayerAnim_002E28 }, - /* PLAYER_ANIMGROUP_35 */ - { &gPlayerAnim_0030C8, &gPlayerAnim_0030C0, &gPlayerAnim_0030C0, &gPlayerAnim_0030C8, &gPlayerAnim_0030C8, - &gPlayerAnim_0030C8 }, - /* PLAYER_ANIMGROUP_36 */ - { &gPlayerAnim_0030D8, &gPlayerAnim_0030D0, &gPlayerAnim_0030D0, &gPlayerAnim_0030D8, &gPlayerAnim_0030D8, - &gPlayerAnim_0030D8 }, - /* PLAYER_ANIMGROUP_37 */ - { &gPlayerAnim_0030B8, &gPlayerAnim_0030B0, &gPlayerAnim_0030B0, &gPlayerAnim_0030B8, &gPlayerAnim_0030B8, - &gPlayerAnim_0030B8 }, - /* PLAYER_ANIMGROUP_38 */ - { &gPlayerAnim_002F20, &gPlayerAnim_002F18, &gPlayerAnim_002F18, &gPlayerAnim_002F20, &gPlayerAnim_002F20, - &gPlayerAnim_002F20 }, - /* PLAYER_ANIMGROUP_39 */ - { &gPlayerAnim_002FF0, &gPlayerAnim_002FE8, &gPlayerAnim_002FE8, &gPlayerAnim_002FF0, &gPlayerAnim_002FF0, - &gPlayerAnim_002FF0 }, - /* PLAYER_ANIMGROUP_40 */ - { &gPlayerAnim_003010, &gPlayerAnim_003008, &gPlayerAnim_003008, &gPlayerAnim_003010, &gPlayerAnim_003010, - &gPlayerAnim_003010 }, - /* PLAYER_ANIMGROUP_41 */ - { &gPlayerAnim_003000, &gPlayerAnim_002FF8, &gPlayerAnim_002FF8, &gPlayerAnim_003000, &gPlayerAnim_003000, - &gPlayerAnim_003000 }, - /* PLAYER_ANIMGROUP_42 */ - { &gPlayerAnim_002EF0, &gPlayerAnim_002EE8, &gPlayerAnim_002EE8, &gPlayerAnim_002EF8, &gPlayerAnim_002EF0, - &gPlayerAnim_002EF0 }, - /* PLAYER_ANIMGROUP_43 */ - { &gPlayerAnim_0031E0, &gPlayerAnim_0031D8, &gPlayerAnim_0031D8, &gPlayerAnim_0031E8, &gPlayerAnim_0031E0, - &gPlayerAnim_0031E0 }, - /* PLAYER_ANIMGROUP_44 */ - { &gPlayerAnim_003468, &gPlayerAnim_003438, &gPlayerAnim_003438, &gPlayerAnim_003468, &gPlayerAnim_003468, - &gPlayerAnim_003468 }, + { + &gPlayerAnim_link_normal_wait_free, + &gPlayerAnim_link_normal_wait, + &gPlayerAnim_link_normal_wait, + &gPlayerAnim_link_fighter_wait_long, + &gPlayerAnim_link_normal_wait_free, + &gPlayerAnim_link_normal_wait_free, + }, + /* PLAYER_ANIMGROUP_1 */ + { + &gPlayerAnim_link_normal_walk_free, + &gPlayerAnim_link_normal_walk, + &gPlayerAnim_link_normal_walk, + &gPlayerAnim_link_fighter_walk_long, + &gPlayerAnim_link_normal_walk_free, + &gPlayerAnim_link_normal_walk_free, + }, + /* PLAYER_ANIMGROUP_2 */ + { + &gPlayerAnim_link_normal_run_free, + &gPlayerAnim_link_fighter_run, + &gPlayerAnim_link_normal_run, + &gPlayerAnim_link_fighter_run_long, + &gPlayerAnim_link_normal_run_free, + &gPlayerAnim_link_normal_run_free, + }, + /* PLAYER_ANIMGROUP_3 */ + { + &gPlayerAnim_link_normal_damage_run_free, + &gPlayerAnim_link_fighter_damage_run, + &gPlayerAnim_link_normal_damage_run_free, + &gPlayerAnim_link_fighter_damage_run_long, + &gPlayerAnim_link_normal_damage_run_free, + &gPlayerAnim_link_normal_damage_run_free, + }, + /* PLAYER_ANIMGROUP_4 */ + { + &gPlayerAnim_link_normal_heavy_run_free, + &gPlayerAnim_link_normal_heavy_run, + &gPlayerAnim_link_normal_heavy_run_free, + &gPlayerAnim_link_fighter_heavy_run_long, + &gPlayerAnim_link_normal_heavy_run_free, + &gPlayerAnim_link_normal_heavy_run_free, + }, + /* PLAYER_ANIMGROUP_5 */ + { + &gPlayerAnim_link_normal_waitL_free, + &gPlayerAnim_link_anchor_waitL, + &gPlayerAnim_link_anchor_waitL, + &gPlayerAnim_link_fighter_waitL_long, + &gPlayerAnim_link_normal_waitL_free, + &gPlayerAnim_link_normal_waitL_free, + }, + /* PLAYER_ANIMGROUP_6 */ + { + &gPlayerAnim_link_normal_waitR_free, + &gPlayerAnim_link_anchor_waitR, + &gPlayerAnim_link_anchor_waitR, + &gPlayerAnim_link_fighter_waitR_long, + &gPlayerAnim_link_normal_waitR_free, + &gPlayerAnim_link_normal_waitR_free, + }, + /* PLAYER_ANIMGROUP_7 */ + { + &gPlayerAnim_link_fighter_wait2waitR_long, + &gPlayerAnim_link_normal_wait2waitR, + &gPlayerAnim_link_normal_wait2waitR, + &gPlayerAnim_link_fighter_wait2waitR_long, + &gPlayerAnim_link_fighter_wait2waitR_long, + &gPlayerAnim_link_fighter_wait2waitR_long, + }, + /* PLAYER_ANIMGROUP_8 */ + { + &gPlayerAnim_link_normal_normal2fighter_free, + &gPlayerAnim_link_fighter_normal2fighter, + &gPlayerAnim_link_fighter_normal2fighter, + &gPlayerAnim_link_normal_normal2fighter_free, + &gPlayerAnim_link_normal_normal2fighter_free, + &gPlayerAnim_link_normal_normal2fighter_free, + }, + /* PLAYER_ANIMGROUP_9 */ + { + &gPlayerAnim_link_demo_doorA_link_free, + &gPlayerAnim_link_demo_doorA_link, + &gPlayerAnim_link_demo_doorA_link, + &gPlayerAnim_link_demo_doorA_link_free, + &gPlayerAnim_link_demo_doorA_link_free, + &gPlayerAnim_link_demo_doorA_link_free, + }, + /* PLAYER_ANIMGROUP_10 */ + { + &gPlayerAnim_clink_demo_doorA_link, + &gPlayerAnim_clink_demo_doorA_link, + &gPlayerAnim_clink_demo_doorA_link, + &gPlayerAnim_clink_demo_doorA_link, + &gPlayerAnim_clink_demo_doorA_link, + &gPlayerAnim_clink_demo_doorA_link, + }, + /* PLAYER_ANIMGROUP_11 */ + { + &gPlayerAnim_link_demo_doorB_link_free, + &gPlayerAnim_link_demo_doorB_link, + &gPlayerAnim_link_demo_doorB_link, + &gPlayerAnim_link_demo_doorB_link_free, + &gPlayerAnim_link_demo_doorB_link_free, + &gPlayerAnim_link_demo_doorB_link_free, + }, + /* PLAYER_ANIMGROUP_12 */ + { + &gPlayerAnim_clink_demo_doorB_link, + &gPlayerAnim_clink_demo_doorB_link, + &gPlayerAnim_clink_demo_doorB_link, + &gPlayerAnim_clink_demo_doorB_link, + &gPlayerAnim_clink_demo_doorB_link, + &gPlayerAnim_clink_demo_doorB_link, + }, + /* PLAYER_ANIMGROUP_13 */ + { + &gPlayerAnim_link_normal_carryB_free, + &gPlayerAnim_link_normal_carryB, + &gPlayerAnim_link_normal_carryB, + &gPlayerAnim_link_normal_carryB_free, + &gPlayerAnim_link_normal_carryB_free, + &gPlayerAnim_link_normal_carryB_free, + }, + /* PLAYER_ANIMGROUP_14 */ + { + &gPlayerAnim_link_normal_landing_free, + &gPlayerAnim_link_normal_landing, + &gPlayerAnim_link_normal_landing, + &gPlayerAnim_link_normal_landing_free, + &gPlayerAnim_link_normal_landing_free, + &gPlayerAnim_link_normal_landing_free, + }, + /* PLAYER_ANIMGROUP_15 */ + { + &gPlayerAnim_link_normal_short_landing_free, + &gPlayerAnim_link_normal_short_landing, + &gPlayerAnim_link_normal_short_landing, + &gPlayerAnim_link_normal_short_landing_free, + &gPlayerAnim_link_normal_short_landing_free, + &gPlayerAnim_link_normal_short_landing_free, + }, + /* PLAYER_ANIMGROUP_16 */ + { + &gPlayerAnim_link_normal_landing_roll_free, + &gPlayerAnim_link_normal_landing_roll, + &gPlayerAnim_link_normal_landing_roll, + &gPlayerAnim_link_fighter_landing_roll_long, + &gPlayerAnim_link_normal_landing_roll_free, + &gPlayerAnim_link_normal_landing_roll_free, + }, + /* PLAYER_ANIMGROUP_17 */ + { + &gPlayerAnim_link_normal_hip_down_free, + &gPlayerAnim_link_normal_hip_down, + &gPlayerAnim_link_normal_hip_down, + &gPlayerAnim_link_normal_hip_down_long, + &gPlayerAnim_link_normal_hip_down_free, + &gPlayerAnim_link_normal_hip_down_free, + }, + /* PLAYER_ANIMGROUP_18 */ + { + &gPlayerAnim_link_normal_walk_endL_free, + &gPlayerAnim_link_normal_walk_endL, + &gPlayerAnim_link_normal_walk_endL, + &gPlayerAnim_link_fighter_walk_endL_long, + &gPlayerAnim_link_normal_walk_endL_free, + &gPlayerAnim_link_normal_walk_endL_free, + }, + /* PLAYER_ANIMGROUP_19 */ + { + &gPlayerAnim_link_normal_walk_endR_free, + &gPlayerAnim_link_normal_walk_endR, + &gPlayerAnim_link_normal_walk_endR, + &gPlayerAnim_link_fighter_walk_endR_long, + &gPlayerAnim_link_normal_walk_endR_free, + &gPlayerAnim_link_normal_walk_endR_free, + }, + /* PLAYER_ANIMGROUP_20 */ + { + &gPlayerAnim_link_normal_defense_free, + &gPlayerAnim_link_normal_defense, + &gPlayerAnim_link_normal_defense, + &gPlayerAnim_link_normal_defense_free, + &gPlayerAnim_link_bow_defense, + &gPlayerAnim_link_normal_defense_free, + }, + /* PLAYER_ANIMGROUP_21 */ + { + &gPlayerAnim_link_normal_defense_wait_free, + &gPlayerAnim_link_normal_defense_wait, + &gPlayerAnim_link_normal_defense_wait, + &gPlayerAnim_link_normal_defense_wait_free, + &gPlayerAnim_link_bow_defense_wait, + &gPlayerAnim_link_normal_defense_wait_free, + }, + /* PLAYER_ANIMGROUP_22 */ + { + &gPlayerAnim_link_normal_defense_end_free, + &gPlayerAnim_link_normal_defense_end, + &gPlayerAnim_link_normal_defense_end, + &gPlayerAnim_link_normal_defense_end_free, + &gPlayerAnim_link_normal_defense_end_free, + &gPlayerAnim_link_normal_defense_end_free, + }, + /* PLAYER_ANIMGROUP_23 */ + { + &gPlayerAnim_link_normal_side_walk_free, + &gPlayerAnim_link_normal_side_walk, + &gPlayerAnim_link_normal_side_walk, + &gPlayerAnim_link_fighter_side_walk_long, + &gPlayerAnim_link_normal_side_walk_free, + &gPlayerAnim_link_normal_side_walk_free, + }, + /* PLAYER_ANIMGROUP_24 */ + { + &gPlayerAnim_link_normal_side_walkL_free, + &gPlayerAnim_link_anchor_side_walkL, + &gPlayerAnim_link_anchor_side_walkL, + &gPlayerAnim_link_fighter_side_walkL_long, + &gPlayerAnim_link_normal_side_walkL_free, + &gPlayerAnim_link_normal_side_walkL_free, + }, + /* PLAYER_ANIMGROUP_25 */ + { + &gPlayerAnim_link_normal_side_walkR_free, + &gPlayerAnim_link_anchor_side_walkR, + &gPlayerAnim_link_anchor_side_walkR, + &gPlayerAnim_link_fighter_side_walkR_long, + &gPlayerAnim_link_normal_side_walkR_free, + &gPlayerAnim_link_normal_side_walkR_free, + }, + /* PLAYER_ANIMGROUP_26 */ + { + &gPlayerAnim_link_normal_45_turn_free, + &gPlayerAnim_link_normal_45_turn, + &gPlayerAnim_link_normal_45_turn, + &gPlayerAnim_link_normal_45_turn_free, + &gPlayerAnim_link_normal_45_turn_free, + &gPlayerAnim_link_normal_45_turn_free, + }, + /* PLAYER_ANIMGROUP_27 */ + { + &gPlayerAnim_link_fighter_waitL2wait_long, + &gPlayerAnim_link_normal_waitL2wait, + &gPlayerAnim_link_normal_waitL2wait, + &gPlayerAnim_link_fighter_waitL2wait_long, + &gPlayerAnim_link_fighter_waitL2wait_long, + &gPlayerAnim_link_fighter_waitL2wait_long, + }, + /* PLAYER_ANIMGROUP_28 */ + { + &gPlayerAnim_link_fighter_waitR2wait_long, + &gPlayerAnim_link_normal_waitR2wait, + &gPlayerAnim_link_normal_waitR2wait, + &gPlayerAnim_link_fighter_waitR2wait_long, + &gPlayerAnim_link_fighter_waitR2wait_long, + &gPlayerAnim_link_fighter_waitR2wait_long, + }, + /* PLAYER_ANIMGROUP_29 */ + { + &gPlayerAnim_link_normal_throw_free, + &gPlayerAnim_link_normal_throw, + &gPlayerAnim_link_normal_throw, + &gPlayerAnim_link_normal_throw_free, + &gPlayerAnim_link_normal_throw_free, + &gPlayerAnim_link_normal_throw_free, + }, + /* PLAYER_ANIMGROUP_30 */ + { + &gPlayerAnim_link_normal_put_free, + &gPlayerAnim_link_normal_put, + &gPlayerAnim_link_normal_put, + &gPlayerAnim_link_normal_put_free, + &gPlayerAnim_link_normal_put_free, + &gPlayerAnim_link_normal_put_free, + }, + /* PLAYER_ANIMGROUP_31 */ + { + &gPlayerAnim_link_normal_back_walk, + &gPlayerAnim_link_normal_back_walk, + &gPlayerAnim_link_normal_back_walk, + &gPlayerAnim_link_normal_back_walk, + &gPlayerAnim_link_normal_back_walk, + &gPlayerAnim_link_normal_back_walk, + }, + /* PLAYER_ANIMGROUP_32 */ + { + &gPlayerAnim_link_normal_check_free, + &gPlayerAnim_link_normal_check, + &gPlayerAnim_link_normal_check, + &gPlayerAnim_link_normal_check_free, + &gPlayerAnim_link_normal_check_free, + &gPlayerAnim_link_normal_check_free, + }, + /* PLAYER_ANIMGROUP_33 */ + { + &gPlayerAnim_link_normal_check_wait_free, + &gPlayerAnim_link_normal_check_wait, + &gPlayerAnim_link_normal_check_wait, + &gPlayerAnim_link_normal_check_wait_free, + &gPlayerAnim_link_normal_check_wait_free, + &gPlayerAnim_link_normal_check_wait_free, + }, + /* PLAYER_ANIMGROUP_34 */ + { + &gPlayerAnim_link_normal_check_end_free, + &gPlayerAnim_link_normal_check_end, + &gPlayerAnim_link_normal_check_end, + &gPlayerAnim_link_normal_check_end_free, + &gPlayerAnim_link_normal_check_end_free, + &gPlayerAnim_link_normal_check_end_free, + }, + /* PLAYER_ANIMGROUP_35 */ + { + &gPlayerAnim_link_normal_pull_start_free, + &gPlayerAnim_link_normal_pull_start, + &gPlayerAnim_link_normal_pull_start, + &gPlayerAnim_link_normal_pull_start_free, + &gPlayerAnim_link_normal_pull_start_free, + &gPlayerAnim_link_normal_pull_start_free, + }, + /* PLAYER_ANIMGROUP_36 */ + { + &gPlayerAnim_link_normal_pulling_free, + &gPlayerAnim_link_normal_pulling, + &gPlayerAnim_link_normal_pulling, + &gPlayerAnim_link_normal_pulling_free, + &gPlayerAnim_link_normal_pulling_free, + &gPlayerAnim_link_normal_pulling_free, + }, + /* PLAYER_ANIMGROUP_37 */ + { + &gPlayerAnim_link_normal_pull_end_free, + &gPlayerAnim_link_normal_pull_end, + &gPlayerAnim_link_normal_pull_end, + &gPlayerAnim_link_normal_pull_end_free, + &gPlayerAnim_link_normal_pull_end_free, + &gPlayerAnim_link_normal_pull_end_free, + }, + /* PLAYER_ANIMGROUP_38 */ + { + &gPlayerAnim_link_normal_fall_up_free, + &gPlayerAnim_link_normal_fall_up, + &gPlayerAnim_link_normal_fall_up, + &gPlayerAnim_link_normal_fall_up_free, + &gPlayerAnim_link_normal_fall_up_free, + &gPlayerAnim_link_normal_fall_up_free, + }, + /* PLAYER_ANIMGROUP_39 */ + { + &gPlayerAnim_link_normal_jump_climb_hold_free, + &gPlayerAnim_link_normal_jump_climb_hold, + &gPlayerAnim_link_normal_jump_climb_hold, + &gPlayerAnim_link_normal_jump_climb_hold_free, + &gPlayerAnim_link_normal_jump_climb_hold_free, + &gPlayerAnim_link_normal_jump_climb_hold_free, + }, + /* PLAYER_ANIMGROUP_40 */ + { + &gPlayerAnim_link_normal_jump_climb_wait_free, + &gPlayerAnim_link_normal_jump_climb_wait, + &gPlayerAnim_link_normal_jump_climb_wait, + &gPlayerAnim_link_normal_jump_climb_wait_free, + &gPlayerAnim_link_normal_jump_climb_wait_free, + &gPlayerAnim_link_normal_jump_climb_wait_free, + }, + /* PLAYER_ANIMGROUP_41 */ + { + &gPlayerAnim_link_normal_jump_climb_up_free, + &gPlayerAnim_link_normal_jump_climb_up, + &gPlayerAnim_link_normal_jump_climb_up, + &gPlayerAnim_link_normal_jump_climb_up_free, + &gPlayerAnim_link_normal_jump_climb_up_free, + &gPlayerAnim_link_normal_jump_climb_up_free, + }, + /* PLAYER_ANIMGROUP_42 */ + { + &gPlayerAnim_link_normal_down_slope_slip_end_free, + &gPlayerAnim_link_normal_down_slope_slip_end, + &gPlayerAnim_link_normal_down_slope_slip_end, + &gPlayerAnim_link_normal_down_slope_slip_end_long, + &gPlayerAnim_link_normal_down_slope_slip_end_free, + &gPlayerAnim_link_normal_down_slope_slip_end_free, + }, + /* PLAYER_ANIMGROUP_43 */ + { + &gPlayerAnim_link_normal_up_slope_slip_end_free, + &gPlayerAnim_link_normal_up_slope_slip_end, + &gPlayerAnim_link_normal_up_slope_slip_end, + &gPlayerAnim_link_normal_up_slope_slip_end_long, + &gPlayerAnim_link_normal_up_slope_slip_end_free, + &gPlayerAnim_link_normal_up_slope_slip_end_free, + }, + /* PLAYER_ANIMGROUP_44 */ + { + &gPlayerAnim_sude_nwait, + &gPlayerAnim_lkt_nwait, + &gPlayerAnim_lkt_nwait, + &gPlayerAnim_sude_nwait, + &gPlayerAnim_sude_nwait, + &gPlayerAnim_sude_nwait, + } }; static LinkAnimationHeader* D_80853D4C[][3] = { - { &gPlayerAnim_002A28, &gPlayerAnim_002A38, &gPlayerAnim_002A30 }, - { &gPlayerAnim_002950, &gPlayerAnim_002960, &gPlayerAnim_002958 }, - { &gPlayerAnim_0029D0, &gPlayerAnim_0029E0, &gPlayerAnim_0029D8 }, - { &gPlayerAnim_002988, &gPlayerAnim_002998, &gPlayerAnim_002990 }, + { &gPlayerAnim_link_fighter_front_jump, &gPlayerAnim_link_fighter_front_jump_end, + &gPlayerAnim_link_fighter_front_jump_endR }, + { &gPlayerAnim_link_fighter_Lside_jump, &gPlayerAnim_link_fighter_Lside_jump_end, + &gPlayerAnim_link_fighter_Lside_jump_endL }, + { &gPlayerAnim_link_fighter_backturn_jump, &gPlayerAnim_link_fighter_backturn_jump_end, + &gPlayerAnim_link_fighter_backturn_jump_endR }, + { &gPlayerAnim_link_fighter_Rside_jump, &gPlayerAnim_link_fighter_Rside_jump_end, + &gPlayerAnim_link_fighter_Rside_jump_endR }, }; static LinkAnimationHeader* D_80853D7C[][2] = { - { &gPlayerAnim_003248, &gPlayerAnim_003200 }, { &gPlayerAnim_003258, &gPlayerAnim_003210 }, - { &gPlayerAnim_003250, &gPlayerAnim_003208 }, { &gPlayerAnim_003250, &gPlayerAnim_003208 }, - { &gPlayerAnim_003430, &gPlayerAnim_0033F0 }, { &gPlayerAnim_003430, &gPlayerAnim_0033F0 }, - { &gPlayerAnim_003430, &gPlayerAnim_0033F0 }, { &gPlayerAnim_0033F8, &gPlayerAnim_0033D0 }, - { &gPlayerAnim_003400, &gPlayerAnim_0033D8 }, { &gPlayerAnim_003420, &gPlayerAnim_003420 }, - { &gPlayerAnim_003408, &gPlayerAnim_0033E0 }, { &gPlayerAnim_003410, &gPlayerAnim_0033E8 }, - { &gPlayerAnim_003418, &gPlayerAnim_003418 }, { &gPlayerAnim_003428, &gPlayerAnim_003428 } + { &gPlayerAnim_link_normal_wait_typeA_20f, &gPlayerAnim_link_normal_waitF_typeA_20f }, + { &gPlayerAnim_link_normal_wait_typeC_20f, &gPlayerAnim_link_normal_waitF_typeC_20f }, + { &gPlayerAnim_link_normal_wait_typeB_20f, &gPlayerAnim_link_normal_waitF_typeB_20f }, + { &gPlayerAnim_link_normal_wait_typeB_20f, &gPlayerAnim_link_normal_waitF_typeB_20f }, + { &gPlayerAnim_link_wait_typeD_20f, &gPlayerAnim_link_waitF_typeD_20f }, + { &gPlayerAnim_link_wait_typeD_20f, &gPlayerAnim_link_waitF_typeD_20f }, + { &gPlayerAnim_link_wait_typeD_20f, &gPlayerAnim_link_waitF_typeD_20f }, + { &gPlayerAnim_link_wait_heat1_20f, &gPlayerAnim_link_waitF_heat1_20f }, + { &gPlayerAnim_link_wait_heat2_20f, &gPlayerAnim_link_waitF_heat2_20f }, + { &gPlayerAnim_link_wait_itemD1_20f, &gPlayerAnim_link_wait_itemD1_20f }, + { &gPlayerAnim_link_wait_itemA_20f, &gPlayerAnim_link_waitF_itemA_20f }, + { &gPlayerAnim_link_wait_itemB_20f, &gPlayerAnim_link_waitF_itemB_20f }, + { &gPlayerAnim_link_wait_itemC_20f, &gPlayerAnim_link_wait_itemC_20f }, + { &gPlayerAnim_link_wait_itemD2_20f, &gPlayerAnim_link_wait_itemD2_20f } }; static struct_80832924 D_80853DEC[] = { @@ -771,7 +1054,7 @@ static s8 sItemActionParams[] = { static u8 sMaskMemory; // Used to map action params to update functions -static s32(*D_80853EDC[])(Player* this, GlobalContext* globalCtx) = { +static s32 (*D_80853EDC[])(Player* this, GlobalContext* globalCtx) = { func_8083485C, func_8083485C, func_8083485C, func_808349DC, func_808349DC, func_808349DC, func_8083485C, func_8083485C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_808356E8, func_808356E8, func_80835800, @@ -818,20 +1101,20 @@ typedef enum { } PlayerD_808540F4Index; static struct_808540F4 D_808540F4[PLAYER_D_808540F4_MAX] = { - /* PLAYER_D_808540F4_0 */ { &gPlayerAnim_002F50, 12 }, - /* PLAYER_D_808540F4_1 */ { &gPlayerAnim_003080, 6 }, - /* PLAYER_D_808540F4_2 */ { &gPlayerAnim_002C68, 8 }, - /* PLAYER_D_808540F4_3 */ { &gPlayerAnim_003090, 8 }, - /* PLAYER_D_808540F4_4 */ { &gPlayerAnim_002A20, 8 }, - /* PLAYER_D_808540F4_5 */ { &gPlayerAnim_002F30, 10 }, - /* PLAYER_D_808540F4_6 */ { &gPlayerAnim_002C58, 7 }, - /* PLAYER_D_808540F4_7 */ { &gPlayerAnim_002C60, 11 }, - /* PLAYER_D_808540F4_8 */ { &gPlayerAnim_002F50, 12 }, - /* PLAYER_D_808540F4_9 */ { &gPlayerAnim_003078, 4 }, - /* PLAYER_D_808540F4_10 */ { &gPlayerAnim_003058, 4 }, - /* PLAYER_D_808540F4_11 */ { &gPlayerAnim_002F38, 4 }, - /* PLAYER_D_808540F4_12 */ { &gPlayerAnim_0024E0, 5 }, - /* PLAYER_D_808540F4_13 */ { &gPlayerAnim_002F48, 13 }, + /* PLAYER_D_808540F4_0 */ { &gPlayerAnim_link_normal_free2free, 12 }, + /* PLAYER_D_808540F4_1 */ { &gPlayerAnim_link_normal_normal2fighter, 6 }, + /* PLAYER_D_808540F4_2 */ { &gPlayerAnim_link_hammer_normal2long, 8 }, + /* PLAYER_D_808540F4_3 */ { &gPlayerAnim_link_normal_normal2free, 8 }, + /* PLAYER_D_808540F4_4 */ { &gPlayerAnim_link_fighter_fighter2long, 8 }, + /* PLAYER_D_808540F4_5 */ { &gPlayerAnim_link_normal_fighter2free, 10 }, + /* PLAYER_D_808540F4_6 */ { &gPlayerAnim_link_hammer_long2free, 7 }, + /* PLAYER_D_808540F4_7 */ { &gPlayerAnim_link_hammer_long2long, 11 }, + /* PLAYER_D_808540F4_8 */ { &gPlayerAnim_link_normal_free2free, 12 }, + /* PLAYER_D_808540F4_9 */ { &gPlayerAnim_link_normal_normal2bom, 4 }, + /* PLAYER_D_808540F4_10 */ { &gPlayerAnim_link_normal_long2bom, 4 }, + /* PLAYER_D_808540F4_11 */ { &gPlayerAnim_link_normal_free2bom, 4 }, + /* PLAYER_D_808540F4_12 */ { &gPlayerAnim_link_anchor_anchor2fighter, 5 }, + /* PLAYER_D_808540F4_13 */ { &gPlayerAnim_link_normal_free2freeB, 13 }, }; static s8 D_80854164[PLAYER_ANIMTYPE_MAX][PLAYER_ANIMTYPE_MAX] = { @@ -855,64 +1138,91 @@ static ExplosiveInfo sExplosiveInfos[] = { }; static struct_80854190 D_80854190[] = { - { &gPlayerAnim_002A80, &gPlayerAnim_002A90, &gPlayerAnim_002A88, 1, 4 }, - { &gPlayerAnim_0028C0, &gPlayerAnim_0028C8, &gPlayerAnim_002498, 1, 4 }, - { &gPlayerAnim_002A98, &gPlayerAnim_002AA0, &gPlayerAnim_002540, 0, 5 }, - { &gPlayerAnim_0028D0, &gPlayerAnim_0028D8, &gPlayerAnim_0024A0, 1, 7 }, - { &gPlayerAnim_002968, &gPlayerAnim_002970, &gPlayerAnim_0024C0, 1, 4 }, - { &gPlayerAnim_002880, &gPlayerAnim_002888, &gPlayerAnim_002478, 0, 5 }, - { &gPlayerAnim_002978, &gPlayerAnim_002980, &gPlayerAnim_0024C8, 2, 8 }, - { &gPlayerAnim_002890, &gPlayerAnim_002898, &gPlayerAnim_002480, 3, 8 }, - { &gPlayerAnim_0029A0, &gPlayerAnim_0029A8, &gPlayerAnim_0024D0, 0, 4 }, - { &gPlayerAnim_0028A0, &gPlayerAnim_0028A8, &gPlayerAnim_002488, 0, 5 }, - { &gPlayerAnim_0029B0, &gPlayerAnim_0029B8, &gPlayerAnim_0024D8, 0, 6 }, - { &gPlayerAnim_0028B0, &gPlayerAnim_0028B8, &gPlayerAnim_002490, 1, 5 }, - { &gPlayerAnim_002AA8, &gPlayerAnim_002AB0, &gPlayerAnim_002548, 0, 3 }, - { &gPlayerAnim_0028E0, &gPlayerAnim_0028E8, &gPlayerAnim_0024A8, 0, 3 }, - { &gPlayerAnim_002AB8, &gPlayerAnim_002AC0, &gPlayerAnim_002550, 1, 9 }, - { &gPlayerAnim_0028F0, &gPlayerAnim_0028F8, &gPlayerAnim_0024B0, 1, 8 }, - { &gPlayerAnim_002A60, &gPlayerAnim_002A50, &gPlayerAnim_002A50, 1, 10 }, - { &gPlayerAnim_002900, &gPlayerAnim_002910, &gPlayerAnim_002910, 1, 11 }, - { &gPlayerAnim_002A50, &gPlayerAnim_002A58, &gPlayerAnim_002A58, 1, 2 }, - { &gPlayerAnim_002910, &gPlayerAnim_002908, &gPlayerAnim_002908, 1, 2 }, - { &gPlayerAnim_002B80, &gPlayerAnim_002B88, &gPlayerAnim_002B88, 1, 5 }, - { &gPlayerAnim_002B70, &gPlayerAnim_002B78, &gPlayerAnim_002B78, 1, 4 }, - { &gPlayerAnim_002C40, &gPlayerAnim_002C50, &gPlayerAnim_002C48, 3, 10 }, - { &gPlayerAnim_002C70, &gPlayerAnim_002C80, &gPlayerAnim_002C78, 2, 11 }, - { &gPlayerAnim_002B28, &gPlayerAnim_002B30, &gPlayerAnim_002560, 0, 12 }, - { &gPlayerAnim_002940, &gPlayerAnim_002948, &gPlayerAnim_0024B8, 0, 15 }, - { &gPlayerAnim_0029C0, &gPlayerAnim_0029C8, &gPlayerAnim_002560, 0, 16 }, - { &gPlayerAnim_0029C0, &gPlayerAnim_0029C8, &gPlayerAnim_0024B8, 0, 16 }, + { &gPlayerAnim_link_fighter_normal_kiru, &gPlayerAnim_link_fighter_normal_kiru_end, + &gPlayerAnim_link_fighter_normal_kiru_endR, 1, 4 }, + { &gPlayerAnim_link_fighter_Lnormal_kiru, &gPlayerAnim_link_fighter_Lnormal_kiru_end, + &gPlayerAnim_link_anchor_Lnormal_kiru_endR, 1, 4 }, + { &gPlayerAnim_link_fighter_normal_kiru_finsh, &gPlayerAnim_link_fighter_normal_kiru_finsh_end, + &gPlayerAnim_link_anchor_normal_kiru_finsh_endR, 0, 5 }, + { &gPlayerAnim_link_fighter_Lnormal_kiru_finsh, &gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end, + &gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR, 1, 7 }, + { &gPlayerAnim_link_fighter_Lside_kiru, &gPlayerAnim_link_fighter_Lside_kiru_end, + &gPlayerAnim_link_anchor_Lside_kiru_endR, 1, 4 }, + { &gPlayerAnim_link_fighter_LLside_kiru, &gPlayerAnim_link_fighter_LLside_kiru_end, + &gPlayerAnim_link_anchor_LLside_kiru_endL, 0, 5 }, + { &gPlayerAnim_link_fighter_Lside_kiru_finsh, &gPlayerAnim_link_fighter_Lside_kiru_finsh_end, + &gPlayerAnim_link_anchor_Lside_kiru_finsh_endR, 2, 8 }, + { &gPlayerAnim_link_fighter_LLside_kiru_finsh, &gPlayerAnim_link_fighter_LLside_kiru_finsh_end, + &gPlayerAnim_link_anchor_LLside_kiru_finsh_endR, 3, 8 }, + { &gPlayerAnim_link_fighter_Rside_kiru, &gPlayerAnim_link_fighter_Rside_kiru_end, + &gPlayerAnim_link_anchor_Rside_kiru_endR, 0, 4 }, + { &gPlayerAnim_link_fighter_LRside_kiru, &gPlayerAnim_link_fighter_LRside_kiru_end, + &gPlayerAnim_link_anchor_LRside_kiru_endR, 0, 5 }, + { &gPlayerAnim_link_fighter_Rside_kiru_finsh, &gPlayerAnim_link_fighter_Rside_kiru_finsh_end, + &gPlayerAnim_link_anchor_Rside_kiru_finsh_endR, 0, 6 }, + { &gPlayerAnim_link_fighter_LRside_kiru_finsh, &gPlayerAnim_link_fighter_LRside_kiru_finsh_end, + &gPlayerAnim_link_anchor_LRside_kiru_finsh_endL, 1, 5 }, + { &gPlayerAnim_link_fighter_pierce_kiru, &gPlayerAnim_link_fighter_pierce_kiru_end, + &gPlayerAnim_link_anchor_pierce_kiru_endR, 0, 3 }, + { &gPlayerAnim_link_fighter_Lpierce_kiru, &gPlayerAnim_link_fighter_Lpierce_kiru_end, + &gPlayerAnim_link_anchor_Lpierce_kiru_endL, 0, 3 }, + { &gPlayerAnim_link_fighter_pierce_kiru_finsh, &gPlayerAnim_link_fighter_pierce_kiru_finsh_end, + &gPlayerAnim_link_anchor_pierce_kiru_finsh_endR, 1, 9 }, + { &gPlayerAnim_link_fighter_Lpierce_kiru_finsh, &gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end, + &gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR, 1, 8 }, + { &gPlayerAnim_link_fighter_jump_rollkiru, &gPlayerAnim_link_fighter_jump_kiru_finsh, + &gPlayerAnim_link_fighter_jump_kiru_finsh, 1, 10 }, + { &gPlayerAnim_link_fighter_Lpower_jump_kiru, &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, + &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, 1, 11 }, + { &gPlayerAnim_link_fighter_jump_kiru_finsh, &gPlayerAnim_link_fighter_jump_kiru_finsh_end, + &gPlayerAnim_link_fighter_jump_kiru_finsh_end, 1, 2 }, + { &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, &gPlayerAnim_link_fighter_Lpower_jump_kiru_end, + &gPlayerAnim_link_fighter_Lpower_jump_kiru_end, 1, 2 }, + { &gPlayerAnim_link_fighter_turn_kiruR, &gPlayerAnim_link_fighter_turn_kiruR_end, + &gPlayerAnim_link_fighter_turn_kiruR_end, 1, 5 }, + { &gPlayerAnim_link_fighter_turn_kiruL, &gPlayerAnim_link_fighter_turn_kiruL_end, + &gPlayerAnim_link_fighter_turn_kiruL_end, 1, 4 }, + { &gPlayerAnim_link_hammer_hit, &gPlayerAnim_link_hammer_hit_end, &gPlayerAnim_link_hammer_hit_endR, 3, 10 }, + { &gPlayerAnim_link_hammer_side_hit, &gPlayerAnim_link_hammer_side_hit_end, &gPlayerAnim_link_hammer_side_hit_endR, + 2, 11 }, + { &gPlayerAnim_link_fighter_rolling_kiru, &gPlayerAnim_link_fighter_rolling_kiru_end, + &gPlayerAnim_link_anchor_rolling_kiru_endR, 0, 12 }, + { &gPlayerAnim_link_fighter_Lrolling_kiru, &gPlayerAnim_link_fighter_Lrolling_kiru_end, + &gPlayerAnim_link_anchor_Lrolling_kiru_endR, 0, 15 }, + { &gPlayerAnim_link_fighter_Wrolling_kiru, &gPlayerAnim_link_fighter_Wrolling_kiru_end, + &gPlayerAnim_link_anchor_rolling_kiru_endR, 0, 16 }, + { &gPlayerAnim_link_fighter_Wrolling_kiru, &gPlayerAnim_link_fighter_Wrolling_kiru_end, + &gPlayerAnim_link_anchor_Lrolling_kiru_endR, 0, 16 }, }; static LinkAnimationHeader* D_80854350[] = { - &gPlayerAnim_002AE8, - &gPlayerAnim_002920, + &gPlayerAnim_link_fighter_power_kiru_start, + &gPlayerAnim_link_fighter_Lpower_kiru_start, }; static LinkAnimationHeader* D_80854358[] = { - &gPlayerAnim_002AE0, - &gPlayerAnim_002920, + &gPlayerAnim_link_fighter_power_kiru_startL, + &gPlayerAnim_link_fighter_Lpower_kiru_start, }; static LinkAnimationHeader* D_80854360[] = { - &gPlayerAnim_002AF0, - &gPlayerAnim_002928, + &gPlayerAnim_link_fighter_power_kiru_wait, + &gPlayerAnim_link_fighter_Lpower_kiru_wait, }; static LinkAnimationHeader* D_80854368[] = { - &gPlayerAnim_002AF8, - &gPlayerAnim_002930, + &gPlayerAnim_link_fighter_power_kiru_wait_end, + &gPlayerAnim_link_fighter_Lpower_kiru_wait_end, }; static LinkAnimationHeader* D_80854370[] = { - &gPlayerAnim_002B00, - &gPlayerAnim_002938, + &gPlayerAnim_link_fighter_power_kiru_walk, + &gPlayerAnim_link_fighter_Lpower_kiru_walk, }; static LinkAnimationHeader* D_80854378[] = { - &gPlayerAnim_002AD8, - &gPlayerAnim_002918, + &gPlayerAnim_link_fighter_power_kiru_side_walk, + &gPlayerAnim_link_fighter_Lpower_kiru_side_walk, }; static u8 D_80854380[2] = { 0x18, 0x19 }; @@ -927,38 +1237,38 @@ static u16 D_80854398[] = { NA_SE_IT_BOW_DRAW, NA_SE_IT_SLING_DRAW, NA_SE_IT_HOO static u8 sMagicArrowCosts[] = { 4, 4, 8 }; static LinkAnimationHeader* D_808543A4[] = { - &gPlayerAnim_0025C0, - &gPlayerAnim_0025C8, + &gPlayerAnim_link_anchor_waitR2defense, + &gPlayerAnim_link_anchor_waitR2defense_long, }; static LinkAnimationHeader* D_808543AC[] = { - &gPlayerAnim_002580, - &gPlayerAnim_002588, + &gPlayerAnim_link_anchor_waitL2defense, + &gPlayerAnim_link_anchor_waitL2defense_long, }; static LinkAnimationHeader* D_808543B4[] = { - &gPlayerAnim_002510, - &gPlayerAnim_002518, + &gPlayerAnim_link_anchor_defense_hit, + &gPlayerAnim_link_anchor_defense_long_hitL, }; static LinkAnimationHeader* D_808543BC[] = { - &gPlayerAnim_002510, - &gPlayerAnim_002520, + &gPlayerAnim_link_anchor_defense_hit, + &gPlayerAnim_link_anchor_defense_long_hitR, }; static LinkAnimationHeader* D_808543C4[] = { - &gPlayerAnim_002EC0, - &gPlayerAnim_002A08, + &gPlayerAnim_link_normal_defense_hit, + &gPlayerAnim_link_fighter_defense_long_hit, }; static LinkAnimationHeader* D_808543CC[] = { - &gPlayerAnim_0026F0, - &gPlayerAnim_002CC8, + &gPlayerAnim_link_bow_walk2ready, + &gPlayerAnim_link_hook_walk2ready, }; static LinkAnimationHeader* D_808543D4[] = { - &gPlayerAnim_0026C0, - &gPlayerAnim_002CC0, + &gPlayerAnim_link_bow_bow_wait, + &gPlayerAnim_link_hook_wait, }; // return type can't be void due to regalloc in func_8084FCAC @@ -1044,8 +1354,7 @@ void func_80832440(GlobalContext* globalCtx, Player* this) { this->stateFlags1 &= ~PLAYER_STATE1_11; this->interactRangeActor = NULL; } - } - else { + } else { this->stateFlags1 &= ~PLAYER_STATE1_11; } } @@ -1069,8 +1378,7 @@ s32 func_80832528(GlobalContext* globalCtx, Player* this) { if (this->heldItemActionParam >= PLAYER_AP_FISHING_POLE) { func_80835F44(globalCtx, this, ITEM_NONE); return 1; - } - else { + } else { return 0; } } @@ -1107,8 +1415,7 @@ void func_8083264C(Player* this, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { void func_80832698(Player* this, u16 sfxId) { if (this->actor.category == ACTORCAT_PLAYER) { func_8002F7DC(&this->actor, sfxId + this->ageProperties->unk_92); - } - else { + } else { func_800F4190(&this->actor.projectedPos, sfxId); } } @@ -1144,8 +1451,7 @@ void func_808327F8(Player* this, f32 arg1) { if (this->currentBoots == PLAYER_BOOTS_IRON) { sfxId = NA_SE_PL_WALK_HEAVYBOOTS; - } - else { + } else { sfxId = func_808327A4(this, NA_SE_PL_WALK_GROUND); } @@ -1157,8 +1463,7 @@ void func_80832854(Player* this) { if (this->currentBoots == PLAYER_BOOTS_IRON) { sfxId = NA_SE_PL_JUMP_HEAVYBOOTS; - } - else { + } else { sfxId = func_808327A4(this, NA_SE_PL_JUMP); } @@ -1170,8 +1475,7 @@ void func_808328A0(Player* this) { if (this->currentBoots == PLAYER_BOOTS_IRON) { sfxId = NA_SE_PL_LAND_HEAVYBOOTS; - } - else { + } else { sfxId = func_808327A4(this, NA_SE_PL_LAND); } @@ -1195,29 +1499,21 @@ void func_80832924(Player* this, struct_80832924* entry) { if (LinkAnimation_OnFrame(&this->skelAnime, fabsf(data & 0x7FF))) { if (flags == 0x800) { func_8002F7DC(&this->actor, entry->sfxId); - } - else if (flags == 0x1000) { + } else if (flags == 0x1000) { func_80832770(this, entry->sfxId); - } - else if (flags == 0x1800) { + } else if (flags == 0x1800) { func_808327C4(this, entry->sfxId); - } - else if (flags == 0x2000) { + } else if (flags == 0x2000) { func_80832698(this, entry->sfxId); - } - else if (flags == 0x2800) { + } else if (flags == 0x2800) { func_808328A0(this); - } - else if (flags == 0x3000) { + } else if (flags == 0x3000) { func_808327F8(this, 6.0f); - } - else if (flags == 0x3800) { + } else if (flags == 0x3800) { func_80832854(this); - } - else if (flags == 0x4000) { + } else if (flags == 0x4000) { func_808327F8(this, 0.0f); - } - else if (flags == 0x4800) { + } else if (flags == 0x4800) { func_800F4010(&this->actor.projectedPos, this->ageProperties->unk_94 + NA_SE_PL_WALK_LADDER, 0.0f); } } @@ -1228,12 +1524,12 @@ void func_80832924(Player* this, struct_80832924* entry) { void func_80832B0C(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) { LinkAnimation_Change(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, - -6.0f); + -6.0f); } void func_80832B78(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) { LinkAnimation_Change(globalCtx, &this->skelAnime, anim, 2.0f / 3.0f, 0.0f, Animation_GetLastFrame(anim), - ANIMMODE_ONCE, -6.0f); + ANIMMODE_ONCE, -6.0f); } void func_80832BE8(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) { @@ -1252,8 +1548,7 @@ s32 func_80832CB0(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* a if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { func_80832284(globalCtx, this, anim); return 1; - } - else { + } else { return 0; } } @@ -1283,8 +1578,7 @@ void func_80832DBC(Player* this) { if (this->skelAnime.moveFlags & 2) { this->skelAnime.jointTable[0].y = this->skelAnime.prevTransl.y; } - } - else { + } else { this->skelAnime.jointTable[0].y = this->skelAnime.baseTransl.y; } func_80832CFC(this); @@ -1321,11 +1615,9 @@ void func_80832E48(Player* this, s32 flags) { void func_80832F54(GlobalContext* globalCtx, Player* this, s32 flags) { if (flags & 0x200) { func_80832D20(this); - } - else if ((flags & 0x100) || (this->skelAnime.moveFlags != 0)) { + } else if ((flags & 0x100) || (this->skelAnime.moveFlags != 0)) { func_80832CFC(this); - } - else { + } else { this->skelAnime.prevTransl = this->skelAnime.jointTable[0]; this->skelAnime.prevRot = this->actor.shape.rot.y; } @@ -1385,8 +1677,7 @@ void func_8083315C(GlobalContext* globalCtx, Player* this) { if (D_808535D4 < 55.0f) { phi_v0 = -1; phi_v1 = -1; - } - else { + } else { phi_v1 = (u16)(D_808535D8 + 0x2000) >> 9; phi_v0 = (u16)((s16)(D_808535DC - this->actor.shape.rot.y) + 0x2000) >> 14; } @@ -1447,12 +1738,10 @@ void func_808333FC(Player* this, s32 arg1) { LinkAnimationHeader* func_80833438(Player* this) { if (this->unk_890 != 0) { return D_80853914[PLAYER_ANIMGROUP_3][this->modelAnimType]; - } - else if (!(this->stateFlags1 & (PLAYER_STATE1_27 | PLAYER_STATE1_29)) && - (this->currentBoots == PLAYER_BOOTS_IRON)) { + } else if (!(this->stateFlags1 & (PLAYER_STATE1_27 | PLAYER_STATE1_29)) && + (this->currentBoots == PLAYER_BOOTS_IRON)) { return D_80853914[PLAYER_ANIMGROUP_4][this->modelAnimType]; - } - else { + } else { return D_80853914[PLAYER_ANIMGROUP_2][this->modelAnimType]; } } @@ -1463,45 +1752,40 @@ s32 func_808334B4(Player* this) { LinkAnimationHeader* func_808334E4(Player* this) { if (func_808334B4(this)) { - return &gPlayerAnim_002638; - } - else { + return &gPlayerAnim_link_boom_throw_waitR; + } else { return D_80853914[PLAYER_ANIMGROUP_6][this->modelAnimType]; } } LinkAnimationHeader* func_80833528(Player* this) { if (func_808334B4(this)) { - return &gPlayerAnim_002630; - } - else { + return &gPlayerAnim_link_boom_throw_waitL; + } else { return D_80853914[PLAYER_ANIMGROUP_5][this->modelAnimType]; } } LinkAnimationHeader* func_8083356C(Player* this) { if (func_8002DD78(this)) { - return &gPlayerAnim_0026E8; - } - else { + return &gPlayerAnim_link_bow_side_walk; + } else { return D_80853914[PLAYER_ANIMGROUP_23][this->modelAnimType]; } } LinkAnimationHeader* func_808335B0(Player* this) { if (func_808334B4(this)) { - return &gPlayerAnim_002620; - } - else { + return &gPlayerAnim_link_boom_throw_side_walkR; + } else { return D_80853914[PLAYER_ANIMGROUP_25][this->modelAnimType]; } } LinkAnimationHeader* func_808335F4(Player* this) { if (func_808334B4(this)) { - return &gPlayerAnim_002618; - } - else { + return &gPlayerAnim_link_boom_throw_side_walkL; + } else { return D_80853914[PLAYER_ANIMGROUP_24][this->modelAnimType]; } } @@ -1539,14 +1823,11 @@ void func_80833664(GlobalContext* globalCtx, Player* this, s8 actionParam) { s8 Player_ItemToActionParam(s32 item) { if (item >= ITEM_NONE_FE) { return PLAYER_AP_NONE; - } - else if (item == ITEM_LAST_USED) { + } else if (item == ITEM_LAST_USED) { return PLAYER_AP_LAST_USED; - } - else if (item == ITEM_FISHING_POLE) { + } else if (item == ITEM_FISHING_POLE) { return PLAYER_AP_FISHING_POLE; - } - else { + } else { return sItemActionParams[item]; } } @@ -1566,8 +1847,7 @@ void func_8083379C(GlobalContext* globalCtx, Player* this) { if (this->heldItemActionParam != PLAYER_AP_SLINGSHOT) { this->unk_860 = -1; - } - else { + } else { this->unk_860 = -2; } } @@ -1586,16 +1866,15 @@ void func_808337D4(GlobalContext* globalCtx, Player* this) { explosiveInfo = &sExplosiveInfos[explosiveType]; spawnedActor = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, explosiveInfo->actorId, - this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, - this->actor.shape.rot.y, 0, 0); + this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, + this->actor.shape.rot.y, 0, 0); if (spawnedActor != NULL) { if ((explosiveType != 0) && (globalCtx->bombchuBowlingStatus != 0)) { globalCtx->bombchuBowlingStatus--; if (globalCtx->bombchuBowlingStatus == 0) { globalCtx->bombchuBowlingStatus = -1; } - } - else { + } else { Inventory_ChangeAmmo(explosiveInfo->itemId, -1); } @@ -1614,7 +1893,7 @@ void func_80833910(GlobalContext* globalCtx, Player* this) { this->heldActor = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_ARMS_HOOK, this->actor.world.pos.x, - this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 0); + this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 0); } void func_80833984(GlobalContext* globalCtx, Player* this) { @@ -1643,20 +1922,17 @@ void func_80833A20(Player* this, s32 newSwordState) { if (this->swordState == 0) { if ((this->heldItemActionParam == PLAYER_AP_SWORD_BGS) && (gSaveContext.swordHealth > 0.0f)) { itemSfx = NA_SE_IT_HAMMER_SWING; - } - else { + } else { itemSfx = NA_SE_IT_SWORD_SWING; } voiceSfx = NA_SE_VO_LI_SWORD_N; if (this->heldItemActionParam == PLAYER_AP_HAMMER) { itemSfx = NA_SE_IT_HAMMER_SWING; - } - else if (this->swordAnimation >= 0x18) { + } else if (this->swordAnimation >= 0x18) { itemSfx = 0; voiceSfx = NA_SE_VO_LI_SWORD_L; - } - else if (this->unk_845 >= 3) { + } else if (this->unk_845 >= 3) { itemSfx = NA_SE_IT_SWORD_SWING_HARD; voiceSfx = NA_SE_VO_LI_SWORD_L; } @@ -1676,8 +1952,7 @@ void func_80833A20(Player* this, s32 newSwordState) { s32 func_80833B2C(Player* this) { if (this->stateFlags1 & (PLAYER_STATE1_16 | PLAYER_STATE1_17 | PLAYER_STATE1_30)) { return 1; - } - else { + } else { return 0; } } @@ -1713,8 +1988,7 @@ void func_80833C3C(Player* this) { s32 func_80833C50(Player* this, s32 item) { if ((item < ITEM_NONE_FE) && (Player_ItemToActionParam(item) == this->itemActionParam)) { return 1; - } - else { + } else { return 0; } } @@ -1722,8 +1996,7 @@ s32 func_80833C50(Player* this, s32 item) { s32 func_80833C98(s32 item1, s32 actionParam) { if ((item1 < ITEM_NONE_FE) && (Player_ItemToActionParam(item1) == actionParam)) { return 1; - } - else { + } else { return 0; } } @@ -1731,23 +2004,17 @@ s32 func_80833C98(s32 item1, s32 actionParam) { s32 func_80833CDC(GlobalContext* globalCtx, s32 index) { if (index >= ((CVar_GetS32("gDpadEquips", 0) != 0) ? 8 : 4)) { return ITEM_NONE; - } - else if (globalCtx->bombchuBowlingStatus != 0) { + } else if (globalCtx->bombchuBowlingStatus != 0) { return (globalCtx->bombchuBowlingStatus > 0) ? ITEM_BOMBCHU : ITEM_NONE; - } - else if (index == 0) { + } else if (index == 0) { return B_BTN_ITEM; - } - else if (index == 1) { + } else if (index == 1) { return C_BTN_ITEM(0); - } - else if (index == 2) { + } else if (index == 2) { return C_BTN_ITEM(1); - } - else if (index == 3) { + } else if (index == 3) { return C_BTN_ITEM(2); - } - else if (index == 4) { + } else if (index == 4) { return DPAD_ITEM(0); } else if (index == 5) { return DPAD_ITEM(1); @@ -1827,8 +2094,7 @@ void func_80833DF8(Player* this, GlobalContext* globalCtx) { if ((item < ITEM_NONE_FE) && (Player_ItemToActionParam(item) == this->heldItemActionParam)) { D_80853618 = true; } - } - else { + } else { this->heldItemButton = i; func_80835F44(globalCtx, this, item); } @@ -1852,15 +2118,15 @@ void func_808340DC(Player* this, GlobalContext* globalCtx) { sp38 = D_80854164[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType]; if ((sp37 == PLAYER_AP_BOTTLE) || (sp37 == PLAYER_AP_BOOMERANG) || ((sp37 == PLAYER_AP_NONE) && - ((this->heldItemActionParam == PLAYER_AP_BOTTLE) || (this->heldItemActionParam == PLAYER_AP_BOOMERANG)))) { + ((this->heldItemActionParam == PLAYER_AP_BOTTLE) || (this->heldItemActionParam == PLAYER_AP_BOOMERANG)))) { sp38 = (sp37 == PLAYER_AP_NONE) ? -PLAYER_D_808540F4_13 : PLAYER_D_808540F4_13; } this->unk_15A = ABS(sp38); anim = D_808540F4[this->unk_15A].anim; - if ((anim == &gPlayerAnim_002F30) && (this->currentShield == PLAYER_SHIELD_NONE)) { - anim = &gPlayerAnim_002F40; + if ((anim == &gPlayerAnim_link_normal_fighter2free) && (this->currentShield == PLAYER_SHIELD_NONE)) { + anim = &gPlayerAnim_link_normal_free2fighter_free; } frameCount = Animation_GetLastFrame(anim); @@ -1869,8 +2135,7 @@ void func_808340DC(Player* this, GlobalContext* globalCtx) { if (sp38 >= 0) { playSpeed = 1.2f; startFrame = 0.0f; - } - else { + } else { endFrame = 0.0f; playSpeed = -1.2f; startFrame = frameCount; @@ -1904,23 +2169,19 @@ s32 func_80834380(GlobalContext* globalCtx, Player* this, s32* itemPtr, s32* typ *itemPtr = ITEM_BOW; if (this->stateFlags1 & PLAYER_STATE1_23) { *typePtr = ARROW_NORMAL_HORSE; - } - else { + } else { *typePtr = this->heldItemActionParam - 6; } - } - else { + } else { *itemPtr = ITEM_SLINGSHOT; *typePtr = ARROW_SEED; } if (gSaveContext.minigameState == 1) { return globalCtx->interfaceCtx.hbaAmmo; - } - else if (globalCtx->shootingGalleryStatus != 0) { + } else if (globalCtx->shootingGalleryStatus != 0) { return globalCtx->shootingGalleryStatus; - } - else { + } else { return AMMO(*itemPtr); } } @@ -1933,8 +2194,7 @@ s32 func_8083442C(Player* this, GlobalContext* globalCtx) { if ((this->heldItemActionParam >= PLAYER_AP_BOW_FIRE) && (this->heldItemActionParam <= PLAYER_AP_BOW_0E) && (gSaveContext.unk_13F0 != 0)) { func_80078884(NA_SE_SY_ERROR); - } - else { + } else { func_80833638(this, func_808351D4); this->stateFlags1 |= PLAYER_STATE1_9; @@ -1969,8 +2229,7 @@ void func_80834594(GlobalContext* globalCtx, Player* this) { if (this->heldItemActionParam != PLAYER_AP_NONE) { if (func_8008F2BC(this, this->heldItemActionParam) >= 0) { func_808328EC(this, NA_SE_IT_SWORD_PUTAWAY); - } - else { + } else { func_808328EC(this, NA_SE_PL_CHANGE_ARMS); } } @@ -1979,8 +2238,7 @@ void func_80834594(GlobalContext* globalCtx, Player* this) { if (func_8008F2BC(this, this->heldItemActionParam) >= 0) { func_808328EC(this, NA_SE_IT_SWORD_PICKOUT); - } - else if (this->heldItemActionParam != PLAYER_AP_NONE) { + } else if (this->heldItemActionParam != PLAYER_AP_NONE) { func_808328EC(this, NA_SE_PL_CHANGE_ARMS); } } @@ -2003,11 +2261,10 @@ LinkAnimationHeader* func_808346C4(GlobalContext* globalCtx, Player* this) { if (this->unk_870 < 0.5f) { return D_808543A4[Player_HoldsTwoHandedWeapon(this) && - !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; - } - else { + !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; + } else { return D_808543AC[Player_HoldsTwoHandedWeapon(this) && - !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; + !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; } } @@ -2026,8 +2283,7 @@ s32 func_80834758(GlobalContext* globalCtx, Player* this) { func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_POSTURE); return 1; - } - else { + } else { return 0; } } @@ -2035,8 +2291,7 @@ s32 func_80834758(GlobalContext* globalCtx, Player* this) { s32 func_8083485C(Player* this, GlobalContext* globalCtx) { if (func_80834758(globalCtx, this)) { return 1; - } - else { + } else { return 0; } } @@ -2069,8 +2324,7 @@ void func_808348EC(GlobalContext* globalCtx, Player* this) { s32 func_8083499C(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_8) { func_808340DC(this, globalCtx); - } - else { + } else { return 0; } @@ -2080,8 +2334,7 @@ s32 func_8083499C(Player* this, GlobalContext* globalCtx) { s32 func_808349DC(Player* this, GlobalContext* globalCtx) { if (func_80834758(globalCtx, this) || func_8083499C(this, globalCtx)) { return 1; - } - else { + } else { return 0; } } @@ -2089,8 +2342,8 @@ s32 func_808349DC(Player* this, GlobalContext* globalCtx) { s32 func_80834A2C(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2) || ((Player_ItemToActionParam(this->heldItemId) == this->heldItemActionParam) && - (D_80853614 = (D_80853614 || - ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (globalCtx->shootingGalleryStatus == 0)))))) { + (D_80853614 = (D_80853614 || + ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (globalCtx->shootingGalleryStatus == 0)))))) { func_80833638(this, D_80853EDC[this->heldItemActionParam]); this->unk_834 = 0; this->unk_6AC = 0; @@ -2102,8 +2355,7 @@ s32 func_80834A2C(Player* this, GlobalContext* globalCtx) { func_808348EC(globalCtx, this); func_80832264(globalCtx, this, func_80833338(this)); this->unk_6AC = 0; - } - else { + } else { func_808348EC(globalCtx, this); } @@ -2116,8 +2368,7 @@ s32 func_80834B5C(Player* this, GlobalContext* globalCtx) { if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { func_80834894(this); return 1; - } - else { + } else { this->stateFlags1 |= PLAYER_STATE1_22; Player_SetModelsForHoldingShield(this); return 1; @@ -2163,23 +2414,20 @@ s32 func_80834D2C(Player* this, GlobalContext* globalCtx) { } if (!Player_HoldsHookshot(this)) { - anim = &gPlayerAnim_0026A0; - } - else { - anim = &gPlayerAnim_002CA0; + anim = &gPlayerAnim_link_bow_bow_ready; + } else { + anim = &gPlayerAnim_link_hook_shot_ready; } LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, anim); - } - else { + } else { func_80833638(this, func_80835884); this->unk_834 = 10; - LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_002628); + LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_link_boom_throw_wait2waitR); } if (this->stateFlags1 & PLAYER_STATE1_23) { - func_80832284(globalCtx, this, &gPlayerAnim_003380); - } - else if ((this->actor.bgCheckFlags & 1) && !func_80833B54(this)) { + func_80832284(globalCtx, this, &gPlayerAnim_link_uma_anim_walk); + } else if ((this->actor.bgCheckFlags & 1) && !func_80833B54(this)) { func_80832284(globalCtx, this, D_80853914[PLAYER_ANIMGROUP_0][this->modelAnimType]); } @@ -2196,7 +2444,7 @@ s32 func_80834E7C(GlobalContext* globalCtx) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } return (globalCtx->shootingGalleryStatus != 0) && - ((globalCtx->shootingGalleryStatus < 0) || CHECK_BTN_ANY(sControlInput->cur.button, buttonsToCheck)); + ((globalCtx->shootingGalleryStatus < 0) || CHECK_BTN_ANY(sControlInput->cur.button, buttonsToCheck)); } s32 func_80834EB8(Player* this, GlobalContext* globalCtx) { @@ -2245,7 +2493,7 @@ s32 func_8083501C(Player* this, GlobalContext* globalCtx) { !func_80834F2C(this, globalCtx)) { return 0; } else if (this->rideActor != NULL) { - this->unk_6AD = 2; // OTRTODO: THIS IS A BAD IDEA BUT IT FIXES THE HORSE FIRST PERSON? + this->unk_6AD = 2; // OTRTODO: THIS IS A BAD IDEA BUT IT FIXES THE HORSE FIRST PERSON? } return 1; @@ -2261,11 +2509,9 @@ s32 func_808350A4(GlobalContext* globalCtx, Player* this) { if (gSaveContext.minigameState == 1) { globalCtx->interfaceCtx.hbaAmmo--; - } - else if (globalCtx->shootingGalleryStatus != 0) { + } else if (globalCtx->shootingGalleryStatus != 0) { globalCtx->shootingGalleryStatus--; - } - else { + } else { Inventory_ChangeAmmo(item, -1); } @@ -2274,8 +2520,7 @@ s32 func_808350A4(GlobalContext* globalCtx, Player* this) { } func_8083264C(this, 150, 10, 150, 0); - } - else { + } else { func_8083264C(this, 255, 20, 150, 0); } @@ -2297,23 +2542,21 @@ s32 func_808351D4(Player* this, GlobalContext* globalCtx) { if (!Player_HoldsHookshot(this)) { sp2C = 0; - } - else { + } else { sp2C = 1; } Math_ScaledStepToS(&this->unk_6C0, 1200, 400); this->unk_6AE |= 0x100; - if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.animation == &gPlayerAnim_0026E8)) { + if ((this->unk_836 == 0) && (func_80833350(this) == 0) && + (this->skelAnime.animation == &gPlayerAnim_link_bow_side_walk)) { LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, D_808543CC[sp2C]); this->unk_836 = -1; - } - else if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { + } else if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, D_808543D4[sp2C]); this->unk_836 = 1; - } - else if (this->unk_836 == 1) { + } else if (this->unk_836 == 1) { this->unk_836 = 2; } @@ -2330,15 +2573,13 @@ s32 func_808351D4(Player* this, GlobalContext* globalCtx) { if (!func_808350A4(globalCtx, this)) { func_8002F7DC(&this->actor, D_808543DC[ABS(this->unk_860) - 1]); } - } - else if (this->actor.bgCheckFlags & 1) { + } else if (this->actor.bgCheckFlags & 1) { func_808350A4(globalCtx, this); } } this->unk_834 = 10; func_80832210(this); - } - else { + } else { this->stateFlags1 |= PLAYER_STATE1_9; } @@ -2359,13 +2600,11 @@ s32 func_808353D8(Player* this, GlobalContext* globalCtx) { if (func_8083442C(this, globalCtx)) { if (Player_HoldsHookshot(this)) { this->unk_836 = 1; - } - else { - LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_0026B8); + } else { + LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_link_bow_bow_shoot_next); } } - } - else { + } else { if (this->unk_834 != 0) { this->unk_834--; } @@ -2379,10 +2618,9 @@ s32 func_808353D8(Player* this, GlobalContext* globalCtx) { if (Player_HoldsHookshot(this)) { func_80833638(this, func_8083501C); - } - else { + } else { func_80833638(this, func_80835588); - LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_0026B0); + LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_link_bow_bow_shoot_end); } this->unk_834 = 0; @@ -2422,7 +2660,7 @@ s32 func_80835644(GlobalContext* globalCtx, Player* this, Actor* arg2) { void func_80835688(Player* this, GlobalContext* globalCtx) { if (!func_80835644(globalCtx, this, this->heldActor)) { func_80833638(this, func_808356E8); - LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_002E10); + LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_link_normal_carryB_wait); } } @@ -2439,7 +2677,7 @@ s32 func_808356E8(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_11) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { - LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_002E10); + LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_link_normal_carryB_wait); } if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) { @@ -2465,8 +2703,7 @@ s32 func_80835800(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_25) { func_80833638(this, func_80835B60); - } - else if (func_80834F2C(this, globalCtx)) { + } else if (func_80834F2C(this, globalCtx)) { return 1; } @@ -2476,7 +2713,7 @@ s32 func_80835800(Player* this, GlobalContext* globalCtx) { s32 func_80835884(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { func_80833638(this, func_808358F0); - LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_002638); + LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayerAnim_link_boom_throw_waitR); } func_80834EB8(this, globalCtx); @@ -2490,9 +2727,8 @@ s32 func_808358F0(Player* this, GlobalContext* globalCtx) { if ((func_808334E4(this) == animSeg) || (func_80833528(this) == animSeg) || (func_808335B0(this) == animSeg) || (func_808335F4(this) == animSeg)) { AnimationContext_SetCopyAll(globalCtx, this->skelAnime.limbCount, this->skelAnime2.jointTable, - this->skelAnime.jointTable); - } - else { + this->skelAnime.jointTable); + } else { LinkAnimation_Update(globalCtx, &this->skelAnime2); } @@ -2501,7 +2737,7 @@ s32 func_808358F0(Player* this, GlobalContext* globalCtx) { if (!D_80853618) { func_80833638(this, func_808359FC); LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, - (this->unk_870 < 0.5f) ? &gPlayerAnim_002608 : &gPlayerAnim_002600); + (this->unk_870 < 0.5f) ? &gPlayerAnim_link_boom_throwR : &gPlayerAnim_link_boom_throwL); } return 1; @@ -2511,14 +2747,13 @@ s32 func_808359FC(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { func_80833638(this, func_80835B60); this->unk_834 = 0; - } - else if (LinkAnimation_OnFrame(&this->skelAnime2, 6.0f)) { + } else if (LinkAnimation_OnFrame(&this->skelAnime2, 6.0f)) { f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.x; f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.z; s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y; EnBoom* boomerang = (EnBoom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOOM, posX, this->actor.world.pos.y + 30.0f, - posZ, this->actor.focus.rot.x, yaw, 0, 0); + posZ, this->actor.focus.rot.x, yaw, 0, 0); this->boomerangActor = &boomerang->actor; if (boomerang != NULL) { @@ -2544,7 +2779,7 @@ s32 func_80835B60(Player* this, GlobalContext* globalCtx) { if (!(this->stateFlags1 & PLAYER_STATE1_25)) { func_80833638(this, func_80835C08); - LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_0025F8); + LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayerAnim_link_boom_catch); func_808357E8(this, D_80125EF8); func_8002F7DC(&this->actor, NA_SE_PL_CATCH_BOOMERANG); func_80832698(this, NA_SE_VO_LI_SWORD_N); @@ -2574,8 +2809,7 @@ s32 func_80835C58(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s3 if (func_8084E3C4 == this->func_674) { Audio_OcaSetInstrument(0); this->stateFlags2 &= ~(PLAYER_STATE2_24 | PLAYER_STATE2_25); - } - else if (func_808507F4 == this->func_674) { + } else if (func_808507F4 == this->func_674) { func_80832340(globalCtx, this); } @@ -2593,7 +2827,7 @@ s32 func_80835C58(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s3 func_80832DBC(this); this->stateFlags1 &= ~(PLAYER_STATE1_2 | PLAYER_STATE1_6 | PLAYER_STATE1_26 | PLAYER_STATE1_28 | PLAYER_STATE1_29 | - PLAYER_STATE1_31); + PLAYER_STATE1_31); this->stateFlags2 &= ~(PLAYER_STATE2_19 | PLAYER_STATE2_27 | PLAYER_STATE2_28); this->stateFlags3 &= ~(PLAYER_STATE3_1 | PLAYER_STATE3_3 | PLAYER_STATE3_7); this->unk_84F = 0; @@ -2630,8 +2864,7 @@ void func_80835E44(GlobalContext* globalCtx, s16 camSetting) { if (camSetting == CAM_SET_SCENE_TRANSITION) { Interface_ChangeAlpha(2); } - } - else { + } else { Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), camSetting); } } @@ -2661,22 +2894,22 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { actionParam = Player_ItemToActionParam(item); if (((this->heldItemActionParam == this->itemActionParam) && - (!(this->stateFlags1 & PLAYER_STATE1_22) || (Player_ActionToSword(actionParam) != 0) || - (actionParam == PLAYER_AP_NONE))) || + (!(this->stateFlags1 & PLAYER_STATE1_22) || (Player_ActionToSword(actionParam) != 0) || + (actionParam == PLAYER_AP_NONE))) || ((this->itemActionParam < 0) && - ((Player_ActionToSword(actionParam) != 0) || (actionParam == PLAYER_AP_NONE)))) { + ((Player_ActionToSword(actionParam) != 0) || (actionParam == PLAYER_AP_NONE)))) { if ((actionParam == PLAYER_AP_NONE) || !(this->stateFlags1 & PLAYER_STATE1_27) || ((this->actor.bgCheckFlags & 1) && - ((actionParam == PLAYER_AP_HOOKSHOT) || (actionParam == PLAYER_AP_LONGSHOT))) || + ((actionParam == PLAYER_AP_HOOKSHOT) || (actionParam == PLAYER_AP_LONGSHOT))) || ((actionParam >= PLAYER_AP_SHIELD_DEKU) && (actionParam <= PLAYER_AP_BOOTS_HOVER))) { if ((globalCtx->bombchuBowlingStatus == 0) && (((actionParam == PLAYER_AP_STICK) && (AMMO(ITEM_STICK) == 0)) || - ((actionParam == PLAYER_AP_BEAN) && (AMMO(ITEM_BEAN) == 0)) || - (temp = Player_ActionToExplosive(this, actionParam), - ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) || - (globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3)))))) { + ((actionParam == PLAYER_AP_BEAN) && (AMMO(ITEM_BEAN) == 0)) || + (temp = Player_ActionToExplosive(this, actionParam), + ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) || + (globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3)))))) { func_80078884(NA_SE_SY_ERROR); return; } @@ -2689,7 +2922,8 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { Inventory_ChangeEquipment(EQUIP_BOOTS, bootsValue); } Player_SetEquipmentData(globalCtx, this); - func_808328EC(this, CUR_EQUIP_VALUE(EQUIP_BOOTS) == PLAYER_BOOTS_IRON + 1 ? NA_SE_PL_WALK_HEAVYBOOTS : NA_SE_PL_CHANGE_ARMS); + func_808328EC(this, CUR_EQUIP_VALUE(EQUIP_BOOTS) == PLAYER_BOOTS_IRON + 1 ? NA_SE_PL_WALK_HEAVYBOOTS + : NA_SE_PL_CHANGE_ARMS); return; } @@ -2727,8 +2961,7 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { if (actionParam == PLAYER_AP_NUT) { if (AMMO(ITEM_NUT) != 0) { func_8083C61C(globalCtx, this); - } - else { + } else { func_80078884(NA_SE_SY_ERROR); } return; @@ -2738,11 +2971,10 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { if (temp >= 0) { if (((actionParam == PLAYER_AP_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || ((gSaveContext.unk_13F4 != 0) && (gSaveContext.unk_13F0 == 0) && - (gSaveContext.magic >= sMagicSpellCosts[temp]))) { + (gSaveContext.magic >= sMagicSpellCosts[temp]))) { this->itemActionParam = actionParam; this->unk_6AD = 4; - } - else { + } else { func_80078884(NA_SE_SY_ERROR); } return; @@ -2751,8 +2983,7 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { if (actionParam >= PLAYER_AP_MASK_KEATON) { if (this->currentMask != PLAYER_MASK_NONE) { this->currentMask = PLAYER_MASK_NONE; - } - else { + } else { this->currentMask = actionParam - PLAYER_AP_MASK_KEATON + 1; } sMaskMemory = this->currentMask; @@ -2778,11 +3009,10 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { if ((this->heldItemActionParam >= 0) && (Player_ActionToMagicSpell(this, actionParam) < 0) && (item != this->heldItemId) && (D_80854164[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType] != - PLAYER_D_808540F4_0)) { + PLAYER_D_808540F4_0)) { this->heldItemId = item; this->stateFlags1 |= PLAYER_STATE1_8; - } - else { + } else { func_80835EFC(this); func_808323B4(globalCtx, this); func_80833664(globalCtx, this, actionParam); @@ -2805,7 +3035,7 @@ void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* this->stateFlags1 |= PLAYER_STATE1_7; func_80832264(globalCtx, this, anim); - if (anim == &gPlayerAnim_002878) { + if (anim == &gPlayerAnim_link_derth_rebirth) { this->skelAnime.endFrame = 84.0f; } @@ -2818,8 +3048,7 @@ void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* if (Inventory_ConsumeFairy(globalCtx)) { globalCtx->gameOverCtx.state = GAMEOVER_REVIVE_START; this->unk_84F = 1; - } - else { + } else { globalCtx->gameOverCtx.state = GAMEOVER_DEATH_START; func_800F6AB0(0); Audio_PlayFanfare(NA_BGM_GAME_OVER); @@ -2834,9 +3063,9 @@ void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* s32 func_808365C8(Player* this) { return (!(func_808458D0 == this->func_674) || - ((this->stateFlags1 & PLAYER_STATE1_8) && - ((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) && - (!(func_80834A2C == this->func_82C) || + ((this->stateFlags1 & PLAYER_STATE1_8) && + ((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) && + (!(func_80834A2C == this->func_82C) || (Player_ItemToActionParam(this->heldItemId) == this->heldItemActionParam)); } @@ -2844,7 +3073,7 @@ s32 func_80836670(Player* this, GlobalContext* globalCtx) { if (!(this->stateFlags1 & PLAYER_STATE1_23) && (this->actor.parent != NULL) && Player_HoldsHookshot(this)) { func_80835C58(globalCtx, this, func_80850AEC, 1); this->stateFlags3 |= PLAYER_STATE3_7; - func_80832264(globalCtx, this, &gPlayerAnim_002C90); + func_80832264(globalCtx, this, &gPlayerAnim_link_hook_fly_start); func_80832F54(globalCtx, this, 0x9B); func_80832224(this); this->currentYaw = this->actor.shape.rot.y; @@ -2869,19 +3098,17 @@ s32 func_80836670(Player* this, GlobalContext* globalCtx) { if (this->unk_830 != 0.0f) { if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { AnimationContext_SetCopyFalse(globalCtx, this->skelAnime.limbCount, this->skelAnime2.jointTable, - this->skelAnime.jointTable, D_80853410); + this->skelAnime.jointTable, D_80853410); } Math_StepToF(&this->unk_830, 0.0f, 0.25f); AnimationContext_SetInterp(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, 1.0f - this->unk_830); - } - else if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { + this->skelAnime2.jointTable, 1.0f - this->unk_830); + } else if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { AnimationContext_SetCopyTrue(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, D_80853410); - } - else { + this->skelAnime2.jointTable, D_80853410); + } else { AnimationContext_SetCopyAll(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable); + this->skelAnime2.jointTable); } return 1; @@ -2901,14 +3128,12 @@ void func_808368EC(Player* this, GlobalContext* globalCtx) { if ((this->unk_664 != NULL) && ((globalCtx->actorCtx.targetCtx.unk_4B != 0) || (this->actor.category != ACTORCAT_PLAYER))) { Math_ScaledStepToS(&this->actor.shape.rot.y, - Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos), 4000); - } - else if ((this->stateFlags1 & PLAYER_STATE1_17) && - !(this->stateFlags2 & (PLAYER_STATE2_5 | PLAYER_STATE2_6))) { + Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos), 4000); + } else if ((this->stateFlags1 & PLAYER_STATE1_17) && + !(this->stateFlags2 & (PLAYER_STATE2_5 | PLAYER_STATE2_6))) { Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 4000); } - } - else if (!(this->stateFlags2 & PLAYER_STATE2_6)) { + } else if (!(this->stateFlags2 & PLAYER_STATE2_6)) { Math_ScaledStepToS(&this->actor.shape.rot.y, this->currentYaw, 2000); } @@ -2929,8 +3154,7 @@ s32 func_808369C8(s16* pValue, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) temp3 = *pValue; if (*pValue < -arg3) { *pValue = -arg3; - } - else if (*pValue > arg3) { + } else if (*pValue > arg3) { *pValue = arg3; } return temp3 - *pValue; @@ -2945,11 +3169,10 @@ s32 func_80836AB8(Player* this, s32 arg1) { var = this->actor.focus.rot.y; this->unk_6BC = this->actor.focus.rot.x; this->unk_6AE |= 0x41; - } - else { + } else { func_808369C8(&this->unk_6BC, - func_808369C8(&this->unk_6B6, this->actor.focus.rot.x, 600, 10000, this->actor.focus.rot.x, 0), - 200, 4000, this->unk_6B6, 10000); + func_808369C8(&this->unk_6B6, this->actor.focus.rot.x, 600, 10000, this->actor.focus.rot.x, 0), + 200, 4000, this->unk_6B6, 10000); sp36 = this->actor.focus.rot.y - var; func_808369C8(&sp36, 0, 200, 24000, this->unk_6BE, 8000); var = this->actor.focus.rot.y - sp36; @@ -2976,19 +3199,15 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { if ((globalCtx->csCtx.state != CS_STATE_IDLE) || (this->csMode != 0) || (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (this->stateFlags3 & PLAYER_STATE3_7)) { this->unk_66C = 0; - } - else if (zTrigPressed || (this->stateFlags2 & PLAYER_STATE2_13) || (this->unk_684 != NULL)) { + } else if (zTrigPressed || (this->stateFlags2 & PLAYER_STATE2_13) || (this->unk_684 != NULL)) { if (this->unk_66C <= 5) { this->unk_66C = 5; - } - else { + } else { this->unk_66C--; } - } - else if (this->stateFlags1 & PLAYER_STATE1_17) { + } else if (this->stateFlags1 & PLAYER_STATE1_17) { this->unk_66C = 0; - } - else if (this->unk_66C != 0) { + } else if (this->unk_66C != 0) { this->unk_66C--; } @@ -3005,8 +3224,7 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { if (this->actor.category == ACTORCAT_PLAYER) { actorToTarget = globalCtx->actorCtx.targetCtx.arrowPointedActor; - } - else { + } else { actorToTarget = &GET_PLAYER(globalCtx)->actor; } @@ -3025,16 +3243,14 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { this->unk_664 = actorToTarget; this->unk_66C = 15; this->stateFlags2 &= ~(PLAYER_STATE2_1 | PLAYER_STATE2_21); - } - else { + } else { if (!holdTarget) { func_8008EDF0(this); } } this->stateFlags1 &= ~PLAYER_STATE1_30; - } - else { + } else { if (!(this->stateFlags1 & (PLAYER_STATE1_17 | PLAYER_STATE1_30))) { func_808355DC(this); } @@ -3046,12 +3262,10 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { func_8002F0C8(this->unk_664, this, sp1C)) { func_8008EDF0(this); this->stateFlags1 |= PLAYER_STATE1_30; - } - else if (this->unk_664 != NULL) { + } else if (this->unk_664 != NULL) { this->unk_664->targetPriority = 40; } - } - else if (this->unk_684 != NULL) { + } else if (this->unk_684 != NULL) { this->unk_664 = this->unk_684; } } @@ -3062,17 +3276,14 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { !CHECK_FLAG_ALL(this->unk_664->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2)) { this->stateFlags1 |= PLAYER_STATE1_16; } - } - else { + } else { if (this->stateFlags1 & PLAYER_STATE1_17) { this->stateFlags2 &= ~PLAYER_STATE2_13; - } - else { + } else { func_8008EE08(this); } } - } - else { + } else { func_8008EE08(this); } } @@ -3086,8 +3297,7 @@ s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, if ((this->unk_6AD != 0) || (globalCtx->sceneLoadFlag == 0x14) || (this->stateFlags1 & PLAYER_STATE1_0)) { *arg2 = 0.0f; *arg3 = this->actor.shape.rot.y; - } - else { + } else { *arg2 = D_808535D4; *arg3 = D_808535D8; @@ -3095,13 +3305,11 @@ s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, *arg2 -= 20.0f; if (*arg2 < 0.0f) { *arg2 = 0.0f; - } - else { + } else { temp_f2 = 1.0f - Math_CosS(*arg2 * 450.0f); *arg2 = ((temp_f2 * temp_f2) * 30.0f) + 7.0f; } - } - else { + } else { *arg2 *= 0.8f; } @@ -3140,14 +3348,12 @@ s32 func_80837268(Player* this, f32* arg1, s16* arg2, f32 arg3, GlobalContext* g *arg2 = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos); return 0; } - } - else if (func_80833B2C(this)) { + } else if (func_80833B2C(this)) { *arg2 = this->targetYaw; } return 0; - } - else { + } else { *arg2 += Camera_GetInputDirYaw(GET_ACTIVE_CAM(globalCtx)); return 1; } @@ -3165,7 +3371,7 @@ static s8 D_80854430[] = { 13, 1, 2, 3, 12, 5, 4, 9, 10, 11, 8, 7, -6 }; static s8 D_80854440[] = { 10, 8, -7 }; static s8 D_80854444[] = { 0, 12, 5, -4 }; -static s32(*D_80854448[])(Player* this, GlobalContext* globalCtx) = { +static s32 (*D_80854448[])(Player* this, GlobalContext* globalCtx) = { func_8083B998, func_80839800, func_8083E5A8, func_8083E0FC, func_8083B644, func_8083F7BC, func_8083C1DC, func_80850224, func_8083C544, func_8083EB44, func_8083BDBC, func_8083C2B0, func_80838A14, func_8083B040, }; @@ -3223,8 +3429,7 @@ s32 func_808374A0(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, void func_80837530(GlobalContext* globalCtx, Player* this, s32 arg2) { if (arg2 != 0) { this->unk_858 = 0.0f; - } - else { + } else { this->unk_858 = 0.5f; } @@ -3232,8 +3437,8 @@ void func_80837530(GlobalContext* globalCtx, Player* this, s32 arg2) { if (this->actor.category == ACTORCAT_PLAYER) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_M_THUNDER, this->bodyPartsPos[PLAYER_BODYPART_WAIST].x, - this->bodyPartsPos[PLAYER_BODYPART_WAIST].y, this->bodyPartsPos[PLAYER_BODYPART_WAIST].z, 0, 0, 0, - Player_GetSwordHeld(this) | arg2); + this->bodyPartsPos[PLAYER_BODYPART_WAIST].y, this->bodyPartsPos[PLAYER_BODYPART_WAIST].z, 0, 0, 0, + Player_GetSwordHeld(this) | arg2); } } @@ -3279,14 +3484,13 @@ void func_80837704(GlobalContext* globalCtx, Player* this) { if ((this->swordAnimation >= 4) && (this->swordAnimation < 8)) { anim = D_80854358[Player_HoldsTwoHandedWeapon(this)]; - } - else { + } else { anim = D_80854350[Player_HoldsTwoHandedWeapon(this)]; } func_80832318(this); LinkAnimation_Change(globalCtx, &this->skelAnime, anim, 1.0f, 8.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, - -9.0f); + -9.0f); func_80837530(globalCtx, this, 0x200); } @@ -3308,21 +3512,17 @@ s32 func_80837818(Player* this) { } sp18 = D_80854484[sp1C]; this->unk_845 = 0; - } - else { + } else { if (func_808375D8(this)) { sp18 = 24; - } - else { + } else { if (sp1C < 0) { if (func_80833BCC(this)) { sp18 = 0; - } - else { + } else { sp18 = 4; } - } - else { + } else { sp18 = D_80854480[sp1C]; if (sp18 == 12) { this->stateFlags2 |= PLAYER_STATE2_30; @@ -3348,8 +3548,7 @@ void func_80837918(Player* this, s32 quadIndex, u32 flags) { if (flags == 2) { this->swordQuads[quadIndex].info.toucherFlags = TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_WOOD; - } - else { + } else { this->swordQuads[quadIndex].info.toucherFlags = TOUCH_ON | TOUCH_NEAREST; } } @@ -3390,15 +3589,13 @@ void func_80837948(GlobalContext* globalCtx, Player* this, s32 arg2) { if (Player_HoldsBrokenKnife(this)) { temp = 1; - } - else { + } else { temp = Player_GetSwordHeld(this) - 1; } if ((arg2 >= 16) && (arg2 < 20)) { flags = D_80854488[temp][1]; - } - else { + } else { flags = D_80854488[temp][0]; } @@ -3426,9 +3623,8 @@ s32 func_80837B18_modified(GlobalContext* globalCtx, Player* this, s32 damage, u } s32 modifiedDamage = damage; - if (modified) - { - modifiedDamage *= (1 << CVar_GetS32("gDamageMul", 0)); + if (modified) { + modifiedDamage *= (1 << CVar_GetS32("gDamageMul", 0)); } return Health_ChangeBy(globalCtx, modifiedDamage); @@ -3445,7 +3641,7 @@ void func_80837B60(Player* this) { void func_80837B9C(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_8084411C, 0); - func_80832284(globalCtx, this, &gPlayerAnim_003040); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_landing_wait); this->unk_850 = 1; if (this->unk_6AD != 3) { this->unk_6AD = 0; @@ -3453,8 +3649,9 @@ void func_80837B9C(Player* this, GlobalContext* globalCtx) { } static LinkAnimationHeader* D_808544B0[] = { - &gPlayerAnim_002F80, &gPlayerAnim_002F78, &gPlayerAnim_002DE0, &gPlayerAnim_002DD8, - &gPlayerAnim_002F70, &gPlayerAnim_002528, &gPlayerAnim_002DC8, &gPlayerAnim_0024F0, + &gPlayerAnim_link_normal_front_shit, &gPlayerAnim_link_normal_front_shitR, &gPlayerAnim_link_normal_back_shit, + &gPlayerAnim_link_normal_back_shitR, &gPlayerAnim_link_normal_front_hit, &gPlayerAnim_link_anchor_front_hitR, + &gPlayerAnim_link_normal_back_hit, &gPlayerAnim_link_anchor_back_hitR, }; void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f32 arg4, s16 arg5, s32 arg6) { @@ -3482,25 +3679,23 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f if (arg2 == 3) { func_80835C58(globalCtx, this, func_8084FB10, 0); - sp2C = &gPlayerAnim_002FD0; + sp2C = &gPlayerAnim_link_normal_ice_down; func_80832224(this); func_8083264C(this, 255, 10, 40, 0); func_8002F7DC(&this->actor, NA_SE_PL_FREEZE_S); func_80832698(this, NA_SE_VO_LI_FREEZE); - } - else if (arg2 == 4) { + } else if (arg2 == 4) { func_80835C58(globalCtx, this, func_8084FBF4, 0); func_8083264C(this, 255, 80, 150, 0); - func_808322A4(globalCtx, this, &gPlayerAnim_002F00); + func_808322A4(globalCtx, this, &gPlayerAnim_link_normal_electric_shock); func_80832224(this); this->unk_850 = 20; - } - else { + } else { arg5 -= this->actor.shape.rot.y; if (this->stateFlags1 & PLAYER_STATE1_27) { func_80835C58(globalCtx, this, func_8084E30C, 0); @@ -3509,12 +3704,11 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f this->linearVelocity = 4.0f; this->actor.velocity.y = 0.0f; - sp2C = &gPlayerAnim_003320; + sp2C = &gPlayerAnim_link_swimer_swim_hit; func_80832698(this, NA_SE_VO_LI_DAMAGE_S); - } - else if ((arg2 == 1) || (arg2 == 2) || !(this->actor.bgCheckFlags & 1) || - (this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) { + } else if ((arg2 == 1) || (arg2 == 2) || !(this->actor.bgCheckFlags & 1) || + (this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) { func_80835C58(globalCtx, this, func_8084377C, 0); this->stateFlags3 |= PLAYER_STATE3_1; @@ -3531,31 +3725,27 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f func_80832C2C(globalCtx, this, D_80853914[PLAYER_ANIMGROUP_3][this->modelAnimType]); func_80832698(this, NA_SE_VO_LI_DAMAGE_S); - } - else { + } else { this->actor.speedXZ = arg3; this->linearVelocity = arg3; this->actor.velocity.y = arg4; if (ABS(arg5) > 0x4000) { - sp2C = &gPlayerAnim_002F58; - } - else { - sp2C = &gPlayerAnim_002DB0; + sp2C = &gPlayerAnim_link_normal_front_downA; + } else { + sp2C = &gPlayerAnim_link_normal_back_downA; } if ((this->actor.category != ACTORCAT_PLAYER) && (this->actor.colChkInfo.health == 0)) { func_80832698(this, NA_SE_VO_BL_DOWN); - } - else { + } else { func_80832698(this, NA_SE_VO_LI_FALL_L); } } this->hoverBootsTimer = 0; this->actor.bgCheckFlags &= ~1; - } - else { + } else { if ((this->linearVelocity > 4.0f) && !func_8008E9C4(this)) { this->unk_890 = 20; func_8083264C(this, 120, 20, 10, 0); @@ -3570,8 +3760,7 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f if (this->actor.colChkInfo.damage < 5) { func_8083264C(this, 120, 20, 10, 0); - } - else { + } else { func_8083264C(this, 180, 20, 100, 0); this->linearVelocity = 23.0f; sp28 += 4; @@ -3612,8 +3801,7 @@ s32 func_80838144(s32 arg0) { if ((temp >= 0) && (temp < 2)) { return temp; - } - else { + } else { return -1; } } @@ -3625,7 +3813,7 @@ s32 func_8083816C(s32 arg0) { void func_8083819C(Player* this, GlobalContext* globalCtx) { if (this->currentShield == PLAYER_SHIELD_DEKU && (CVar_GetS32("gFireproofDekuShield", 0) == 0)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_SHIELD, this->actor.world.pos.x, - this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 1); + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 1); Inventory_DeleteEquipment(globalCtx, EQUIP_SHIELD); Message_StartTextbox(globalCtx, 0x305F, NULL); } @@ -3664,8 +3852,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { Player_InflictDamageModified(globalCtx, -16 * (1 << CVar_GetS32("gVoidDamageMul", 0)), false); this->unk_A86 = 0; } - } - else { + } else { sp68 = ((Player_GetHeight(this) - 8.0f) < (this->unk_6C4 * this->actor.scale.y)); if (sp68 || (this->actor.bgCheckFlags & 0x100) || (D_808535E4 == 9) || (this->stateFlags2 & PLAYER_STATE2_31)) { @@ -3674,8 +3861,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { if (sp68) { Gameplay_TriggerRespawn(globalCtx); func_800994A0(globalCtx); - } - else { + } else { // Special case for getting crushed in Forest Temple's Checkboard Ceiling Hall or Shadow Temple's // Falling Spike Trap Room, to respawn the player in a specific place if (((globalCtx->sceneNum == SCENE_BMORI1) && (globalCtx->roomCtx.curRoom.num == 15)) || @@ -3686,8 +3872,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_BMORI1) { respawnInfo = &checkboardCeilingRespawn; - } - else { + } else { respawnInfo = &fallingSpikeTrapRespawn; } @@ -3702,8 +3887,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { func_80832698(this, NA_SE_VO_LI_TAKEN_AWAY); globalCtx->unk_11DE9 = 1; func_80078884(NA_SE_OC_ABYSS); - } - else if ((this->unk_8A1 != 0) && ((this->unk_8A1 >= 2) || (this->invincibilityTimer == 0))) { + } else if ((this->unk_8A1 != 0) && ((this->unk_8A1 >= 2) || (this->invincibilityTimer == 0))) { u8 sp5C[] = { 2, 1, 1 }; func_80838280(this); @@ -3714,8 +3898,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { this->actor.colChkInfo.damage += this->unk_8A0; func_80837C0C(globalCtx, this, sp5C[this->unk_8A1 - 1], this->unk_8A4, this->unk_8A8, this->unk_8A2, 20); - } - else { + } else { sp64 = (this->shieldQuad.base.acFlags & AC_BOUNCED) != 0; //! @bug The second set of conditions here seems intended as a way for Link to "block" hits by rolling. @@ -3723,7 +3906,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { // Additionally, `Collider.atHit` can never be set while already colliding as AC, so it's also bugged. // This behavior was later fixed in MM, most likely by removing both the `atHit` and `atFlags` checks. if (sp64 || ((this->invincibilityTimer < 0) && (this->cylinder.base.acFlags & AC_HIT) && - (this->cylinder.info.atHit != NULL) && (this->cylinder.info.atHit->atFlags & 0x20000000))) { + (this->cylinder.info.atHit != NULL) && (this->cylinder.info.atHit->atFlags & 0x20000000))) { func_8083264C(this, 180, 20, 100, 0); @@ -3741,17 +3924,19 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { if (this->unk_870 < 0.5f) { anim = D_808543BC[Player_HoldsTwoHandedWeapon(this) && - !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; - } - else { + !(CVar_GetS32("gShieldTwoHanded", 0) && + (this->heldItemActionParam != PLAYER_AP_STICK))]; + } else { anim = D_808543B4[Player_HoldsTwoHandedWeapon(this) && - !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]; + !(CVar_GetS32("gShieldTwoHanded", 0) && + (this->heldItemActionParam != PLAYER_AP_STICK))]; } LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, anim); - } - else { - func_80832264(globalCtx, this, D_808543C4[Player_HoldsTwoHandedWeapon(this) && - !(CVar_GetS32("gShieldTwoHanded", 0) && (this->heldItemActionParam != PLAYER_AP_STICK))]); + } else { + func_80832264(globalCtx, this, + D_808543C4[Player_HoldsTwoHandedWeapon(this) && + !(CVar_GetS32("gShieldTwoHanded", 0) && + (this->heldItemActionParam != PLAYER_AP_STICK))]); } } @@ -3784,42 +3969,35 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_27) { sp4C = 0; - } - else if (this->actor.colChkInfo.acHitEffect == 2) { + } else if (this->actor.colChkInfo.acHitEffect == 2) { sp4C = 3; - } - else if (this->actor.colChkInfo.acHitEffect == 3) { + } else if (this->actor.colChkInfo.acHitEffect == 3) { sp4C = 4; - } - else if (this->actor.colChkInfo.acHitEffect == 4) { + } else if (this->actor.colChkInfo.acHitEffect == 4) { sp4C = 1; - } - else { + } else { func_80838280(this); sp4C = 0; } func_80837C0C(globalCtx, this, sp4C, 4.0f, 5.0f, Actor_WorldYawTowardActor(ac, &this->actor), 20); - } - else if (this->invincibilityTimer != 0) { + } else if (this->invincibilityTimer != 0) { return 0; - } - else { + } else { static u8 D_808544F4[] = { 120, 60 }; s32 sp48 = func_80838144(D_808535E4); if (((this->actor.wallPoly != NULL) && - SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallBgId)) || + SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallBgId)) || ((sp48 >= 0) && - SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId) && - (this->unk_A79 >= D_808544F4[sp48])) || - ((sp48 >= 0) && - ((this->currentTunic != PLAYER_TUNIC_GORON && CVar_GetS32("gSuperTunic", 0) == 0) || (this->unk_A79 >= D_808544F4[sp48])))) { + SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId) && + (this->unk_A79 >= D_808544F4[sp48])) || + ((sp48 >= 0) && ((this->currentTunic != PLAYER_TUNIC_GORON && CVar_GetS32("gSuperTunic", 0) == 0) || + (this->unk_A79 >= D_808544F4[sp48])))) { this->unk_A79 = 0; this->actor.colChkInfo.damage = 4; func_80837C0C(globalCtx, this, 0, 4.0f, 5.0f, this->actor.shape.rot.y, 20); - } - else { + } else { return 0; } } @@ -3868,13 +4046,11 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { if ((this->unk_88C < 2) || (this->wallHeight > this->ageProperties->unk_10)) { return 0; } - } - else if ((this->currentBoots != PLAYER_BOOTS_IRON) || (this->unk_88C > 2)) { + } else if ((this->currentBoots != PLAYER_BOOTS_IRON) || (this->unk_88C > 2)) { return 0; } - } - else if (!(this->actor.bgCheckFlags & 1) || - ((this->ageProperties->unk_14 <= this->wallHeight) && (this->stateFlags1 & PLAYER_STATE1_27))) { + } else if (!(this->actor.bgCheckFlags & 1) || + ((this->ageProperties->unk_14 <= this->wallHeight) && (this->stateFlags1 & PLAYER_STATE1_27))) { return 0; } @@ -3885,8 +4061,7 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { sp3C = 1; } } - } - else if ((this->unk_88D >= 6) || CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { + } else if ((this->unk_88D >= 6) || CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { sp3C = 1; } @@ -3898,10 +4073,9 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { sp34 = this->wallHeight; if (this->ageProperties->unk_14 <= sp34) { - sp38 = &gPlayerAnim_002D48; + sp38 = &gPlayerAnim_link_normal_250jump_start; this->linearVelocity = 1.0f; - } - else { + } else { sp2C = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.x); sp28 = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.z); sp24 = this->wallDistance + 0.5f; @@ -3909,16 +4083,14 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { this->stateFlags1 |= PLAYER_STATE1_14; if (func_808332B8(this)) { - sp38 = &gPlayerAnim_0032E8; + sp38 = &gPlayerAnim_link_swimer_swim_15step_up; sp34 -= (60.0f * this->ageProperties->unk_08); this->stateFlags1 &= ~PLAYER_STATE1_27; - } - else if (this->ageProperties->unk_18 <= sp34) { - sp38 = &gPlayerAnim_002D40; + } else if (this->ageProperties->unk_18 <= sp34) { + sp38 = &gPlayerAnim_link_normal_150step_up; sp34 -= (59.0f * this->ageProperties->unk_08); - } - else { - sp38 = &gPlayerAnim_002D38; + } else { + sp38 = &gPlayerAnim_link_normal_100step_up; sp34 -= (41.0f * this->ageProperties->unk_08); } @@ -3940,10 +4112,9 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { return 1; } - } - else if ((this->actor.bgCheckFlags & 1) && (this->unk_88C == 1) && (this->unk_88D >= 3)) { + } else if ((this->actor.bgCheckFlags & 1) && (this->unk_88C == 1) && (this->unk_88D >= 3)) { temp = (this->wallHeight * 0.08f) + 5.5f; - func_808389E8(this, &gPlayerAnim_002FE0, temp, globalCtx); + func_808389E8(this, &gPlayerAnim_link_normal_jump, temp, globalCtx); this->linearVelocity = 2.5f; return 1; @@ -3967,7 +4138,7 @@ void func_80838E70(GlobalContext* globalCtx, Player* this, f32 arg2, s16 arg3) { void func_80838F18(GlobalContext* globalCtx, Player* this) { func_80835C58(globalCtx, this, func_8084D610, 0); - func_80832C6C(globalCtx, this, &gPlayerAnim_003328); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); } void func_80838F5C(GlobalContext* globalCtx, Player* this) { @@ -3981,7 +4152,7 @@ void func_80838F5C(GlobalContext* globalCtx, Player* this) { s32 func_80838FB8(GlobalContext* globalCtx, Player* this) { if ((globalCtx->sceneLoadFlag == 0) && (this->stateFlags1 & PLAYER_STATE1_31)) { func_80838F5C(globalCtx, this); - func_80832284(globalCtx, this, &gPlayerAnim_003040); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_landing_wait); func_80832698(this, NA_SE_VO_LI_FALL_S); func_800788CC(NA_SE_OC_SECRET_WARP_IN); return 1; @@ -4022,7 +4193,7 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u if (!(this->stateFlags1 & PLAYER_STATE1_7) && (globalCtx->sceneLoadFlag == 0) && (this->csMode == 0) && !(this->stateFlags1 & PLAYER_STATE1_0) && (((poly != NULL) && (sp3C = SurfaceType_GetSceneExitIndex(&globalCtx->colCtx, poly, bgId), sp3C != 0)) || - (func_8083816C(D_808535E4) && (this->unk_A7A == 12)))) { + (func_8083816C(D_808535E4) && (this->unk_A7A == 12)))) { sp34 = this->unk_A84 - (s32)this->actor.world.pos.y; @@ -4034,21 +4205,18 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u if (sp3C == 0) { Gameplay_TriggerVoidOut(globalCtx); func_800994A0(globalCtx); - } - else { + } else { globalCtx->nextEntranceIndex = globalCtx->setupExitList[sp3C - 1]; if (globalCtx->nextEntranceIndex == 0x7FFF) { gSaveContext.respawnFlag = 2; globalCtx->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex; globalCtx->fadeTransition = 3; gSaveContext.nextTransition = 3; - } - else if (globalCtx->nextEntranceIndex >= 0x7FF9) { + } else if (globalCtx->nextEntranceIndex >= 0x7FF9) { globalCtx->nextEntranceIndex = D_808544F8[D_80854514[globalCtx->nextEntranceIndex - 0x7FF9] + globalCtx->curSpawn]; func_800994A0(globalCtx); - } - else { + } else { if (SurfaceType_GetSlope(&globalCtx->colCtx, poly, bgId) == 2) { gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = globalCtx->nextEntranceIndex; Gameplay_TriggerVoidOut(globalCtx); @@ -4070,8 +4238,7 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u func_800F6964(5); gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = NATURE_ID_DISABLED; - } - else { + } else { linearVel = this->linearVelocity; if (linearVel < 0.0f) { @@ -4081,21 +4248,18 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u if (linearVel > R_RUN_SPEED_LIMIT / 100.0f) { gSaveContext.entranceSpeed = R_RUN_SPEED_LIMIT / 100.0f; - } - else { + } else { gSaveContext.entranceSpeed = linearVel; } if (D_808535F4 != 0) { yaw = D_808535FC; - } - else { + } else { yaw = this->actor.world.rot.y; } func_80838E70(globalCtx, this, 400.0f, yaw); } - } - else { + } else { if (!(this->actor.bgCheckFlags & 1)) { func_80832210(this); } @@ -4106,33 +4270,29 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u func_80835E44(globalCtx, 0x2F); return 1; - } - else { + } else { if (globalCtx->sceneLoadFlag == 0) { if ((this->actor.world.pos.y < -4000.0f) || (((this->unk_A7A == 5) || (this->unk_A7A == 12)) && - ((D_80853600 < 100.0f) || (this->fallDistance > 400.0f) || - ((globalCtx->sceneNum != SCENE_HAKADAN) && (this->fallDistance > 200.0f)))) || + ((D_80853600 < 100.0f) || (this->fallDistance > 400.0f) || + ((globalCtx->sceneNum != SCENE_HAKADAN) && (this->fallDistance > 200.0f)))) || ((globalCtx->sceneNum == SCENE_GANON_FINAL) && (this->fallDistance > 320.0f))) { if (this->actor.bgCheckFlags & 1) { if (this->unk_A7A == 5) { Gameplay_TriggerRespawn(globalCtx); - } - else { + } else { Gameplay_TriggerVoidOut(globalCtx); } globalCtx->fadeTransition = 4; func_80078884(NA_SE_OC_ABYSS); - } - else { + } else { func_80838F5C(globalCtx, this); this->unk_850 = 9999; if (this->unk_A7A == 5) { this->unk_84F = -1; - } - else { + } else { this->unk_84F = 1; } } @@ -4206,7 +4366,7 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { if ((this->doorType != PLAYER_DOORTYPE_NONE) && (!(this->stateFlags1 & PLAYER_STATE1_11) || - ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) { + ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) { if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (func_8084F9A0 == this->func_674)) { doorActor = this->doorActor; @@ -4251,38 +4411,33 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { this->unk_850 = 0; func_80832B0C(globalCtx, this, func_80833338(this)); this->skelAnime.endFrame = 0.0f; - } - else { + } else { this->linearVelocity = 0.1f; } if (doorShutter->dyna.actor.category == ACTORCAT_DOOR) { this->unk_46A = globalCtx->transiActorCtx.list[(u16)doorShutter->dyna.actor.params >> 10] - .sides[(doorDirection > 0) ? 0 : 1] - .effects; + .sides[(doorDirection > 0) ? 0 : 1] + .effects; Actor_DisableLens(globalCtx); } - } - else { + } else { // This actor can be either EnDoor or DoorKiller. // Don't try to access any struct vars other than `animStyle` and `playerIsOpening`! These two variables // are common across the two actors' structs however most other variables are not! door = (EnDoor*)doorActor; door->animStyle = (doorDirection < 0.0f) ? (LINK_IS_ADULT ? KNOB_ANIM_ADULT_L : KNOB_ANIM_CHILD_L) - : (LINK_IS_ADULT ? KNOB_ANIM_ADULT_R : KNOB_ANIM_CHILD_R); + : (LINK_IS_ADULT ? KNOB_ANIM_ADULT_R : KNOB_ANIM_CHILD_R); if (door->animStyle == KNOB_ANIM_ADULT_L) { sp5C = D_80853914[PLAYER_ANIMGROUP_9][this->modelAnimType]; - } - else if (door->animStyle == KNOB_ANIM_CHILD_L) { + } else if (door->animStyle == KNOB_ANIM_CHILD_L) { sp5C = D_80853914[PLAYER_ANIMGROUP_10][this->modelAnimType]; - } - else if (door->animStyle == KNOB_ANIM_ADULT_R) { + } else if (door->animStyle == KNOB_ANIM_ADULT_R) { sp5C = D_80853914[PLAYER_ANIMGROUP_11][this->modelAnimType]; - } - else { + } else { sp5C = D_80853914[PLAYER_ANIMGROUP_12][this->modelAnimType]; } @@ -4291,8 +4446,7 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { if (doorDirection < 0) { this->actor.shape.rot.y = doorActor->shape.rot.y; - } - else { + } else { this->actor.shape.rot.y = doorActor->shape.rot.y - 0x8000; } @@ -4332,21 +4486,20 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { gSaveContext.entranceSpeed = 2.0f; gSaveContext.entranceSound = NA_SE_OC_DOOR_OPEN; } - } - else { + } else { Camera_ChangeDoorCam(Gameplay_GetCamera(globalCtx, 0), doorActor, - globalCtx->transiActorCtx.list[(u16)doorActor->params >> 10] - .sides[(doorDirection > 0) ? 0 : 1] - .effects, - 0, 38.0f * D_808535EC, 26.0f * D_808535EC, 10.0f * D_808535EC); + globalCtx->transiActorCtx.list[(u16)doorActor->params >> 10] + .sides[(doorDirection > 0) ? 0 : 1] + .effects, + 0, 38.0f * D_808535EC, 26.0f * D_808535EC, 10.0f * D_808535EC); } } } if ((this->doorType != PLAYER_DOORTYPE_FAKE) && (doorActor->category == ACTORCAT_DOOR)) { frontRoom = globalCtx->transiActorCtx.list[(u16)doorActor->params >> 10] - .sides[(doorDirection > 0) ? 0 : 1] - .room; + .sides[(doorDirection > 0) ? 0 : 1] + .room; if ((frontRoom >= 0) && (frontRoom != globalCtx->roomCtx.curRoom.num)) { func_8009728C(globalCtx, &globalCtx->roomCtx, frontRoom); @@ -4374,8 +4527,7 @@ void func_80839E88(Player* this, GlobalContext* globalCtx) { if (this->unk_870 < 0.5f) { anim = func_808334E4(this); this->unk_870 = 0.0f; - } - else { + } else { anim = func_80833528(this); this->unk_870 = 1.0f; } @@ -4394,11 +4546,9 @@ void func_80839F30(Player* this, GlobalContext* globalCtx) { void func_80839F90(Player* this, GlobalContext* globalCtx) { if (func_8008E9C4(this)) { func_80839E88(this, globalCtx); - } - else if (func_80833B2C(this)) { + } else if (func_80833B2C(this)) { func_80839F30(this, globalCtx); - } - else { + } else { func_80853080(this, globalCtx); } } @@ -4408,11 +4558,9 @@ void func_80839FFC(Player* this, GlobalContext* globalCtx) { if (func_8008E9C4(this)) { func = func_80840450; - } - else if (func_80833B2C(this)) { + } else if (func_80833B2C(this)) { func = func_808407CC; - } - else { + } else { func = func_80840BC8; } @@ -4445,30 +4593,26 @@ void func_8083A0F4(GlobalContext* globalCtx, Player* this) { func_80835C58(globalCtx, this, func_8084F608, 0); this->stateFlags1 |= PLAYER_STATE1_29; sMaskMemory = PLAYER_MASK_NONE; - } - else { + } else { LinkAnimationHeader* anim; if (interactActorId == ACTOR_BG_HEAVY_BLOCK) { func_80835C58(globalCtx, this, func_80846120, 0); this->stateFlags1 |= PLAYER_STATE1_29; - anim = &gPlayerAnim_002F98; - } - else if ((interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 0xF) == 1)) { + anim = &gPlayerAnim_link_normal_heavy_carry; + } else if ((interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 0xF) == 1)) { func_80835C58(globalCtx, this, func_80846260, 0); - anim = &gPlayerAnim_0032B0; - } - else if (((interactActorId == ACTOR_EN_BOMBF) || (interactActorId == ACTOR_EN_KUSA)) && - (Player_GetStrength() <= PLAYER_STR_NONE)) { + anim = &gPlayerAnim_link_silver_carry; + } else if (((interactActorId == ACTOR_EN_BOMBF) || (interactActorId == ACTOR_EN_KUSA)) && + (Player_GetStrength() <= PLAYER_STR_NONE)) { func_80835C58(globalCtx, this, func_80846408, 0); this->actor.world.pos.x = (Math_SinS(interactRangeActor->yawTowardsPlayer) * 20.0f) + interactRangeActor->world.pos.x; this->actor.world.pos.z = (Math_CosS(interactRangeActor->yawTowardsPlayer) * 20.0f) + interactRangeActor->world.pos.z; this->currentYaw = this->actor.shape.rot.y = interactRangeActor->yawTowardsPlayer + 0x8000; - anim = &gPlayerAnim_003060; - } - else { + anim = &gPlayerAnim_link_normal_nocarry_free; + } else { func_80835C58(globalCtx, this, func_80846050, 0); anim = D_80853914[PLAYER_ANIMGROUP_13][this->modelAnimType]; } @@ -4479,8 +4623,7 @@ void func_8083A0F4(GlobalContext* globalCtx, Player* this) { LinkAnimation_PlayOnce(globalCtx, &this->skelAnime, anim); } } - } - else { + } else { func_80839F90(this, globalCtx); this->stateFlags1 &= ~PLAYER_STATE1_11; } @@ -4527,11 +4670,9 @@ void func_8083A434(GlobalContext* globalCtx, Player* this) { if (this->getItemId == GI_HEART_CONTAINER_2) { this->unk_850 = 20; - } - else if (this->getItemId >= 0) { + } else if (this->getItemId >= 0) { this->unk_850 = 1; - } - else { + } else { this->getItemId = -this->getItemId; } } @@ -4544,16 +4685,14 @@ s32 func_8083A4A8(Player* this, GlobalContext* globalCtx) { yawDiff = this->currentYaw - this->actor.shape.rot.y; if ((ABS(yawDiff) < 0x1000) && (this->linearVelocity > 4.0f)) { - anim = &gPlayerAnim_003148; - } - else { - anim = &gPlayerAnim_002FE0; + anim = &gPlayerAnim_link_normal_run_jump; + } else { + anim = &gPlayerAnim_link_normal_jump; } if (this->linearVelocity > (IREG(66) / 100.0f)) { temp = IREG(67) / 100.0f; - } - else { + } else { temp = (IREG(68) / 100.0f) + ((IREG(69) * this->linearVelocity) / 1000.0f); } @@ -4593,8 +4732,7 @@ s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) { temp1 = sqrtf(SQ(sp74.x) + SQ(sp74.z)); if (temp1 != 0.0f) { temp1 = 5.0f / temp1; - } - else { + } else { temp1 = 0.0f; } @@ -4603,7 +4741,7 @@ s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) { sp74.z = this->actor.prevPos.z + (sp74.z * temp1); if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &sp74, &sp68, &sp84, true, false, false, - true, &sp80) && + true, &sp80) && ((ABS(sp84->normal.y) < 600) || (CVar_GetS32("gClimbEverything", 0) != 0))) { f32 nx = COLPOLY_GET_NORMAL(sp84->normal.x); f32 ny = COLPOLY_GET_NORMAL(sp84->normal.y); @@ -4618,7 +4756,8 @@ s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) { sp50 = 1; } - func_8083A5C4(globalCtx, this, sp84, sp54, sp50 ? &gPlayerAnim_002D88 : &gPlayerAnim_002F10); + func_8083A5C4(globalCtx, this, sp84, sp54, + sp50 ? &gPlayerAnim_link_normal_Fclimb_startB : &gPlayerAnim_link_normal_fall); if (sp50) { func_80836898(globalCtx, this, func_8083A3B0); @@ -4631,8 +4770,7 @@ s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) { this->unk_850 = -1; this->unk_84F = sp50; - } - else { + } else { this->stateFlags1 |= PLAYER_STATE1_13; this->stateFlags1 &= ~PLAYER_STATE1_17; } @@ -4705,7 +4843,7 @@ void func_8083AA10(Player* this, GlobalContext* globalCtx) { if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, sp44.x, sp44.z, &sp3C, &sp50) && ((sp3C - sp40) > 50.0f)) { - func_808389E8(this, &gPlayerAnim_003158, 6.0f, globalCtx); + func_808389E8(this, &gPlayerAnim_link_normal_run_jump_water_fall, 6.0f, globalCtx); func_80835C58(globalCtx, this, func_80844A44, 0); return; } @@ -4717,13 +4855,12 @@ void func_8083AA10(Player* this, GlobalContext* globalCtx) { if ((D_80853604 == 9) || (D_80853600 <= this->ageProperties->unk_34) || !func_8083A6AC(this, globalCtx)) { - func_80832284(globalCtx, this, &gPlayerAnim_003040); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_landing_wait); return; } } } - } - else { + } else { this->fallStartHeight = this->actor.world.pos.y; } } @@ -4735,16 +4872,13 @@ s32 func_8083AD4C(GlobalContext* globalCtx, Player* this) { if (func_8002DD6C(this)) { if (LINK_IS_ADULT) { cameraMode = CAM_MODE_BOWARROW; - } - else { + } else { cameraMode = CAM_MODE_SLINGSHOT; } - } - else { + } else { cameraMode = CAM_MODE_BOOMERANG; } - } - else { + } else { cameraMode = CAM_MODE_FIRSTPERSON; } @@ -4759,8 +4893,7 @@ s32 func_8083ADD4(GlobalContext* globalCtx, Player* this) { } func_80832318(this); return 1; - } - else { + } else { return 0; } } @@ -4778,8 +4911,9 @@ void func_8083AE40(Player* this, s16 objectId) { LOG_HEX("size", size); ASSERT(size <= 1024 * 8); - DmaMgr_SendRequest2(&this->giObjectDmaRequest, (uintptr_t)this->giObjectSegment, gObjectTable[objectId].vromStart, - size, 0, &this->giObjectLoadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__); + DmaMgr_SendRequest2(&this->giObjectDmaRequest, (uintptr_t)this->giObjectSegment, + gObjectTable[objectId].vromStart, size, 0, &this->giObjectLoadQueue, OS_MESG_PTR(NULL), + __FILE__, __LINE__); } } @@ -4789,12 +4923,11 @@ void func_8083AF44(GlobalContext* globalCtx, Player* this, s32 magicSpell) { this->unk_84F = magicSpell - 3; func_80087708(globalCtx, sMagicSpellCosts[magicSpell], 4); - LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayerAnim_002D28, 0.83f); + LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayerAnim_link_magic_tame, 0.83f); if (magicSpell == 5) { this->unk_46C = OnePointCutscene_Init(globalCtx, 1100, -101, NULL, MAIN_CAM); - } - else { + } else { func_80835EA4(globalCtx, 10); } } @@ -4815,9 +4948,9 @@ static u8 D_80854528[] = { }; static LinkAnimationHeader* D_80854548[] = { - &gPlayerAnim_002F88, - &gPlayerAnim_002690, - &gPlayerAnim_003198, + &gPlayerAnim_link_normal_give_other, + &gPlayerAnim_link_bottle_read, + &gPlayerAnim_link_normal_take_out, }; s32 func_8083B040(Player* this, GlobalContext* globalCtx) { @@ -4835,8 +4968,7 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { if (sp2C >= 0) { if ((sp2C != 3) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { func_8083AF44(globalCtx, this, sp2C); - } - else { + } else { func_80835C58(globalCtx, this, func_8085063C, 1); this->stateFlags1 |= PLAYER_STATE1_28 | PLAYER_STATE1_29; func_80832264(globalCtx, this, func_80833338(this)); @@ -4850,11 +4982,11 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { sp2C = this->itemActionParam - PLAYER_AP_LETTER_ZELDA; if ((sp2C >= 0) || (sp28 = Player_ActionToBottle(this, this->itemActionParam) - 1, - ((sp28 >= 0) && (sp28 < 6) && - ((this->itemActionParam > PLAYER_AP_BOTTLE_POE) || - ((this->targetActor != NULL) && - (((this->itemActionParam == PLAYER_AP_BOTTLE_POE) && (this->exchangeItemId == EXCH_ITEM_POE)) || - (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE))))))) { + ((sp28 >= 0) && (sp28 < 6) && + ((this->itemActionParam > PLAYER_AP_BOTTLE_POE) || + ((this->targetActor != NULL) && + (((this->itemActionParam == PLAYER_AP_BOTTLE_POE) && (this->exchangeItemId == EXCH_ITEM_POE)) || + (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE))))))) { if ((globalCtx->actorCtx.titleCtx.delayTimer == 0) && (globalCtx->actorCtx.titleCtx.alpha == 0)) { func_80835DE4(globalCtx, this, func_8084F104, 0); @@ -4872,8 +5004,7 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { if (sp2C >= 0) { sp2C = sp2C + 1; - } - else { + } else { sp2C = sp28 + 0x18; } @@ -4881,10 +5012,10 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { if ((targetActor != NULL) && ((this->exchangeItemId == sp2C) || (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE) || - ((this->exchangeItemId == EXCH_ITEM_POE) && - (this->itemActionParam == PLAYER_AP_BOTTLE_BIG_POE)) || - ((this->exchangeItemId == EXCH_ITEM_BEAN) && - (this->itemActionParam == PLAYER_AP_BOTTLE_BUG))) && + ((this->exchangeItemId == EXCH_ITEM_POE) && + (this->itemActionParam == PLAYER_AP_BOTTLE_BIG_POE)) || + ((this->exchangeItemId == EXCH_ITEM_BEAN) && + (this->itemActionParam == PLAYER_AP_BOTTLE_BUG))) && ((this->exchangeItemId != EXCH_ITEM_BEAN) || (this->itemActionParam == PLAYER_AP_BEAN))) { if (this->exchangeItemId == EXCH_ITEM_BEAN) { Inventory_ChangeAmmo(ITEM_BEAN, -1); @@ -4895,13 +5026,11 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { } targetActor->flags |= ACTOR_FLAG_8; this->unk_664 = this->targetActor; - } - else if (sp2C == EXCH_ITEM_LETTER_RUTO) { + } else if (sp2C == EXCH_ITEM_LETTER_RUTO) { this->unk_84F = 1; this->actor.textId = 0x4005; func_80835EA4(globalCtx, 1); - } - else { + } else { this->unk_84F = 2; this->actor.textId = 0xCF; func_80835EA4(globalCtx, 4); @@ -4912,8 +5041,7 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { if (this->unk_84F < 0) { func_80832B0C(globalCtx, this, D_80853914[PLAYER_ANIMGROUP_32][this->modelAnimType]); - } - else { + } else { func_80832264(globalCtx, this, D_80854548[this->unk_84F]); } @@ -4926,23 +5054,20 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { if (sp2C >= 0) { if (sp2C == 0xC) { func_80835DE4(globalCtx, this, func_8084EED8, 0); - func_808322D0(globalCtx, this, &gPlayerAnim_002650); + func_808322D0(globalCtx, this, &gPlayerAnim_link_bottle_bug_out); func_80835EA4(globalCtx, 3); - } - else if ((sp2C > 0) && (sp2C < 4)) { + } else if ((sp2C > 0) && (sp2C < 4)) { func_80835DE4(globalCtx, this, func_8084EFC0, 0); - func_808322D0(globalCtx, this, &gPlayerAnim_002688); + func_808322D0(globalCtx, this, &gPlayerAnim_link_bottle_fish_out); func_80835EA4(globalCtx, (sp2C == 1) ? 1 : 5); - } - else { + } else { func_80835DE4(globalCtx, this, func_8084EAC0, 0); - func_80832B78(globalCtx, this, &gPlayerAnim_002668); + func_80832B78(globalCtx, this, &gPlayerAnim_link_bottle_drink_demo_start); func_80835EA4(globalCtx, 2); } - } - else { + } else { func_80835DE4(globalCtx, this, func_8084E3C4, 0); - func_808322D0(globalCtx, this, &gPlayerAnim_0030A0); + func_808322D0(globalCtx, this, &gPlayerAnim_link_normal_okarina_start); this->stateFlags2 |= PLAYER_STATE2_27; func_80835EA4(globalCtx, (this->unk_6A8 != NULL) ? 0x5B : 0x5A); if (this->unk_6A8 != NULL) { @@ -4950,8 +5075,7 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->unk_6A8); } } - } - else if (func_8083AD4C(globalCtx, this)) { + } else if (func_8083AD4C(globalCtx, this)) { if (!(this->stateFlags1 & PLAYER_STATE1_23)) { func_80835C58(globalCtx, this, func_8084B1D8, 1); this->unk_850 = 13; @@ -4961,8 +5085,7 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) { func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); func_80832210(this); return 1; - } - else { + } else { this->unk_6AD = 0; func_80078884(NA_SE_SY_ERROR); return 0; @@ -4995,8 +5118,7 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { sp30 = NULL; sp34 = NULL; } - } - else { + } else { sp2C = sp30; } } @@ -5005,7 +5127,7 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { if ((sp30 == NULL) || (sp30 == sp34) || (sp30 == sp2C)) { if (!(this->stateFlags1 & PLAYER_STATE1_11) || ((this->heldActor != NULL) && (sp28 || (sp34 == this->heldActor) || (sp2C == this->heldActor) || - ((sp34 != NULL) && (sp34->flags & ACTOR_FLAG_16))))) { + ((sp34 != NULL) && (sp34->flags & ACTOR_FLAG_16))))) { if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_23) || (func_808332B8(this) && !(this->stateFlags2 & PLAYER_STATE2_10))) { @@ -5013,8 +5135,7 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_1; if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (sp34->flags & ACTOR_FLAG_16)) { sp2C = NULL; - } - else if (sp2C == NULL) { + } else if (sp2C == NULL) { return 0; } } @@ -5024,7 +5145,8 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_21; } - if (!CHECK_BTN_ALL(sControlInput->press.button, CVar_GetS32("gNaviOnL", 0) ? BTN_L : BTN_CUP) && !sp28) { + if (!CHECK_BTN_ALL(sControlInput->press.button, CVar_GetS32("gNaviOnL", 0) ? BTN_L : BTN_CUP) && + !sp28) { return 0; } @@ -5034,12 +5156,10 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { if (sp28 || !sp24) { if (this->naviTextId >= 0) { sp2C->textId = this->naviTextId; - } - else { + } else { sp2C->textId = -this->naviTextId; } - } - else { + } else { if (sp2C->naviEnemyId != 0xFF) { sp2C->textId = sp2C->naviEnemyId + 0x600; } @@ -5079,10 +5199,9 @@ s32 func_8083B998(Player* this, GlobalContext* globalCtx) { if ((this->unk_664 != NULL) && (CHECK_FLAG_ALL(this->unk_664->flags, ACTOR_FLAG_0 | ACTOR_FLAG_18) || (this->unk_664->naviEnemyId != 0xFF))) { this->stateFlags2 |= PLAYER_STATE2_21; - } - else if ((this->naviTextId == 0 || CVar_GetS32("gNaviOnL", 0)) && - !func_8008E9C4(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && - (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, globalCtx)) { + } else if ((this->naviTextId == 0 || CVar_GetS32("gNaviOnL", 0)) && !func_8008E9C4(this) && + CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && (YREG(15) != 0x10) && (YREG(15) != 0x20) && + !func_8083B8F4(this, globalCtx)) { func_80078884(NA_SE_SY_ERROR); } @@ -5129,7 +5248,7 @@ s32 func_8083BBA0(Player* this, GlobalContext* globalCtx) { void func_8083BC04(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_80844708, 0); LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_16][this->modelAnimType], - 1.25f * D_808535E8); + 1.25f * D_808535E8); } s32 func_8083BC7C(Player* this, GlobalContext* globalCtx) { @@ -5169,24 +5288,20 @@ s32 func_8083BDBC(Player* this, GlobalContext* globalCtx) { if (func_80833BCC(this)) { if (this->actor.category != ACTORCAT_PLAYER) { if (sp2C < 0) { - func_808389E8(this, &gPlayerAnim_002FE0, REG(69) / 100.0f, globalCtx); - } - else { + func_808389E8(this, &gPlayerAnim_link_normal_jump, REG(69) / 100.0f, globalCtx); + } else { func_8083BC04(this, globalCtx); } - } - else { + } else { if (Player_GetSwordHeld(this) && func_808365C8(this)) { func_8083BA90(globalCtx, this, 17, 5.0f, 5.0f); - } - else { + } else { func_8083BC04(this, globalCtx); } } return 1; } - } - else { + } else { func_8083BCD0(this, globalCtx, sp2C); return 1; } @@ -5211,8 +5326,7 @@ void func_8083BF50(Player* this, GlobalContext* globalCtx) { sp30 = 1.375f * -sp30; } sp30 /= 11.0f; - } - else { + } else { anim = D_80853914[PLAYER_ANIMGROUP_19][this->modelAnimType]; sp30 = 26.0f - sp30; if (sp30 < 0.0f) { @@ -5222,7 +5336,7 @@ void func_8083BF50(Player* this, GlobalContext* globalCtx) { } LinkAnimation_Change(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, - 4.0f * sp30); + 4.0f * sp30); this->currentYaw = this->actor.shape.rot.y; } @@ -5242,8 +5356,7 @@ void func_8083C148(Player* this, GlobalContext* globalCtx) { func_8083B010(this); if (this->stateFlags1 & PLAYER_STATE1_27) { func_80838F18(globalCtx, this); - } - else { + } else { func_80839F90(this, globalCtx); } if (this->unk_6AD < 4) { @@ -5262,8 +5375,7 @@ s32 func_8083C1DC(Player* this, GlobalContext* globalCtx) { } if ((this->unk_837 == 0) && (this->heldItemActionParam >= PLAYER_AP_SWORD_MASTER)) { func_80835F44(globalCtx, this, ITEM_NONE); - } - else { + } else { this->stateFlags2 ^= PLAYER_STATE2_20; } } @@ -5288,16 +5400,14 @@ s32 func_8083C2B0(Player* this, GlobalContext* globalCtx) { if (!Player_IsChildWithHylianShield(this)) { Player_SetModelsForHoldingShield(this); anim = D_80853914[PLAYER_ANIMGROUP_20][this->modelAnimType]; - } - else { - anim = &gPlayerAnim_002400; + } else { + anim = &gPlayerAnim_clink_normal_defense_ALL; } if (anim != this->skelAnime.animation) { if (func_8008E9C4(this)) { this->unk_86C = 1.0f; - } - else { + } else { this->unk_86C = 0.0f; func_80833C3C(this); } @@ -5327,8 +5437,7 @@ s32 func_8083C484(Player* this, f32* arg1, s16* arg2) { if (func_8083721C(this)) { *arg1 = 0.0f; *arg2 = this->currentYaw; - } - else { + } else { return 1; } } @@ -5351,8 +5460,7 @@ s32 func_8083C544(Player* this, GlobalContext* globalCtx) { return 1; } } - } - else { + } else { func_8083C50C(this); } @@ -5360,10 +5468,10 @@ s32 func_8083C544(Player* this, GlobalContext* globalCtx) { } s32 func_8083C61C(GlobalContext* globalCtx, Player* this) { - if ((globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && - (this->actor.bgCheckFlags & 1) && (AMMO(ITEM_NUT) != 0)) { + if ((globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && (this->actor.bgCheckFlags & 1) && + (AMMO(ITEM_NUT) != 0)) { func_80835C58(globalCtx, this, func_8084E604, 0); - func_80832264(globalCtx, this, &gPlayerAnim_003048); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_light_bom); this->unk_6AD = 0; return 1; } @@ -5372,8 +5480,8 @@ s32 func_8083C61C(GlobalContext* globalCtx, Player* this) { } static struct_80854554 D_80854554[] = { - { &gPlayerAnim_002648, &gPlayerAnim_002640, 2, 3 }, - { &gPlayerAnim_002680, &gPlayerAnim_002678, 5, 3 }, + { &gPlayerAnim_link_bottle_bug_miss, &gPlayerAnim_link_bottle_bug_in, 2, 3 }, + { &gPlayerAnim_link_bottle_fish_miss, &gPlayerAnim_link_bottle_fish_in, 5, 3 }, }; s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) { @@ -5398,8 +5506,10 @@ s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) { sp24 = this->actor.world.pos; sp24.y += 50.0f; - if (CVar_GetS32("gHoverFishing", 0) ? 0 : !(this->actor.bgCheckFlags & 1) || - (this->actor.world.pos.z > 1300.0f) || BgCheck_SphVsFirstPoly(&globalCtx->colCtx, &sp24, 20.0f)) { + if (CVar_GetS32("gHoverFishing", 0) + ? 0 + : !(this->actor.bgCheckFlags & 1) || (this->actor.world.pos.z > 1300.0f) || + BgCheck_SphVsFirstPoly(&globalCtx->colCtx, &sp24, 20.0f)) { func_80078884(NA_SE_SY_ERROR); return 0; } @@ -5407,10 +5517,9 @@ s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) { func_80835C58(globalCtx, this, func_80850C68, 0); this->unk_860 = 1; func_80832210(this); - func_80832264(globalCtx, this, &gPlayerAnim_002C30); + func_80832264(globalCtx, this, &gPlayerAnim_link_fishing_throw); return 1; - } - else { + } else { return 0; } } @@ -5423,8 +5532,7 @@ void func_8083C858(Player* this, GlobalContext* globalCtx) { if (func_80833BCC(this)) { func = func_8084227C; - } - else { + } else { func = func_80842180; } @@ -5446,11 +5554,11 @@ s32 func_8083C910(GlobalContext* globalCtx, Player* this, f32 arg2) { sp28 = this->actor.world.pos.y; if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp28, - &sp2C) != 0) { + &sp2C) != 0) { sp28 -= this->actor.world.pos.y; if (this->ageProperties->unk_24 <= sp28) { func_80835C58(globalCtx, this, func_8084D7C4, 0); - func_80832C6C(globalCtx, this, &gPlayerAnim_0032F0); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim); this->stateFlags1 |= PLAYER_STATE1_27 | PLAYER_STATE1_29; this->unk_850 = 20; this->linearVelocity = 2.0f; @@ -5507,8 +5615,8 @@ void func_8083CB94(Player* this, GlobalContext* globalCtx) { void func_8083CBF0(Player* this, s16 yaw, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_808423EC, 1); - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_0024F8, 2.2f, 0.0f, - Animation_GetLastFrame(&gPlayerAnim_0024F8), ANIMMODE_ONCE, -6.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_anchor_back_walk, 2.2f, 0.0f, + Animation_GetLastFrame(&gPlayerAnim_link_anchor_back_walk), ANIMMODE_ONCE, -6.0f); this->linearVelocity = 8.0f; this->currentYaw = yaw; } @@ -5521,7 +5629,7 @@ void func_8083CC9C(Player* this, GlobalContext* globalCtx) { void func_8083CD00(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_8084251C, 1); - LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayerAnim_0024E8, 2.0f); + LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayerAnim_link_anchor_back_brake, 2.0f); } void func_8083CD54(GlobalContext* globalCtx, Player* this, s16 yaw) { @@ -5530,7 +5638,7 @@ void func_8083CD54(GlobalContext* globalCtx, Player* this, s16 yaw) { this->unk_87E = 1200; this->unk_87E *= D_808535E8; LinkAnimation_Change(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_26][this->modelAnimType], 1.0f, 0.0f, - 0.0f, ANIMMODE_LOOP, -6.0f); + 0.0f, ANIMMODE_LOOP, -6.0f); } void func_8083CE0C(Player* this, GlobalContext* globalCtx) { @@ -5540,8 +5648,7 @@ void func_8083CE0C(Player* this, GlobalContext* globalCtx) { if (this->unk_870 < 0.5f) { anim = D_80853914[PLAYER_ANIMGROUP_28][this->modelAnimType]; - } - else { + } else { anim = D_80853914[PLAYER_ANIMGROUP_27][this->modelAnimType]; } func_80832264(globalCtx, this, anim); @@ -5558,8 +5665,7 @@ void func_8083CEAC(Player* this, GlobalContext* globalCtx) { void func_8083CF10(Player* this, GlobalContext* globalCtx) { if (this->linearVelocity != 0.0f) { func_8083C858(this, globalCtx); - } - else { + } else { func_8083CE0C(this, globalCtx); } } @@ -5567,8 +5673,7 @@ void func_8083CF10(Player* this, GlobalContext* globalCtx) { void func_8083CF5C(Player* this, GlobalContext* globalCtx) { if (this->linearVelocity != 0.0f) { func_8083C858(this, globalCtx); - } - else { + } else { func_80839F90(this, globalCtx); } } @@ -5612,10 +5717,10 @@ void func_8083D0A8(GlobalContext* globalCtx, Player* this, f32 arg2) { s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) { if (!(this->stateFlags1 & PLAYER_STATE1_10) && !(this->stateFlags2 & PLAYER_STATE2_10)) { if ((arg2 == NULL) || (CHECK_BTN_ALL(arg2->press.button, BTN_A) && (ABS(this->unk_6C2) < 12000) && - (this->currentBoots != PLAYER_BOOTS_IRON))) { + (this->currentBoots != PLAYER_BOOTS_IRON))) { func_80835C58(globalCtx, this, func_8084DC48, 0); - func_80832264(globalCtx, this, &gPlayerAnim_003308); + func_80832264(globalCtx, this, &gPlayerAnim_link_swimer_swim_deep_start); this->unk_6C2 = 0; this->stateFlags2 |= PLAYER_STATE2_10; @@ -5648,7 +5753,8 @@ s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) { func_80832340(globalCtx, this); func_80832B0C(globalCtx, this, - (this->stateFlags1 & PLAYER_STATE1_11) ? &gPlayerAnim_003318 : &gPlayerAnim_003300); + (this->stateFlags1 & PLAYER_STATE1_11) ? &gPlayerAnim_link_swimer_swim_get + : &gPlayerAnim_link_swimer_swim_deep_end); if (func_8083CFA8(globalCtx, this, this->actor.velocity.y, 500)) { func_8002F7DC(&this->actor, NA_SE_PL_FACE_UP); @@ -5663,7 +5769,7 @@ s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) { } void func_8083D330(GlobalContext* globalCtx, Player* this) { - func_80832284(globalCtx, this, &gPlayerAnim_0032F0); + func_80832284(globalCtx, this, &gPlayerAnim_link_swimer_swim); this->unk_6C2 = 16000; this->unk_850 = 1; } @@ -5676,14 +5782,14 @@ void func_8083D36C(GlobalContext* globalCtx, Player* this) { this->stateFlags2 &= ~PLAYER_STATE2_10; func_8083D12C(globalCtx, this, 0); this->unk_84F = 1; - } - else if (func_80844A44 == this->func_674) { + } else if (func_80844A44 == this->func_674) { func_80835C58(globalCtx, this, func_8084DC48, 0); func_8083D330(globalCtx, this); - } - else { + } else { func_80835C58(globalCtx, this, func_8084D610, 1); - func_80832B0C(globalCtx, this, (this->actor.bgCheckFlags & 1) ? &gPlayerAnim_003330 : &gPlayerAnim_0032E0); + func_80832B0C(globalCtx, this, + (this->actor.bgCheckFlags & 1) ? &gPlayerAnim_link_swimer_wait2swim_wait + : &gPlayerAnim_link_swimer_land2swim_wait); } } @@ -5709,8 +5815,7 @@ void func_8083D53C(GlobalContext* globalCtx, Player* this) { if (this->actor.yDistToWater < this->ageProperties->unk_2C) { Audio_SetBaseFilter(0); this->unk_840 = 0; - } - else { + } else { Audio_SetBaseFilter(0x20); if (this->unk_840 < 300) { this->unk_840++; @@ -5721,15 +5826,14 @@ void func_8083D53C(GlobalContext* globalCtx, Player* this) { if (this->ageProperties->unk_2C < this->actor.yDistToWater) { if (!(this->stateFlags1 & PLAYER_STATE1_27) || (!((this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.bgCheckFlags & 1)) && - (func_8084E30C != this->func_674) && (func_8084E368 != this->func_674) && - (func_8084D610 != this->func_674) && (func_8084D84C != this->func_674) && - (func_8084DAB4 != this->func_674) && (func_8084DC48 != this->func_674) && - (func_8084E1EC != this->func_674) && (func_8084D7C4 != this->func_674))) { + (func_8084E30C != this->func_674) && (func_8084E368 != this->func_674) && + (func_8084D610 != this->func_674) && (func_8084D84C != this->func_674) && + (func_8084DAB4 != this->func_674) && (func_8084DC48 != this->func_674) && + (func_8084E1EC != this->func_674) && (func_8084D7C4 != this->func_674))) { func_8083D36C(globalCtx, this); return; } - } - else if ((this->stateFlags1 & PLAYER_STATE1_27) && (this->actor.yDistToWater < this->ageProperties->unk_24)) { + } else if ((this->stateFlags1 & PLAYER_STATE1_27) && (this->actor.yDistToWater < this->ageProperties->unk_24)) { if ((this->skelAnime.moveFlags == 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) { func_8083CD54(globalCtx, this, this->actor.shape.rot.y); } @@ -5755,23 +5859,19 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { if (D_808535E4 == 4) { if (this->unk_6C4 > 1300.0f) { temp2 = this->unk_6C4; - } - else { + } else { temp2 = 1300.0f; } if (this->currentBoots == PLAYER_BOOTS_HOVER) { temp1 += temp1; - } - else if (this->currentBoots == PLAYER_BOOTS_IRON) { + } else if (this->currentBoots == PLAYER_BOOTS_IRON) { temp1 *= 0.3f; } - } - else { + } else { temp2 = 20000.0f; if (this->currentBoots != PLAYER_BOOTS_HOVER) { temp1 += temp1; - } - else if ((D_808535E4 == 7) || (this->currentBoots == PLAYER_BOOTS_IRON)) { + } else if ((D_808535E4 == 7) || (this->currentBoots == PLAYER_BOOTS_IRON)) { temp1 = 0; } } @@ -5788,16 +5888,15 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { this->unk_6C4 = CLAMP(this->unk_6C4, 0.0f, temp2); this->actor.gravity -= this->unk_6C4 * 0.004f; - } - else { + } else { this->unk_6C4 = 0.0f; } if (this->actor.bgCheckFlags & 0x20) { if (this->actor.yDistToWater < 50.0f) { temp4 = fabsf(this->bodyPartsPos[PLAYER_BODYPART_WAIST].x - this->unk_A88.x) + - fabsf(this->bodyPartsPos[PLAYER_BODYPART_WAIST].y - this->unk_A88.y) + - fabsf(this->bodyPartsPos[PLAYER_BODYPART_WAIST].z - this->unk_A88.z); + fabsf(this->bodyPartsPos[PLAYER_BODYPART_WAIST].y - this->unk_A88.y) + + fabsf(this->bodyPartsPos[PLAYER_BODYPART_WAIST].z - this->unk_A88.z); if (temp4 > 4.0f) { temp4 = 4.0f; } @@ -5813,9 +5912,9 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { if ((this->linearVelocity > 4.0f) && !func_808332B8(this) && ((this->actor.world.pos.y + this->actor.yDistToWater) < - this->bodyPartsPos[PLAYER_BODYPART_WAIST].y)) { + this->bodyPartsPos[PLAYER_BODYPART_WAIST].y)) { func_8083CFA8(globalCtx, this, 20.0f, - (fabsf(this->linearVelocity) * 50.0f) + (this->actor.yDistToWater * 5.0f)); + (fabsf(this->linearVelocity) * 50.0f) + (this->actor.yDistToWater * 5.0f)); } } } @@ -5828,8 +5927,7 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { if (Rand_ZeroOne() < 0.2f) { numBubbles = 1; } - } - else { + } else { numBubbles = this->actor.velocity.y * -2.0f; } @@ -5869,8 +5967,7 @@ void func_8083DC54(Player* this, GlobalContext* globalCtx) { if (this->unk_664 != NULL) { if (func_8002DD78(this) || func_808334B4(this)) { func_8083DB98(this, 1); - } - else { + } else { func_8083DB98(this, 0); } return; @@ -5878,8 +5975,7 @@ void func_8083DC54(Player* this, GlobalContext* globalCtx) { if (D_808535E4 == 11) { Math_SmoothStepToS(&this->actor.focus.rot.x, -20000, 10, 4000, 800); - } - else { + } else { sp46 = 0; temp1 = func_8083973C(globalCtx, this, &D_8085456C, &sp34); if (temp1 > BGCHECK_Y_MIN) { @@ -5907,8 +6003,7 @@ void func_8083DDC8(Player* this, GlobalContext* globalCtx) { Math_ScaledStepToS(&this->unk_6BA, temp2, 300); Math_ScaledStepToS(&this->unk_6C0, temp2, 200); this->unk_6AE |= 0x168; - } - else { + } else { func_8083DC54(this, globalCtx); } } @@ -5933,16 +6028,15 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = *arg2; } - } - else { + } else { Math_AsymStepToF(&this->linearVelocity, *arg1, 0.05f, 0.1f); Math_ScaledStepToS(&this->currentYaw, *arg2, 200); } } static struct_80854578 D_80854578[] = { - { &gPlayerAnim_003398, 35.17f, 6.6099997f }, - { &gPlayerAnim_0033A8, -34.16f, 7.91f }, + { &gPlayerAnim_link_uma_left_up, 35.17f, 6.6099997f }, + { &gPlayerAnim_link_uma_right_up, -34.16f, 7.91f }, }; s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { @@ -5964,8 +6058,7 @@ s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { if (this->mountSide < 0) { temp = 0; - } - else { + } else { temp = 1; } @@ -6000,8 +6093,8 @@ void func_8083E298(CollisionPoly* arg0, Vec3f* arg1, s16* arg2) { } static LinkAnimationHeader* D_80854590[] = { - &gPlayerAnim_002EE0, - &gPlayerAnim_0031D0, + &gPlayerAnim_link_normal_down_slope_slip, + &gPlayerAnim_link_normal_up_slope_slip, }; s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) { @@ -6027,8 +6120,7 @@ s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) { } this->windDirection = sp3A; Math_StepToF(&this->windSpeed, temp1, temp2); - } - else { + } else { func_80835C58(globalCtx, this, func_8084F390, 0); func_80832564(globalCtx, this); if (D_80853610 >= 0) { @@ -6058,8 +6150,7 @@ void func_8083E4C4(GlobalContext* globalCtx, Player* this, GetItemEntry* giEntry (sp1C != 0x14) && (sp1C != 0x13)) { Item_Give(globalCtx, giEntry->itemId); } - } - else { + } else { Item_Give(globalCtx, giEntry->itemId); } @@ -6097,7 +6188,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { Actor* interactedActor; if (iREG(67) || (((interactedActor = this->interactRangeActor) != NULL) && - func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx))) { + func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx))) { if (iREG(67) || (this->getItemId > GI_NONE)) { if (iREG(67)) { this->getItemId = iREG(68); @@ -6128,10 +6219,11 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { s32 drop = giEntry.objectId; - if (gSaveContext.n64ddFlag || (globalCtx->sceneNum == SCENE_BOWLING) || !(CVar_GetS32("gFastDrops", 0) && - ((drop == OBJECT_GI_BOMB_1) || (drop == OBJECT_GI_NUTS) || (drop == OBJECT_GI_STICK) || - (drop == OBJECT_GI_SEED) || (drop == OBJECT_GI_MAGICPOT) || (drop == OBJECT_GI_ARROW))) && - (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE)) { + if (gSaveContext.n64ddFlag || (globalCtx->sceneNum == SCENE_BOWLING) || + !(CVar_GetS32("gFastDrops", 0) && + ((drop == OBJECT_GI_BOMB_1) || (drop == OBJECT_GI_NUTS) || (drop == OBJECT_GI_STICK) || + (drop == OBJECT_GI_SEED) || (drop == OBJECT_GI_MAGICPOT) || (drop == OBJECT_GI_ARROW))) && + (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE)) { if (gSaveContext.n64ddFlag && ((interactedActor->id == ACTOR_EN_ITEM00 && @@ -6141,14 +6233,14 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { this->getItemId = GI_NONE; this->getItemEntry = (GetItemEntry)GET_ITEM_NONE; return 0; - } + } func_808323B4(globalCtx, this); func_8083AE40(this, giEntry.objectId); if (!(this->stateFlags2 & PLAYER_STATE2_10) || (this->currentBoots == PLAYER_BOOTS_IRON)) { func_80836898(globalCtx, this, func_8083A434); - func_808322D0(globalCtx, this, &gPlayerAnim_002788); + func_808322D0(globalCtx, this, &gPlayerAnim_link_demo_get_itemB); func_80835EA4(globalCtx, 9); } @@ -6200,7 +6292,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { chest->unk_1F4 = 1; Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_SLOW_CHEST_CS); } else { - func_80832264(globalCtx, this, &gPlayerAnim_002DF8); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_box_kick); chest->unk_1F4 = -1; } @@ -6268,8 +6360,7 @@ s32 func_8083EB44(Player* this, GlobalContext* globalCtx) { if (!func_8083EAF0(this, this->heldActor)) { func_80835C58(globalCtx, this, func_808464B0, 1); func_80832264(globalCtx, this, D_80853914[PLAYER_ANIMGROUP_30][this->modelAnimType]); - } - else { + } else { func_8083EA94(this, globalCtx); } } @@ -6299,8 +6390,7 @@ s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) { if (sp8C != 0) { sp80 = this->actor.world.pos.x; sp7C = this->actor.world.pos.z; - } - else { + } else { Vec3f sp50[3]; s32 i; f32 sp48; @@ -6316,15 +6406,13 @@ s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) { sp44++; if (sp80 > sp44->x) { sp80 = sp44->x; - } - else if (phi_f12 < sp44->x) { + } else if (phi_f12 < sp44->x) { phi_f12 = sp44->x; } if (sp7C > sp44->z) { sp7C = sp44->z; - } - else if (phi_f14 < sp44->z) { + } else if (phi_f14 < sp44->z) { phi_f14 = sp44->z; } @@ -6337,7 +6425,7 @@ s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) { sp7C = (sp7C + phi_f14) * 0.5f; phi_f12 = ((this->actor.world.pos.x - sp80) * COLPOLY_GET_NORMAL(sp84->normal.z)) - - ((this->actor.world.pos.z - sp7C) * COLPOLY_GET_NORMAL(sp84->normal.x)); + ((this->actor.world.pos.z - sp7C) * COLPOLY_GET_NORMAL(sp84->normal.x)); sp48 = this->actor.world.pos.y - phi_f20; phi_f20 = ((f32)(s32)((sp48 / 15.000000223517418) + 0.5) * 15.000000223517418) - sp48; @@ -6357,22 +6445,19 @@ s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) { if ((sp8C != 0) || (arg2 & 2)) { if ((this->unk_84F = sp8C) != 0) { if (this->actor.bgCheckFlags & 1) { - sp30 = &gPlayerAnim_002D80; - } - else { - sp30 = &gPlayerAnim_002D68; + sp30 = &gPlayerAnim_link_normal_Fclimb_startA; + } else { + sp30 = &gPlayerAnim_link_normal_Fclimb_hold2upL; } sp34 = (this->ageProperties->unk_38 - 1.0f) - sp34; - } - else { + } else { sp30 = this->ageProperties->unk_A4; sp34 = sp34 - 1.0f; } this->unk_850 = -2; this->actor.world.pos.y += phi_f20; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; - } - else { + } else { sp30 = this->ageProperties->unk_A8; this->unk_850 = -4; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw; @@ -6418,15 +6503,13 @@ s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) { for (i = 1; i < 3; i++) { if (tempX > wallVertices[i].x) { tempX = wallVertices[i].x; - } - else if (temp < wallVertices[i].x) { + } else if (temp < wallVertices[i].x) { temp = wallVertices[i].x; } if (tempZ > wallVertices[i].z) { tempZ = wallVertices[i].z; - } - else if (maxWallZ < wallVertices[i].z) { + } else if (maxWallZ < wallVertices[i].z) { maxWallZ = wallVertices[i].z; } } @@ -6436,7 +6519,7 @@ s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) { tempZ = (tempZ + maxWallZ) * 0.5f; temp = ((this->actor.world.pos.x - tempX) * COLPOLY_GET_NORMAL(wallPoly->normal.z)) - - ((this->actor.world.pos.z - tempZ) * COLPOLY_GET_NORMAL(wallPoly->normal.x)); + ((this->actor.world.pos.z - tempZ) * COLPOLY_GET_NORMAL(wallPoly->normal.x)); if (fabsf(temp) < 8.0f) { this->stateFlags2 |= PLAYER_STATE2_16; @@ -6453,7 +6536,7 @@ s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) { this->actor.world.pos.z = tempZ + (wallDistance * wallPolyNormZ); func_80832224(this); this->actor.prevPos = this->actor.world.pos; - func_80832264(globalCtx, this, &gPlayerAnim_002708); + func_80832264(globalCtx, this, &gPlayerAnim_link_child_tunnel_start); func_80832F54(globalCtx, this, 0x9D); return 1; @@ -6486,7 +6569,7 @@ s32 func_8083F360(GlobalContext* globalCtx, Player* this, f32 arg1, f32 arg2, f3 sp60.y = sp6C.y = this->actor.world.pos.y + arg1; if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &sp6C, &sp60, &sp54, &this->actor.wallPoly, true, false, false, - true, &sp78)) { + true, &sp78)) { wallPoly = this->actor.wallPoly; this->actor.bgCheckFlags |= 0x200; @@ -6530,14 +6613,14 @@ s32 func_8083F570(Player* this, GlobalContext* globalCtx) { if (this->linearVelocity > 0.0f) { this->actor.shape.rot.y = this->actor.wallYaw + 0x8000; - func_80832264(globalCtx, this, &gPlayerAnim_002700); + func_80832264(globalCtx, this, &gPlayerAnim_link_child_tunnel_end); func_80832F54(globalCtx, this, 0x9D); OnePointCutscene_Init(globalCtx, 9601, 999, NULL, MAIN_CAM); - } - else { + } else { this->actor.shape.rot.y = this->actor.wallYaw; - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_002708, -1.0f, - Animation_GetLastFrame(&gPlayerAnim_002708), 0.0f, ANIMMODE_ONCE, 0.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_child_tunnel_start, -1.0f, + Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), 0.0f, ANIMMODE_ONCE, + 0.0f); func_80832F54(globalCtx, this, 0x9D); OnePointCutscene_Init(globalCtx, 9602, 999, NULL, MAIN_CAM); } @@ -6600,12 +6683,11 @@ s32 func_8083F7BC(Player* this, GlobalContext* globalCtx) { } this->unk_3C4 = &wallPolyActor->actor; - } - else { + } else { this->unk_3C4 = NULL; } - func_8083F72C(this, &gPlayerAnim_0030F8, globalCtx); + func_8083F72C(this, &gPlayerAnim_link_normal_push_wait, globalCtx); return 1; } @@ -6627,15 +6709,14 @@ s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) { if (&wallPolyActor->actor == this->unk_3C4) { if (this->stateFlags2 & PLAYER_STATE2_4) { return 1; - } - else { + } else { return 0; } } } func_80839FFC(this, globalCtx); - func_80832264(globalCtx, this, &gPlayerAnim_003100); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_push_wait_end); this->stateFlags2 &= ~PLAYER_STATE2_4; return 1; } @@ -6643,7 +6724,7 @@ s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) { void func_8083FAB8(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_8084B898, 0); this->stateFlags2 |= PLAYER_STATE2_4; - func_80832264(globalCtx, this, &gPlayerAnim_0030F0); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_push_start); } void func_8083FB14(Player* this, GlobalContext* globalCtx) { @@ -6661,7 +6742,7 @@ void func_8083FB7C(Player* this, GlobalContext* globalCtx) { s32 func_8083FBC0(Player* this, GlobalContext* globalCtx) { if (!CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && (this->actor.bgCheckFlags & 0x200) && ((D_808535F0 & 8) || (D_808535F0 & 2) || - func_80041E4C(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallBgId))) { + func_80041E4C(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallBgId))) { return 0; } @@ -6682,8 +6763,7 @@ s32 func_8083FC68(Player* this, f32 arg1, s16 arg2) { if (arg1 > (((temp * temp) * 50.0f) + 6.0f)) { return 1; - } - else if (arg1 > (((1.0f - temp) * 10.0f) + 6.8f)) { + } else if (arg1 > (((1.0f - temp) * 10.0f) + 6.8f)) { return -1; } @@ -6699,29 +6779,24 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) if (*arg1 != 0.0f) { *arg2 = (((sp2E >= 0) ? 1 : -1) << 0xE) + this->actor.shape.rot.y; - } - else { + } else { *arg2 = this->actor.shape.rot.y; } if (this->unk_664 != NULL) { func_8083DB98(this, 1); - } - else { + } else { Math_SmoothStepToS(&this->actor.focus.rot.x, sControlInput->rel.stick_y * 240.0f, 14, 4000, 30); func_80836AB8(this, 1); } - } - else { + } else { if (this->unk_664 != NULL) { return func_8083FC68(this, *arg1, *arg2); - } - else { + } else { func_8083DC54(this, globalCtx); if ((*arg1 != 0.0f) && (sp2C < 6000)) { return 1; - } - else if (*arg1 > Math_SinS((0x4000 - (sp2C >> 1))) * 200.0f) { + } else if (*arg1 > Math_SinS((0x4000 - (sp2C >> 1))) * 200.0f) { return -1; } } @@ -6740,8 +6815,7 @@ s32 func_8083FFB8(Player* this, f32* arg1, s16* arg2) { if (*arg1 != 0.0f) { if (temp3 > 0) { return 1; - } - else { + } else { return -1; } } @@ -6758,8 +6832,7 @@ s32 func_80840058(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) if ((temp2 < 0x4000) || (this->unk_87C != 0)) { return -1; - } - else { + } else { return 1; } } @@ -6773,8 +6846,7 @@ void func_80840138(Player* this, f32 arg1, s16 arg2) { if (arg1 > 0.0f) { if (temp < 0) { this->unk_874 = 0.0f; - } - else { + } else { this->unk_874 = 1.0f; } } @@ -6784,7 +6856,7 @@ void func_80840138(Player* this, f32 arg1, s16 arg2) { void func_808401B0(GlobalContext* globalCtx, Player* this) { LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, func_808334E4(this), this->unk_868, func_80833528(this), - this->unk_868, this->unk_870, this->blendTable); + this->unk_868, this->unk_870, this->blendTable); } s32 func_8084021C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { @@ -6809,15 +6881,13 @@ void func_8084029C(Player* this, f32 arg1) { arg1 *= updateScale; if (arg1 < -7.25) { arg1 = -7.25; - } - else if (arg1 > 7.25f) { + } else if (arg1 > 7.25f) { arg1 = 7.25f; } if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) { func_8002F8F0(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG); - } - else if (func_8084021C(this->unk_868, arg1, 29.0f, 10.0f) || func_8084021C(this->unk_868, arg1, 29.0f, 24.0f)) { + } else if (func_8084021C(this->unk_868, arg1, 29.0f, 10.0f) || func_8084021C(this->unk_868, arg1, 29.0f, 24.0f)) { func_808327F8(this, this->linearVelocity); if (this->linearVelocity > 4.0f) { this->stateFlags2 |= PLAYER_STATE2_3; @@ -6828,8 +6898,7 @@ void func_8084029C(Player* this, f32 arg1) { if (this->unk_868 < 0.0f) { this->unk_868 += 29.0f; - } - else if (this->unk_868 >= 29.0f) { + } else if (this->unk_868 >= 29.0f) { this->unk_868 -= 29.0f; } } @@ -6845,8 +6914,7 @@ void func_80840450(Player* this, GlobalContext* globalCtx) { if (this->stateFlags3 & PLAYER_STATE3_3) { if (Player_GetSwordHeld(this)) { this->stateFlags2 |= PLAYER_STATE2_5 | PLAYER_STATE2_6; - } - else { + } else { this->stateFlags3 &= ~PLAYER_STATE3_3; } } @@ -6859,8 +6927,7 @@ void func_80840450(Player* this, GlobalContext* globalCtx) { this->stateFlags3 &= ~PLAYER_STATE3_3; } func_80833C3C(this); - } - else { + } else { func_808401B0(globalCtx, this); } @@ -6993,8 +7060,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) { (!(heathIsCritical = HealthMeter_IsCritical()) && ((this->unk_6AC = (this->unk_6AC + 1) & 1) != 0))) { this->stateFlags2 &= ~PLAYER_STATE2_28; anim = func_80833338(this); - } - else { + } else { this->stateFlags2 |= PLAYER_STATE2_28; if (this->stateFlags1 & PLAYER_STATE1_11) { anim = func_80833338(this); @@ -7004,16 +7070,14 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) { if (this->unk_6AC >= 0) { sp38 = 7; this->unk_6AC = -1; - } - else { + } else { sp38 = 8; } - } - else { + } else { sp34 = Rand_ZeroOne() * 5.0f; if (sp34 < 4) { if (((sp34 != 0) && (sp34 != 3)) || ((this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) && - ((sp34 == 3) || Player_GetSwordHeld(this)))) { + ((sp34 == 3) || Player_GetSwordHeld(this)))) { if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this) && CVar_GetS32("gTwoHandedIdle", 0) == 1) { sp34 = 4; } @@ -7030,7 +7094,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) { } LinkAnimation_Change(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f) * D_808535E8, 0.0f, - Animation_GetLastFrame(anim), ANIMMODE_ONCE, -6.0f); + Animation_GetLastFrame(anim), ANIMMODE_ONCE, -6.0f); } void func_80840BC8(Player* this, GlobalContext* globalCtx) { @@ -7053,8 +7117,7 @@ void func_80840BC8(Player* this, GlobalContext* globalCtx) { this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } this->skelAnime.jointTable[0].y = (this->skelAnime.jointTable[0].y + ((this->unk_850 & 1) * 0x50)) - 0x28; - } - else { + } else { func_80832DBC(this); func_808409CC(globalCtx, this); } @@ -7111,11 +7174,10 @@ void func_80840DE4(Player* this, GlobalContext* globalCtx) { this->skelAnime.animation = func_8083356C(this); - if (this->skelAnime.animation == &gPlayerAnim_0026E8) { + if (this->skelAnime.animation == &gPlayerAnim_link_bow_side_walk) { frames = 24.0f; coeff = -(MREG(95) / 100.0f); - } - else { + } else { frames = 29.0f; coeff = MREG(95) / 100.0f; } @@ -7125,8 +7187,7 @@ void func_80840DE4(Player* this, GlobalContext* globalCtx) { if ((s16)(this->currentYaw - this->actor.shape.rot.y) >= 0) { direction = 1; - } - else { + } else { direction = -1; } @@ -7196,34 +7257,31 @@ void func_80841138(Player* this, GlobalContext* globalCtx) { temp1 = R_UPDATE_RATE * 0.5f; func_8084029C(this, REG(35) / 1000.0f); LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_31][this->modelAnimType], - this->unk_868); + this->unk_868); this->unk_864 += 1 * temp1; if (this->unk_864 >= 1.0f) { this->unk_864 = 1.0f; } temp1 = this->unk_864; - } - else { + } else { temp2 = this->linearVelocity - (REG(48) / 100.0f); if (temp2 < 0.0f) { temp1 = 1.0f; func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_31][this->modelAnimType], - this->unk_868); - } - else { + this->unk_868); + } else { temp1 = (REG(37) / 1000.0f) * temp2; if (temp1 < 1.0f) { func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); - } - else { + } else { temp1 = 1.0f; func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2)); } LinkAnimation_LoadToMorph(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_31][this->modelAnimType], - this->unk_868); - LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, &gPlayerAnim_002DD0, - this->unk_868 * (16.0f / 29.0f)); + this->unk_868); + LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, &gPlayerAnim_link_normal_back_run, + this->unk_868 * (16.0f / 29.0f)); } } @@ -7234,7 +7292,7 @@ void func_80841138(Player* this, GlobalContext* globalCtx) { void func_8084140C(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_8084170C, 1); - func_80832B0C(globalCtx, this, &gPlayerAnim_002DA0); + func_80832B0C(globalCtx, this, &gPlayerAnim_link_normal_back_brake); } s32 func_80841458(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) { @@ -7247,8 +7305,7 @@ s32 func_80841458(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) if (func_8083721C(this)) { *arg1 = 0.0f; *arg2 = this->currentYaw; - } - else { + } else { return 1; } } @@ -7277,16 +7334,13 @@ void func_808414F8(Player* this, GlobalContext* globalCtx) { if (!func_80841458(this, &sp34, &sp32, globalCtx)) { if (sp2C != 0) { func_8083C858(this, globalCtx); - } - else if (sp34 > 4.9f) { + } else if (sp34 > 4.9f) { func_8083CC9C(this, globalCtx); - } - else { + } else { func_8083CB94(this, globalCtx); } } - } - else { + } else { sp2A = sp32 - this->currentYaw; Math_AsymStepToF(&this->linearVelocity, sp34 * 1.5f, 1.5f, 2.0f); @@ -7301,7 +7355,7 @@ void func_808414F8(Player* this, GlobalContext* globalCtx) { void func_808416C0(Player* this, GlobalContext* globalCtx) { func_80835C58(globalCtx, this, func_808417FC, 1); - func_80832264(globalCtx, this, &gPlayerAnim_002DA8); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_back_brake_end); } void func_8084170C(Player* this, GlobalContext* globalCtx) { @@ -7320,8 +7374,7 @@ void func_8084170C(Player* this, GlobalContext* globalCtx) { if (func_8083FD78(this, &sp30, &sp2E, globalCtx) > 0) { func_8083C858(this, globalCtx); - } - else if ((sp30 != 0.0f) || (sp34 != 0)) { + } else if ((sp30 != 0.0f) || (sp34 != 0)) { func_808416C0(this, globalCtx); } } @@ -7373,8 +7426,7 @@ void func_8084193C(Player* this, GlobalContext* globalCtx) { if (func_80833B2C(this)) { temp1 = func_8083FD78(this, &sp3C, &sp3A, globalCtx); - } - else { + } else { temp1 = func_8083FC68(this, sp3C, sp3A); } @@ -7386,8 +7438,7 @@ void func_8084193C(Player* this, GlobalContext* globalCtx) { if (temp1 < 0) { if (func_80833B2C(this)) { func_8083CB2C(this, sp3A, globalCtx); - } - else { + } else { func_8083CBF0(this, sp3A, globalCtx); } return; @@ -7396,8 +7447,7 @@ void func_8084193C(Player* this, GlobalContext* globalCtx) { if ((this->linearVelocity < 3.6f) && (sp3C < 4.0f)) { if (!func_8008E9C4(this) && func_80833B2C(this)) { func_8083CB94(this, globalCtx); - } - else { + } else { func_80839F90(this, globalCtx); } return; @@ -7429,9 +7479,9 @@ void func_80841BA8(Player* this, GlobalContext* globalCtx) { if (Player_HoldsTwoHandedWeapon(this)) { AnimationContext_SetLoadFrame(globalCtx, func_80833338(this), 0, this->skelAnime.limbCount, - this->skelAnime.morphTable); + this->skelAnime.morphTable); AnimationContext_SetCopyTrue(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime.morphTable, D_80853410); + this->skelAnime.morphTable, D_80853410); } func_80837268(this, &sp34, &sp32, 0.018f, globalCtx); @@ -7440,8 +7490,7 @@ void func_80841BA8(Player* this, GlobalContext* globalCtx) { if (sp34 != 0.0f) { this->actor.shape.rot.y = sp32; func_8083C858(this, globalCtx); - } - else if (Math_ScaledStepToS(&this->actor.shape.rot.y, sp32, this->unk_87E)) { + } else if (Math_ScaledStepToS(&this->actor.shape.rot.y, sp32, this->unk_87E)) { func_8083C0E8(this, globalCtx); } @@ -7456,8 +7505,7 @@ void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) { if (ABS(D_80853610) < 3640) { target = 0; - } - else { + } else { target = CLAMP(D_80853610, -10922, 10922); } @@ -7466,19 +7514,17 @@ void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) { if ((this->modelAnimType == PLAYER_ANIMTYPE_3) || ((this->unk_89C == 0) && (this->unk_6C4 <= 0.0f))) { if (arg1 == 0) { LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_1][this->modelAnimType], - this->unk_868); - } - else { + this->unk_868); + } else { LinkAnimation_LoadToMorph(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_1][this->modelAnimType], - this->unk_868); + this->unk_868); } return; } if (this->unk_89C != 0) { rate = this->unk_89C / 10922.0f; - } - else { + } else { rate = this->unk_6C4 * 0.0006f; } @@ -7489,20 +7535,18 @@ void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) { } if (rate < 0.0f) { - anim = &gPlayerAnim_002E48; + anim = &gPlayerAnim_link_normal_climb_down; rate = -rate; - } - else { - anim = &gPlayerAnim_002E90; + } else { + anim = &gPlayerAnim_link_normal_climb_up; } if (arg1 == 0) { LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_1][this->modelAnimType], - this->unk_868, anim, this->unk_868, rate, this->blendTable); - } - else { + this->unk_868, anim, this->unk_868, rate, this->blendTable); + } else { LinkAnimation_BlendToMorph(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_1][this->modelAnimType], - this->unk_868, anim, this->unk_868, rate, this->blendTable); + this->unk_868, anim, this->unk_868, rate, this->blendTable); } } @@ -7515,7 +7559,7 @@ void func_80841EE4(Player* this, GlobalContext* globalCtx) { func_8084029C(this, REG(35) / 1000.0f); LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_1][this->modelAnimType], - this->unk_868); + this->unk_868); this->unk_864 += 1 * temp1; if (this->unk_864 >= 1.0f) { @@ -7523,8 +7567,7 @@ void func_80841EE4(Player* this, GlobalContext* globalCtx) { } temp1 = this->unk_864; - } - else { + } else { temp2 = this->linearVelocity - (REG(48) / 100.0f); if (temp2 < 0.0f) { @@ -7532,13 +7575,11 @@ void func_80841EE4(Player* this, GlobalContext* globalCtx) { func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); func_80841CC4(this, 0, globalCtx); - } - else { + } else { temp1 = (REG(37) / 1000.0f) * temp2; if (temp1 < 1.0f) { func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); - } - else { + } else { temp1 = 1.0f; func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2)); } @@ -7546,7 +7587,7 @@ void func_80841EE4(Player* this, GlobalContext* globalCtx) { func_80841CC4(this, 1, globalCtx); LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, func_80833438(this), - this->unk_868 * (20.0f / 29.0f)); + this->unk_868 * (20.0f / 29.0f)); } } @@ -7687,10 +7728,10 @@ s32 func_8084269C(GlobalContext* globalCtx, Player* this) { if ((this->unk_89E == 0) || (this->unk_89E == 1)) { func_8084260C(&this->actor.shape.feetPos[FOOT_LEFT], &sp2C, - this->actor.floorHeight - this->actor.shape.feetPos[FOOT_LEFT].y, 7.0f, 5.0f); + this->actor.floorHeight - this->actor.shape.feetPos[FOOT_LEFT].y, 7.0f, 5.0f); func_800286CC(globalCtx, &sp2C, &D_808545B4, &D_808545C0, 50, 30); func_8084260C(&this->actor.shape.feetPos[FOOT_RIGHT], &sp2C, - this->actor.floorHeight - this->actor.shape.feetPos[FOOT_RIGHT].y, 7.0f, 5.0f); + this->actor.floorHeight - this->actor.shape.feetPos[FOOT_RIGHT].y, 7.0f, 5.0f); func_800286CC(globalCtx, &this->actor.shape.feetPos[FOOT_RIGHT], &D_808545B4, &D_808545C0, 50, 30); return 1; } @@ -7726,7 +7767,7 @@ s32 func_808428D8(Player* this, GlobalContext* globalCtx) { return 0; } - func_80832264(globalCtx, this, &gPlayerAnim_002EC8); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_defense_kiru); this->unk_84F = 1; this->swordAnimation = 0xC; this->currentYaw = this->actor.shape.rot.y + this->unk_6BE; @@ -7781,7 +7822,7 @@ s32 func_80842AC4(GlobalContext* globalCtx, Player* this) { if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_85C > 0.5f)) { if (AMMO(ITEM_STICK) != 0) { EffectSsStick_Spawn(globalCtx, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND], - this->actor.shape.rot.y + 0x8000); + this->actor.shape.rot.y + 0x8000); this->unk_85C = 0.5f; func_80842A88(globalCtx, this); func_8002F7DC(&this->actor, NA_SE_IT_WOODSTICK_BROKEN); @@ -7798,7 +7839,7 @@ s32 func_80842B7C(GlobalContext* globalCtx, Player* this) { if (!gSaveContext.bgsFlag && (gSaveContext.swordHealth > 0.0f)) { if ((gSaveContext.swordHealth -= 1.0f) <= 0.0f) { EffectSsStick_Spawn(globalCtx, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND], - this->actor.shape.rot.y + 0x8000); + this->actor.shape.rot.y + 0x8000); func_800849EC(globalCtx); func_8002F7DC(&this->actor, NA_SE_IT_MAJIN_SWORD_BROKEN); } @@ -7816,10 +7857,10 @@ void func_80842CF0(GlobalContext* globalCtx, Player* this) { } static LinkAnimationHeader* D_808545CC[] = { - &gPlayerAnim_002B10, - &gPlayerAnim_002B20, - &gPlayerAnim_002B08, - &gPlayerAnim_002B18, + &gPlayerAnim_link_fighter_rebound, + &gPlayerAnim_link_fighter_rebound_long, + &gPlayerAnim_link_fighter_reboundR, + &gPlayerAnim_link_fighter_rebound_longR, }; void func_80842D20(GlobalContext* globalCtx, Player* this) { @@ -7832,8 +7873,7 @@ void func_80842D20(GlobalContext* globalCtx, Player* this) { if (func_8008E9C4(this)) { sp28 = 2; - } - else { + } else { sp28 = 0; } @@ -7870,7 +7910,7 @@ s32 func_80842DF4(GlobalContext* globalCtx, Player* this) { sp68.z = this->swordInfo[0].tip.z + (sp50.z * phi_f2); if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &sp68, &this->swordInfo[0].tip, &sp5C, &sp78, true, - false, false, true, &sp74) && + false, false, true, &sp74) && !SurfaceType_IsIgnoredByEntities(&globalCtx->colCtx, sp78, sp74) && (func_80041D4C(&globalCtx->colCtx, sp78, sp74) != 6) && (func_8002F9EC(globalCtx, &this->actor, sp78, sp74, &sp5C) == 0)) { @@ -7887,13 +7927,11 @@ s32 func_80842DF4(GlobalContext* globalCtx, Player* this) { if (sp48 == 0xA) { CollisionCheck_SpawnShieldParticlesWood(globalCtx, &sp5C, &this->actor.projectedPos); - } - else { + } else { CollisionCheck_SpawnShieldParticles(globalCtx, &sp5C); if (sp48 == 0xB) { func_8002F7DC(&this->actor, NA_SE_IT_WALL_HIT_SOFT); - } - else { + } else { func_8002F7DC(&this->actor, NA_SE_IT_WALL_HIT_HARD); } } @@ -7904,8 +7942,7 @@ s32 func_80842DF4(GlobalContext* globalCtx, Player* this) { } } } - } - else { + } else { func_80842D20(globalCtx, this); func_80832630(globalCtx); return 1; @@ -7997,27 +8034,24 @@ void func_80843188(Player* this, GlobalContext* globalCtx) { if (this->skelAnime.curFrame < 2.0f) { func_80833A20(this, 1); } - } - else { + } else { this->unk_850 = 1; this->unk_84F = 0; } - } - else if (!func_80842964(this, globalCtx)) { + } else if (!func_80842964(this, globalCtx)) { if (func_8083C2B0(this, globalCtx)) { func_808428D8(this, globalCtx); - } - else { + } else { this->stateFlags1 &= ~PLAYER_STATE1_22; func_80832318(this); if (Player_IsChildWithHylianShield(this)) { func_8083A060(this, globalCtx); - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_002400, 1.0f, - Animation_GetLastFrame(&gPlayerAnim_002400), 0.0f, ANIMMODE_ONCE, 0.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_clink_normal_defense_ALL, 1.0f, + Animation_GetLastFrame(&gPlayerAnim_clink_normal_defense_ALL), 0.0f, + ANIMMODE_ONCE, 0.0f); func_80832F54(globalCtx, this, 4); - } - else { + } else { if (this->itemActionParam < 0) { func_8008EC70(this); } @@ -8027,8 +8061,7 @@ void func_80843188(Player* this, GlobalContext* globalCtx) { func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_REMOVE); return; } - } - else { + } else { return; } } @@ -8051,8 +8084,7 @@ void func_808435C4(Player* this, GlobalContext* globalCtx) { if ((func_80834B5C == this->func_82C) || (func_808374A0(globalCtx, this, &this->skelAnime2, 4.0f) > 0)) { func_80835C58(globalCtx, this, func_80840450, 1); } - } - else { + } else { temp = func_808374A0(globalCtx, this, &this->skelAnime, 4.0f); if ((temp != 0) && ((temp > 0) || LinkAnimation_Update(globalCtx, &this->skelAnime))) { func_80835C58(globalCtx, this, func_80843188, 1); @@ -8103,19 +8135,18 @@ void func_8084377C(Player* this, GlobalContext* globalCtx) { if (this->unk_850 == 0) { func_80853080(this, globalCtx); } - } - else if ((this->stateFlags1 & PLAYER_STATE1_29) || - (!(this->cylinder.base.acFlags & AC_HIT) && (this->unk_8A1 == 0))) { + } else if ((this->stateFlags1 & PLAYER_STATE1_29) || + (!(this->cylinder.base.acFlags & AC_HIT) && (this->unk_8A1 == 0))) { if (this->stateFlags1 & PLAYER_STATE1_29) { this->unk_850++; - } - else { + } else { func_80835C58(globalCtx, this, func_80843954, 0); this->stateFlags1 |= PLAYER_STATE1_26; } func_80832264(globalCtx, this, - (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_002F60 : &gPlayerAnim_002DB8); + (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_downB + : &gPlayerAnim_link_normal_back_downB); func_80832698(this, NA_SE_VO_LI_FREEZE); } } @@ -8134,14 +8165,14 @@ void func_80843954(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->linearVelocity == 0.0f)) { if (this->stateFlags1 & PLAYER_STATE1_29) { this->unk_850++; - } - else { + } else { func_80835C58(globalCtx, this, func_80843A38, 0); this->stateFlags1 |= PLAYER_STATE1_26; } func_808322D0(globalCtx, this, - (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_002F68 : &gPlayerAnim_002DC0); + (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_down_wake + : &gPlayerAnim_link_normal_back_down_wake); this->currentYaw = this->actor.shape.rot.y; } } @@ -8159,8 +8190,7 @@ void func_80843A38(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_29) { LinkAnimation_Update(globalCtx, &this->skelAnime); - } - else { + } else { sp24 = func_808374A0(globalCtx, this, &this->skelAnime, 16.0f); if ((sp24 != 0) && (LinkAnimation_Update(globalCtx, &this->skelAnime) || (sp24 > 0))) { func_80839F90(this, globalCtx); @@ -8178,51 +8208,42 @@ void func_80843AE8(GlobalContext* globalCtx, Player* this) { this->unk_850--; if (this->unk_850 == 0) { if (this->stateFlags1 & PLAYER_STATE1_27) { - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_003328, 1.0f, 0.0f, - Animation_GetLastFrame(&gPlayerAnim_003328), ANIMMODE_ONCE, -16.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_swimer_swim_wait, 1.0f, 0.0f, + Animation_GetLastFrame(&gPlayerAnim_link_swimer_swim_wait), ANIMMODE_ONCE, + -16.0f); + } else { + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_derth_rebirth, 1.0f, 99.0f, + Animation_GetLastFrame(&gPlayerAnim_link_derth_rebirth), ANIMMODE_ONCE, 0.0f); } - else { - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_002878, 1.0f, 99.0f, - Animation_GetLastFrame(&gPlayerAnim_002878), ANIMMODE_ONCE, 0.0f); - } - if (CVar_GetS32("gFairyReviveEffect", 0)) - { - if (CVar_GetS32("gFairyRevivePercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gFairyReviveHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + if (CVar_GetS32("gFairyReviveEffect", 0)) { + if (CVar_GetS32("gFairyRevivePercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gFairyReviveHealth", 100) / 100 + 15) / 16 * 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gFairyReviveHealth", 20) * 16; } - } - else - { + } else { gSaveContext.healthAccumulator = 0x140; } this->unk_850 = -1; } - } - else if (gSaveContext.healthAccumulator == 0) { + } else if (gSaveContext.healthAccumulator == 0) { this->stateFlags1 &= ~PLAYER_STATE1_7; if (this->stateFlags1 & PLAYER_STATE1_27) { func_80838F18(globalCtx, this); - } - else { + } else { func_80853080(this, globalCtx); } this->unk_A87 = 20; func_80837AFC(this, -20); func_800F47FC(); } - } - else if (this->unk_84F != 0) { + } else if (this->unk_84F != 0) { this->unk_850 = 60; Player_SpawnFairy(globalCtx, this, &this->actor.world.pos, &D_808545E4, FAIRY_REVIVE_DEATH); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); OnePointCutscene_Init(globalCtx, 9908, 125, &this->actor, MAIN_CAM); - } - else if (globalCtx->gameOverCtx.state == GAMEOVER_DEATH_WAIT_GROUND) { + } else if (globalCtx->gameOverCtx.state == GAMEOVER_DEATH_WAIT_GROUND) { globalCtx->gameOverCtx.state = GAMEOVER_DEATH_DELAY_MENU; sMaskMemory = PLAYER_MASK_NONE; } @@ -8239,7 +8260,7 @@ void func_80843CEC(Player* this, GlobalContext* globalCtx) { if (this->currentTunic != PLAYER_TUNIC_GORON && CVar_GetS32("gSuperTunic", 0) == 0) { if ((globalCtx->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) || (D_808535E4 == 9) || ((func_80838144(D_808535E4) >= 0) && - !SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId))) { + !SurfaceType_IsWallDamage(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId))) { func_8083821C(this); } } @@ -8253,10 +8274,9 @@ void func_80843CEC(Player* this, GlobalContext* globalCtx) { return; } - if (this->skelAnime.animation == &gPlayerAnim_002878) { + if (this->skelAnime.animation == &gPlayerAnim_link_derth_rebirth) { func_80832924(this, D_808545F0); - } - else if (this->skelAnime.animation == &gPlayerAnim_002F08) { + } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_electric_shock_end) { if (LinkAnimation_OnFrame(&this->skelAnime, 88.0f)) { func_80832770(this, NA_SE_PL_BOUND); } @@ -8281,8 +8301,7 @@ s32 func_80843E64(GlobalContext* globalCtx, Player* this) { if ((D_808535E4 == 6) || (D_808535E4 == 9)) { sp34 = 0; - } - else { + } else { sp34 = this->fallDistance; } @@ -8296,14 +8315,14 @@ s32 func_80843E64(GlobalContext* globalCtx, Player* this) { if (this->fallDistance < 800) { impactIndex = 0; - } - else { + } else { impactIndex = 1; } impactInfo = &D_80854600[impactIndex]; - if (Player_InflictDamageModified(globalCtx, impactInfo->damage * (1 << CVar_GetS32("gFallDamageMul", 0)), false)) { + if (Player_InflictDamageModified(globalCtx, impactInfo->damage * (1 << CVar_GetS32("gFallDamageMul", 0)), + false)) { return -1; } @@ -8354,8 +8373,7 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { if (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 40) { this->actor.gravity = 0.0f; - } - else if (func_8008E9C4(this)) { + } else if (func_8008E9C4(this)) { this->actor.gravity = -1.2f; } @@ -8392,12 +8410,11 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { this->stateFlags1 &= ~PLAYER_STATE1_2; } - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_003020, 1.0f, 0.0f, 0.0f, - ANIMMODE_ONCE, 8.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_normal_landing, 1.0f, 0.0f, + 0.0f, ANIMMODE_ONCE, 8.0f); this->unk_850 = -1; } - } - else { + } else { if ((this->unk_850 == -1) && (this->fallDistance > 120.0f) && (D_80853600 > 280.0f)) { this->unk_850 = -2; func_80843E14(this, NA_SE_VO_LI_FALL_L); @@ -8407,20 +8424,18 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { !(this->stateFlags1 & (PLAYER_STATE1_11 | PLAYER_STATE1_27)) && (this->linearVelocity > 0.0f)) { if ((this->wallHeight >= 150.0f) && (this->unk_84B[this->unk_846] == 0)) { func_8083EC18(this, globalCtx, D_808535F0); - } - else if ((this->unk_88C >= 2) && (this->wallHeight < 150.0f) && - (((this->actor.world.pos.y - this->actor.floorHeight) + this->wallHeight) > - (70.0f * this->ageProperties->unk_08))) { + } else if ((this->unk_88C >= 2) && (this->wallHeight < 150.0f) && + (((this->actor.world.pos.y - this->actor.floorHeight) + this->wallHeight) > + (70.0f * this->ageProperties->unk_08))) { AnimationContext_DisableQueue(globalCtx); if (this->stateFlags1 & PLAYER_STATE1_2) { func_80832698(this, NA_SE_VO_LI_HOOKSHOT_HANG); - } - else { + } else { func_80832698(this, NA_SE_VO_LI_HANG); } this->actor.world.pos.y += this->wallHeight; func_8083A5C4(globalCtx, this, this->actor.wallPoly, this->wallDistance, - D_80853914[PLAYER_ANIMGROUP_39][this->modelAnimType]); + D_80853914[PLAYER_ANIMGROUP_39][this->modelAnimType]); this->actor.shape.rot.y = this->currentYaw += 0x8000; this->stateFlags1 |= PLAYER_STATE1_13; } @@ -8428,31 +8443,25 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { } } } - } - else { + } else { LinkAnimationHeader* anim = D_80853914[PLAYER_ANIMGROUP_14][this->modelAnimType]; s32 sp3C; if (this->stateFlags2 & PLAYER_STATE2_19) { if (func_8008E9C4(this)) { anim = D_80853D4C[this->unk_84F][2]; - } - else { + } else { anim = D_80853D4C[this->unk_84F][1]; } - } - else if (this->skelAnime.animation == &gPlayerAnim_003148) { - anim = &gPlayerAnim_003150; - } - else if (func_8008E9C4(this)) { - anim = &gPlayerAnim_002538; + } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_run_jump) { + anim = &gPlayerAnim_link_normal_run_jump_end; + } else if (func_8008E9C4(this)) { + anim = &gPlayerAnim_link_anchor_landingR; func_80833C3C(this); - } - else if (this->fallDistance <= 80) { + } else if (this->fallDistance <= 80) { anim = D_80853914[PLAYER_ANIMGROUP_15][this->modelAnimType]; - } - else if ((this->fallDistance < 800) && (this->unk_84B[this->unk_846] == 0) && - !(this->stateFlags1 & PLAYER_STATE1_11)) { + } else if ((this->fallDistance < 800) && (this->unk_84B[this->unk_846] == 0) && + !(this->stateFlags1 & PLAYER_STATE1_11)) { func_8083BC04(this, globalCtx); return; } @@ -8464,12 +8473,10 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { this->skelAnime.endFrame = 8.0f; if (sp3C == 1) { this->unk_850 = 10; - } - else { + } else { this->unk_850 = 20; } - } - else if (sp3C == 0) { + } else if (sp3C == 0) { func_8083A098(this, anim, globalCtx); } } @@ -8508,19 +8515,17 @@ void func_80844708(Player* this, GlobalContext* globalCtx) { if ((temp != 0) && ((temp > 0) || sp44)) { func_8083A060(this, globalCtx); } - } - else { + } else { if (this->linearVelocity >= 7.0f) { if (((this->actor.bgCheckFlags & 0x200) && (D_8085360C < 0x2000)) || ((this->cylinder.base.ocFlags1 & OC1_HIT) && - (cylinderOc = this->cylinder.base.oc, - ((cylinderOc->id == ACTOR_EN_WOOD02) && - (ABS((s16)(this->actor.world.rot.y - cylinderOc->yawTowardsPlayer)) > 0x6000))))) { + (cylinderOc = this->cylinder.base.oc, + ((cylinderOc->id == ACTOR_EN_WOOD02) && + (ABS((s16)(this->actor.world.rot.y - cylinderOc->yawTowardsPlayer)) > 0x6000))))) { if (cylinderOc != NULL) { cylinderOc->home.rot.y = 1; - } - else if (this->actor.wallBgId != BGCHECK_SCENE) { + } else if (this->actor.wallBgId != BGCHECK_SCENE) { wallPolyActor = DynaPoly_GetActor(&globalCtx->colCtx, this->actor.wallBgId); if ((wallPolyActor != NULL) && (wallPolyActor->actor.id == ACTOR_OBJ_KIBAKO2)) { wallPolyActor->actor.home.rot.z = 1; @@ -8567,7 +8572,7 @@ void func_80844A44(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_5; if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_80832284(globalCtx, this, &gPlayerAnim_003160); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_run_jump_water_fall_wait); } Math_StepToF(&this->linearVelocity, 0.0f, 0.05f); @@ -8610,13 +8615,11 @@ s32 func_80844BE4(Player* this, GlobalContext* globalCtx) { if (func_8083ADD4(globalCtx, this)) { this->stateFlags2 |= PLAYER_STATE2_17; - } - else { + } else { if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { if ((this->unk_858 >= 0.85f) || func_808375D8(this)) { temp = D_80854384[Player_HoldsTwoHandedWeapon(this)]; - } - else { + } else { temp = D_80854380[Player_HoldsTwoHandedWeapon(this)]; } @@ -8627,8 +8630,7 @@ s32 func_80844BE4(Player* this, GlobalContext* globalCtx) { if (this->unk_84B[this->unk_846] == 0) { this->stateFlags2 |= PLAYER_STATE2_30; } - } - else { + } else { return 0; } } @@ -8686,19 +8688,16 @@ void func_80844E68(Player* this, GlobalContext* globalCtx) { if (this->unk_858 >= 0.1f) { this->unk_845 = 0; this->unk_850 = 1; - } - else if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { + } else if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { func_80844D68(this, globalCtx); } - } - else if (!func_80844BE4(this, globalCtx)) { + } else if (!func_80844BE4(this, globalCtx)) { func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); temp = func_80840058(this, &sp34, &sp32, globalCtx); if (temp > 0) { func_80844CF8(this, globalCtx); - } - else if (temp < 0) { + } else if (temp < 0) { func_80844D30(this, globalCtx); } } @@ -8735,8 +8734,8 @@ void func_80845000(Player* this, GlobalContext* globalCtx) { sp58 = CLAMP(sp5C * 0.5f, 0.5f, 1.0f); LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, D_80854360[Player_HoldsTwoHandedWeapon(this)], 0.0f, - D_80854370[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * (21.0f / 29.0f), sp58, - this->blendTable); + D_80854370[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * (21.0f / 29.0f), sp58, + this->blendTable); if (!func_80842964(this, globalCtx) && !func_80844BE4(this, globalCtx)) { func_80844E3C(this); @@ -8792,8 +8791,7 @@ void func_80845308(Player* this, GlobalContext* globalCtx) { sp5C = 0.0f; } func_8084029C(this, ((this->unk_87C >= 0) ? 1 : -1) * sp5C); - } - else { + } else { sp58 = sp5C * 1.5f; if (sp58 < 1.5f) { sp58 = 1.5f; @@ -8804,8 +8802,8 @@ void func_80845308(Player* this, GlobalContext* globalCtx) { sp58 = CLAMP(sp5C * 0.5f, 0.5f, 1.0f); LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, D_80854360[Player_HoldsTwoHandedWeapon(this)], 0.0f, - D_80854378[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * (21.0f / 29.0f), sp58, - this->blendTable); + D_80854378[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * (21.0f / 29.0f), sp58, + this->blendTable); if (!func_80842964(this, globalCtx) && !func_80844BE4(this, globalCtx)) { func_80844E3C(this); @@ -8851,7 +8849,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_5; sp3C = LinkAnimation_Update(globalCtx, &this->skelAnime); - if (this->skelAnime.animation == &gPlayerAnim_002D48) { + if (this->skelAnime.animation == &gPlayerAnim_link_normal_250jump_start) { this->linearVelocity = 1.0f; if (LinkAnimation_OnFrame(&this->skelAnime, 8.0f)) { @@ -8863,8 +8861,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_27) { temp1 *= 0.085f; - } - else { + } else { temp1 *= 0.072f; } @@ -8876,8 +8873,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { this->unk_850 = -1; return; } - } - else { + } else { temp2 = func_808374A0(globalCtx, this, &this->skelAnime, 4.0f); if (temp2 == 0) { @@ -8893,16 +8889,14 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { temp3 = 0.0f; - if (this->skelAnime.animation == &gPlayerAnim_0032E8) { + if (this->skelAnime.animation == &gPlayerAnim_link_swimer_swim_15step_up) { if (LinkAnimation_OnFrame(&this->skelAnime, 30.0f)) { func_8083D0A8(globalCtx, this, 10.0f); } temp3 = 50.0f; - } - else if (this->skelAnime.animation == &gPlayerAnim_002D40) { + } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_150step_up) { temp3 = 30.0f; - } - else if (this->skelAnime.animation == &gPlayerAnim_002D38) { + } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_100step_up) { temp3 = 16.0f; } @@ -8911,7 +8905,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) { func_80832698(this, NA_SE_VO_LI_CLIMB_END); } - if ((this->skelAnime.animation == &gPlayerAnim_002D38) || (this->skelAnime.curFrame > 5.0f)) { + if ((this->skelAnime.animation == &gPlayerAnim_link_normal_100step_up) || (this->skelAnime.curFrame > 5.0f)) { if (this->unk_850 == 0) { func_80832854(this); this->unk_850 = 1; @@ -8953,12 +8947,10 @@ s32 func_80845964(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2 if (temp >= sp24) { arg4 = this->actor.shape.rot.y; arg3 = 0.0f; - } - else { + } else { arg3 = sp28 / ((sp24 - temp) + 1); } - } - else { + } else { arg3 = sp28 / sp24; } } @@ -9015,8 +9007,7 @@ void func_80845CA4(Player* this, GlobalContext* globalCtx) { this->linearVelocity = 0.1f; this->unk_850 = 1; } - } - else if (this->unk_84F == 0) { + } else if (this->unk_84F == 0) { sp3C = 5.0f * D_808535E8; if (func_80845BA0(globalCtx, this, &sp3C, -1) < 30) { @@ -9026,8 +9017,7 @@ void func_80845CA4(Player* this, GlobalContext* globalCtx) { this->unk_450.x = this->unk_45C.x; this->unk_450.z = this->unk_45C.z; } - } - else { + } else { sp34 = 5.0f; sp30 = 20; @@ -9038,8 +9028,7 @@ void func_80845CA4(Player* this, GlobalContext* globalCtx) { this->unk_450.x = (Math_SinS(D_808535FC) * 400.0f) + this->actor.world.pos.x; this->unk_450.z = (Math_CosS(D_808535FC) * 400.0f) + this->actor.world.pos.z; } - } - else if (this->unk_850 < 0) { + } else if (this->unk_850 < 0) { this->unk_850++; sp34 = gSaveContext.entranceSpeed; @@ -9080,8 +9069,7 @@ void func_80845EF8(Player* this, GlobalContext* globalCtx) { this->unk_850 = 1; this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } - } - else { + } else { func_8083C0E8(this, globalCtx); if (globalCtx->roomCtx.prevRoom.num >= 0) { func_80097534(globalCtx, &globalCtx->roomCtx); @@ -9130,7 +9118,7 @@ static struct_80832924 D_8085461C[] = { void func_80846120(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_850++ > 20)) { if (!func_8083B040(this, globalCtx)) { - func_8083A098(this, &gPlayerAnim_002FA0, globalCtx); + func_8083A098(this, &gPlayerAnim_link_normal_heavy_carry_end, globalCtx); } return; } @@ -9163,7 +9151,7 @@ void func_80846260(Player* this, GlobalContext* globalCtx) { func_8083721C(this); if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_80832284(globalCtx, this, &gPlayerAnim_0032C0); + func_80832284(globalCtx, this, &gPlayerAnim_link_silver_wait); this->unk_850 = 1; return; } @@ -9189,7 +9177,7 @@ void func_80846260(Player* this, GlobalContext* globalCtx) { } else if (CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)) { func_80835C58(globalCtx, this, func_80846358, 1); - func_80832264(globalCtx, this, &gPlayerAnim_0032B8); + func_80832264(globalCtx, this, &gPlayerAnim_link_silver_throw); } } @@ -9213,7 +9201,7 @@ void func_80846358(Player* this, GlobalContext* globalCtx) { void func_80846408(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_80832284(globalCtx, this, &gPlayerAnim_003070); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_nocarry_free_wait); this->unk_850 = 15; return; } @@ -9221,7 +9209,7 @@ void func_80846408(Player* this, GlobalContext* globalCtx) { if (this->unk_850 != 0) { this->unk_850--; if (this->unk_850 == 0) { - func_8083A098(this, &gPlayerAnim_003068, globalCtx); + func_8083A098(this, &gPlayerAnim_link_normal_nocarry_free_end, globalCtx); this->stateFlags1 &= ~PLAYER_STATE1_11; func_80832698(this, NA_SE_VO_LI_DAMAGE_S); } @@ -9341,8 +9329,8 @@ void func_80846660(GlobalContext* globalCtx, Player* this) { this->unk_84F = 1; } this->stateFlags1 |= PLAYER_STATE1_29; - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_003298, 2.0f / 3.0f, 0.0f, 24.0f, ANIMMODE_ONCE, - 0.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_okarina_warp_goal, 2.0f / 3.0f, 0.0f, 24.0f, + ANIMMODE_ONCE, 0.0f); this->actor.world.pos.y += 800.0f; } @@ -9374,7 +9362,7 @@ void func_808467D4(GlobalContext* globalCtx, Player* this) { Math_Vec3f_Copy(&this->actor.world.pos, &D_808546F4); this->currentYaw = this->actor.shape.rot.y = -0x8000; LinkAnimation_Change(globalCtx, &this->skelAnime, this->ageProperties->unk_A0, 2.0f / 3.0f, 0.0f, 0.0f, - ANIMMODE_ONCE, 0.0f); + ANIMMODE_ONCE, 0.0f); func_80832F54(globalCtx, this, 0x28F); if (LINK_IS_ADULT) { func_80846720(globalCtx, this, 0); @@ -9388,7 +9376,7 @@ void func_808468A8(GlobalContext* globalCtx, Player* this) { } void func_808468E8(GlobalContext* globalCtx, Player* this) { - func_808389E8(this, &gPlayerAnim_002FE0, 12.0f, globalCtx); + func_808389E8(this, &gPlayerAnim_link_normal_jump, 12.0f, globalCtx); func_80835C58(globalCtx, this, func_8084F9C0, 0); this->stateFlags1 |= PLAYER_STATE1_29; this->fallStartHeight = this->actor.world.pos.y; @@ -9409,7 +9397,7 @@ static s16 D_80854700[] = { ACTOR_MAGIC_WIND, ACTOR_MAGIC_DARK, ACTOR_MAGIC_FIRE Actor* func_80846A00(GlobalContext* globalCtx, Player* this, s32 arg2) { return Actor_Spawn(&globalCtx->actorCtx, globalCtx, D_80854700[arg2], this->actor.world.pos.x, - this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); } void func_80846A68(GlobalContext* globalCtx, Player* this) { @@ -9438,10 +9426,10 @@ void Player_InitCommon(Player* this, GlobalContext* globalCtx, FlexSkeletonHeade func_80834644(globalCtx, this); SkelAnime_InitLink(globalCtx, &this->skelAnime, skelHeader, D_80853914[PLAYER_ANIMGROUP_0][this->modelAnimType], 9, - this->jointTable, this->morphTable, PLAYER_LIMB_MAX); + this->jointTable, this->morphTable, PLAYER_LIMB_MAX); this->skelAnime.baseTransl = D_80854730; SkelAnime_InitLink(globalCtx, &this->skelAnime2, skelHeader, func_80833338(this), 9, this->jointTable2, - this->morphTable2, PLAYER_LIMB_MAX); + this->morphTable2, PLAYER_LIMB_MAX); this->skelAnime2.baseTransl = D_80854730; Effect_Add(globalCtx, &this->swordEffectIndex, EFFECT_BLURE2, 0, 0, &D_8085470C); @@ -9495,14 +9483,16 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) { Player_SetEquipmentData(globalCtx, this); this->prevBoots = this->currentBoots; if (CVar_GetS32("gMMBunnyHood", 0)) { - if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) { sMaskMemory = PLAYER_MASK_NONE; } + if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) { + sMaskMemory = PLAYER_MASK_NONE; + } this->currentMask = sMaskMemory; for (uint16_t cSlotIndex = 0; cSlotIndex < ARRAY_COUNT(gSaveContext.equips.cButtonSlots); cSlotIndex++) { if (gSaveContext.equips.cButtonSlots[cSlotIndex] == SLOT_TRADE_CHILD && - (gItemAgeReqs[gSaveContext.equips.buttonItems[cSlotIndex+1]] != 9 && - LINK_IS_ADULT && !CVar_GetS32("gNoRestrictAge", 0))) { + (gItemAgeReqs[gSaveContext.equips.buttonItems[cSlotIndex + 1]] != 9 && LINK_IS_ADULT && + !CVar_GetS32("gNoRestrictAge", 0))) { gSaveContext.equips.cButtonSlots[cSlotIndex] = SLOT_NONE; - gSaveContext.equips.buttonItems[cSlotIndex+1] = ITEM_NONE; + gSaveContext.equips.buttonItems[cSlotIndex + 1] = ITEM_NONE; } } } @@ -9514,16 +9504,14 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) { if (sp50 != 0) { if (sp50 == -3) { thisx->params = gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams; - } - else { + } else { if ((sp50 == 1) || (sp50 == -1)) { this->unk_A86 = -2; } if (sp50 < 0) { sp4C = 0; - } - else { + } else { sp4C = sp50 - 1; Math_Vec3f_Copy(&thisx->world.pos, &gSaveContext.respawn[sp50 - 1].pos); Math_Vec3f_Copy(&thisx->home.pos, &thisx->world.pos); @@ -9543,11 +9531,11 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) { if (gSaveContext.showTitleCard) { if ((gSaveContext.sceneSetupIndex < 4) && (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field & - 0x4000) && + 0x4000) && ((globalCtx->sceneNum != SCENE_DDAN) || (gSaveContext.eventChkInf[11] & 1)) && ((globalCtx->sceneNum != SCENE_NIGHT_SHOP) || (gSaveContext.eventChkInf[2] & 0x20))) { TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, - 24, 20); + 24, 20); } } gSaveContext.showTitleCard = true; @@ -9641,8 +9629,7 @@ void func_80847298(Player* this) { if (!(this->unk_6AE & 0x80)) { if (this->unk_6B0 != 0) { func_808471F4(&this->unk_6B0); - } - else { + } else { func_808471F4(&this->unk_6BE); } } @@ -9671,93 +9658,73 @@ void func_808473D4(GlobalContext* globalCtx, Player* this) { if (!Player_InBlockingCsMode(globalCtx, this)) { if (this->stateFlags1 & PLAYER_STATE1_20) { doAction = DO_ACTION_RETURN; - } - else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 != 0)) { + } else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 != 0)) { if (this->unk_860 == 2) { doAction = DO_ACTION_REEL; } - } - else if ((func_8084E3C4 != this->func_674) && !(this->stateFlags2 & PLAYER_STATE2_18)) { + } else if ((func_8084E3C4 != this->func_674) && !(this->stateFlags2 & PLAYER_STATE2_18)) { if ((this->doorType != PLAYER_DOORTYPE_NONE) && (!(this->stateFlags1 & PLAYER_STATE1_11) || - ((heldActor != NULL) && (heldActor->id == ACTOR_EN_RU1)))) { + ((heldActor != NULL) && (heldActor->id == ACTOR_EN_RU1)))) { doAction = DO_ACTION_OPEN; - } - else if ((!(this->stateFlags1 & PLAYER_STATE1_11) || (heldActor == NULL)) && - (interactRangeActor != NULL) && - ((!sp1C && (this->getItemId == GI_NONE)) || - ((this->getItemId < 0) && !(this->stateFlags1 & PLAYER_STATE1_27)))) { + } else if ((!(this->stateFlags1 & PLAYER_STATE1_11) || (heldActor == NULL)) && + (interactRangeActor != NULL) && + ((!sp1C && (this->getItemId == GI_NONE)) || + ((this->getItemId < 0) && !(this->stateFlags1 & PLAYER_STATE1_27)))) { if (this->getItemId < 0) { doAction = DO_ACTION_OPEN; - } - else if ((interactRangeActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) { + } else if ((interactRangeActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) { doAction = DO_ACTION_DROP; - } - else { + } else { doAction = DO_ACTION_GRAB; } - } - else if (!sp1C && (this->stateFlags2 & PLAYER_STATE2_0)) { + } else if (!sp1C && (this->stateFlags2 & PLAYER_STATE2_0)) { doAction = DO_ACTION_GRAB; - } - else if ((this->stateFlags2 & PLAYER_STATE2_2) || - (!(this->stateFlags1 & PLAYER_STATE1_23) && (this->rideActor != NULL))) { + } else if ((this->stateFlags2 & PLAYER_STATE2_2) || + (!(this->stateFlags1 & PLAYER_STATE1_23) && (this->rideActor != NULL))) { doAction = DO_ACTION_CLIMB; - } - else if ((this->stateFlags1 & PLAYER_STATE1_23) && !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) && - (func_8084D3E4 != this->func_674)) { + } else if ((this->stateFlags1 & PLAYER_STATE1_23) && !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) && + (func_8084D3E4 != this->func_674)) { if ((this->stateFlags2 & PLAYER_STATE2_1) && (this->targetActor != NULL)) { if (this->targetActor->category == ACTORCAT_NPC) { doAction = DO_ACTION_SPEAK; - } - else { + } else { doAction = DO_ACTION_CHECK; } - } - else if (!func_8002DD78(this) && !(this->stateFlags1 & PLAYER_STATE1_20)) { + } else if (!func_8002DD78(this) && !(this->stateFlags1 & PLAYER_STATE1_20)) { doAction = DO_ACTION_FASTER; } - } - else if ((this->stateFlags2 & PLAYER_STATE2_1) && (this->targetActor != NULL)) { + } else if ((this->stateFlags2 & PLAYER_STATE2_1) && (this->targetActor != NULL)) { if (this->targetActor->category == ACTORCAT_NPC) { doAction = DO_ACTION_SPEAK; - } - else { + } else { doAction = DO_ACTION_CHECK; } - } - else if ((this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_21)) || - ((this->stateFlags1 & PLAYER_STATE1_23) && (this->stateFlags2 & PLAYER_STATE2_22))) { + } else if ((this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_21)) || + ((this->stateFlags1 & PLAYER_STATE1_23) && (this->stateFlags2 & PLAYER_STATE2_22))) { doAction = DO_ACTION_DOWN; - } - else if (this->stateFlags2 & PLAYER_STATE2_16) { + } else if (this->stateFlags2 & PLAYER_STATE2_16) { doAction = DO_ACTION_ENTER; - } - else if ((this->stateFlags1 & PLAYER_STATE1_11) && (this->getItemId == GI_NONE) && - (heldActor != NULL)) { + } else if ((this->stateFlags1 & PLAYER_STATE1_11) && (this->getItemId == GI_NONE) && + (heldActor != NULL)) { if ((this->actor.bgCheckFlags & 1) || (heldActor->id == ACTOR_EN_NIW)) { if (func_8083EAF0(this, heldActor) == 0) { doAction = DO_ACTION_DROP; - } - else { + } else { doAction = DO_ACTION_THROW; } } - } - else if (!(this->stateFlags1 & PLAYER_STATE1_27) && func_8083A0D4(this) && - (this->getItemId < GI_MAX)) { + } else if (!(this->stateFlags1 & PLAYER_STATE1_27) && func_8083A0D4(this) && + (this->getItemId < GI_MAX)) { doAction = DO_ACTION_GRAB; - } - else if (this->stateFlags2 & PLAYER_STATE2_11) { + } else if (this->stateFlags2 & PLAYER_STATE2_11) { sp24 = (D_80854784[CUR_UPG_VALUE(UPG_SCALE)] - this->actor.yDistToWater) / 40.0f; sp24 = CLAMP(sp24, 0, 7); doAction = sDiveDoActions[sp24]; - } - else if (sp1C && !(this->stateFlags2 & PLAYER_STATE2_10)) { + } else if (sp1C && !(this->stateFlags2 & PLAYER_STATE2_10)) { doAction = DO_ACTION_DIVE; - } - else if (!sp1C && (!(this->stateFlags1 & PLAYER_STATE1_22) || func_80833BCC(this) || - !Player_IsChildWithHylianShield(this))) { + } else if (!sp1C && (!(this->stateFlags1 & PLAYER_STATE1_22) || func_80833BCC(this) || + !Player_IsChildWithHylianShield(this))) { if ((!(this->stateFlags1 & PLAYER_STATE1_14) && (sp20 <= 0) && (func_8008E9C4(this) || ((D_808535E4 != 7) && (func_80833B2C(this) || @@ -9767,10 +9734,9 @@ void func_808473D4(GlobalContext* globalCtx, Player* this) { } else if ((globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && func_80833BCC(this) && (sp20 > 0)) { doAction = DO_ACTION_JUMP; - } - else if ((this->heldItemActionParam >= PLAYER_AP_SWORD_MASTER) || - ((this->stateFlags2 & PLAYER_STATE2_20) && - (globalCtx->actorCtx.targetCtx.arrowPointedActor == NULL))) { + } else if ((this->heldItemActionParam >= PLAYER_AP_SWORD_MASTER) || + ((this->stateFlags2 & PLAYER_STATE2_20) && + (globalCtx->actorCtx.targetCtx.arrowPointedActor == NULL))) { doAction = DO_ACTION_PUTAWAY; } } @@ -9779,14 +9745,10 @@ void func_808473D4(GlobalContext* globalCtx, Player* this) { if (doAction != DO_ACTION_PUTAWAY) { this->unk_837 = 20; - } - else if (this->unk_837 != 0) { - if (CVar_GetS32("gInstantPutaway", 0) != 0) - { + } else if (this->unk_837 != 0) { + if (CVar_GetS32("gInstantPutaway", 0) != 0) { this->unk_837 = 0; - } - else - { + } else { doAction = DO_ACTION_NONE; this->unk_837--; } @@ -9797,13 +9759,11 @@ void func_808473D4(GlobalContext* globalCtx, Player* this) { if (this->stateFlags2 & PLAYER_STATE2_21) { if (this->unk_664 != NULL) { Interface_SetNaviCall(globalCtx, 0x1E); - } - else { + } else { Interface_SetNaviCall(globalCtx, 0x1D); } Interface_SetNaviCall(globalCtx, 0x1E); - } - else { + } else { Interface_SetNaviCall(globalCtx, 0x1F); } } @@ -9814,13 +9774,12 @@ s32 func_80847A78(Player* this) { if ((this->currentBoots == PLAYER_BOOTS_HOVER) && (this->hoverBootsTimer != 0)) { this->hoverBootsTimer--; - } - else { + } else { this->hoverBootsTimer = 0; } cond = (this->currentBoots == PLAYER_BOOTS_HOVER) && - ((this->actor.yDistToWater >= 0.0f) || (func_80838144(D_808535E4) >= 0) || func_8083816C(D_808535E4)); + ((this->actor.yDistToWater >= 0.0f) || (func_80838144(D_808535E4) >= 0) || func_8083816C(D_808535E4)); if (cond && (this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) { this->actor.bgCheckFlags &= ~1; @@ -9856,8 +9815,7 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { spB0 = 10.0f; spAC = 15.0f; spA8 = 30.0f; - } - else { + } else { spB0 = this->ageProperties->unk_38; spAC = 26.0f; spA8 = this->ageProperties->unk_00; @@ -9867,20 +9825,16 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if (this->stateFlags1 & PLAYER_STATE1_31) { this->actor.bgCheckFlags &= ~1; spA4 = 0x38; - } - else if ((this->stateFlags1 & PLAYER_STATE1_0) && ((this->unk_A84 - (s32)this->actor.world.pos.y) >= 100)) { + } else if ((this->stateFlags1 & PLAYER_STATE1_0) && ((this->unk_A84 - (s32)this->actor.world.pos.y) >= 100)) { spA4 = 0x39; - } - else if (!(this->stateFlags1 & PLAYER_STATE1_0) && - ((func_80845EF8 == this->func_674) || (func_80845CA4 == this->func_674))) { + } else if (!(this->stateFlags1 & PLAYER_STATE1_0) && + ((func_80845EF8 == this->func_674) || (func_80845CA4 == this->func_674))) { this->actor.bgCheckFlags &= ~0x208; spA4 = 0x3C; - } - else { + } else { spA4 = 0x3F; } - } - else { + } else { spA4 = 0x3F; } @@ -9911,16 +9865,13 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if (this->actor.bgCheckFlags & 0x20) { if (this->actor.yDistToWater < 20.0f) { this->unk_89E = 4; - } - else { + } else { this->unk_89E = 5; } - } - else { + } else { if (this->stateFlags2 & PLAYER_STATE2_9) { this->unk_89E = 1; - } - else { + } else { this->unk_89E = SurfaceType_GetSfx(&globalCtx->colCtx, spC0, this->actor.floorBgId); } } @@ -9930,9 +9881,8 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if (this->actor.floorBgId == BGCHECK_SCENE) { func_80074CE8(globalCtx, - SurfaceType_GetLightSettingIndex(&globalCtx->colCtx, spC0, this->actor.floorBgId)); - } - else { + SurfaceType_GetLightSettingIndex(&globalCtx->colCtx, spC0, this->actor.floorBgId)); + } else { func_80043508(&globalCtx->colCtx, this->actor.floorBgId); } } @@ -9941,11 +9891,10 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if (D_808535F4 != 0) { D_808535F8 = SurfaceType_IsConveyor(&globalCtx->colCtx, spC0, this->actor.floorBgId); if (((D_808535F8 == 0) && (this->actor.yDistToWater > 20.0f) && - (this->currentBoots != PLAYER_BOOTS_IRON)) || + (this->currentBoots != PLAYER_BOOTS_IRON)) || ((D_808535F8 != 0) && (this->actor.bgCheckFlags & 1))) { D_808535FC = SurfaceType_GetConveyorDirection(&globalCtx->colCtx, spC0, this->actor.floorBgId) << 10; - } - else { + } else { D_808535F4 = 0; } } @@ -9987,8 +9936,7 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { spB0 = D_8085360C * 0.00008f; if (!(this->actor.bgCheckFlags & 1) || spB0 >= 1.0f) { this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; - } - else { + } else { spAC = (R_RUN_SPEED_LIMIT / 100.0f * spB0); this->unk_880 = spAC; if (spAC < 0.1f) { @@ -10025,41 +9973,35 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if ((this->wallHeight < 18.0f) || BgCheck_EntityCheckCeiling(&globalCtx->colCtx, &sp60, &this->actor.world.pos, - (sp64 - this->actor.world.pos.y) + 20.0f, &sp78, &sp74, &this->actor)) { + (sp64 - this->actor.world.pos.y) + 20.0f, &sp78, &sp74, &this->actor)) { this->wallHeight = 399.96002f; - } - else { + } else { D_80854798.y = (sp64 + 5.0f) - this->actor.world.pos.y; if (func_80839768(globalCtx, this, &D_80854798, &sp78, &sp74, &D_80858AA8) && (temp3 = this->actor.wallYaw - Math_Atan2S(sp78->normal.z, sp78->normal.x), - ABS(temp3) < 0x4000) && + ABS(temp3) < 0x4000) && !func_80041E18(&globalCtx->colCtx, sp78, sp74)) { this->wallHeight = 399.96002f; - } - else if (func_80041DE4(&globalCtx->colCtx, wallPoly, this->actor.wallBgId) == 0) { + } else if (func_80041DE4(&globalCtx->colCtx, wallPoly, this->actor.wallBgId) == 0) { if (this->ageProperties->unk_1C <= this->wallHeight) { if (ABS(sp7C->normal.y) > 28000) { if (this->ageProperties->unk_14 <= this->wallHeight) { spC7 = 4; - } - else if (this->ageProperties->unk_18 <= this->wallHeight) { + } else if (this->ageProperties->unk_18 <= this->wallHeight) { spC7 = 3; - } - else { + } else { spC7 = 2; } } - } - else { + } else { spC7 = 1; } } } } } - } - else { + } else { this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; this->unk_88D = 0; this->wallHeight = 0.0f; @@ -10069,8 +10011,7 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { if ((this->linearVelocity != 0.0f) && (this->unk_88D < 100)) { this->unk_88D++; } - } - else { + } else { this->unk_88C = spC7; this->unk_88D = 0; } @@ -10108,15 +10049,13 @@ void func_80847BA0(GlobalContext* globalCtx, Player* this) { func_8083E318(globalCtx, this, spC0); } - } - else { + } else { func_80847A78(this); } if (this->unk_A7B == D_808535E4) { this->unk_A79++; - } - else { + } else { this->unk_A7B = D_808535E4; this->unk_A79 = 0; } @@ -10133,76 +10072,57 @@ void Player_UpdateCamAndSeqModes(GlobalContext* globalCtx, Player* this) { if (this->csMode != 0) { Camera_ChangeMode(Gameplay_GetCamera(globalCtx, 0), CAM_MODE_NORMAL); - } - else if (!(this->stateFlags1 & PLAYER_STATE1_20)) { + } else if (!(this->stateFlags1 & PLAYER_STATE1_20)) { if ((this->actor.parent != NULL) && (this->stateFlags3 & PLAYER_STATE3_7)) { camMode = CAM_MODE_HOOKSHOT; Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->actor.parent); - } - else if (func_8084377C == this->func_674) { + } else if (func_8084377C == this->func_674) { camMode = CAM_MODE_STILL; - } - else if (this->stateFlags2 & PLAYER_STATE2_8) { + } else if (this->stateFlags2 & PLAYER_STATE2_8) { camMode = CAM_MODE_PUSHPULL; - } - else if ((unk_664 = this->unk_664) != NULL) { + } else if ((unk_664 = this->unk_664) != NULL) { if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_8)) { camMode = CAM_MODE_TALK; - } - else if (this->stateFlags1 & PLAYER_STATE1_16) { + } else if (this->stateFlags1 & PLAYER_STATE1_16) { if (this->stateFlags1 & PLAYER_STATE1_25) { camMode = CAM_MODE_FOLLOWBOOMERANG; - } - else { + } else { camMode = CAM_MODE_FOLLOWTARGET; } - } - else { + } else { camMode = CAM_MODE_BATTLE; } Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, unk_664); - } - else if (this->stateFlags1 & PLAYER_STATE1_12) { + } else if (this->stateFlags1 & PLAYER_STATE1_12) { camMode = CAM_MODE_CHARGE; - } - else if (this->stateFlags1 & PLAYER_STATE1_25) { + } else if (this->stateFlags1 & PLAYER_STATE1_25) { camMode = CAM_MODE_FOLLOWBOOMERANG; Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->boomerangActor); - } - else if (this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14)) { + } else if (this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14)) { if (func_80833B2C(this)) { camMode = CAM_MODE_HANGZ; - } - else { + } else { camMode = CAM_MODE_HANG; } - } - else if (this->stateFlags1 & (PLAYER_STATE1_17 | PLAYER_STATE1_30)) { + } else if (this->stateFlags1 & (PLAYER_STATE1_17 | PLAYER_STATE1_30)) { if (func_8002DD78(this) || func_808334B4(this)) { camMode = CAM_MODE_BOWARROWZ; - } - else if (this->stateFlags1 & PLAYER_STATE1_21) { + } else if (this->stateFlags1 & PLAYER_STATE1_21) { camMode = CAM_MODE_CLIMBZ; - } - else { + } else { camMode = CAM_MODE_TARGET; } - } - else if (this->stateFlags1 & (PLAYER_STATE1_18 | PLAYER_STATE1_21)) { + } else if (this->stateFlags1 & (PLAYER_STATE1_18 | PLAYER_STATE1_21)) { if ((func_80845668 == this->func_674) || (this->stateFlags1 & PLAYER_STATE1_21)) { camMode = CAM_MODE_CLIMB; - } - else { + } else { camMode = CAM_MODE_JUMP; } - } - else if (this->stateFlags1 & PLAYER_STATE1_19) { + } else if (this->stateFlags1 & PLAYER_STATE1_19) { camMode = CAM_MODE_FREEFALL; - } - else if ((this->swordState != 0) && (this->swordAnimation >= 0) && (this->swordAnimation < 0x18)) { + } else if ((this->swordState != 0) && (this->swordAnimation >= 0) && (this->swordAnimation < 0x18)) { camMode = CAM_MODE_STILL; - } - else { + } else { camMode = CAM_MODE_NORMAL; if ((this->linearVelocity == 0.0f) && (!(this->stateFlags1 & PLAYER_STATE1_23) || (this->rideActor->speedXZ == 0.0f))) { @@ -10212,8 +10132,7 @@ void Player_UpdateCamAndSeqModes(GlobalContext* globalCtx, Player* this) { } Camera_ChangeMode(Gameplay_GetCamera(globalCtx, 0), camMode); - } - else { + } else { // First person mode seqMode = SEQ_MODE_STILL; } @@ -10249,17 +10168,15 @@ void func_80848A04(GlobalContext* globalCtx, Player* this) { this->unk_860 = 1; temp = 0.0f; this->unk_85C = temp; - } - else if (this->unk_860 > 200) { + } else if (this->unk_860 > 200) { temp = (210 - this->unk_860) / 10.0f; - } - else if (this->unk_860 < 20) { + } else if (this->unk_860 < 20) { temp = this->unk_860 / 20.0f; this->unk_85C = temp; } func_8002836C(globalCtx, &this->swordInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0, temp * 200.0f, - 0, 8); + 0, 8); } void func_80848B44(GlobalContext* globalCtx, Player* this) { @@ -10301,8 +10218,7 @@ void func_80848C74(GlobalContext* globalCtx, Player* this) { if (this->currentTunic == PLAYER_TUNIC_GORON || CVar_GetS32("gSuperTunic", 0) != 0) { sp54 = 20; - } - else { + } else { sp54 = (s32)(this->linearVelocity * 0.4f) + 1; } @@ -10311,8 +10227,7 @@ void func_80848C74(GlobalContext* globalCtx, Player* this) { if (this->stateFlags2 & PLAYER_STATE2_3) { sp58 = 100; - } - else { + } else { sp58 = 0; } @@ -10323,16 +10238,14 @@ void func_80848C74(GlobalContext* globalCtx, Player* this) { if (*timerPtr <= timerStep) { *timerPtr = 0; - } - else { + } else { spawnedFlame = true; *timerPtr -= timerStep; if (*timerPtr > 20.0f) { flameIntensity = (*timerPtr - 20.0f) * 0.01f; flameScale = CLAMP(flameIntensity, 0.19999999f, 0.2f); - } - else { + } else { flameScale = *timerPtr * 0.01f; } @@ -10347,16 +10260,14 @@ void func_80848C74(GlobalContext* globalCtx, Player* this) { if (globalCtx->sceneNum == SCENE_JYASINBOSS) { dmgCooldown = 0; - } - else { + } else { dmgCooldown = 7; } if ((dmgCooldown & globalCtx->gameplayFrames) == 0) { Player_InflictDamage(globalCtx, -1); } - } - else { + } else { this->isBurning = false; } } @@ -10374,68 +10285,84 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) { /*Prevent it on horse, while jumping and on title screen. If you fly around no stone of agony for you! */ Color_RGB8 StoneOfAgony_ori = { 255, 255, 255 }; - if (CVar_GetS32("gVisualAgony", 0) !=0 && !this->stateFlags1) { - s16 Top_Margins = (CVar_GetS32("gHUDMargin_T", 0)*-1); + if (CVar_GetS32("gVisualAgony", 0) != 0 && !this->stateFlags1) { + s16 Top_Margins = (CVar_GetS32("gHUDMargin_T", 0) * -1); s16 Left_Margins = CVar_GetS32("gHUDMargin_L", 0); s16 Right_Margins = CVar_GetS32("gHUDMargin_R", 0); s16 X_Margins_VSOA; s16 Y_Margins_VSOA; if (CVar_GetS32("gVSOAUseMargins", 0) != 0) { - if (CVar_GetS32("gVSOAPosType", 0) == 0) {X_Margins_VSOA = Left_Margins;}; + if (CVar_GetS32("gVSOAPosType", 0) == 0) { + X_Margins_VSOA = Left_Margins; + }; Y_Margins_VSOA = Top_Margins; } else { X_Margins_VSOA = 0; Y_Margins_VSOA = 0; } - s16 PosX_VSOA_ori = OTRGetRectDimensionFromLeftEdge(26)+X_Margins_VSOA; - s16 PosY_VSOA_ori = 60+Y_Margins_VSOA; + s16 PosX_VSOA_ori = OTRGetRectDimensionFromLeftEdge(26) + X_Margins_VSOA; + s16 PosY_VSOA_ori = 60 + Y_Margins_VSOA; s16 PosX_VSOA; s16 PosY_VSOA; if (CVar_GetS32("gVSOAPosType", 0) != 0) { - PosY_VSOA = CVar_GetS32("gVSOAPosY", 0)+Y_Margins_VSOA; - if (CVar_GetS32("gVSOAPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gVSOAUseMargins", 0) != 0) {X_Margins_VSOA = Left_Margins;}; - PosX_VSOA = OTRGetDimensionFromLeftEdge(CVar_GetS32("gVSOAPosX", 0)+X_Margins_VSOA); - } else if (CVar_GetS32("gVSOAPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gVSOAUseMargins", 0) != 0) {X_Margins_VSOA = Right_Margins;}; - PosX_VSOA = OTRGetDimensionFromRightEdge(CVar_GetS32("gVSOAPosX", 0)+X_Margins_VSOA); - } else if (CVar_GetS32("gVSOAPosType", 0) == 3) {//Anchor None + PosY_VSOA = CVar_GetS32("gVSOAPosY", 0) + Y_Margins_VSOA; + if (CVar_GetS32("gVSOAPosType", 0) == 1) { // Anchor Left + if (CVar_GetS32("gVSOAUseMargins", 0) != 0) { + X_Margins_VSOA = Left_Margins; + }; + PosX_VSOA = OTRGetDimensionFromLeftEdge(CVar_GetS32("gVSOAPosX", 0) + X_Margins_VSOA); + } else if (CVar_GetS32("gVSOAPosType", 0) == 2) { // Anchor Right + if (CVar_GetS32("gVSOAUseMargins", 0) != 0) { + X_Margins_VSOA = Right_Margins; + }; + PosX_VSOA = OTRGetDimensionFromRightEdge(CVar_GetS32("gVSOAPosX", 0) + X_Margins_VSOA); + } else if (CVar_GetS32("gVSOAPosType", 0) == 3) { // Anchor None PosX_VSOA = CVar_GetS32("gVSOAPosX", 0); - } else if (CVar_GetS32("gVSOAPosType", 0) == 4) {//Hidden - PosX_VSOA = -9999; + } else if (CVar_GetS32("gVSOAPosType", 0) == 4) { // Hidden + PosX_VSOA = -9999; } } else { PosY_VSOA = PosY_VSOA_ori; PosX_VSOA = PosX_VSOA_ori; } - int rectLeft = PosX_VSOA; //Left X Pos - int rectTop = PosY_VSOA; //Top Y Pos - int rectWidth = 24; //Texture Width - int rectHeight = 24; //Texture Heigh - int DefaultIconA= 50; //Default icon alpha (55 on 255) + int rectLeft = PosX_VSOA; // Left X Pos + int rectTop = PosY_VSOA; // Top Y Pos + int rectWidth = 24; // Texture Width + int rectHeight = 24; // Texture Heigh + int DefaultIconA = 50; // Default icon alpha (55 on 255) OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(OVERLAY_DISP++); if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); } else { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, + DefaultIconA); } - gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); if (this->unk_6A0 > 4000000.0f) { if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, 255); } else { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, 255); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, + 255); } } else { if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); } else { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, + DefaultIconA); } } if (temp == 0 || temp <= 0.1f) { @@ -10443,23 +10370,35 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) { link is standing out range but do not refresh unk_6A0. Also used to make a default value in my case.*/ if (CVar_GetS32("gHudColors", 1) == 2) { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g,CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).r, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).g, + CVar_GetRGB("gCCVSOAPrim", StoneOfAgony_ori).b, DefaultIconA); } else { - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, DefaultIconA); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, StoneOfAgony_ori.r, StoneOfAgony_ori.g, StoneOfAgony_ori.b, + DefaultIconA); } } gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); - gDPSetOtherMode(OVERLAY_DISP++, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_IA16 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); - gDPLoadTextureBlock(OVERLAY_DISP++, gStoneOfAgonyIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPSetOtherMode(OVERLAY_DISP++, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); - gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + gDPSetOtherMode(OVERLAY_DISP++, + G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_IA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); + gDPLoadTextureBlock(OVERLAY_DISP++, gStoneOfAgonyIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); + gDPSetOtherMode(OVERLAY_DISP++, + G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); + gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, + (rectTop + rectHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); CLOSE_DISPS(globalCtx->state.gfxCtx); } if (this->unk_6A0 > 4000000.0f) { this->unk_6A0 = 0.0f; - if (CVar_GetS32("gVisualAgony", 0) !=0 && !this->stateFlags1) { - //This audio is placed here and not in previous CVar check to prevent ears ra.. :) + if (CVar_GetS32("gVisualAgony", 0) != 0 && !this->stateFlags1) { + // This audio is placed here and not in previous CVar check to prevent ears ra.. :) Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E0); } func_8083264C(this, 120, 20, 10, 0); @@ -10507,8 +10446,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (this->invincibilityTimer < 0) { this->invincibilityTimer++; - } - else if (this->invincibilityTimer > 0) { + } else if (this->invincibilityTimer > 0) { this->invincibilityTimer--; } @@ -10521,8 +10459,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_860 != 0)) { func_80848A04(globalCtx, this); - } - else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 < 0)) { + } else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 < 0)) { this->unk_860++; } @@ -10547,8 +10484,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { } func_80847BA0(globalCtx, this); - } - else { + } else { f32 temp_f0; f32 phi_f12; @@ -10560,8 +10496,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->stateFlags2 |= PLAYER_STATE2_10; } } - } - else { + } else { if (this->stateFlags1 & PLAYER_STATE1_27) { if ((this->prevBoots == PLAYER_BOOTS_IRON) || (this->actor.bgCheckFlags & 1)) { func_8083D36C(globalCtx, this); @@ -10577,18 +10512,16 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->actor.parent = this->rideActor; func_8083A360(globalCtx, this); this->stateFlags1 |= PLAYER_STATE1_23; - func_80832264(globalCtx, this, &gPlayerAnim_0033B8); + func_80832264(globalCtx, this, &gPlayerAnim_link_uma_wait_1); func_80832F54(globalCtx, this, 0x9B); this->unk_850 = 99; } if (this->unk_844 == 0) { this->unk_845 = 0; - } - else if (this->unk_844 < 0) { + } else if (this->unk_844 < 0) { this->unk_844++; - } - else { + } else { this->unk_844--; } @@ -10608,7 +10541,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (!(this->skelAnime.moveFlags & 0x80)) { if (((this->actor.bgCheckFlags & 1) && (D_808535E4 == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) || ((this->currentBoots == PLAYER_BOOTS_HOVER) && - !(this->stateFlags1 & (PLAYER_STATE1_27 | PLAYER_STATE1_29)))) { + !(this->stateFlags1 & (PLAYER_STATE1_27 | PLAYER_STATE1_29)))) { f32 sp70 = this->linearVelocity; s16 sp6E = this->currentYaw; s16 yawDiff = this->actor.world.rot.y - sp6E; @@ -10635,8 +10568,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((this->linearVelocity == 0.0f) && (this->actor.speedXZ != 0.0f)) { func_800F4138(&this->actor.projectedPos, 0xD0, this->actor.speedXZ); } - } - else { + } else { this->actor.speedXZ = this->linearVelocity; this->actor.world.rot.y = this->currentYaw; } @@ -10652,8 +10584,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { func_8002D7EC(&this->actor); func_80847BA0(globalCtx, this); - } - else { + } else { D_808535E4 = 0; this->unk_A7A = 0; @@ -10665,8 +10596,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (!(rideActor->actor.bgCheckFlags & 1)) { func_808396F4(globalCtx, this, &D_80854814, &sp4C, &sp5C, &sp58); - } - else { + } else { sp5C = rideActor->actor.floorPoly; sp58 = rideActor->actor.floorBgId; } @@ -10674,8 +10604,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((sp5C != NULL) && func_80839034(globalCtx, this, sp5C, sp58)) { if (DREG(25) != 0) { DREG(25) = 0; - } - else { + } else { AREG(6) = 1; } } @@ -10696,17 +10625,15 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (!(this->stateFlags1 & PLAYER_STATE1_27)) { sp48 *= 0.25f; } - } - else { + } else { sp48 = D_8085482C[D_808535F4]; } Math_StepToF(&this->windSpeed, sp48, sp48 * 0.1f); Math_ScaledStepToS(&this->windDirection, D_808535FC, - ((this->stateFlags1 & PLAYER_STATE1_27) ? 400.0f : 800.0f) * sp48); - } - else if (this->windSpeed != 0.0f) { + ((this->stateFlags1 & PLAYER_STATE1_27) ? 400.0f : 800.0f) * sp48); + } else if (this->windSpeed != 0.0f) { Math_StepToF(&this->windSpeed, 0.0f, (this->stateFlags1 & PLAYER_STATE1_27) ? 0.5f : 1.0f); } @@ -10717,20 +10644,17 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21)) { func_80832440(globalCtx, this); func_80837B9C(this, globalCtx); - } - else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_27)) { + } else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_27)) { func_80836448(globalCtx, this, - func_808332B8(this) ? &gPlayerAnim_003310 - : (this->shockTimer != 0) ? &gPlayerAnim_002F08 - : &gPlayerAnim_002878); + func_808332B8(this) ? &gPlayerAnim_link_swimer_swim_down + : (this->shockTimer != 0) ? &gPlayerAnim_link_normal_electric_shock_end + : &gPlayerAnim_link_derth_rebirth); } - } - else { + } else { if ((this->actor.parent == NULL) && ((globalCtx->sceneLoadFlag == 0x14) || (this->unk_A87 != 0) || !func_808382DC(this, globalCtx))) { func_8083AA10(this, globalCtx); - } - else { + } else { this->fallStartHeight = this->actor.world.pos.y; } func_80848EF8(this, globalCtx); @@ -10745,9 +10669,8 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((linkActionCsCmd != NULL) && (D_808547C4[linkActionCsCmd->action] != 0)) { func_8002DF54(globalCtx, NULL, 6); func_80832210(this); - } - else if ((this->csMode == 0) && !(this->stateFlags2 & PLAYER_STATE2_10) && - (globalCtx->csCtx.state != CS_STATE_UNSKIPPABLE_INIT)) { + } else if ((this->csMode == 0) && !(this->stateFlags2 & PLAYER_STATE2_10) && + (globalCtx->csCtx.state != CS_STATE_UNSKIPPABLE_INIT)) { func_8002DF54(globalCtx, NULL, 0x31); func_80832210(this); } @@ -10757,12 +10680,10 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if ((this->csMode != 7) || !(this->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21 | PLAYER_STATE1_26))) { this->unk_6AD = 3; - } - else if (func_80852E14 != this->func_674) { + } else if (func_80852E14 != this->func_674) { func_80852944(globalCtx, this, NULL); } - } - else { + } else { this->prevCsMode = 0; } @@ -10774,8 +10695,8 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->stateFlags1 &= ~(PLAYER_STATE1_1 | PLAYER_STATE1_9 | PLAYER_STATE1_12 | PLAYER_STATE1_22); this->stateFlags2 &= ~(PLAYER_STATE2_0 | PLAYER_STATE2_2 | PLAYER_STATE2_3 | PLAYER_STATE2_5 | PLAYER_STATE2_6 | - PLAYER_STATE2_8 | PLAYER_STATE2_9 | PLAYER_STATE2_12 | PLAYER_STATE2_14 | - PLAYER_STATE2_16 | PLAYER_STATE2_22 | PLAYER_STATE2_26); + PLAYER_STATE2_8 | PLAYER_STATE2_9 | PLAYER_STATE2_12 | PLAYER_STATE2_14 | + PLAYER_STATE2_16 | PLAYER_STATE2_22 | PLAYER_STATE2_26); this->stateFlags3 &= ~PLAYER_STATE3_4; func_80847298(this); @@ -10783,8 +10704,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (this->stateFlags1 & PLAYER_STATE1_27) { D_808535E8 = 0.5f; - } - else { + } else { D_808535E8 = 1.0f; } @@ -10800,15 +10720,14 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (this->skelAnime.moveFlags & 8) { AnimationContext_SetMoveActor(globalCtx, &this->actor, &this->skelAnime, - (this->skelAnime.moveFlags & 4) ? 1.0f : this->ageProperties->unk_08); + (this->skelAnime.moveFlags & 4) ? 1.0f : this->ageProperties->unk_08); } func_808368EC(this, globalCtx); if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_8)) { this->targetActorDistance = 0.0f; - } - else { + } else { this->targetActor = NULL; this->targetActorDistance = FLT_MAX; this->exchangeItemId = EXCH_ITEM_NONE; @@ -10880,8 +10799,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { if (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_28 | PLAYER_STATE1_29)) { this->actor.colChkInfo.mass = MASS_IMMOVABLE; - } - else { + } else { this->actor.colChkInfo.mass = 50; } @@ -10910,14 +10828,13 @@ void Player_Update(Actor* thisx, GlobalContext* globalCtx) { if (gSaveContext.dogParams < 0) { if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DOG) < 0) { gSaveContext.dogParams = 0; - } - else { + } else { gSaveContext.dogParams &= 0x7FFF; func_808395DC(this, &this->actor.world.pos, &D_80854838, &sDogSpawnPos); dogParams = gSaveContext.dogParams; dog = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_DOG, sDogSpawnPos.x, sDogSpawnPos.y, - sDogSpawnPos.z, 0, this->actor.shape.rot.y, 0, dogParams | 0x8000); + sDogSpawnPos.z, 0, this->actor.shape.rot.y, 0, dogParams | 0x8000); if (dog != NULL) { dog->room = 0; } @@ -10934,8 +10851,7 @@ void Player_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->stateFlags1 & (PLAYER_STATE1_5 | PLAYER_STATE1_29)) { memset(&sp44, 0, sizeof(sp44)); - } - else { + } else { sp44 = globalCtx->state.input[0]; if (this->unk_88E != 0) { sp44.cur.button &= ~(BTN_A | BTN_B | BTN_CUP); @@ -10963,7 +10879,7 @@ static Gfx* sMaskDlists[PLAYER_MASK_MAX - 1] = { static Vec3s D_80854864 = { 0, 0, 0 }; void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDList, - OverrideLimbDrawOpa overrideLimbDraw) { + OverrideLimbDrawOpa overrideLimbDraw) { static s32 D_8085486C = 255; OPEN_DISPS(globalCtx->state.gfxCtx); @@ -10972,8 +10888,8 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c gSPSegment(POLY_XLU_DISP++, 0x0C, cullDList); func_8008F470(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, lod, - this->currentTunic, this->currentBoots, this->actor.shape.face, overrideLimbDraw, - func_80090D20, this); + this->currentTunic, this->currentBoots, this->actor.shape.face, overrideLimbDraw, func_80090D20, + this); if ((overrideLimbDraw == func_80090014) && (this->currentMask != PLAYER_MASK_NONE)) { Mtx* sp70 = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Mtx)); @@ -11007,8 +10923,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c if (this->hoverBootsTimer < 19) { if (hoverBootsTimer >= 15) { D_8085486C = (19 - hoverBootsTimer) * 51.0f; - } - else if (hoverBootsTimer < 19) { + } else if (hoverBootsTimer < 19) { sp5C = hoverBootsTimer; if (sp5C > 9) { @@ -11022,14 +10937,14 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c } Matrix_SetTranslateRotateYXZ(this->actor.world.pos.x, this->actor.world.pos.y + 2.0f, - this->actor.world.pos.z, &D_80854864); + this->actor.world.pos.z, &D_80854864); Matrix_Scale(4.0f, 4.0f, 4.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, - Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0, - (globalCtx->gameplayFrames * -15) % 128, 16, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0, + (globalCtx->gameplayFrames * -15) % 128, 16, 32)); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, D_8085486C); gDPSetEnvColor(POLY_XLU_DISP++, 120, 90, 30, 128); gSPDisplayList(POLY_XLU_DISP++, gHoverBootsCircleDL); @@ -11043,7 +10958,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; Player* this = (Player*)thisx; - Vec3f pos; + Vec3f pos; Vec3s rot; f32 scale; @@ -11072,7 +10987,6 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { OPEN_DISPS(globalCtx->state.gfxCtx); - if (!(this->stateFlags2 & PLAYER_STATE2_29)) { OverrideLimbDrawOpa overrideLimbDraw = func_80090014; s32 lod; @@ -11080,8 +10994,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { if ((this->csMode != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { lod = 0; - } - else { + } else { lod = 1; } @@ -11107,8 +11020,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (projectedHeadPos.z < -4.0f) { overrideLimbDraw = func_800902F0; } - } - else if (this->stateFlags2 & PLAYER_STATE2_18) { + } else if (this->stateFlags2 & PLAYER_STATE2_18) { if (this->actor.projectedPos.z < 0.0f) { overrideLimbDraw = func_80090440; } @@ -11123,7 +11035,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_SetTranslateRotateYXZ( this->actor.world.pos.x, (this->actor.floorHeight + (this->actor.floorHeight - this->actor.world.pos.y)) + - (this->actor.shape.yOffset * this->actor.scale.y), + (this->actor.shape.yOffset * this->actor.scale.y), this->actor.world.pos.z, &this->actor.shape.rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_RotateX(sp78, MTXMODE_APPLY); @@ -11149,12 +11061,12 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { f32 scale = (this->unk_84F >> 1) * 22.0f; gSPSegment(POLY_XLU_DISP++, 0x08, - Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) % 128, 32, 32, 1, - 0, (globalCtx->gameplayFrames * -2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) % 128, 32, 32, 1, + 0, (globalCtx->gameplayFrames * -2) % 128, 32, 32)); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, 255); gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL); } @@ -11183,87 +11095,94 @@ void Player_Destroy(Actor* thisx, GlobalContext* globalCtx) { } s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) { - s32 temp1; - s16 temp2; - s16 temp3; + s32 temp1; + s16 temp2; + s16 temp3; - if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { - if (CVar_GetS32("gAutoCenterView", 0) != 0) { - temp2 = sControlInput->rel.stick_y * 240.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); - Math_SmoothStepToS(&this->actor.focus.rot.x, temp2, 14, 4000, 30); + if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { + if (CVar_GetS32("gAutoCenterView", 0) != 0) { + temp2 = sControlInput->rel.stick_y * 240.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); + Math_SmoothStepToS(&this->actor.focus.rot.x, temp2, 14, 4000, 30); - temp2 = sControlInput->rel.stick_x * -16.0f * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1); - temp2 = CLAMP(temp2, -3000, 3000); - this->actor.focus.rot.y += temp2; - } else { - temp1 = (this->stateFlags1 & PLAYER_STATE1_23) ? 3500 : 14000; - temp3 = ((sControlInput->rel.stick_y >= 0) ? 1 : -1) * - (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f * (CVar_GetS32("gInvertYAxis", 0) ? 1 : -1)); - this->actor.focus.rot.x += temp3; + temp2 = sControlInput->rel.stick_x * -16.0f * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1); + temp2 = CLAMP(temp2, -3000, 3000); + this->actor.focus.rot.y += temp2; + } else { + temp1 = (this->stateFlags1 & PLAYER_STATE1_23) ? 3500 : 14000; + temp3 = ((sControlInput->rel.stick_y >= 0) ? 1 : -1) * + (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f * + (CVar_GetS32("gInvertYAxis", 0) ? 1 : -1)); + this->actor.focus.rot.x += temp3; - if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { - this->actor.focus.rot.x -= (sControlInput->cur.gyro_x) * 750.0f; - } - - if (fabsf(sControlInput->cur.right_stick_y) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { - this->actor.focus.rot.x -= (sControlInput->cur.right_stick_y) * 10.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); - } + if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { + this->actor.focus.rot.x -= (sControlInput->cur.gyro_x) * 750.0f; + } - this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -temp1, temp1); + if (fabsf(sControlInput->cur.right_stick_y) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { + this->actor.focus.rot.x -= + (sControlInput->cur.right_stick_y) * 10.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); + } - temp1 = 19114; - temp2 = this->actor.focus.rot.y - this->actor.shape.rot.y; - temp3 = ((sControlInput->rel.stick_x >= 0) ? 1 : -1) * - (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1)); - temp2 += temp3; + this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -temp1, temp1); - this->actor.focus.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; + temp1 = 19114; + temp2 = this->actor.focus.rot.y - this->actor.shape.rot.y; + temp3 = ((sControlInput->rel.stick_x >= 0) ? 1 : -1) * + (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f * + (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1)); + temp2 += temp3; - if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { - this->actor.focus.rot.y += (sControlInput->cur.gyro_y) * 750.0f; - } + this->actor.focus.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; - if (fabsf(sControlInput->cur.right_stick_x) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { - this->actor.focus.rot.y += (sControlInput->cur.right_stick_x) * 10.0f * (CVar_GetS32("gInvertXAxis", 0) ? 1 : -1); - } - } -} - else { - temp1 = (this->stateFlags1 & PLAYER_STATE1_23) ? 3500 : 14000; - temp3 = ((sControlInput->rel.stick_y >= 0) ? 1 : -1) * - (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f * (CVar_GetS32("gInvertYAxis", 0) ? 1 : -1)); - this->actor.focus.rot.x += temp3; + if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { + this->actor.focus.rot.y += (sControlInput->cur.gyro_y) * 750.0f; + } - if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { - this->actor.focus.rot.x -= (sControlInput->cur.gyro_x) * 750.0f; - } - - if (fabsf(sControlInput->cur.right_stick_y) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { - this->actor.focus.rot.x -= (sControlInput->cur.right_stick_y) * 10.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); - } + if (fabsf(sControlInput->cur.right_stick_x) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { + this->actor.focus.rot.y += + (sControlInput->cur.right_stick_x) * 10.0f * (CVar_GetS32("gInvertXAxis", 0) ? 1 : -1); + } + } + } else { + temp1 = (this->stateFlags1 & PLAYER_STATE1_23) ? 3500 : 14000; + temp3 = + ((sControlInput->rel.stick_y >= 0) ? 1 : -1) * (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * + 1500.0f * (CVar_GetS32("gInvertYAxis", 0) ? 1 : -1)); + this->actor.focus.rot.x += temp3; - this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -temp1, temp1); + if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { + this->actor.focus.rot.x -= (sControlInput->cur.gyro_x) * 750.0f; + } - temp1 = 19114; - temp2 = this->actor.focus.rot.y - this->actor.shape.rot.y; - temp3 = ((sControlInput->rel.stick_x >= 0) ? 1 : -1) * - (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1)); - temp2 += temp3; + if (fabsf(sControlInput->cur.right_stick_y) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { + this->actor.focus.rot.x -= + (sControlInput->cur.right_stick_y) * 10.0f * (CVar_GetS32("gInvertYAxis", 0) ? -1 : 1); + } - this->actor.focus.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; + this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -temp1, temp1); - if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { - this->actor.focus.rot.y += (sControlInput->cur.gyro_y) * 750.0f; - } + temp1 = 19114; + temp2 = this->actor.focus.rot.y - this->actor.shape.rot.y; + temp3 = + ((sControlInput->rel.stick_x >= 0) ? 1 : -1) * (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * + -1500.0f * (CVar_GetS32("gInvertXAxis", 0) ? -1 : 1)); + temp2 += temp3; - if (fabsf(sControlInput->cur.right_stick_x) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { - this->actor.focus.rot.y += (sControlInput->cur.right_stick_x) * 10.0f * (CVar_GetS32("gInvertXAxis", 0) ? 1 : -1); - } - } + this->actor.focus.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; + + if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { + this->actor.focus.rot.y += (sControlInput->cur.gyro_y) * 750.0f; + } + + if (fabsf(sControlInput->cur.right_stick_x) > 15.0f && CVar_GetS32("gRightStickAiming", 0) != 0) { + this->actor.focus.rot.y += + (sControlInput->cur.right_stick_x) * 10.0f * (CVar_GetS32("gInvertXAxis", 0) ? 1 : -1); + } + } this->unk_6AE |= 2; return func_80836AB8(this, (globalCtx->shootingGalleryStatus != 0) || func_8002DD78(this) || func_808334B4(this)) - - arg3; + arg3; } void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) { @@ -11279,8 +11198,7 @@ void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) { if ((0.0f < temp1) && (temp1 < 10.0f)) { temp1 *= 6.0f; - } - else { + } else { temp1 = 0.0f; arg2 = 0.0f; } @@ -11305,23 +11223,19 @@ void func_8084B000(Player* this) { if (this->actor.yDistToWater < phi_f16) { if (this->actor.velocity.y <= 0.0f) { phi_f16 = 0.0f; - } - else { + } else { phi_f16 = this->actor.velocity.y * 0.5f; } phi_f18 = -0.1f - phi_f16; - } - else { + } else { if (!(this->stateFlags1 & PLAYER_STATE1_7) && (this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.velocity.y >= -3.0f)) { phi_f18 = -0.2f; - } - else { + } else { phi_f14 = 2.0f; if (this->actor.velocity.y >= 0.0f) { phi_f16 = 0.0f; - } - else { + } else { phi_f16 = this->actor.velocity.y * -0.3f; } phi_f18 = phi_f16 + 0.1f; @@ -11347,8 +11261,7 @@ void func_8084B158(GlobalContext* globalCtx, Player* this, Input* input, f32 arg if ((input != NULL) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_B)) { temp = 1.0f; - } - else { + } else { temp = 0.5f; } @@ -11366,8 +11279,7 @@ void func_8084B1D8(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_27) { func_8084B000(this); func_8084AEEC(this, &this->linearVelocity, 0, this->actor.shape.rot.y); - } - else { + } else { func_8083721C(this); } @@ -11382,17 +11294,14 @@ void func_8084B1D8(Player* this, GlobalContext* globalCtx) { if ((this->csMode != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || func_80833B54(this) || (this->unk_664 != NULL) || !func_8083AD4C(globalCtx, this) || (((this->unk_6AD == 2) && (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) || - func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) || - ((this->unk_6AD == 1) && - CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)))) { + func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) || + ((this->unk_6AD == 1) && CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)))) { func_8083C148(this, globalCtx); func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); - } - else if ((DECR(this->unk_850) == 0) || (this->unk_6AD != 2)) { + } else if ((DECR(this->unk_850) == 0) || (this->unk_6AD != 2)) { if (func_8008F128(this)) { this->unk_6AE |= 0x43; - } - else { + } else { this->actor.shape.rot.y = func_8084ABD8(globalCtx, this, 0, 0); } } @@ -11455,11 +11364,9 @@ void func_8084B530(Player* this, GlobalContext* globalCtx) { s32 sp24 = this->unk_850; func_8083A360(globalCtx, this); this->unk_850 = sp24; - } - else if (func_808332B8(this)) { + } else if (func_808332B8(this)) { func_80838F18(globalCtx, this); - } - else { + } else { func_80853080(this, globalCtx); } } @@ -11471,23 +11378,19 @@ void func_8084B530(Player* this, GlobalContext* globalCtx) { if (this->stateFlags1 & PLAYER_STATE1_23) { func_8084CC98(this, globalCtx); - } - else if (func_808332B8(this)) { + } else if (func_808332B8(this)) { func_8084D610(this, globalCtx); - } - else if (!func_8008E9C4(this) && LinkAnimation_Update(globalCtx, &this->skelAnime)) { + } else if (!func_8008E9C4(this) && LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (this->skelAnime.moveFlags != 0) { func_80832DBC(this); if ((this->targetActor->category == ACTORCAT_NPC) && (this->heldItemActionParam != PLAYER_AP_FISHING_POLE)) { - func_808322D0(globalCtx, this, &gPlayerAnim_0031A0); - } - else { + func_808322D0(globalCtx, this, &gPlayerAnim_link_normal_talk_free); + } else { func_80832284(globalCtx, this, func_80833338(this)); } - } - else { - func_808322A4(globalCtx, this, &gPlayerAnim_0031A8); + } else { + func_808322A4(globalCtx, this, &gPlayerAnim_link_normal_talk_free_wait); } } @@ -11510,8 +11413,7 @@ void func_8084B78C(Player* this, GlobalContext* globalCtx) { temp = func_8083FFB8(this, &sp34, &sp32); if (temp > 0) { func_8083FAB8(this, globalCtx); - } - else if (temp < 0) { + } else if (temp < 0) { func_8083FB14(this, globalCtx); } } @@ -11540,10 +11442,9 @@ void func_8084B898(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_0 | PLAYER_STATE2_6 | PLAYER_STATE2_8; - if (func_80832CB0(globalCtx, this, &gPlayerAnim_003108)) { + if (func_80832CB0(globalCtx, this, &gPlayerAnim_link_normal_pushing)) { this->unk_850 = 1; - } - else if (this->unk_850 == 0) { + } else if (this->unk_850 == 0) { if (LinkAnimation_OnFrame(&this->skelAnime, 11.0f)) { func_80832698(this, NA_SE_VO_LI_PUSH); } @@ -11557,11 +11458,9 @@ void func_8084B898(Player* this, GlobalContext* globalCtx) { temp = func_8083FFB8(this, &sp34, &sp32); if (temp < 0) { func_8083FB14(this, globalCtx); - } - else if (temp == 0) { - func_8083F72C(this, &gPlayerAnim_0030E0, globalCtx); - } - else { + } else if (temp == 0) { + func_8083F72C(this, &gPlayerAnim_link_normal_push_end, globalCtx); + } else { this->stateFlags2 |= PLAYER_STATE2_4; } } @@ -11596,14 +11495,12 @@ void func_8084B9E4(Player* this, GlobalContext* globalCtx) { if (func_80832CB0(globalCtx, this, anim)) { this->unk_850 = 1; - } - else { + } else { if (this->unk_850 == 0) { if (LinkAnimation_OnFrame(&this->skelAnime, 11.0f)) { func_80832698(this, NA_SE_VO_LI_PUSH); } - } - else { + } else { func_80832924(this, D_80854878); } } @@ -11615,11 +11512,9 @@ void func_8084B9E4(Player* this, GlobalContext* globalCtx) { temp1 = func_8083FFB8(this, &sp70, &sp6E); if (temp1 > 0) { func_8083FAB8(this, globalCtx); - } - else if (temp1 == 0) { + } else if (temp1 == 0) { func_8083F72C(this, D_80853914[PLAYER_ANIMGROUP_37][this->modelAnimType], globalCtx); - } - else { + } else { this->stateFlags2 |= PLAYER_STATE2_4; } } @@ -11631,7 +11526,7 @@ void func_8084B9E4(Player* this, GlobalContext* globalCtx) { sp44.z = this->actor.world.pos.z; sp44.y = sp5C.y; if (!BgCheck_EntityLineTest1(&globalCtx->colCtx, &sp44, &sp5C, &sp38, &sp54, true, false, false, true, - &sp50)) { + &sp50)) { func_8084B840(globalCtx, this, -2.0f); return; } @@ -11650,23 +11545,20 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { // clang-format off - anim = (this->unk_84F > 0) ? &gPlayerAnim_002F28 : D_80853914[PLAYER_ANIMGROUP_40][this->modelAnimType]; func_80832284(globalCtx, this, anim); + anim = (this->unk_84F > 0) ? &gPlayerAnim_link_normal_fall_wait : D_80853914[PLAYER_ANIMGROUP_40][this->modelAnimType]; func_80832284(globalCtx, this, anim); // clang-format on - } - else if (this->unk_84F == 0) { - if (this->skelAnime.animation == &gPlayerAnim_002F10) { + } else if (this->unk_84F == 0) { + if (this->skelAnime.animation == &gPlayerAnim_link_normal_fall) { temp = 11.0f; - } - else { + } else { temp = 1.0f; } if (LinkAnimation_OnFrame(&this->skelAnime, temp)) { func_80832770(this, NA_SE_PL_WALK_GROUND); - if (this->skelAnime.animation == &gPlayerAnim_002F10) { + if (this->skelAnime.animation == &gPlayerAnim_link_normal_fall) { this->unk_84F = 1; - } - else { + } else { this->unk_84F = -1; } } @@ -11679,8 +11571,7 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) { if (this->unk_847[this->unk_846] >= 0) { if (this->unk_84F > 0) { anim = D_80853914[PLAYER_ANIMGROUP_38][this->modelAnimType]; - } - else { + } else { anim = D_80853914[PLAYER_ANIMGROUP_41][this->modelAnimType]; } func_8083A9B8(this, anim, globalCtx); @@ -11691,8 +11582,7 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) { func_80837B60(this); if (this->unk_84F < 0) { this->linearVelocity = -0.8f; - } - else { + } else { this->linearVelocity = 0.8f; } func_80837B9C(this, globalCtx); @@ -11712,8 +11602,7 @@ void func_8084BDFC(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_OnFrame(&this->skelAnime, this->skelAnime.endFrame - 6.0f)) { func_808328A0(this); - } - else if (LinkAnimation_OnFrame(&this->skelAnime, this->skelAnime.endFrame - 34.0f)) { + } else if (LinkAnimation_OnFrame(&this->skelAnime, this->skelAnime.endFrame - 34.0f)) { this->stateFlags1 &= ~(PLAYER_STATE1_13 | PLAYER_STATE1_14); func_8002F7DC(&this->actor, NA_SE_PL_CLIMB_CLIFF); func_80832698(this, NA_SE_VO_LI_CLIMB_END); @@ -11746,23 +11635,20 @@ void func_8084BF1C(Player* this, GlobalContext* globalCtx) { if ((this->unk_84F != 0) && (ABS(sp84) < ABS(sp80))) { phi_f0 = ABS(sp80) * 0.0325f; sp84 = 0; - } - else { + } else { phi_f0 = ABS(sp84) * 0.05f; sp80 = 0; } if (phi_f0 < 1.0f) { phi_f0 = 1.0f; - } - else if (phi_f0 > 3.35f) { + } else if (phi_f0 > 3.35f) { phi_f0 = 3.35f; } if (this->skelAnime.playSpeed >= 0.0f) { phi_f2 = 1.0f; - } - else { + } else { phi_f2 = -1.0f; } @@ -11800,59 +11686,51 @@ void func_8084BF1C(Player* this, GlobalContext* globalCtx) { this->actor.world.pos.y = temp_f0; this->stateFlags1 &= ~PLAYER_STATE1_21; func_8083A5C4(globalCtx, this, this->actor.wallPoly, this->ageProperties->unk_3C, - &gPlayerAnim_003000); + &gPlayerAnim_link_normal_jump_climb_up_free); this->currentYaw += 0x8000; this->actor.shape.rot.y = this->currentYaw; - func_8083A9B8(this, &gPlayerAnim_003000, globalCtx); + func_8083A9B8(this, &gPlayerAnim_link_normal_jump_climb_up_free, globalCtx); this->stateFlags1 |= PLAYER_STATE1_14; - } - else { + } else { func_8083F070(this, this->ageProperties->unk_CC[this->unk_850], globalCtx); } - } - else { + } else { this->skelAnime.prevTransl = this->ageProperties->unk_4A[sp68]; func_80832264(globalCtx, this, this->ageProperties->unk_AC[sp68]); } - } - else { + } else { if ((this->actor.world.pos.y - this->actor.floorHeight) < 15.0f) { if (this->unk_84F != 0) { func_8083FB7C(this, globalCtx); - } - else { + } else { if (this->unk_850 != 0) { this->skelAnime.prevTransl = this->ageProperties->unk_44; } func_8083F070(this, this->ageProperties->unk_C4[this->unk_850], globalCtx); this->unk_850 = 1; } - } - else { + } else { sp68 ^= 1; this->skelAnime.prevTransl = this->ageProperties->unk_62[sp68]; anim1 = this->ageProperties->unk_AC[sp68]; LinkAnimation_Change(globalCtx, &this->skelAnime, anim1, -1.0f, Animation_GetLastFrame(anim1), - 0.0f, ANIMMODE_ONCE, 0.0f); + 0.0f, ANIMMODE_ONCE, 0.0f); } } this->unk_850 ^= 1; - } - else { + } else { if ((this->unk_84F != 0) && (sp80 != 0)) { anim2 = this->ageProperties->unk_BC[this->unk_850]; if (sp80 > 0) { this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->unk_850]; func_80832264(globalCtx, this, anim2); - } - else { + } else { this->skelAnime.prevTransl = this->ageProperties->unk_86[this->unk_850]; LinkAnimation_Change(globalCtx, &this->skelAnime, anim2, -1.0f, Animation_GetLastFrame(anim2), - 0.0f, ANIMMODE_ONCE, 0.0f); + 0.0f, ANIMMODE_ONCE, 0.0f); } - } - else { + } else { this->stateFlags2 |= PLAYER_STATE2_12; } } @@ -11863,10 +11741,10 @@ void func_8084BF1C(Player* this, GlobalContext* globalCtx) { if (this->unk_850 < 0) { if (((this->unk_850 == -2) && - (LinkAnimation_OnFrame(&this->skelAnime, 14.0f) || LinkAnimation_OnFrame(&this->skelAnime, 29.0f))) || + (LinkAnimation_OnFrame(&this->skelAnime, 14.0f) || LinkAnimation_OnFrame(&this->skelAnime, 29.0f))) || ((this->unk_850 == -4) && - (LinkAnimation_OnFrame(&this->skelAnime, 22.0f) || LinkAnimation_OnFrame(&this->skelAnime, 35.0f) || - LinkAnimation_OnFrame(&this->skelAnime, 49.0f) || LinkAnimation_OnFrame(&this->skelAnime, 55.0f)))) { + (LinkAnimation_OnFrame(&this->skelAnime, 22.0f) || LinkAnimation_OnFrame(&this->skelAnime, 35.0f) || + LinkAnimation_OnFrame(&this->skelAnime, 49.0f) || LinkAnimation_OnFrame(&this->skelAnime, 55.0f)))) { func_8084BEE4(this); } return; @@ -11998,8 +11876,8 @@ s32 func_8084C89C(GlobalContext* globalCtx, Player* this, s32 arg2, f32* arg3) { *arg3 = func_8083973C(globalCtx, this, &D_808548FC[arg2], &sp40); return (sp4C < *arg3) && (*arg3 < sp50) && - !func_80839768(globalCtx, this, &D_80854914[arg2], &sp30, &sp2C, &sp34) && - !func_80839768(globalCtx, this, &D_8085492C[arg2], &sp30, &sp2C, &sp34); + !func_80839768(globalCtx, this, &D_80854914[arg2], &sp30, &sp2C, &sp34) && + !func_80839768(globalCtx, this, &D_8085492C[arg2], &sp30, &sp2C, &sp34); } s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { @@ -12009,15 +11887,13 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { if (this->unk_850 < 0) { this->unk_850 = 99; - } - else { + } else { sp38 = (this->mountSide < 0) ? 0 : 1; if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { sp38 ^= 1; if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { return 0; - } - else { + } else { this->mountSide = -this->mountSide; } } @@ -12031,7 +11907,9 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { rideActor->actor.child = NULL; func_80835DAC(globalCtx, this, func_8084D3E4, 0); this->unk_878 = sp34 - rideActor->actor.world.pos.y; - func_80832264(globalCtx, this, (this->mountSide < 0) ? &gPlayerAnim_003390 : &gPlayerAnim_0033A0); + func_80832264(globalCtx, this, + (this->mountSide < 0) ? &gPlayerAnim_link_uma_left_down + : &gPlayerAnim_link_uma_right_down); return 1; } } @@ -12048,13 +11926,11 @@ void func_8084CBF4(Player* this, f32 arg1, f32 arg2) { if (arg1 < fabsf(this->unk_878)) { if (this->unk_878 >= 0.0f) { dir = 1; - } - else { + } else { dir = -1; } temp = dir * arg1; - } - else { + } else { temp = this->unk_878; } this->actor.world.pos.y += temp; @@ -12063,33 +11939,33 @@ void func_8084CBF4(Player* this, f32 arg1, f32 arg2) { } static LinkAnimationHeader* D_80854944[] = { - &gPlayerAnim_003370, - &gPlayerAnim_003368, - &gPlayerAnim_003380, - &gPlayerAnim_003358, - &gPlayerAnim_003338, - &gPlayerAnim_003348, - &gPlayerAnim_003350, + &gPlayerAnim_link_uma_anim_stop, + &gPlayerAnim_link_uma_anim_stand, + &gPlayerAnim_link_uma_anim_walk, + &gPlayerAnim_link_uma_anim_slowrun, + &gPlayerAnim_link_uma_anim_fastrun, + &gPlayerAnim_link_uma_anim_jump100, + &gPlayerAnim_link_uma_anim_jump200, NULL, NULL, }; static LinkAnimationHeader* D_80854968[] = { - &gPlayerAnim_003388, - &gPlayerAnim_003388, - &gPlayerAnim_003388, - &gPlayerAnim_003360, - &gPlayerAnim_003340, - &gPlayerAnim_003340, - &gPlayerAnim_003340, + &gPlayerAnim_link_uma_anim_walk_muti, + &gPlayerAnim_link_uma_anim_walk_muti, + &gPlayerAnim_link_uma_anim_walk_muti, + &gPlayerAnim_link_uma_anim_slowrun_muti, + &gPlayerAnim_link_uma_anim_fastrun_muti, + &gPlayerAnim_link_uma_anim_fastrun_muti, + &gPlayerAnim_link_uma_anim_fastrun_muti, NULL, NULL, }; static LinkAnimationHeader* D_8085498C[] = { - &gPlayerAnim_0033C8, - &gPlayerAnim_0033B8, - &gPlayerAnim_0033C0, + &gPlayerAnim_link_uma_wait_3, + &gPlayerAnim_link_uma_wait_1, + &gPlayerAnim_link_uma_wait_2, }; static u8 D_80854998[2][2] = { @@ -12115,7 +11991,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if (this->unk_850 == 0) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - this->skelAnime.animation = &gPlayerAnim_0033B8; + this->skelAnime.animation = &gPlayerAnim_link_uma_wait_1; this->unk_850 = 99; return; } @@ -12148,13 +12024,11 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if (rand < 0.1f) { temp = 2; - } - else if (rand < 0.2f) { + } else if (rand < 0.2f) { temp = 1; } func_80832264(globalCtx, this, D_8085498C[temp]); - } - else { + } else { this->skelAnime.animation = D_80854944[this->unk_850 - 2]; Animation_SetMorph(globalCtx, &this->skelAnime, 8.0f); if (this->unk_850 < 4) { @@ -12166,22 +12040,19 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if (this->unk_850 == 1) { if ((D_808535E0 != 0) || func_8083224C(globalCtx)) { - func_80832264(globalCtx, this, &gPlayerAnim_0033C8); - } - else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { + func_80832264(globalCtx, this, &gPlayerAnim_link_uma_wait_3); + } else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { this->unk_850 = 99; - } - else if (this->skelAnime.animation == &gPlayerAnim_0033B8) { + } else if (this->skelAnime.animation == &gPlayerAnim_link_uma_wait_1) { func_80832924(this, D_808549A4); } - } - else { + } else { this->skelAnime.curFrame = rideActor->curFrame; LinkAnimation_AnimateFrame(globalCtx, &this->skelAnime); } AnimationContext_SetCopyAll(globalCtx, this->skelAnime.limbCount, this->skelAnime.morphTable, - this->skelAnime.jointTable); + this->skelAnime.jointTable); if ((globalCtx->csCtx.state != CS_STATE_IDLE) || (this->csMode != 0)) { if (this->csMode == 7) { @@ -12189,8 +12060,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { } this->unk_6AD = 0; this->unk_84F = 0; - } - else if ((this->unk_850 < 2) || (this->unk_850 >= 4)) { + } else if ((this->unk_850 < 2) || (this->unk_850 >= 4)) { D_808535E0 = func_80836670(this, globalCtx); if (D_808535E0 != 0) { this->unk_84F = 0; @@ -12205,7 +12075,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if ((this->csMode != 0) || (!func_8083224C(globalCtx) && ((rideActor->actor.speedXZ != 0.0f) || !func_8083B644(this, globalCtx)) && - !func_8083C1DC(this, globalCtx))) { + !func_8083C1DC(this, globalCtx))) { if (D_808535E0 == 0) { if (this->unk_84F != 0) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { @@ -12213,32 +12083,29 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { this->unk_84F = 0; } - if (this->skelAnime2.animation == &gPlayerAnim_0033B0) { + if (this->skelAnime2.animation == &gPlayerAnim_link_uma_stop_muti) { if (LinkAnimation_OnFrame(&this->skelAnime2, 23.0f)) { func_8002F7DC(&this->actor, NA_SE_IT_LASH); func_80832698(this, NA_SE_VO_LI_LASH); } AnimationContext_SetCopyAll(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable); - } - else { + this->skelAnime2.jointTable); + } else { if (LinkAnimation_OnFrame(&this->skelAnime2, 10.0f)) { func_8002F7DC(&this->actor, NA_SE_IT_LASH); func_80832698(this, NA_SE_VO_LI_LASH); } AnimationContext_SetCopyTrue(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, D_80853410); + this->skelAnime2.jointTable, D_80853410); } - } - else { + } else { LinkAnimationHeader* anim = NULL; if (EN_HORSE_CHECK_3(rideActor)) { - anim = &gPlayerAnim_0033B0; - } - else if (EN_HORSE_CHECK_2(rideActor)) { + anim = &gPlayerAnim_link_uma_stop_muti; + } else if (EN_HORSE_CHECK_2(rideActor)) { if ((this->unk_850 >= 2) && (this->unk_850 != 99)) { anim = D_80854968[this->unk_850 - 2]; } @@ -12256,8 +12123,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { func_80833BCC(this)) { this->unk_6AD = 0; this->stateFlags1 &= ~PLAYER_STATE1_20; - } - else { + } else { this->unk_6BE = func_8084ABD8(globalCtx, this, 1, -5000) - this->actor.shape.rot.y; this->unk_6BE += 5000; this->unk_6B0 = -5000; @@ -12273,12 +12139,10 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { this->actor.focus.rot.y = this->actor.shape.rot.y + this->unk_6BE; this->unk_6BE += 5000; this->unk_6AE |= 0x80; - } - else { + } else { func_8083DB98(this, 0); } - } - else { + } else { if (func_8002DD78(this) != 0) { this->unk_6BE = func_8084ABD8(globalCtx, this, 1, -5000) - this->actor.shape.rot.y; this->unk_6BE += 5000; @@ -12313,14 +12177,12 @@ void func_8084D3E4(Player* this, GlobalContext* globalCtx) { gSaveContext.horseData.pos.z = rideActor->actor.world.pos.z; gSaveContext.horseData.angle = rideActor->actor.shape.rot.y; } - } - else { + } else { Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_NORMAL0); if (this->mountSide < 0) { D_808549C4[0].field = 0x2828; - } - else { + } else { D_808549C4[0].field = 0x281D; } func_80832924(this, D_808549C4); @@ -12339,19 +12201,19 @@ void func_8084D530(Player* this, f32* arg1, f32 arg2, s16 arg3) { void func_8084D574(GlobalContext* globalCtx, Player* this, s16 arg2) { func_80835C58(globalCtx, this, func_8084D84C, 0); this->actor.shape.rot.y = this->currentYaw = arg2; - func_80832C6C(globalCtx, this, &gPlayerAnim_0032F0); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim); } void func_8084D5CC(GlobalContext* globalCtx, Player* this) { func_80835C58(globalCtx, this, func_8084DAB4, 0); - func_80832C6C(globalCtx, this, &gPlayerAnim_0032F0); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim); } void func_8084D610(Player* this, GlobalContext* globalCtx) { f32 sp34; s16 sp32; - func_80832CB0(globalCtx, this, &gPlayerAnim_003328); + func_80832CB0(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); func_8084B000(this); if (!func_8083224C(globalCtx) && !func_80837348(globalCtx, this, D_80854444, 1) && @@ -12368,8 +12230,7 @@ void func_8084D610(Player* this, GlobalContext* globalCtx) { func_8083A098(this, D_80853914[PLAYER_ANIMGROUP_15][this->modelAnimType], globalCtx); func_808328A0(this); } - } - else { + } else { func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); if (sp34 != 0.0f) { @@ -12381,8 +12242,7 @@ void func_8084D610(Player* this, GlobalContext* globalCtx) { if (func_80833C04(this)) { func_8084D5CC(globalCtx, this); - } - else { + } else { func_8084D574(globalCtx, this, sp32); } } @@ -12421,8 +12281,7 @@ void func_8084D84C(Player* this, GlobalContext* globalCtx) { temp = this->actor.shape.rot.y - sp32; if ((sp34 == 0.0f) || (ABS(temp) > 0x6000) || (this->currentBoots == PLAYER_BOOTS_IRON)) { func_80838F18(globalCtx, this); - } - else if (func_80833C04(this)) { + } else if (func_80833C04(this)) { func_8084D5CC(globalCtx, this); } @@ -12438,30 +12297,25 @@ s32 func_8084D980(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3) temp1 = this->currentYaw - *arg3; if (ABS(temp1) > 0x6000) { - anim = &gPlayerAnim_003328; + anim = &gPlayerAnim_link_swimer_swim_wait; if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) { this->currentYaw = *arg3; - } - else { + } else { *arg2 = 0.0f; *arg3 = this->currentYaw; } - } - else { + } else { temp2 = func_8083FD78(this, arg2, arg3, globalCtx); if (temp2 > 0) { - anim = &gPlayerAnim_0032F0; - } - else if (temp2 < 0) { - anim = &gPlayerAnim_0032D8; - } - else if ((temp1 = this->actor.shape.rot.y - *arg3) > 0) { - anim = &gPlayerAnim_0032D0; - } - else { - anim = &gPlayerAnim_0032C8; + anim = &gPlayerAnim_link_swimer_swim; + } else if (temp2 < 0) { + anim = &gPlayerAnim_link_swimer_back_swim; + } else if ((temp1 = this->actor.shape.rot.y - *arg3) > 0) { + anim = &gPlayerAnim_link_swimer_Rside_swim; + } else { + anim = &gPlayerAnim_link_swimer_Lside_swim; } } @@ -12485,11 +12339,9 @@ void func_8084DAB4(Player* this, GlobalContext* globalCtx) { if (sp2C == 0.0f) { func_80838F18(globalCtx, this); - } - else if (!func_80833C04(this)) { + } else if (!func_80833C04(this)) { func_8084D574(globalCtx, this, sp2A); - } - else { + } else { func_8084D980(globalCtx, this, &sp2C, &sp2A); } @@ -12524,8 +12376,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime) || ((this->skelAnime.curFrame >= 22.0f) && !CHECK_BTN_ALL(sControlInput->cur.button, BTN_A))) { func_8083D330(globalCtx, this); - } - else if (LinkAnimation_OnFrame(&this->skelAnime, 20.0f) != 0) { + } else if (LinkAnimation_OnFrame(&this->skelAnime, 20.0f) != 0) { this->actor.velocity.y = -2.0f; } @@ -12539,23 +12390,20 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) { if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A) && !func_8083E5A8(this, globalCtx) && !(this->actor.bgCheckFlags & 1) && (this->actor.yDistToWater < D_80854784[CUR_UPG_VALUE(UPG_SCALE)])) { func_8084DBC4(globalCtx, this, -2.0f); - } - else { + } else { this->unk_84F++; - func_80832C6C(globalCtx, this, &gPlayerAnim_003328); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); } - } - else if (this->unk_84F == 1) { + } else if (this->unk_84F == 1) { LinkAnimation_Update(globalCtx, &this->skelAnime); func_8084B000(this); if (this->unk_6C2 < 10000) { this->unk_84F++; this->unk_850 = this->actor.yDistToWater; - func_80832C6C(globalCtx, this, &gPlayerAnim_0032F0); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim); } - } - else if (!func_8083D12C(globalCtx, this, sControlInput)) { + } else if (!func_8083D12C(globalCtx, this, sControlInput)) { sp2C = (this->unk_850 * 0.018f) + 4.0f; if (this->stateFlags1 & PLAYER_STATE1_11) { @@ -12607,9 +12455,9 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) { this->unk_84F = 1; // make sure we get the BGS instead of giant's knife - if(this->getItemId == GI_SWORD_BGS) { + if (this->getItemId == GI_SWORD_BGS) { gSaveContext.bgsFlag = 1; - gSaveContext.swordHealth = 8; + gSaveContext.swordHealth = 8; } Message_StartTextbox(globalCtx, giEntry.textId, &this->actor); @@ -12680,7 +12528,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) { Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900); } } - //this->getItemEntry = (GetItemEntry)GET_ITEM_NONE; + // this->getItemEntry = (GetItemEntry)GET_ITEM_NONE; } else { if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { if (this->getItemId == GI_GAUNTLETS_SILVER && !gSaveContext.n64ddFlag) { @@ -12708,14 +12556,12 @@ void func_8084E1EC(Player* this, GlobalContext* globalCtx) { func_80838F18(globalCtx, this); func_80832340(globalCtx, this); } - } - else { + } else { if ((this->stateFlags1 & PLAYER_STATE1_10) && LinkAnimation_OnFrame(&this->skelAnime, 10.0f)) { func_808332F4(this, globalCtx); func_80832340(globalCtx, this); func_80835EA4(globalCtx, 8); - } - else if (LinkAnimation_OnFrame(&this->skelAnime, 5.0f)) { + } else if (LinkAnimation_OnFrame(&this->skelAnime, 5.0f)) { func_80832698(this, NA_SE_VO_LI_BREATH_DRINK); } } @@ -12748,12 +12594,11 @@ static s16 D_808549D4[] = { 0x0600, 0x04F6, 0x0604, 0x01F1, 0x0568, 0x05F4 }; void func_8084E3C4(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_808322A4(globalCtx, this, &gPlayerAnim_0030A8); + func_808322A4(globalCtx, this, &gPlayerAnim_link_normal_okarina_swing); this->unk_850 = 1; if (this->stateFlags2 & (PLAYER_STATE2_23 | PLAYER_STATE2_25)) { this->stateFlags2 |= PLAYER_STATE2_24; - } - else { + } else { func_8010BD58(globalCtx, OCARINA_ACTION_FREE_PLAY); } return; @@ -12768,20 +12613,17 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) { if ((this->targetActor != NULL) && (this->targetActor == this->unk_6A8)) { func_80853148(globalCtx, this->targetActor); - } - else if (this->naviTextId < 0) { + } else if (this->naviTextId < 0) { this->targetActor = this->naviActor; this->naviActor->textId = -this->naviTextId; func_80853148(globalCtx, this->targetActor); - } - else if (!func_8083B040(this, globalCtx)) { - func_8083A098(this, &gPlayerAnim_003098, globalCtx); + } else if (!func_8083B040(this, globalCtx)) { + func_8083A098(this, &gPlayerAnim_link_normal_okarina_end, globalCtx); } this->stateFlags2 &= ~(PLAYER_STATE2_23 | PLAYER_STATE2_24 | PLAYER_STATE2_25); this->unk_6A8 = NULL; - } - else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_02) { + } else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_02) { gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = D_808549D4[globalCtx->msgCtx.lastPlayedSong]; gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x5FF; gSaveContext.respawn[RESPAWN_MODE_RETURN].data = globalCtx->msgCtx.lastPlayedSong; @@ -12806,13 +12648,12 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) { void func_8084E604(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_8083A098(this, &gPlayerAnim_003050, globalCtx); - } - else if (LinkAnimation_OnFrame(&this->skelAnime, 3.0f)) { + func_8083A098(this, &gPlayerAnim_link_normal_light_bom_end, globalCtx); + } else if (LinkAnimation_OnFrame(&this->skelAnime, 3.0f)) { Inventory_ChangeAmmo(ITEM_NUT, -1); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, this->bodyPartsPos[PLAYER_BODYPART_R_HAND].x, - this->bodyPartsPos[PLAYER_BODYPART_R_HAND].y, this->bodyPartsPos[PLAYER_BODYPART_R_HAND].z, 4000, - this->actor.shape.rot.y, 0, ARROW_NUT); + this->bodyPartsPos[PLAYER_BODYPART_R_HAND].y, this->bodyPartsPos[PLAYER_BODYPART_R_HAND].z, 4000, + this->actor.shape.rot.y, 0, ARROW_NUT); func_80832698(this, NA_SE_VO_LI_SWORD_N); } @@ -12837,7 +12678,7 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { if (func_8084DFF4(globalCtx, this) && (this->unk_850 == 1)) { cond = ((this->targetActor != NULL) && (this->exchangeItemId < 0)) || - (this->stateFlags3 & PLAYER_STATE3_5); + (this->stateFlags3 & PLAYER_STATE3_5); if (cond || (gSaveContext.healthAccumulator == 0)) { if (cond) { @@ -12847,14 +12688,12 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { if (func_8084B4D4(globalCtx, this) == 0) { func_80853148(globalCtx, this->targetActor); } - } - else { + } else { func_8084DFAC(globalCtx, this); } } } - } - else { + } else { func_80832DBC(this); if ((this->getItemId == GI_ICE_TRAP && !gSaveContext.n64ddFlag) || @@ -12864,7 +12703,7 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { if ((this->getItemId != GI_ICE_TRAP && !gSaveContext.n64ddFlag) || (gSaveContext.n64ddFlag && this->getItemId != RG_ICE_TRAP)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, - this->actor.world.pos.y + 100.0f, this->actor.world.pos.z, 0, 0, 0, 0); + this->actor.world.pos.y + 100.0f, this->actor.world.pos.z, 0, 0, 0, 0); func_8083C0E8(this, globalCtx); } else { this->actor.colChkInfo.damage = 0; @@ -12875,18 +12714,16 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { return; } - if (this->skelAnime.animation == &gPlayerAnim_002DF8) { - func_808322D0(globalCtx, this, &gPlayerAnim_002788); - } - else { - func_808322D0(globalCtx, this, &gPlayerAnim_002780); + if (this->skelAnime.animation == &gPlayerAnim_link_normal_box_kick) { + func_808322D0(globalCtx, this, &gPlayerAnim_link_demo_get_itemB); + } else { + func_808322D0(globalCtx, this, &gPlayerAnim_link_demo_get_itemA); } this->unk_850 = 2; func_80835EA4(globalCtx, 9); } - } - else { + } else { if (this->unk_850 == 0) { if (!LINK_IS_ADULT) { func_80832924(this, D_808549E0); @@ -12894,7 +12731,7 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) { return; } - if (this->skelAnime.animation == &gPlayerAnim_002788) { + if (this->skelAnime.animation == &gPlayerAnim_link_demo_get_itemB) { Math_ScaledStepToS(&this->actor.shape.rot.y, Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000, 4000); } @@ -12924,12 +12761,10 @@ void func_8084E9AC(Player* this, GlobalContext* globalCtx) { this->unk_84F = 1; this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } - } - else { + } else { func_8083C0E8(this, globalCtx); } - } - else { + } else { if (LINK_IS_ADULT && LinkAnimation_OnFrame(&this->skelAnime, 158.0f)) { func_80832698(this, NA_SE_VO_LI_SWORD_N); return; @@ -12937,8 +12772,7 @@ void func_8084E9AC(Player* this, GlobalContext* globalCtx) { if (!LINK_IS_ADULT) { func_80832924(this, D_808549F4); - } - else { + } else { func_8084E988(this); } } @@ -12964,96 +12798,83 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) { if (rand < 0) { Health_ChangeBy(globalCtx, -0x10); - } - else { + } else { gSaveContext.healthAccumulator = rand * 0x10; } - } - else { + } else { s32 sp28 = D_808549FC[this->itemActionParam - PLAYER_AP_BOTTLE_POTION_RED]; - - if (CVar_GetS32("gRedPotionEffect", 0) && this->itemActionParam == PLAYER_AP_BOTTLE_POTION_RED) - { - if (CVar_GetS32("gRedPercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gRedPotionHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + + if (CVar_GetS32("gRedPotionEffect", 0) && this->itemActionParam == PLAYER_AP_BOTTLE_POTION_RED) { + if (CVar_GetS32("gRedPercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gRedPotionHealth", 100) / 100 + 15) / 16 * 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gRedPotionHealth", 20) * 16; } - } - else if (CVar_GetS32("gBluePotionEffects", 0) && this->itemActionParam == PLAYER_AP_BOTTLE_POTION_BLUE) - { - if (CVar_GetS32("gBlueHealthPercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gBluePotionHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + } else if (CVar_GetS32("gBluePotionEffects", 0) && + this->itemActionParam == PLAYER_AP_BOTTLE_POTION_BLUE) { + if (CVar_GetS32("gBlueHealthPercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gBluePotionHealth", 100) / 100 + 15) / 16 * 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gBluePotionHealth", 20) * 16; } - if (CVar_GetS32("gBlueManaPercentRestore", 0)) - { + if (CVar_GetS32("gBlueManaPercentRestore", 0)) { if (gSaveContext.unk_13F0 != 10) { Magic_Fill(globalCtx); } - func_80087708(globalCtx, (gSaveContext.magicLevel * 48 * CVar_GetS32("gBluePotionMana", 100) / 100 + 15) / 16 * 16, 5); - } - else - { + func_80087708(globalCtx, + (gSaveContext.magicLevel * 48 * CVar_GetS32("gBluePotionMana", 100) / 100 + 15) / + 16 * 16, + 5); + } else { if (gSaveContext.unk_13F0 != 10) { Magic_Fill(globalCtx); } - func_80087708(globalCtx, CVar_GetS32("gBluePotionMana", 100), 5);; + func_80087708(globalCtx, CVar_GetS32("gBluePotionMana", 100), 5); + ; } - } - else if (CVar_GetS32("gGreenPotionEffect", 0) && this->itemActionParam == PLAYER_AP_BOTTLE_POTION_GREEN) - { - if (CVar_GetS32("gGreenPercentRestore", 0)) - { + } else if (CVar_GetS32("gGreenPotionEffect", 0) && + this->itemActionParam == PLAYER_AP_BOTTLE_POTION_GREEN) { + if (CVar_GetS32("gGreenPercentRestore", 0)) { if (gSaveContext.unk_13F0 != 10) { Magic_Fill(globalCtx); } - func_80087708(globalCtx, (gSaveContext.magicLevel * 48 * CVar_GetS32("gGreenPotionMana", 100) / 100 + 15) / 16 * 16, 5); - } - else - { + func_80087708(globalCtx, + (gSaveContext.magicLevel * 48 * CVar_GetS32("gGreenPotionMana", 100) / 100 + 15) / + 16 * 16, + 5); + } else { if (gSaveContext.unk_13F0 != 10) { Magic_Fill(globalCtx); } - func_80087708(globalCtx, CVar_GetS32("gGreenPotionMana", 100), 5);; + func_80087708(globalCtx, CVar_GetS32("gGreenPotionMana", 100), 5); + ; } - } - else if (CVar_GetS32("gMilkEffect", 0) && (this->itemActionParam == PLAYER_AP_BOTTLE_MILK || this->itemActionParam == PLAYER_AP_BOTTLE_MILK_HALF)) - { - if (CVar_GetS32("gMilkPercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gMilkHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + } else if (CVar_GetS32("gMilkEffect", 0) && (this->itemActionParam == PLAYER_AP_BOTTLE_MILK || + this->itemActionParam == PLAYER_AP_BOTTLE_MILK_HALF)) { + if (CVar_GetS32("gMilkPercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gMilkHealth", 100) / 100 + 15) / 16 * 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gMilkHealth", 5) * 16; } - if (CVar_GetS32("gSeparateHalfMilkEffect", 0) && this->itemActionParam == PLAYER_AP_BOTTLE_MILK_HALF) - { - if (CVar_GetS32("gHalfMilkPercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gHalfMilkHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + if (CVar_GetS32("gSeparateHalfMilkEffect", 0) && + this->itemActionParam == PLAYER_AP_BOTTLE_MILK_HALF) { + if (CVar_GetS32("gHalfMilkPercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gHalfMilkHealth", 100) / 100 + 15) / 16 * + 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gHalfMilkHealth", 5) * 16; } } - } - else - { + } else { if (sp28 & 1) { gSaveContext.healthAccumulator = 0x140; } @@ -13068,23 +12889,21 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) { } } - func_808322A4(globalCtx, this, &gPlayerAnim_002670); + func_808322A4(globalCtx, this, &gPlayerAnim_link_bottle_drink_demo_wait); this->unk_850 = 1; return; } func_8083C0E8(this, globalCtx); func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); - } - else if (this->unk_850 == 1) { + } else if (this->unk_850 == 1) { if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.unk_13F0 != 9)) { - func_80832B78(globalCtx, this, &gPlayerAnim_002660); + func_80832B78(globalCtx, this, &gPlayerAnim_link_bottle_drink_demo_end); this->unk_850 = 2; Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); } func_80832698(this, NA_SE_VO_LI_DRINK - SFX_FLAG); - } - else if ((this->unk_850 == 2) && LinkAnimation_OnFrame(&this->skelAnime, 29.0f)) { + } else if ((this->unk_850 == 2) && LinkAnimation_OnFrame(&this->skelAnime, 29.0f)) { func_80832698(this, NA_SE_VO_LI_BREATH_DRINK); } } @@ -13108,23 +12927,21 @@ void func_8084ECA4(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (this->unk_84F != 0) { if (this->unk_850 == 0) { - if (CVar_GetS32("gFastDrops", 0)) - { this->unk_84F = 0; } - else - { Message_StartTextbox(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor); } + if (CVar_GetS32("gFastDrops", 0)) { + this->unk_84F = 0; + } else { + Message_StartTextbox(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor); + } Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900); this->unk_850 = 1; - } - else if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { + } else if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { this->unk_84F = 0; func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); } - } - else { + } else { func_8083C0E8(this, globalCtx); } - } - else { + } else { if (this->unk_84F == 0) { temp = this->skelAnime.curFrame - sp24->unk_08; @@ -13180,21 +12997,15 @@ void func_8084EED8(Player* this, GlobalContext* globalCtx) { Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); func_8002F7DC(&this->actor, NA_SE_EV_BOTTLE_CAP_OPEN); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); - } - else if (LinkAnimation_OnFrame(&this->skelAnime, 47.0f)) { - if (CVar_GetS32("gFairyEffect", 0)) - { - if (CVar_GetS32("gFairyPercentRestore", 0)) - { - gSaveContext.healthAccumulator = (gSaveContext.healthCapacity * CVar_GetS32("gFairyHealth", 100) / 100 + 15) / 16 * 16; - } - else - { + } else if (LinkAnimation_OnFrame(&this->skelAnime, 47.0f)) { + if (CVar_GetS32("gFairyEffect", 0)) { + if (CVar_GetS32("gFairyPercentRestore", 0)) { + gSaveContext.healthAccumulator = + (gSaveContext.healthCapacity * CVar_GetS32("gFairyHealth", 100) / 100 + 15) / 16 * 16; + } else { gSaveContext.healthAccumulator = CVar_GetS32("gFairyHealth", 8) * 16; } - } - else - { + } else { gSaveContext.healthAccumulator = 0x140; } } @@ -13224,9 +13035,9 @@ void func_8084EFC0(Player* this, GlobalContext* globalCtx) { BottleDropInfo* dropInfo = &D_80854A28[this->itemActionParam - PLAYER_AP_BOTTLE_FISH]; Actor_Spawn(&globalCtx->actorCtx, globalCtx, dropInfo->actorId, - (Math_SinS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.x, this->leftHandPos.y, - (Math_CosS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y, - 0, dropInfo->actorParams); + (Math_SinS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.x, this->leftHandPos.y, + (Math_CosS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y, + 0, dropInfo->actorParams); Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); return; @@ -13245,8 +13056,7 @@ void func_8084F104(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (this->unk_850 < 0) { func_8083C0E8(this, globalCtx); - } - else if (this->exchangeItemId == EXCH_ITEM_NONE) { + } else if (this->exchangeItemId == EXCH_ITEM_NONE) { Actor* targetActor = this->targetActor; this->unk_862 = 0; @@ -13255,15 +13065,13 @@ void func_8084F104(Player* this, GlobalContext* globalCtx) { } func_80853148(globalCtx, targetActor); - } - else { + } else { GetItemEntry giEntry = ItemTable_Retrieve(D_80854528[this->exchangeItemId - 1]); if (this->itemActionParam >= PLAYER_AP_LETTER_ZELDA) { if (giEntry.gi >= 0) { this->unk_862 = giEntry.gi; - } - else { + } else { this->unk_862 = -giEntry.gi; } } @@ -13276,24 +13084,21 @@ void func_8084F104(Player* this, GlobalContext* globalCtx) { } this->unk_850 = 1; - } - else if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { + } else if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CLOSING) { this->actor.flags &= ~ACTOR_FLAG_8; this->unk_862 = 0; if (this->unk_84F == 1) { - func_80832264(globalCtx, this, &gPlayerAnim_002698); + func_80832264(globalCtx, this, &gPlayerAnim_link_bottle_read_end); this->unk_850 = -1; - } - else { + } else { func_8083C0E8(this, globalCtx); } func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); } } - } - else if (this->unk_850 >= 0) { + } else if (this->unk_850 >= 0) { func_80832924(this, D_80854A3C); } @@ -13306,7 +13111,7 @@ void func_8084F308(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_5 | PLAYER_STATE2_6; if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_80832284(globalCtx, this, &gPlayerAnim_003128); + func_80832284(globalCtx, this, &gPlayerAnim_link_normal_re_dead_attack_wait); } if (func_80832594(this, 0, 100)) { @@ -13366,8 +13171,7 @@ void func_8084F390(Player* this, GlobalContext* globalCtx) { LinkAnimationHeader* anim; if (this->unk_84F == 0) { anim = D_80853914[PLAYER_ANIMGROUP_42][this->modelAnimType]; - } - else { + } else { anim = D_80853914[PLAYER_ANIMGROUP_43][this->modelAnimType]; } func_8083A098(this, anim, globalCtx); @@ -13398,8 +13202,7 @@ void func_8084F710(Player* this, GlobalContext* globalCtx) { if ((this->unk_84F != 0) && (globalCtx->csCtx.frames < 0x131)) { this->actor.gravity = 0.0f; this->actor.velocity.y = 0.0f; - } - else if (D_80853600 < 150.0f) { + } else if (D_80853600 < 150.0f) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (this->unk_850 == 0) { if (this->actor.bgCheckFlags & 1) { @@ -13407,8 +13210,7 @@ void func_8084F710(Player* this, GlobalContext* globalCtx) { func_808328A0(this); this->unk_850 = 1; } - } - else { + } else { if ((globalCtx->sceneNum == SCENE_SPOT04) && func_8083ADD4(globalCtx, this)) { return; } @@ -13438,18 +13240,15 @@ void func_8084F88C(Player* this, GlobalContext* globalCtx) { if (globalCtx->sceneNum == 9) { Gameplay_TriggerRespawn(globalCtx); globalCtx->nextEntranceIndex = 0x0088; - } - else if (this->unk_84F < 0) { + } else if (this->unk_84F < 0) { Gameplay_TriggerRespawn(globalCtx); - } - else { + } else { Gameplay_TriggerVoidOut(globalCtx); } globalCtx->fadeTransition = 4; func_80078884(NA_SE_OC_ABYSS); - } - else { + } else { globalCtx->fadeTransition = 2; gSaveContext.nextTransition = 2; gSaveContext.seqId = (u8)NA_BGM_DISABLED; @@ -13471,8 +13270,7 @@ void func_8084F9C0(Player* this, GlobalContext* globalCtx) { if (this->actor.velocity.y < 0.0f) { func_80837B9C(this, globalCtx); - } - else if (this->actor.velocity.y < 6.0f) { + } else if (this->actor.velocity.y < 6.0f) { Math_StepToF(&this->linearVelocity, 3.0f, 0.5f); } } @@ -13505,16 +13303,14 @@ void func_8084FB10(Player* this, GlobalContext* globalCtx) { this->unk_84F = -1; EffectSsIcePiece_SpawnBurst(globalCtx, &this->actor.world.pos, this->actor.scale.x); func_8002F7DC(&this->actor, NA_SE_PL_ICE_BROKEN); - } - else { + } else { this->stateFlags2 |= PLAYER_STATE2_14; } if ((globalCtx->gameplayFrames % 4) == 0) { Player_InflictDamage(globalCtx, -1); } - } - else { + } else { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { func_80839F90(this, globalCtx); func_80837AFC(this, -20); @@ -13539,9 +13335,10 @@ void func_8084FBF4(Player* this, GlobalContext* globalCtx) { s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { sControlInput = &globalCtx->state.input[0]; - if (CVar_GetS32("gDebugEnabled", 0) && ((CHECK_BTN_ALL(sControlInput->cur.button, BTN_A | BTN_L | BTN_R) && - CHECK_BTN_ALL(sControlInput->press.button, BTN_B)) || - (CHECK_BTN_ALL(sControlInput->cur.button, BTN_L) && CHECK_BTN_ALL(sControlInput->press.button, BTN_DRIGHT)))) { + if (CVar_GetS32("gDebugEnabled", 0) && + ((CHECK_BTN_ALL(sControlInput->cur.button, BTN_A | BTN_L | BTN_R) && + CHECK_BTN_ALL(sControlInput->press.button, BTN_B)) || + (CHECK_BTN_ALL(sControlInput->cur.button, BTN_L) && CHECK_BTN_ALL(sControlInput->press.button, BTN_DRIGHT)))) { D_808535D0 ^= 1; @@ -13555,8 +13352,7 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { speed = 100.0f; - } - else { + } else { speed = 20.0f; } @@ -13565,8 +13361,7 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_L)) { if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { this->actor.world.pos.y += speed; - } - else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A)) { this->actor.world.pos.y -= speed; } @@ -13578,11 +13373,9 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DDOWN)) { angle = temp + 0x8000; - } - else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DLEFT)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DLEFT)) { angle = temp + 0x4000; - } - else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DRIGHT)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DRIGHT)) { angle = temp - 0x4000; } @@ -13644,15 +13437,13 @@ void func_8085002C(Player* this) { if (D_80858AC8.unk_06 > 6000) { D_80858AC8.unk_06 = 6000; - } - else if (D_80858AC8.unk_06 < -6000) { + } else if (D_80858AC8.unk_06 < -6000) { D_80858AC8.unk_06 = -6000; } if (D_80858AC8.unk_08 > 6000) { D_80858AC8.unk_08 = 6000; - } - else if (D_80858AC8.unk_08 < -6000) { + } else if (D_80858AC8.unk_08 < -6000) { D_80858AC8.unk_08 = -6000; } @@ -13661,8 +13452,7 @@ void func_8085002C(Player* this) { if (D_80858AC8.unk_00 < 0) { D_80858AC8.unk_04 = D_80858AC8.unk_00 >> 1; - } - else { + } else { D_80858AC8.unk_04 = 0; } } @@ -13679,8 +13469,7 @@ s32 func_80850224(Player* this, GlobalContext* globalCtx) { func_80837530(globalCtx, this, 0); return 1; } - } - else { + } else { return 0; } } @@ -13718,16 +13507,16 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { if (func_8008E9C4(this)) { sp3C = sp44->unk_08; - } - else { + } else { sp3C = sp44->unk_04; } func_80832318(this); this->skelAnime.moveFlags = 0; - if ((sp3C == &gPlayerAnim_002908) && (this->modelAnimType != PLAYER_ANIMTYPE_3)) { - sp3C = &gPlayerAnim_002AC8; + if ((sp3C == &gPlayerAnim_link_fighter_Lpower_jump_kiru_end) && + (this->modelAnimType != PLAYER_ANIMTYPE_3)) { + sp3C = &gPlayerAnim_link_fighter_power_jump_kiru_end; } func_8083A098(this, sp3C, globalCtx); @@ -13735,8 +13524,7 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { this->skelAnime.moveFlags = sp43; this->stateFlags3 |= PLAYER_STATE3_3; } - } - else if (this->heldItemActionParam == PLAYER_AP_HAMMER) { + } else if (this->heldItemActionParam == PLAYER_AP_HAMMER) { if ((this->swordAnimation == 0x16) || (this->swordAnimation == 0x13)) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f shockwavePos; @@ -13749,7 +13537,7 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { func_80836AB8(this, 1); if ((((this->swordAnimation == 0x16) && LinkAnimation_OnFrame(&this->skelAnime, 7.0f)) || - ((this->swordAnimation == 0x13) && LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) && + ((this->swordAnimation == 0x13) && LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) && (sp2C > -40.0f) && (sp2C < 40.0f)) { func_80842A28(globalCtx, this); EffectSsBlast_SpawnWhiteShockwave(globalCtx, &shockwavePos, &zeroVec, &zeroVec); @@ -13820,21 +13608,21 @@ void func_8085076C(Player* this, GlobalContext* globalCtx) { } static LinkAnimationHeader* D_80854A58[] = { - &gPlayerAnim_002CF8, - &gPlayerAnim_002CE0, - &gPlayerAnim_002D10, + &gPlayerAnim_link_magic_kaze1, + &gPlayerAnim_link_magic_honoo1, + &gPlayerAnim_link_magic_tamashii1, }; static LinkAnimationHeader* D_80854A64[] = { - &gPlayerAnim_002D00, - &gPlayerAnim_002CE8, - &gPlayerAnim_002D18, + &gPlayerAnim_link_magic_kaze2, + &gPlayerAnim_link_magic_honoo2, + &gPlayerAnim_link_magic_tamashii2, }; static LinkAnimationHeader* D_80854A70[] = { - &gPlayerAnim_002D08, - &gPlayerAnim_002CF0, - &gPlayerAnim_002D20, + &gPlayerAnim_link_magic_kaze3, + &gPlayerAnim_link_magic_honoo3, + &gPlayerAnim_link_magic_tamashii3, }; static u8 D_80854A7C[] = { 70, 10, 10 }; @@ -13867,8 +13655,7 @@ void func_808507F4(Player* this, GlobalContext* globalCtx) { func_80839FFC(this, globalCtx); func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); } - } - else { + } else { if (this->unk_850 == 0) { LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, D_80854A58[this->unk_84F], 0.83f); @@ -13877,12 +13664,10 @@ void func_808507F4(Player* this, GlobalContext* globalCtx) { if ((this->unk_84F != 0) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { gSaveContext.unk_13F0 = 1; } - } - else { + } else { func_800876C8(globalCtx); } - } - else { + } else { LinkAnimation_PlayLoopSetSpeed(globalCtx, &this->skelAnime, D_80854A64[this->unk_84F], 0.83f); if (this->unk_84F == 0) { @@ -13892,8 +13677,7 @@ void func_808507F4(Player* this, GlobalContext* globalCtx) { this->unk_850++; } - } - else { + } else { if (this->unk_850 < 0) { this->unk_850++; @@ -13912,18 +13696,15 @@ void func_808507F4(Player* this, GlobalContext* globalCtx) { gSaveContext.fw.tempCollectFlags = gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags; this->unk_850 = 2; } - } - else if (this->unk_84F >= 0) { + } else if (this->unk_84F >= 0) { if (this->unk_850 == 0) { func_80832924(this, D_80854A80); - } - else if (this->unk_850 == 1) { + } else if (this->unk_850 == 1) { func_80832924(this, D_80854A8C[this->unk_84F]); if ((this->unk_84F == 2) && LinkAnimation_OnFrame(&this->skelAnime, 30.0f)) { this->stateFlags1 &= ~(PLAYER_STATE1_28 | PLAYER_STATE1_29); } - } - else if (D_80854A7C[this->unk_84F] < this->unk_850++) { + } else if (D_80854A7C[this->unk_84F] < this->unk_850++) { LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, D_80854A70[this->unk_84F], 0.83f); this->currentYaw = this->actor.shape.rot.y; this->unk_84F = -1; @@ -13940,7 +13721,7 @@ void func_80850AEC(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= PLAYER_STATE2_5; if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_80832284(globalCtx, this, &gPlayerAnim_002C98); + func_80832284(globalCtx, this, &gPlayerAnim_link_hook_fly_wait); } Math_Vec3f_Sum(&this->actor.world.pos, &this->actor.velocity, &this->actor.world.pos); @@ -13965,7 +13746,7 @@ void func_80850AEC(Player* this, GlobalContext* globalCtx) { return; } - if ((this->skelAnime.animation != &gPlayerAnim_002C90) || (4.0f <= this->skelAnime.curFrame)) { + if ((this->skelAnime.animation != &gPlayerAnim_link_hook_fly_start) || (4.0f <= this->skelAnime.curFrame)) { this->actor.gravity = 0.0f; Math_ScaledStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x, 0x800); func_8083264C(this, 100, 2, 100, 0); @@ -13981,17 +13762,18 @@ void func_80850C68(Player* this, GlobalContext* globalCtx) { this->skelAnime.curFrame -= this->skelAnime.animLength; } - LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, &gPlayerAnim_002C38, this->skelAnime.curFrame, - (this->unk_858 < 0.0f) ? &gPlayerAnim_002C18 : &gPlayerAnim_002C20, 5.0f, + LinkAnimation_BlendToJoint( + globalCtx, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame, + (this->unk_858 < 0.0f) ? &gPlayerAnim_link_fishing_reel_left : &gPlayerAnim_link_fishing_reel_right, 5.0f, fabsf(this->unk_858), this->blendTable); - LinkAnimation_BlendToMorph(globalCtx, &this->skelAnime, &gPlayerAnim_002C38, this->skelAnime.curFrame, - (this->unk_85C < 0.0f) ? &gPlayerAnim_002C28 : &gPlayerAnim_002C10, 5.0f, + LinkAnimation_BlendToMorph( + globalCtx, &this->skelAnime, &gPlayerAnim_link_fishing_wait, this->skelAnime.curFrame, + (this->unk_85C < 0.0f) ? &gPlayerAnim_link_fishing_reel_up : &gPlayerAnim_link_fishing_reel_down, 5.0f, fabsf(this->unk_85C), D_80858AD8); LinkAnimation_InterpJointMorph(globalCtx, &this->skelAnime, 0.5f); - } - else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { + } else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { this->unk_860 = 2; - func_80832284(globalCtx, this, &gPlayerAnim_002C38); + func_80832284(globalCtx, this, &gPlayerAnim_link_fishing_wait); this->unk_850 = 1; } @@ -13999,16 +13781,15 @@ void func_80850C68(Player* this, GlobalContext* globalCtx) { if (this->unk_860 == 0) { func_80853080(this, globalCtx); - } - else if (this->unk_860 == 3) { + } else if (this->unk_860 == 3) { func_80835C58(globalCtx, this, func_80850E84, 0); - func_80832B0C(globalCtx, this, &gPlayerAnim_002C00); + func_80832B0C(globalCtx, this, &gPlayerAnim_link_fishing_fish_catch); } } void func_80850E84(Player* this, GlobalContext* globalCtx) { if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_860 == 0)) { - func_8083A098(this, &gPlayerAnim_002C08, globalCtx); + func_8083A098(this, &gPlayerAnim_link_fishing_fish_catch_end, globalCtx); } } @@ -14036,107 +13817,107 @@ static struct_80832924 D_80854B14[] = { static struct_80854B18 D_80854B18[] = { { 0, NULL }, { -1, func_808515A4 }, - { 2, &gPlayerAnim_002790 }, + { 2, &gPlayerAnim_link_demo_goma_furimuki }, { 0, NULL }, { 0, NULL }, - { 3, &gPlayerAnim_002740 }, + { 3, &gPlayerAnim_link_demo_bikkuri }, { 0, NULL }, { 0, NULL }, { -1, func_808515A4 }, - { 2, &gPlayerAnim_002778 }, + { 2, &gPlayerAnim_link_demo_furimuki }, { -1, func_80851788 }, - { 3, &gPlayerAnim_002860 }, + { 3, &gPlayerAnim_link_demo_warp }, { -1, func_808518DC }, - { 7, &gPlayerAnim_002348 }, - { 5, &gPlayerAnim_002350 }, - { 5, &gPlayerAnim_002358 }, - { 5, &gPlayerAnim_0023B0 }, - { 7, &gPlayerAnim_0023B8 }, + { 7, &gPlayerAnim_clink_demo_get1 }, + { 5, &gPlayerAnim_clink_demo_get2 }, + { 5, &gPlayerAnim_clink_demo_get3 }, + { 5, &gPlayerAnim_clink_demo_standup }, + { 7, &gPlayerAnim_clink_demo_standup_wait }, { -1, func_808519EC }, - { 2, &gPlayerAnim_002728 }, - { 2, &gPlayerAnim_002738 }, + { 2, &gPlayerAnim_link_demo_baru_op1 }, + { 2, &gPlayerAnim_link_demo_baru_op3 }, { 0, NULL }, { -1, func_80851B90 }, - { 3, &gPlayerAnim_0027A8 }, - { 9, &gPlayerAnim_002DB0 }, - { 2, &gPlayerAnim_002DC0 }, + { 3, &gPlayerAnim_link_demo_jibunmiru }, + { 9, &gPlayerAnim_link_normal_back_downA }, + { 2, &gPlayerAnim_link_normal_back_down_wake }, { -1, func_80851D2C }, - { 2, &gPlayerAnim_003098 }, - { 3, &gPlayerAnim_002780 }, + { 2, &gPlayerAnim_link_normal_okarina_end }, + { 3, &gPlayerAnim_link_demo_get_itemA }, { -1, func_808515A4 }, - { 2, &gPlayerAnim_003088 }, + { 2, &gPlayerAnim_link_normal_normal2fighter_free }, { 0, NULL }, { 0, NULL }, - { 5, &gPlayerAnim_002320 }, + { 5, &gPlayerAnim_clink_demo_atozusari }, { -1, func_80851368 }, { -1, func_80851E64 }, - { 5, &gPlayerAnim_002328 }, - { 16, &gPlayerAnim_002F90 }, + { 5, &gPlayerAnim_clink_demo_bashi }, + { 16, &gPlayerAnim_link_normal_hang_up_down }, { -1, func_80851F84 }, { -1, func_80851E90 }, - { 6, &gPlayerAnim_002410 }, - { 6, &gPlayerAnim_002418 }, + { 6, &gPlayerAnim_clink_op3_okiagari }, + { 6, &gPlayerAnim_clink_op3_tatiagari }, { -1, func_80852080 }, - { 5, &gPlayerAnim_002390 }, + { 5, &gPlayerAnim_clink_demo_miokuri }, { -1, func_808521F4 }, { -1, func_8085225C }, { -1, func_80852280 }, - { 5, &gPlayerAnim_0023A0 }, - { 5, &gPlayerAnim_002368 }, + { 5, &gPlayerAnim_clink_demo_nozoki }, + { 5, &gPlayerAnim_clink_demo_koutai }, { -1, func_808515A4 }, - { 5, &gPlayerAnim_002370 }, - { 5, &gPlayerAnim_0027B0 }, - { 5, &gPlayerAnim_0027B8 }, - { 5, &gPlayerAnim_0027C0 }, - { 3, &gPlayerAnim_002768 }, - { 3, &gPlayerAnim_0027D8 }, - { 4, &gPlayerAnim_0027E0 }, - { 3, &gPlayerAnim_002380 }, - { 3, &gPlayerAnim_002828 }, - { 6, &gPlayerAnim_002470 }, - { 6, &gPlayerAnim_0032A8 }, - { 14, &gPlayerAnim_0032A0 }, - { 3, &gPlayerAnim_0032A0 }, - { 5, &gPlayerAnim_002AE8 }, - { 16, &gPlayerAnim_002450 }, - { 15, &gPlayerAnim_002460 }, - { 15, &gPlayerAnim_002458 }, - { 3, &gPlayerAnim_002440 }, - { 3, &gPlayerAnim_002438 }, - { 3, &gPlayerAnim_002C88 }, - { 6, &gPlayerAnim_003450 }, - { 6, &gPlayerAnim_003448 }, - { 6, &gPlayerAnim_003460 }, - { 6, &gPlayerAnim_003440 }, - { 3, &gPlayerAnim_002798 }, - { 3, &gPlayerAnim_002818 }, - { 4, &gPlayerAnim_002848 }, - { 3, &gPlayerAnim_002850 }, - { 3, &gPlayerAnim_0034E0 }, - { 3, &gPlayerAnim_0034D8 }, - { 6, &gPlayerAnim_0034C8 }, - { 3, &gPlayerAnim_003470 }, - { 3, &gPlayerAnim_003478 }, - { 3, &gPlayerAnim_0034C0 }, - { 3, &gPlayerAnim_003480 }, - { 3, &gPlayerAnim_003490 }, - { 3, &gPlayerAnim_003488 }, - { 3, &gPlayerAnim_003498 }, - { 3, &gPlayerAnim_0034B0 }, + { 5, &gPlayerAnim_clink_demo_koutai_kennuki }, + { 5, &gPlayerAnim_link_demo_kakeyori }, + { 5, &gPlayerAnim_link_demo_kakeyori_mimawasi }, + { 5, &gPlayerAnim_link_demo_kakeyori_miokuri }, + { 3, &gPlayerAnim_link_demo_furimuki2 }, + { 3, &gPlayerAnim_link_demo_kaoage }, + { 4, &gPlayerAnim_link_demo_kaoage_wait }, + { 3, &gPlayerAnim_clink_demo_mimawasi }, + { 3, &gPlayerAnim_link_demo_nozokikomi }, + { 6, &gPlayerAnim_kolink_odoroki_demo }, + { 6, &gPlayerAnim_link_shagamu_demo }, + { 14, &gPlayerAnim_link_okiru_demo }, + { 3, &gPlayerAnim_link_okiru_demo }, + { 5, &gPlayerAnim_link_fighter_power_kiru_start }, + { 16, &gPlayerAnim_demo_link_nwait }, + { 15, &gPlayerAnim_demo_link_tewatashi }, + { 15, &gPlayerAnim_demo_link_orosuu }, + { 3, &gPlayerAnim_d_link_orooro }, + { 3, &gPlayerAnim_d_link_imanodare }, + { 3, &gPlayerAnim_link_hatto_demo }, + { 6, &gPlayerAnim_o_get_mae }, + { 6, &gPlayerAnim_o_get_ato }, + { 6, &gPlayerAnim_om_get_mae }, + { 6, &gPlayerAnim_nw_modoru }, + { 3, &gPlayerAnim_link_demo_gurad }, + { 3, &gPlayerAnim_link_demo_look_hand }, + { 4, &gPlayerAnim_link_demo_sita_wait }, + { 3, &gPlayerAnim_link_demo_ue }, + { 3, &gPlayerAnim_Link_muku }, + { 3, &gPlayerAnim_Link_miageru }, + { 6, &gPlayerAnim_Link_ha }, + { 3, &gPlayerAnim_L_1kyoro }, + { 3, &gPlayerAnim_L_2kyoro }, + { 3, &gPlayerAnim_L_sagaru }, + { 3, &gPlayerAnim_L_bouzen }, + { 3, &gPlayerAnim_L_kamaeru }, + { 3, &gPlayerAnim_L_hajikareru }, + { 3, &gPlayerAnim_L_ken_miru }, + { 3, &gPlayerAnim_L_mukinaoru }, { -1, func_808524B0 }, - { 3, &gPlayerAnim_003420 }, + { 3, &gPlayerAnim_link_wait_itemD1_20f }, { -1, func_80852544 }, { -1, func_80852564 }, - { 3, &gPlayerAnim_003250 }, + { 3, &gPlayerAnim_link_normal_wait_typeB_20f }, { -1, func_80852608 }, - { 3, &gPlayerAnim_002810 }, - { 3, &gPlayerAnim_002838 }, - { 3, &gPlayerAnim_002CD0 }, - { 3, &gPlayerAnim_002CD8 }, - { 3, &gPlayerAnim_002868 }, - { 3, &gPlayerAnim_0027E8 }, - { 3, &gPlayerAnim_0027F8 }, - { 3, &gPlayerAnim_002800 }, + { 3, &gPlayerAnim_link_demo_kousan }, + { 3, &gPlayerAnim_link_demo_return_to_past }, + { 3, &gPlayerAnim_link_last_hit_motion1 }, + { 3, &gPlayerAnim_link_last_hit_motion2 }, + { 3, &gPlayerAnim_link_demo_zeldamiru }, + { 3, &gPlayerAnim_link_demo_kenmiru1 }, + { 3, &gPlayerAnim_link_demo_kenmiru2 }, + { 3, &gPlayerAnim_link_demo_kenmiru2_modori }, }; static struct_80854B18 D_80854E50[] = { @@ -14159,14 +13940,14 @@ static struct_80854B18 D_80854E50[] = { { 18, D_80854AF0 }, { 11, NULL }, { -1, func_80851A50 }, - { 12, &gPlayerAnim_002730 }, + { 12, &gPlayerAnim_link_demo_baru_op2 }, { 11, NULL }, { 0, NULL }, { -1, func_80851BE8 }, { 11, NULL }, { -1, func_80851CA4 }, { 11, NULL }, - { 17, &gPlayerAnim_0030A8 }, + { 17, &gPlayerAnim_link_normal_okarina_swing }, { 11, NULL }, { 11, NULL }, { 11, NULL }, @@ -14183,7 +13964,7 @@ static struct_80854B18 D_80854E50[] = { { -1, func_80851FB0 }, { -1, func_80852048 }, { -1, func_80852174 }, - { 13, &gPlayerAnim_002398 }, + { 13, &gPlayerAnim_clink_demo_miokuri_wait }, { -1, func_80852234 }, { 0, NULL }, { 0, NULL }, @@ -14191,13 +13972,13 @@ static struct_80854B18 D_80854E50[] = { { -1, func_80852450 }, { -1, func_80851688 }, { -1, func_80852298 }, - { 13, &gPlayerAnim_0027D0 }, + { 13, &gPlayerAnim_link_demo_kakeyori_wait }, { -1, func_80852480 }, - { 13, &gPlayerAnim_0027C8 }, + { 13, &gPlayerAnim_link_demo_kakeyori_miokuri_wait }, { -1, func_80852328 }, { 11, NULL }, { 11, NULL }, - { 12, &gPlayerAnim_002388 }, + { 12, &gPlayerAnim_clink_demo_mimawasi_wait }, { -1, func_80852358 }, { 11, NULL }, { 18, D_80854B14 }, @@ -14206,29 +13987,29 @@ static struct_80854B18 D_80854E50[] = { { 11, NULL }, { 11, NULL }, { -1, func_80852388 }, - { 17, &gPlayerAnim_002450 }, - { 12, &gPlayerAnim_002448 }, - { 12, &gPlayerAnim_002450 }, + { 17, &gPlayerAnim_demo_link_nwait }, + { 12, &gPlayerAnim_d_link_orowait }, + { 12, &gPlayerAnim_demo_link_nwait }, { 11, NULL }, { -1, func_808526EC }, - { 17, &gPlayerAnim_003468 }, + { 17, &gPlayerAnim_sude_nwait }, { -1, func_808526EC }, - { 17, &gPlayerAnim_003468 }, - { 12, &gPlayerAnim_0027A0 }, - { 12, &gPlayerAnim_002820 }, + { 17, &gPlayerAnim_sude_nwait }, + { 12, &gPlayerAnim_link_demo_gurad_wait }, + { 12, &gPlayerAnim_link_demo_look_hand_wait }, { 11, NULL }, - { 12, &gPlayerAnim_002858 }, - { 12, &gPlayerAnim_0034D0 }, - { 13, &gPlayerAnim_0034F0 }, - { 12, &gPlayerAnim_0034E8 }, - { 12, &gPlayerAnim_0034A8 }, + { 12, &gPlayerAnim_link_demo_ue_wait }, + { 12, &gPlayerAnim_Link_m_wait }, + { 13, &gPlayerAnim_Link_ue_wait }, + { 12, &gPlayerAnim_Link_otituku_w }, + { 12, &gPlayerAnim_L_kw }, { 11, NULL }, { 11, NULL }, { 11, NULL }, { 11, NULL }, { -1, func_80852648 }, { 11, NULL }, - { 12, &gPlayerAnim_0034A0 }, + { 12, &gPlayerAnim_L_kennasi_w }, { -1, func_808524D0 }, { -1, func_80852514 }, { -1, func_80852554 }, @@ -14239,10 +14020,10 @@ static struct_80854B18 D_80854E50[] = { { -1, func_8085283C }, { -1, func_808528C8 }, { -1, func_808528C8 }, - { 12, &gPlayerAnim_002870 }, - { 12, &gPlayerAnim_0027F0 }, - { 12, &gPlayerAnim_002808 }, - { 12, &gPlayerAnim_002450 }, + { 12, &gPlayerAnim_link_demo_zeldamiru_wait }, + { 12, &gPlayerAnim_link_demo_kenmiru1_wait }, + { 12, &gPlayerAnim_link_demo_kenmiru2_wait }, + { 12, &gPlayerAnim_demo_link_nwait }, }; void func_80850ED8(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) { @@ -14254,7 +14035,7 @@ void func_80850ED8(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* void func_80850F1C(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) { func_80832DB0(this); LinkAnimation_Change(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, Animation_GetLastFrame(anim), - ANIMMODE_ONCE, -8.0f); + ANIMMODE_ONCE, -8.0f); func_80832210(this); } @@ -14365,7 +14146,7 @@ void func_80851368(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg this->stateFlags2 |= PLAYER_STATE2_10; this->stateFlags1 &= ~(PLAYER_STATE1_18 | PLAYER_STATE1_19); - func_80832284(globalCtx, this, &gPlayerAnim_0032F0); + func_80832284(globalCtx, this, &gPlayerAnim_link_swimer_swim); } void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { @@ -14374,8 +14155,7 @@ void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (this->unk_84F == 0) { if (func_8083D12C(globalCtx, this, NULL)) { this->unk_84F = 1; - } - else { + } else { func_8084B158(globalCtx, this, NULL, fabsf(this->actor.velocity.y)); Math_ScaledStepToS(&this->unk_6C2, -10000, 800); func_8084AEEC(this, &this->actor.velocity.y, 4.0f, this->currentYaw); @@ -14385,10 +14165,9 @@ void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (this->unk_84F == 1) { - func_80832C6C(globalCtx, this, &gPlayerAnim_003328); - } - else { - func_80832284(globalCtx, this, &gPlayerAnim_003328); + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); + } else { + func_80832284(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); } } @@ -14432,11 +14211,10 @@ void func_808515A4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if ((this->unk_446 == 6) || (this->unk_446 == 0x2E)) { func_80832264(globalCtx, this, anim); - } - else { + } else { func_80832DB0(this); LinkAnimation_Change(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, Animation_GetLastFrame(anim), - ANIMMODE_LOOP, -4.0f); + ANIMMODE_LOOP, -4.0f); } func_80832210(this); @@ -14480,8 +14258,7 @@ void func_80851788(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (this->linearVelocity <= 0.0f) { this->linearVelocity = 0.1f; - } - else if (this->linearVelocity > 2.5f) { + } else if (this->linearVelocity > 2.5f) { this->linearVelocity = 2.5f; } } @@ -14496,8 +14273,7 @@ void func_80851828(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE) { return; } - } - else { + } else { if (Message_GetState(&globalCtx->msgCtx) != TEXT_STATE_NONE) { return; } @@ -14524,8 +14300,7 @@ void func_8085190C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } func_80833C3C(this); - } - else { + } else { func_808401B0(globalCtx, this); } } @@ -14540,8 +14315,8 @@ void func_808519C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg // unused static LinkAnimationHeader* D_80855190[] = { - &gPlayerAnim_002720, - &gPlayerAnim_002360, + &gPlayerAnim_link_demo_back_to_past, + &gPlayerAnim_clink_demo_goto_future, }; static Vec3f D_80855198 = { -1.0f, 70.0f, 20.0f }; @@ -14576,8 +14351,7 @@ void func_80851A50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (!LINK_IS_ADULT) { dLists = D_80125DE8; - } - else { + } else { dLists = D_80125E18; } this->leftHandDLists = &dLists[gSaveContext.linkAge]; @@ -14586,20 +14360,18 @@ void func_80851A50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (!LINK_IS_ADULT) { func_80832698(this, sp2C->unk_02); } - } - else if (LINK_IS_ADULT) { + } else if (LINK_IS_ADULT) { if (LinkAnimation_OnFrame(&this->skelAnime, 66.0f)) { func_80832698(this, NA_SE_VO_LI_SWORD_L); } - } - else { + } else { func_80832924(this, D_808551AC); } } void func_80851B90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_002860, -(2.0f / 3.0f), 12.0f, 12.0f, ANIMMODE_ONCE, - 0.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_demo_warp, -(2.0f / 3.0f), 12.0f, 12.0f, + ANIMMODE_ONCE, 0.0f); } static struct_80832924 D_808551B4[] = { @@ -14613,8 +14385,8 @@ void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (this->unk_850 >= 180) { if (this->unk_850 == 180) { - LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_003298, (2.0f / 3.0f), 10.0f, - Animation_GetLastFrame(&gPlayerAnim_003298), ANIMMODE_ONCE, -8.0f); + LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayerAnim_link_okarina_warp_goal, (2.0f / 3.0f), 10.0f, + Animation_GetLastFrame(&gPlayerAnim_link_okarina_warp_goal), ANIMMODE_ONCE, -8.0f); } func_80832924(this, D_808551B4); } @@ -14622,7 +14394,7 @@ void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_850 == 0) && (this->actor.bgCheckFlags & 1)) { - func_80832264(globalCtx, this, &gPlayerAnim_002DB8); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_back_downB); this->unk_850 = 1; } @@ -14632,7 +14404,7 @@ void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } void func_80851D2C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80850F1C(globalCtx, this, &gPlayerAnim_0030A0); + func_80850F1C(globalCtx, this, &gPlayerAnim_link_normal_okarina_start); func_8084B498(this); Player_SetModels(this, Player_ActionToModelGroup(this, this->itemActionParam)); } @@ -14646,8 +14418,7 @@ void func_80851D80(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (LinkAnimation_OnFrame(&this->skelAnime, 6.0f)) { func_80846720(globalCtx, this, 0); - } - else { + } else { func_80832924(this, D_808551B8); } } @@ -14663,17 +14434,17 @@ void func_80851E28(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } void func_80851E64(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80833064(globalCtx, this, &gPlayerAnim_003318, 0x98); + func_80833064(globalCtx, this, &gPlayerAnim_link_swimer_swim_get, 0x98); } void func_80851E90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_8083303C(globalCtx, this, &gPlayerAnim_002408, 0x9C); + func_8083303C(globalCtx, this, &gPlayerAnim_clink_op3_negaeri, 0x9C); func_80832698(this, NA_SE_VO_LI_GROAN); } void func_80851ECC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_808330EC(globalCtx, this, &gPlayerAnim_002428, 0x9C); + func_808330EC(globalCtx, this, &gPlayerAnim_clink_op3_wait2, 0x9C); } } @@ -14681,15 +14452,14 @@ void func_80851F14(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { func_808322A4(globalCtx, this, anim); this->unk_850 = 1; - } - else if (this->unk_850 == 0) { + } else if (this->unk_850 == 0) { func_80832924(this, arg3); } } void func_80851F84(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { this->actor.shape.shadowDraw = NULL; - func_80851134(globalCtx, this, &gPlayerAnim_002420); + func_80851134(globalCtx, this, &gPlayerAnim_clink_op3_wait1); } static struct_80832924 D_808551BC[] = { @@ -14700,10 +14470,9 @@ static struct_80832924 D_808551BC[] = { void func_80851FB0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_808330EC(globalCtx, this, &gPlayerAnim_002430, 0x9C); + func_808330EC(globalCtx, this, &gPlayerAnim_clink_op3_wait3, 0x9C); this->unk_850 = 1; - } - else if (this->unk_850 == 0) { + } else if (this->unk_850 == 0) { func_80832924(this, D_808551BC); if (LinkAnimation_OnFrame(&this->skelAnime, 240.0f)) { this->actor.shape.shadowDraw = ActorShadow_DrawFeet; @@ -14724,7 +14493,7 @@ void func_80852048(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } void func_80852080(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80833064(globalCtx, this, &gPlayerAnim_002340, 0x9D); + func_80833064(globalCtx, this, &gPlayerAnim_clink_demo_futtobi, 0x9D); func_80832698(this, NA_SE_VO_LI_FALL_L); } @@ -14779,10 +14548,9 @@ void func_80852280(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_80852298(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_8083313C(globalCtx, this, &gPlayerAnim_002378); + func_8083313C(globalCtx, this, &gPlayerAnim_clink_demo_koutai_wait); this->unk_850 = 1; - } - else if (this->unk_850 == 0) { + } else if (this->unk_850 == 0) { if (LinkAnimation_OnFrame(&this->skelAnime, 10.0f)) { func_80846720(globalCtx, this, 1); } @@ -14795,7 +14563,7 @@ static struct_80832924 D_808551E0[] = { }; void func_80852328(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80851F14(globalCtx, this, &gPlayerAnim_002770, D_808551E0); + func_80851F14(globalCtx, this, &gPlayerAnim_link_demo_furimuki2_wait, D_808551E0); } static struct_80832924 D_808551E8[] = { @@ -14804,19 +14572,18 @@ static struct_80832924 D_808551E8[] = { }; void func_80852358(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80851F14(globalCtx, this, &gPlayerAnim_002830, D_808551E8); + func_80851F14(globalCtx, this, &gPlayerAnim_link_demo_nozokikomi_wait, D_808551E8); } void func_80852388(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { - func_808322A4(globalCtx, this, &gPlayerAnim_002468); + func_808322A4(globalCtx, this, &gPlayerAnim_demo_link_twait); this->unk_850 = 1; } if ((this->unk_850 != 0) && (globalCtx->csCtx.frames >= 900)) { this->rightHandType = PLAYER_MODELTYPE_LH_OPEN; - } - else { + } else { this->rightHandType = PLAYER_MODELTYPE_RH_FF; } } @@ -14834,7 +14601,7 @@ static struct_80832924 D_808551F0[] = { }; void func_80852450(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80852414(globalCtx, this, &gPlayerAnim_002378, D_808551F0); + func_80852414(globalCtx, this, &gPlayerAnim_clink_demo_koutai_wait, D_808551F0); } static struct_80832924 D_808551F8[] = { @@ -14842,7 +14609,7 @@ static struct_80832924 D_808551F8[] = { }; void func_80852480(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - func_80852414(globalCtx, this, &gPlayerAnim_0027D0, D_808551F8); + func_80852414(globalCtx, this, &gPlayerAnim_link_demo_kakeyori_wait, D_808551F8); } void func_808524B0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { @@ -14870,7 +14637,7 @@ void func_80852564(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg this->linearVelocity = 2.0f; this->actor.velocity.y = -1.0f; - func_80832264(globalCtx, this, &gPlayerAnim_002DB0); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_back_downA); func_80832698(this, NA_SE_VO_LI_FALL_L); } @@ -14886,7 +14653,7 @@ void func_808525C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_80852608(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { func_80846720(globalCtx, this, 0); - func_808322D0(globalCtx, this, &gPlayerAnim_002838); + func_808322D0(globalCtx, this, &gPlayerAnim_link_demo_return_to_past); } void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { @@ -14904,8 +14671,8 @@ void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } static LinkAnimationHeader* D_80855208[] = { - &gPlayerAnim_0034B8, - &gPlayerAnim_003458, + &gPlayerAnim_L_okarina_get, + &gPlayerAnim_om_get, }; static Vec3s D_80855210[2][2] = { @@ -14943,12 +14710,10 @@ void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_8085283C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { func_80852944(globalCtx, this, arg2); - } - else if (this->unk_850 == 0) { + } else if (this->unk_850 == 0) { Item_Give(globalCtx, ITEM_SWORD_MASTER); func_80846720(globalCtx, this, 0); - } - else { + } else { func_8084E988(this); } } @@ -14967,8 +14732,7 @@ void func_80852944(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (func_808332B8(this)) { func_80838F18(globalCtx, this); func_80832340(globalCtx, this); - } - else { + } else { func_8083C148(this, globalCtx); if (!func_8083B644(this, globalCtx)) { func_8083E5A8(this, globalCtx); @@ -15007,8 +14771,7 @@ void func_80852A54(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg void func_80852B4C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2, struct_80854B18* arg3) { if (arg3->type > 0) { D_80854AA4[arg3->type](globalCtx, this, arg3->ptr); - } - else if (arg3->type < 0) { + } else if (arg3->type < 0) { arg3->func(globalCtx, this, arg2); } @@ -15046,8 +14809,7 @@ void func_80852C50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg if (sp24 >= 0) { if ((sp24 == 3) || (sp24 == 4)) { func_80852A54(globalCtx, this, linkCsAction); - } - else { + } else { func_808529D0(globalCtx, this, linkCsAction); } } @@ -15112,7 +14874,7 @@ s32 func_80852F38(GlobalContext* globalCtx, Player* this) { !(this->stateFlags3 & PLAYER_STATE3_7)) { func_80832564(globalCtx, this); func_80835C58(globalCtx, this, func_8084F308, 0); - func_80832264(globalCtx, this, &gPlayerAnim_003120); + func_80832264(globalCtx, this, &gPlayerAnim_link_normal_re_dead_attack); this->stateFlags2 |= PLAYER_STATE2_7; func_80832224(this); func_80832698(this, NA_SE_VO_LI_HELD); @@ -15176,12 +14938,10 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) { func_8002DF54(globalCtx, actor, 1); actor->flags |= ACTOR_FLAG_8; func_80832528(globalCtx, this); - } - else { + } else { if (this->actor.flags & ACTOR_FLAG_8) { this->actor.textId = 0; - } - else { + } else { this->actor.flags |= ACTOR_FLAG_8; this->actor.textId = actor->textId; } @@ -15193,31 +14953,28 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) { func_8083A2F8(globalCtx, this); this->unk_850 = sp24; - } - else { + } else { if (func_808332B8(this)) { func_80836898(globalCtx, this, func_8083A2F8); - func_80832C6C(globalCtx, this, &gPlayerAnim_003328); - } - else if ((actor->category != ACTORCAT_NPC) || (this->heldItemActionParam == PLAYER_AP_FISHING_POLE)) { + func_80832C6C(globalCtx, this, &gPlayerAnim_link_swimer_swim_wait); + } else if ((actor->category != ACTORCAT_NPC) || (this->heldItemActionParam == PLAYER_AP_FISHING_POLE)) { func_8083A2F8(globalCtx, this); if (!func_8008E9C4(this)) { if ((actor != this->naviActor) && (actor->xzDistToPlayer < 40.0f)) { - func_808322D0(globalCtx, this, &gPlayerAnim_002DF0); - } - else { + func_808322D0(globalCtx, this, &gPlayerAnim_link_normal_backspace); + } else { func_80832284(globalCtx, this, func_80833338(this)); } } - } - else { + } else { func_80836898(globalCtx, this, func_8083A2F8); func_808322D0(globalCtx, this, - (actor->xzDistToPlayer < 40.0f) ? &gPlayerAnim_002DF0 : &gPlayerAnim_0031A0); + (actor->xzDistToPlayer < 40.0f) ? &gPlayerAnim_link_normal_backspace + : &gPlayerAnim_link_normal_talk_free); } - if (this->skelAnime.animation == &gPlayerAnim_002DF0) { + if (this->skelAnime.animation == &gPlayerAnim_link_normal_backspace) { func_80832F54(globalCtx, this, 0x19); }