From 1f1b5e39f5235fcebc517fd8f932079bcd921653 Mon Sep 17 00:00:00 2001 From: fig02 Date: Sat, 29 Aug 2020 18:25:16 -0400 Subject: [PATCH] attchaedA/attachedB renamed to parent/child (#358) * fix colliderinit typo * rename parent/child * cleanup * forgot to change something in functions.h * SpawnAsChild * format --- .../actors/ovl_Bg_Bowl_Wall/func_8086F260.s | 2 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80873868.s | 2 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874304.s | 2 +- .../actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s | 2 +- .../ovl_Bg_Hidan_Hamstep/func_8088805C.s | 2 +- .../BgHidanKowarerukabe_Update.s | 2 +- .../ovl_Bg_Jya_Bigmirror/func_80893750.s | 2 +- .../actors/ovl_Bg_Jya_Cobra/func_808959C4.s | 2 +- .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s | 2 +- .../actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s | 2 +- .../actors/ovl_Bg_Mori_Bigst/func_808A1190.s | 4 +- .../ovl_Bg_Mori_Hashigo/func_808A2698.s | 2 +- .../actors/ovl_Bg_Po_Event/func_808A6210.s | 2 +- .../actors/ovl_Bg_Po_Event/func_808A658C.s | 2 +- .../BgSpot00Hanebasi_Init.s | 4 +- .../ovl_Bg_Spot01_Objects2/func_808AC2BC.s | 2 +- .../ovl_Bg_Spot08_Iceblock/func_808B1054.s | 2 +- .../BgSpot18Basket_Init.s | 2 +- .../ovl_Boss_Dodongo/BossDodongo_Init.s | 2 +- .../actors/ovl_Boss_Dodongo/func_808C52E0.s | 2 +- .../actors/ovl_Boss_Dodongo/func_808C5578.s | 2 +- .../overlays/actors/ovl_Boss_Fd/BossFd_Init.s | 6 +- .../actors/ovl_Boss_Fd/BossFd_Update.s | 2 +- .../actors/ovl_Boss_Fd/func_808D08F8.s | 2 +- .../actors/ovl_Boss_Fd2/func_808D40C8.s | 2 +- .../actors/ovl_Boss_Ganon/BossGanon_Init.s | 2 +- .../actors/ovl_Boss_Ganon/BossGanon_Update.s | 2 +- .../actors/ovl_Boss_Ganon/func_808D7918.s | 4 +- .../actors/ovl_Boss_Ganon/func_808D933C.s | 2 +- .../actors/ovl_Boss_Ganon/func_808DB2E8.s | 2 +- .../actors/ovl_Boss_Ganon/func_808DC14C.s | 2 +- .../actors/ovl_Boss_Ganon/func_808DC9B4.s | 2 +- .../actors/ovl_Boss_Ganon/func_808E1EB4.s | 2 +- .../actors/ovl_Boss_Ganon/func_808E2544.s | 2 +- .../actors/ovl_Boss_Ganon2/func_808FD5F4.s | 2 +- .../ovl_Boss_Ganondrof/BossGanondrof_Init.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_80910DCC.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_809112D4.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_80911CB0.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_80911DD8.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_80912594.s | 2 +- .../actors/ovl_Boss_Ganondrof/func_80912D2C.s | 2 +- .../actors/ovl_Boss_Goma/BossGoma_Init.s | 2 +- .../actors/ovl_Boss_Goma/func_80916C9C.s | 4 +- .../actors/ovl_Boss_Goma/func_80917D98.s | 2 +- .../actors/ovl_Boss_Goma/func_8091A9E8.s | 2 +- .../actors/ovl_Boss_Goma/func_8091ADA8.s | 2 +- .../overlays/actors/ovl_Boss_Mo/BossMo_Init.s | 4 +- .../actors/ovl_Boss_Mo/func_8091C538.s | 2 +- .../overlays/actors/ovl_Boss_Tw/BossTw_Init.s | 6 +- .../actors/ovl_Boss_Tw/func_8093A5C4.s | 4 +- .../actors/ovl_Boss_Tw/func_8093F9E4.s | 6 +- .../actors/ovl_Boss_Tw/func_809499AC.s | 2 +- .../overlays/actors/ovl_Boss_Va/BossVa_Init.s | 6 +- .../actors/ovl_Boss_Va/func_80950780.s | 2 +- .../actors/ovl_Boss_Va/func_80951AD8.s | 2 +- .../actors/ovl_Boss_Va/func_8095213C.s | 2 +- .../actors/ovl_Demo_6K/func_80966F84.s | 2 +- .../actors/ovl_Demo_Du/func_80969EDC.s | 2 +- .../actors/ovl_Demo_Du/func_80969F38.s | 2 +- .../actors/ovl_Demo_Du/func_8096B4A8.s | 2 +- .../actors/ovl_Demo_Effect/DemoEffect_Init.s | 4 +- .../actors/ovl_Demo_Effect/func_80972EA8.s | 2 +- .../actors/ovl_Demo_Effect/func_8097322C.s | 2 +- .../actors/ovl_Demo_Gj/func_809789A4.s | 2 +- .../actors/ovl_Demo_Kankyo/DemoKankyo_Init.s | 2 +- .../actors/ovl_Door_Killer/func_80995A84.s | 2 +- .../actors/ovl_En_Arrow/EnArrow_Update.s | 2 +- .../overlays/actors/ovl_En_Bb/func_809B9B64.s | 2 +- .../overlays/actors/ovl_En_Bb/func_809BA628.s | 2 +- .../ovl_En_Bom_Bowl_Man/func_809C441C.s | 4 +- .../ovl_En_Bom_Bowl_Pit/func_809C5360.s | 2 +- .../ovl_En_Bom_Bowl_Pit/func_809C55B0.s | 2 +- .../actors/ovl_En_Bom_Chu/func_809C5DDC.s | 2 +- .../actors/ovl_En_Box/func_809C9B28.s | 2 +- .../actors/ovl_En_Changer/EnChanger_Init.s | 6 +- .../actors/ovl_En_Dekubaba/func_809E80D8.s | 2 +- .../actors/ovl_En_Dekunuts/EnDekunuts_Init.s | 2 +- .../overlays/actors/ovl_En_Dh/func_809EB110.s | 2 +- .../actors/ovl_En_Diving_Game/func_809ED9E0.s | 2 +- .../actors/ovl_En_Diving_Game/func_809EEA90.s | 2 +- .../actors/ovl_En_Dns/func_809EFF50.s | 2 +- .../actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s | 4 +- .../actors/ovl_En_Dnt_Jiji/func_809F26B0.s | 2 +- .../actors/ovl_En_Dnt_Nomal/func_809F3F6C.s | 2 +- .../overlays/actors/ovl_En_Door/EnDoor_Init.s | 2 +- .../overlays/actors/ovl_En_Du/func_809FEC70.s | 2 +- .../actors/ovl_En_Eiyer/EnEiyer_Init.s | 2 +- .../actors/ovl_En_Elf/func_80A0329C.s | 2 +- .../actors/ovl_En_Encount1/func_80A0693C.s | 2 +- .../actors/ovl_En_Encount1/func_80A06CD0.s | 2 +- .../actors/ovl_En_Encount1/func_80A06E88.s | 2 +- .../actors/ovl_En_Encount2/func_80A07CA4.s | 2 +- .../actors/ovl_En_Ex_Item/func_80A09978.s | 2 +- .../overlays/actors/ovl_En_Fd/func_80A0B6C0.s | 2 +- .../overlays/actors/ovl_En_Fd/func_80A0B7B8.s | 2 +- .../actors/ovl_En_Fhg_Fire/func_80A10220.s | 2 +- .../actors/ovl_En_Fish/func_80A16C68.s | 2 +- .../overlays/actors/ovl_En_Fr/func_80A1CAAC.s | 2 +- .../overlays/actors/ovl_En_Gb/func_80A2FBB0.s | 2 +- .../actors/ovl_En_Ge1/func_80A3196C.s | 2 +- .../actors/ovl_En_Ge2/func_80A33A0C.s | 2 +- .../actors/ovl_En_Ge3/func_80A34AA0.s | 2 +- .../overlays/actors/ovl_En_Gm/func_80A3DF00.s | 2 +- .../overlays/actors/ovl_En_Go/func_80A40B74.s | 2 +- .../actors/ovl_En_Go2/func_80A470E8.s | 2 +- .../actors/ovl_En_Goma/func_80A4B3F0.s | 2 +- .../actors/ovl_En_Honotrap/func_80A5A208.s | 2 +- .../actors/ovl_En_Horse/func_80A6304C.s | 4 +- .../overlays/actors/ovl_En_Hs/func_80A6E740.s | 2 +- .../overlays/actors/ovl_En_Hy/func_80A714C4.s | 2 +- .../actors/ovl_En_Ice_Hono/func_80A734F8.s | 2 +- .../actors/ovl_En_Ishi/func_80A7F0A8.s | 2 +- .../actors/ovl_En_Ishi/func_80A7F31C.s | 2 +- .../overlays/actors/ovl_En_Jj/EnJj_Init.s | 2 +- .../overlays/actors/ovl_En_Jj/func_80A87D94.s | 2 +- .../actors/ovl_En_Kanban/EnKanban_Update.s | 2 +- .../actors/ovl_En_Karebaba/func_80A96048.s | 2 +- .../overlays/actors/ovl_En_Ko/func_80A99048.s | 2 +- .../overlays/actors/ovl_En_Ko/func_80A99504.s | 2 +- .../actors/ovl_En_Kusa/func_80A9B8D8.s | 2 +- .../actors/ovl_En_Kusa/func_80A9BAD8.s | 2 +- .../actors/ovl_En_M_Thunder/func_80A9F408.s | 2 +- .../overlays/actors/ovl_En_Mk/func_80AACA94.s | 2 +- .../overlays/actors/ovl_En_Mk/func_80AACFA0.s | 2 +- .../overlays/actors/ovl_En_Nb/func_80AB1578.s | 2 +- .../overlays/actors/ovl_En_Nb/func_80AB15D4.s | 2 +- .../overlays/actors/ovl_En_Nb/func_80AB1A94.s | 2 +- .../actors/ovl_En_Niw/func_80AB5FA0.s | 2 +- .../actors/ovl_En_Niw/func_80AB6450.s | 2 +- .../actors/ovl_En_Niw/func_80AB6570.s | 2 +- .../actors/ovl_En_Niw/func_80AB6BF8.s | 2 +- .../actors/ovl_En_Niw/func_80AB6D08.s | 2 +- .../actors/ovl_En_Niw_Lady/func_80ABAC00.s | 2 +- .../actors/ovl_En_Ossan/func_80AC5D40.s | 2 +- .../actors/ovl_En_Ossan/func_80AC6B3C.s | 2 +- .../actors/ovl_En_Peehat/func_80ACF920.s | 2 +- .../actors/ovl_En_Peehat/func_80ACFEF8.s | 2 +- .../overlays/actors/ovl_En_Rl/func_80AE78D4.s | 2 +- .../overlays/actors/ovl_En_Sa/EnSa_Init.s | 2 +- .../actors/ovl_En_Skj/func_80AFFE44.s | 2 +- .../actors/ovl_En_Skj/func_80B010C4.s | 2 +- .../actors/ovl_En_Sth/func_80B07C88.s | 2 +- .../overlays/actors/ovl_En_Sw/func_80B0D878.s | 2 +- .../ovl_En_Syateki_Itm/EnSyatekiItm_Init.s | 4 +- .../actors/ovl_En_Syateki_Itm/func_80B0FABC.s | 2 +- .../actors/ovl_En_Syateki_Man/func_80B11164.s | 2 +- .../overlays/actors/ovl_En_Ta/func_80B15E80.s | 2 +- .../actors/ovl_En_Takara_Man/func_80B17A6C.s | 2 +- .../actors/ovl_En_Toryo/func_80B20768.s | 2 +- .../overlays/actors/ovl_En_Tr/func_80B22F28.s | 2 +- .../actors/ovl_En_Vb_Ball/EnVbBall_Update.s | 2 +- .../actors/ovl_En_Viewer/EnViewer_Init.s | 2 +- .../actors/ovl_En_Viewer/func_80B2A75C.s | 6 +- .../overlays/actors/ovl_En_Vm/func_80B2E034.s | 2 +- .../actors/ovl_En_Wood02/func_80B3B094.s | 2 +- .../actors/ovl_En_Zl3/func_80B54F18.s | 2 +- .../actors/ovl_En_Zl4/func_80B5DAD8.s | 2 +- .../actors/ovl_En_fHG/func_80B62B6C.s | 6 +- .../actors/ovl_En_fHG/func_80B6404C.s | 2 +- .../actors/ovl_En_fHG/func_80B6424C.s | 4 +- .../actors/ovl_En_fHG/func_80B6476C.s | 2 +- .../actors/ovl_En_fHG/func_80B64AA8.s | 2 +- .../actors/ovl_Fishing/Fishing_Init.s | 2 +- .../actors/ovl_Fishing/func_80B77404.s | 2 +- .../actors/ovl_Item_Shield/func_80B86AC8.s | 2 +- .../actors/ovl_Item_Shield/func_80B86BC8.s | 2 +- .../actors/ovl_Obj_Kibako/func_80B9534C.s | 2 +- .../actors/ovl_Obj_Kibako/func_80B95574.s | 2 +- .../ovl_Obj_Lightswitch/ObjLightswitch_Init.s | 2 +- .../actors/ovl_Obj_Mure/func_80B9910C.s | 2 +- .../actors/ovl_Obj_Mure2/func_80B9A438.s | 2 +- .../actors/ovl_Obj_Mure3/func_80B9ACE4.s | 2 +- .../actors/ovl_Obj_Mure3/func_80B9ADCC.s | 2 +- .../actors/ovl_Obj_Switch/func_80B9D4D8.s | 2 +- .../actors/ovl_Obj_Tsubo/func_80BA15BC.s | 2 +- .../actors/ovl_Obj_Tsubo/func_80BA180C.s | 2 +- .../actors/ovl_player_actor/func_808337D4.s | 2 +- .../actors/ovl_player_actor/func_80833910.s | 2 +- .../actors/ovl_player_actor/func_8083442C.s | 2 +- include/functions.h | 14 +-- include/z64actor.h | 4 +- src/code/z_actor.c | 74 +++++++------- src/code/z_en_item00.c | 12 +-- .../actors/ovl_Arms_Hook/z_arms_hook.c | 26 ++--- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 16 +-- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 16 +-- .../actors/ovl_Arrow_Light/z_arrow_light.c | 16 +-- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 30 +++--- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 21 ++-- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h | 4 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 31 +++--- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 8 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 14 +-- .../z_bg_spot17_bakudankabe.c | 8 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 8 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 10 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 14 +-- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 4 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 8 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 14 +-- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 30 +++--- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 40 ++++---- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 8 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 30 +++--- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 22 ++--- .../actors/ovl_En_Floormas/z_en_floormas.c | 98 +++++++++---------- .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 4 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 4 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 12 +-- .../actors/ovl_En_Heishi2/z_en_heishi2.h | 2 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 12 +-- .../actors/ovl_En_Insect/z_en_insect.c | 16 +-- src/overlays/actors/ovl_En_Js/z_en_js.c | 8 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 10 +- src/overlays/actors/ovl_En_Light/z_en_light.c | 4 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 4 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 4 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 8 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 9 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 4 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 26 ++--- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 2 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 4 +- .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 6 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 12 +-- 233 files changed, 584 insertions(+), 585 deletions(-) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s index 9c3110d898..150b9126bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F260.s @@ -74,7 +74,7 @@ glabel func_8086F260 /* 001EC 8086F34C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 001F0 8086F350 AFA30048 */ sw $v1, 0x0048($sp) /* 001F4 8086F354 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 001F8 8086F358 0C00C916 */ jal Actor_SpawnAttached +/* 001F8 8086F358 0C00C916 */ jal Actor_SpawnAsChild /* 001FC 8086F35C AFAC0028 */ sw $t4, 0x0028($sp) /* 00200 8086F360 10400032 */ beq $v0, $zero, .L8086F42C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s index 8a973a45ad..21cee26d05 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s @@ -123,7 +123,7 @@ glabel func_80873868 /* 011E0 80873A10 AFA0001C */ sw $zero, 0x001C($sp) /* 011E4 80873A14 AFA00020 */ sw $zero, 0x0020($sp) /* 011E8 80873A18 AFA00024 */ sw $zero, 0x0024($sp) -/* 011EC 80873A1C 0C00C916 */ jal Actor_SpawnAttached +/* 011EC 80873A1C 0C00C916 */ jal Actor_SpawnAsChild /* 011F0 80873A20 AFA20028 */ sw $v0, 0x0028($sp) /* 011F4 80873A24 AE020340 */ sw $v0, 0x0340($s0) ## 00000340 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s index a90e0bb565..90055c0a83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s @@ -287,7 +287,7 @@ glabel func_80874304 /* 01ED4 80874704 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01ED8 80874708 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 /* 01EDC 8087470C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01EE0 80874710 0C00C916 */ jal Actor_SpawnAttached +/* 01EE0 80874710 0C00C916 */ jal Actor_SpawnAsChild /* 01EE4 80874714 AFAA0028 */ sw $t2, 0x0028($sp) /* 01EE8 80874718 87A30056 */ lh $v1, 0x0056($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s index 0bfae02e21..93775b9d3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Init.s @@ -75,7 +75,7 @@ glabel BgHakaShip_Init /* 00108 8087F208 AFA00024 */ sw $zero, 0x0024($sp) /* 0010C 8087F20C AFA00020 */ sw $zero, 0x0020($sp) /* 00110 8087F210 AFA0001C */ sw $zero, 0x001C($sp) -/* 00114 8087F214 0C00C916 */ jal Actor_SpawnAttached +/* 00114 8087F214 0C00C916 */ jal Actor_SpawnAsChild /* 00118 8087F218 E7A40018 */ swc1 $f4, 0x0018($sp) /* 0011C 8087F21C 54400004 */ bnel $v0, $zero, .L8087F230 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s index e2180b42e1..5598090911 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s @@ -75,7 +75,7 @@ glabel func_8088805C /* 00134 80888174 AFAC0020 */ sw $t4, 0x0020($sp) /* 00138 80888178 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 /* 0013C 8088817C AFA30028 */ sw $v1, 0x0028($sp) -/* 00140 80888180 0C00C916 */ jal Actor_SpawnAttached +/* 00140 80888180 0C00C916 */ jal Actor_SpawnAsChild /* 00144 80888184 AFAD0024 */ sw $t5, 0x0024($sp) /* 00148 80888188 14400003 */ bne $v0, $zero, .L80888198 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s index 15dc9757c3..df533a13e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s @@ -8,7 +8,7 @@ glabel BgHidanKowarerukabe_Update /* 00C24 8088AC44 26260164 */ addiu $a2, $s1, 0x0164 ## $a2 = 00000164 /* 00C28 8088AC48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C2C 8088AC4C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000164 -/* 00C30 8088AC50 0C00CD90 */ jal func_80033640 +/* 00C30 8088AC50 0C00CD90 */ jal Actor_GetCollidedExplosive /* 00C34 8088AC54 AFA60024 */ sw $a2, 0x0024($sp) /* 00C38 8088AC58 1040001E */ beq $v0, $zero, .L8088ACD4 /* 00C3C 8088AC5C 8FA60024 */ lw $a2, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s index 7ccd0af7fe..d2f625a891 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893750.s @@ -97,7 +97,7 @@ glabel func_80893750 /* 00190 80893870 AFA00024 */ sw $zero, 0x0024($sp) /* 00194 80893874 AFAB0020 */ sw $t3, 0x0020($sp) /* 00198 80893878 864C000C */ lh $t4, 0x000C($s2) ## 80893F00 -/* 0019C 8089387C 0C00C916 */ jal Actor_SpawnAttached +/* 0019C 8089387C 0C00C916 */ jal Actor_SpawnAsChild /* 001A0 80893880 AFAC0028 */ sw $t4, 0x0028($sp) /* 001A4 80893884 AE220000 */ sw $v0, 0x0000($s1) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s index 73d77d4757..2b1d80e558 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_808959C4.s @@ -38,7 +38,7 @@ glabel func_808959C4 /* 0011C 80895A0C AFA00024 */ sw $zero, 0x0024($sp) /* 00120 80895A10 AFA00020 */ sw $zero, 0x0020($sp) /* 00124 80895A14 AFA0001C */ sw $zero, 0x001C($sp) -/* 00128 80895A18 0C00C916 */ jal Actor_SpawnAttached +/* 00128 80895A18 0C00C916 */ jal Actor_SpawnAsChild /* 0012C 80895A1C E7B00018 */ swc1 $f16, 0x0018($sp) /* 00130 80895A20 8FA50038 */ lw $a1, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s index a4af4c4adc..26ec219398 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Init.s @@ -264,7 +264,7 @@ glabel L8089DF24 /* 003F0 8089E020 AFB80020 */ sw $t8, 0x0020($sp) /* 003F4 8089E024 86190034 */ lh $t9, 0x0034($s0) ## 00000034 /* 003F8 8089E028 AFA90028 */ sw $t1, 0x0028($sp) -/* 003FC 8089E02C 0C00C916 */ jal Actor_SpawnAttached +/* 003FC 8089E02C 0C00C916 */ jal Actor_SpawnAsChild /* 00400 8089E030 AFB90024 */ sw $t9, 0x0024($sp) /* 00404 8089E034 54400004 */ bnel $v0, $zero, .L8089E048 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s index 5384a2720c..731671d44a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s @@ -40,7 +40,7 @@ glabel func_808A0EF4 /* 00398 808A0F58 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0039C 808A0F5C E7A60014 */ swc1 $f6, 0x0014($sp) /* 003A0 808A0F60 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 003A4 808A0F64 0C00C916 */ jal Actor_SpawnAttached +/* 003A4 808A0F64 0C00C916 */ jal Actor_SpawnAsChild /* 003A8 808A0F68 E7A80018 */ swc1 $f8, 0x0018($sp) /* 003AC 808A0F6C 10400006 */ beq $v0, $zero, .L808A0F88 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s index 98d3438c0d..51c9e16484 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s @@ -50,7 +50,7 @@ glabel func_808A1190 /* 0063C 808A11FC AFA00024 */ sw $zero, 0x0024($sp) /* 00640 808A1200 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00644 808A1204 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00648 808A1208 0C00C916 */ jal Actor_SpawnAttached +/* 00648 808A1208 0C00C916 */ jal Actor_SpawnAsChild /* 0064C 808A120C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00650 808A1210 10400006 */ beq $v0, $zero, .L808A122C @@ -82,7 +82,7 @@ glabel func_808A1190 /* 006AC 808A126C AFA00024 */ sw $zero, 0x0024($sp) /* 006B0 808A1270 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 006B4 808A1274 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 006B8 808A1278 0C00C916 */ jal Actor_SpawnAttached +/* 006B8 808A1278 0C00C916 */ jal Actor_SpawnAsChild /* 006BC 808A127C E7B20018 */ swc1 $f18, 0x0018($sp) /* 006C0 808A1280 10400006 */ beq $v0, $zero, .L808A129C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s index af6db6f13c..8ddb9a600f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s @@ -47,7 +47,7 @@ glabel func_808A2698 /* 001BC 808A271C AFAF0020 */ sw $t7, 0x0020($sp) /* 001C0 808A2720 86180034 */ lh $t8, 0x0034($s0) ## 00000034 /* 001C4 808A2724 AFA00028 */ sw $zero, 0x0028($sp) -/* 001C8 808A2728 0C00C916 */ jal Actor_SpawnAttached +/* 001C8 808A2728 0C00C916 */ jal Actor_SpawnAsChild /* 001CC 808A272C AFB80024 */ sw $t8, 0x0024($sp) /* 001D0 808A2730 10400003 */ beq $v0, $zero, .L808A2740 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s index 99fd9ca0e1..58f970d081 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s @@ -176,7 +176,7 @@ glabel func_808A6210 /* 00274 808A6484 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00278 808A6488 24070093 */ addiu $a3, $zero, 0x0093 ## $a3 = 00000093 /* 0027C 808A648C 018D7021 */ addu $t6, $t4, $t5 -/* 00280 808A6490 0C00C916 */ jal Actor_SpawnAttached +/* 00280 808A6490 0C00C916 */ jal Actor_SpawnAsChild /* 00284 808A6494 AFAE0028 */ sw $t6, 0x0028($sp) /* 00288 808A6498 54400006 */ bnel $v0, $zero, .L808A64B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s index 3424f9d478..bef0319366 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s @@ -63,7 +63,7 @@ glabel func_808A658C /* 00454 808A6664 AFAC0024 */ sw $t4, 0x0024($sp) /* 00458 808A6668 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0045C 808A666C 03195021 */ addu $t2, $t8, $t9 -/* 00460 808A6670 0C00C916 */ jal Actor_SpawnAttached +/* 00460 808A6670 0C00C916 */ jal Actor_SpawnAsChild /* 00464 808A6674 AFAA0028 */ sw $t2, 0x0028($sp) /* 00468 808A6678 54400006 */ bnel $v0, $zero, .L808A6694 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s index 94e60fd6d1..56ec96f233 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s @@ -188,7 +188,7 @@ glabel BgSpot00Hanebasi_Init /* 00290 808A9A10 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 00294 808A9A14 AFA00028 */ sw $zero, 0x0028($sp) /* 00298 808A9A18 AFA00024 */ sw $zero, 0x0024($sp) -/* 0029C 808A9A1C 0C00C916 */ jal Actor_SpawnAttached +/* 0029C 808A9A1C 0C00C916 */ jal Actor_SpawnAsChild /* 002A0 808A9A20 AFA90020 */ sw $t1, 0x0020($sp) /* 002A4 808A9A24 14400003 */ bne $v0, $zero, .L808A9A34 @@ -236,7 +236,7 @@ glabel BgSpot00Hanebasi_Init /* 00338 808A9AB8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 0033C 808A9ABC AFAF0028 */ sw $t7, 0x0028($sp) /* 00340 808A9AC0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00344 808A9AC4 0C00C916 */ jal Actor_SpawnAttached +/* 00344 808A9AC4 0C00C916 */ jal Actor_SpawnAsChild /* 00348 808A9AC8 AFAE0020 */ sw $t6, 0x0020($sp) /* 0034C 808A9ACC 14400005 */ bne $v0, $zero, .L808A9AE4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s index cbff853bb0..5675736577 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC2BC.s @@ -111,7 +111,7 @@ glabel L808AC394 /* 002F4 808AC434 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 /* 002F8 808AC438 00084A00 */ sll $t1, $t0, 8 /* 002FC 808AC43C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 00300 808AC440 0C00C916 */ jal Actor_SpawnAttached +/* 00300 808AC440 0C00C916 */ jal Actor_SpawnAsChild /* 00304 808AC444 AFAA0028 */ sw $t2, 0x0028($sp) glabel L808AC448 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s index de7bb38347..118e82ed50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B1054.s @@ -41,7 +41,7 @@ glabel func_808B1054 /* 00788 808B10E8 86080018 */ lh $t0, 0x0018($s0) ## 00000018 /* 0078C 808B10EC E7AC0040 */ swc1 $f12, 0x0040($sp) /* 00790 808B10F0 AFA90028 */ sw $t1, 0x0028($sp) -/* 00794 808B10F4 0C00C916 */ jal Actor_SpawnAttached +/* 00794 808B10F4 0C00C916 */ jal Actor_SpawnAsChild /* 00798 808B10F8 AFA80024 */ sw $t0, 0x0024($sp) /* 0079C 808B10FC C7AC0040 */ lwc1 $f12, 0x0040($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s index eb251047f7..97109ac917 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Init.s @@ -98,7 +98,7 @@ glabel BgSpot18Basket_Init /* 00328 808B7A38 AFB80020 */ sw $t8, 0x0020($sp) /* 0032C 808B7A3C 861900B8 */ lh $t9, 0x00B8($s0) ## 000000B8 /* 00330 808B7A40 AFA80028 */ sw $t0, 0x0028($sp) -/* 00334 808B7A44 0C00C916 */ jal Actor_SpawnAttached +/* 00334 808B7A44 0C00C916 */ jal Actor_SpawnAsChild /* 00338 808B7A48 AFB90024 */ sw $t9, 0x0024($sp) /* 0033C 808B7A4C 8E09011C */ lw $t1, 0x011C($s0) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index eeeb9c6dca..7533dc5065 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -151,7 +151,7 @@ glabel BossDodongo_Init /* 009C8 808C1B58 AFA00028 */ sw $zero, 0x0028($sp) /* 009CC 808C1B5C E7B20010 */ swc1 $f18, 0x0010($sp) /* 009D0 808C1B60 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 009D4 808C1B64 0C00C916 */ jal Actor_SpawnAttached +/* 009D4 808C1B64 0C00C916 */ jal Actor_SpawnAsChild /* 009D8 808C1B68 E7A60018 */ swc1 $f6, 0x0018($sp) /* 009DC 808C1B6C 3C01808D */ lui $at, %hi(D_808CA658) ## $at = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s index 9cd0486286..ffaccd3810 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C52E0.s @@ -22,7 +22,7 @@ glabel func_808C52E0 /* 041A0 808C5330 84AE00B6 */ lh $t6, 0x00B6($a1) ## 000000B6 /* 041A4 808C5334 AFA00024 */ sw $zero, 0x0024($sp) /* 041A8 808C5338 AFAF0028 */ sw $t7, 0x0028($sp) -/* 041AC 808C533C 0C00C916 */ jal Actor_SpawnAttached +/* 041AC 808C533C 0C00C916 */ jal Actor_SpawnAsChild /* 041B0 808C5340 AFAE0020 */ sw $t6, 0x0020($sp) /* 041B4 808C5344 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index 5ee9c25d55..e69fdbe1f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -1626,7 +1626,7 @@ glabel L808C5FE4 /* 059E0 808C6B70 AFA00028 */ sw $zero, 0x0028($sp) /* 059E4 808C6B74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 059E8 808C6B78 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 059EC 808C6B7C 0C00C916 */ jal Actor_SpawnAttached +/* 059EC 808C6B7C 0C00C916 */ jal Actor_SpawnAsChild /* 059F0 808C6B80 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 059F4 808C6B84 8FA401A4 */ lw $a0, 0x01A4($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s index e08a7663f0..907dc7e2b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s @@ -26,7 +26,7 @@ glabel BossFd_Init /* 005A0 808CB360 AFA00024 */ sw $zero, 0x0024($sp) /* 005A4 808CB364 E7A40010 */ swc1 $f4, 0x0010($sp) /* 005A8 808CB368 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 005AC 808CB36C 0C00C916 */ jal Actor_SpawnAttached +/* 005AC 808CB36C 0C00C916 */ jal Actor_SpawnAsChild /* 005B0 808CB370 E7A80018 */ swc1 $f8, 0x0018($sp) /* 005B4 808CB374 3C05808D */ lui $a1, %hi(D_808D191C) ## $a1 = 808D0000 @@ -175,7 +175,7 @@ glabel BossFd_Init /* 007B8 808CB578 AFA00024 */ sw $zero, 0x0024($sp) /* 007BC 808CB57C E7B20014 */ swc1 $f18, 0x0014($sp) /* 007C0 808CB580 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 007C4 808CB584 0C00C916 */ jal Actor_SpawnAttached +/* 007C4 808CB584 0C00C916 */ jal Actor_SpawnAsChild /* 007C8 808CB588 E7A40018 */ swc1 $f4, 0x0018($sp) /* 007CC 808CB58C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -211,7 +211,7 @@ glabel BossFd_Init /* 0083C 808CB5FC AFA0001C */ sw $zero, 0x001C($sp) /* 00840 808CB600 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00844 808CB604 860E1402 */ lh $t6, 0x1402($s0) ## 00001402 -/* 00848 808CB608 0C00C916 */ jal Actor_SpawnAttached +/* 00848 808CB608 0C00C916 */ jal Actor_SpawnAsChild /* 0084C 808CB60C AFAE0028 */ sw $t6, 0x0028($sp) /* 00850 808CB610 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s index 95bf3f26e9..55e1def730 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s @@ -255,7 +255,7 @@ glabel BossFd_Update /* 04244 808CF004 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 04248 808CF008 240700AD */ addiu $a3, $zero, 0x00AD ## $a3 = 000000AD /* 0424C 808CF00C E7A60018 */ swc1 $f6, 0x0018($sp) -/* 04250 808CF010 0C00C916 */ jal Actor_SpawnAttached +/* 04250 808CF010 0C00C916 */ jal Actor_SpawnAsChild /* 04254 808CF014 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 04258 808CF018 1040003E */ beq $v0, $zero, .L808CF114 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 2d06b55e66..558f4c6445 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -556,7 +556,7 @@ glabel func_808D08F8 /* 06288 808D1048 E7A40018 */ swc1 $f4, 0x0018($sp) /* 0628C 808D104C AFA9001C */ sw $t1, 0x001C($sp) /* 06290 808D1050 AFAD0020 */ sw $t5, 0x0020($sp) -/* 06294 808D1054 0C00C916 */ jal Actor_SpawnAttached +/* 06294 808D1054 0C00C916 */ jal Actor_SpawnAsChild /* 06298 808D1058 AFAE0024 */ sw $t6, 0x0024($sp) /* 0629C 808D105C C6660050 */ lwc1 $f6, 0x0050($s3) ## 00000050 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index 845fbdd936..a6a67282dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -456,7 +456,7 @@ glabel L808D4594 /* 02090 808D4700 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02094 808D4704 E7A00018 */ swc1 $f0, 0x0018($sp) /* 02098 808D4708 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0209C 808D470C 0C00C916 */ jal Actor_SpawnAttached +/* 0209C 808D470C 0C00C916 */ jal Actor_SpawnAsChild /* 020A0 808D4710 E7A60014 */ swc1 $f6, 0x0014($sp) /* 020A4 808D4714 8FA40084 */ lw $a0, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index f0072bbcb1..b0b518d784 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -149,7 +149,7 @@ glabel BossGanon_Init /* 00B04 808D7374 AFA00024 */ sw $zero, 0x0024($sp) /* 00B08 808D7378 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00B0C 808D737C E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00B10 808D7380 0C00C916 */ jal Actor_SpawnAttached +/* 00B10 808D7380 0C00C916 */ jal Actor_SpawnAsChild /* 00B14 808D7384 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00B18 808D7388 3C018090 */ lui $at, %hi(D_808F93C0) ## $at = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s index 318fdae413..c104b2de0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s @@ -1298,7 +1298,7 @@ glabel L808DE3B0 /* 07E74 808DE6E4 000D7400 */ sll $t6, $t5, 16 /* 07E78 808DE6E8 000E7C03 */ sra $t7, $t6, 16 /* 07E7C 808DE6EC 25F86000 */ addiu $t8, $t7, 0x6000 ## $t8 = 00006000 -/* 07E80 808DE6F0 0C00C916 */ jal Actor_SpawnAttached +/* 07E80 808DE6F0 0C00C916 */ jal Actor_SpawnAsChild /* 07E84 808DE6F4 AFB80020 */ sw $t8, 0x0020($sp) /* 07E88 808DE6F8 A2A00274 */ sb $zero, 0x0274($s5) ## 00000274 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index 1fdde04ff1..789a2c68fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -208,7 +208,7 @@ glabel L808D79E8 /* 012F8 808D7B68 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 012FC 808D7B6C E7A40014 */ swc1 $f4, 0x0014($sp) /* 01300 808D7B70 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01304 808D7B74 0C00C916 */ jal Actor_SpawnAttached +/* 01304 808D7B74 0C00C916 */ jal Actor_SpawnAsChild /* 01308 808D7B78 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0130C 808D7B7C 3C018090 */ lui $at, %hi(D_808F93D4) ## $at = 80900000 @@ -226,7 +226,7 @@ glabel L808D79E8 /* 01338 808D7BA8 AFA00024 */ sw $zero, 0x0024($sp) /* 0133C 808D7BAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 01340 808D7BB0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 01344 808D7BB4 0C00C916 */ jal Actor_SpawnAttached +/* 01344 808D7BB4 0C00C916 */ jal Actor_SpawnAsChild /* 01348 808D7BB8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0134C 808D7BBC 3C014264 */ lui $at, 0x4264 ## $at = 42640000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index af1329b2d4..ed18bb66f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -943,7 +943,7 @@ glabel L808D9E8C /* 036C8 808D9F38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 036CC 808D9F3C E7A00018 */ swc1 $f0, 0x0018($sp) /* 036D0 808D9F40 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 036D4 808D9F44 0C00C916 */ jal Actor_SpawnAttached +/* 036D4 808D9F44 0C00C916 */ jal Actor_SpawnAsChild /* 036D8 808D9F48 E7B00014 */ swc1 $f16, 0x0014($sp) /* 036DC 808D9F4C 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index ff05bf6cf7..eb37d89d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -523,7 +523,7 @@ glabel L808DB99C /* 05184 808DB9F4 862F008A */ lh $t7, 0x008A($s1) ## 0000008A /* 05188 808DB9F8 AFB80028 */ sw $t8, 0x0028($sp) /* 0518C 808DB9FC AFA00024 */ sw $zero, 0x0024($sp) -/* 05190 808DBA00 0C00C916 */ jal Actor_SpawnAttached +/* 05190 808DBA00 0C00C916 */ jal Actor_SpawnAsChild /* 05194 808DBA04 AFAF0020 */ sw $t7, 0x0020($sp) /* 05198 808DBA08 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index 16156bc975..496d99dd33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -96,7 +96,7 @@ glabel func_808DC14C /* 05A20 808DC290 AFA00020 */ sw $zero, 0x0020($sp) /* 05A24 808DC294 AFA0001C */ sw $zero, 0x001C($sp) /* 05A28 808DC298 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 05A2C 808DC29C 0C00C916 */ jal Actor_SpawnAttached +/* 05A2C 808DC29C 0C00C916 */ jal Actor_SpawnAsChild /* 05A30 808DC2A0 E7B00018 */ swc1 $f16, 0x0018($sp) /* 05A34 808DC2A4 1000002E */ beq $zero, $zero, .L808DC360 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index f7eaf74d33..b028a445d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -94,7 +94,7 @@ glabel func_808DC9B4 /* 062A4 808DCB14 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 /* 062A8 808DCB18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 062AC 808DCB1C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 062B0 808DCB20 0C00C916 */ jal Actor_SpawnAttached +/* 062B0 808DCB20 0C00C916 */ jal Actor_SpawnAsChild /* 062B4 808DCB24 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 /* 062B8 808DCB28 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s index b2e2b50fa8..62fc69de7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s @@ -261,7 +261,7 @@ glabel func_808E1EB4 /* 0B9D4 808E2244 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0B9D8 808E2248 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 /* 0B9DC 808E224C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0B9E0 808E2250 0C00C916 */ jal Actor_SpawnAttached +/* 0B9E0 808E2250 0C00C916 */ jal Actor_SpawnAsChild /* 0B9E4 808E2254 E7A80018 */ swc1 $f8, 0x0018($sp) .L808E2258: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index 97a2a423af..41c93fa5e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -868,7 +868,7 @@ glabel L808E306C /* 0C8E8 808E3158 AFA00020 */ sw $zero, 0x0020($sp) /* 0C8EC 808E315C AFA0001C */ sw $zero, 0x001C($sp) /* 0C8F0 808E3160 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0C8F4 808E3164 0C00C916 */ jal Actor_SpawnAttached +/* 0C8F4 808E3164 0C00C916 */ jal Actor_SpawnAsChild /* 0C8F8 808E3168 E7A60018 */ swc1 $f6, 0x0018($sp) .L808E316C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 46c7743b33..5bf54a094a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -169,7 +169,7 @@ glabel L808FD644 /* 007C0 808FD700 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 007C4 808FD704 E7A40010 */ swc1 $f4, 0x0010($sp) /* 007C8 808FD708 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 007CC 808FD70C 0C00C916 */ jal Actor_SpawnAttached +/* 007CC 808FD70C 0C00C916 */ jal Actor_SpawnAsChild /* 007D0 808FD710 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007D4 808FD714 3C018091 */ lui $at, %hi(D_8090EB2C) ## $at = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s index 9e3633b42c..d214212835 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s @@ -180,7 +180,7 @@ glabel BossGanondrof_Init /* 00694 80910CD4 AFA0001C */ sw $zero, 0x001C($sp) /* 00698 80910CD8 E7A40018 */ swc1 $f4, 0x0018($sp) /* 0069C 80910CDC 8619001C */ lh $t9, 0x001C($s0) ## 00001C40 -/* 006A0 80910CE0 0C00C916 */ jal Actor_SpawnAttached +/* 006A0 80910CE0 0C00C916 */ jal Actor_SpawnAsChild /* 006A4 80910CE4 AFB90028 */ sw $t9, 0x0028($sp) /* 006A8 80910CE8 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index e95fdbfa04..25f6cd4925 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -191,7 +191,7 @@ glabel func_80910DCC /* 00A20 80911060 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A24 80911064 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 00A28 80911068 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00A2C 8091106C 0C00C916 */ jal Actor_SpawnAttached +/* 00A2C 8091106C 0C00C916 */ jal Actor_SpawnAsChild /* 00A30 80911070 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A34 80911074 AE70011C */ sw $s0, 0x011C($s3) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s index e044133b04..e877bd4cd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s @@ -70,7 +70,7 @@ glabel func_809112D4 /* 00D40 80911380 AFA00020 */ sw $zero, 0x0020($sp) /* 00D44 80911384 AFB9001C */ sw $t9, 0x001C($sp) /* 00D48 80911388 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00D4C 8091138C 0C00C916 */ jal Actor_SpawnAttached +/* 00D4C 8091138C 0C00C916 */ jal Actor_SpawnAsChild /* 00D50 80911390 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00D54 80911394 8FA90048 */ lw $t1, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s index 44573a7cfc..5ec8610d07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s @@ -67,7 +67,7 @@ glabel func_80911CB0 /* 01750 80911D90 AFA00024 */ sw $zero, 0x0024($sp) /* 01754 80911D94 AFA00020 */ sw $zero, 0x0020($sp) /* 01758 80911D98 AFA2001C */ sw $v0, 0x001C($sp) -/* 0175C 80911D9C 0C00C916 */ jal Actor_SpawnAttached +/* 0175C 80911D9C 0C00C916 */ jal Actor_SpawnAsChild /* 01760 80911DA0 E7B20018 */ swc1 $f18, 0x0018($sp) /* 01764 80911DA4 860C01A6 */ lh $t4, 0x01A6($s0) ## 000001A6 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s index f9b58874b8..a9015ac965 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s @@ -122,7 +122,7 @@ glabel func_80911DD8 /* 0191C 80911F5C AFAC0028 */ sw $t4, 0x0028($sp) /* 01920 80911F60 AFA00024 */ sw $zero, 0x0024($sp) /* 01924 80911F64 AFA00020 */ sw $zero, 0x0020($sp) -/* 01928 80911F68 0C00C916 */ jal Actor_SpawnAttached +/* 01928 80911F68 0C00C916 */ jal Actor_SpawnAsChild /* 0192C 80911F6C AFAB001C */ sw $t3, 0x001C($sp) /* 01930 80911F70 8FAD004C */ lw $t5, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index 706e0417d3..59b907d139 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -491,7 +491,7 @@ glabel func_80912594 /* 02614 80912C54 AFAC0020 */ sw $t4, 0x0020($sp) /* 02618 80912C58 AFAB001C */ sw $t3, 0x001C($sp) /* 0261C 80912C5C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 02620 80912C60 0C00C916 */ jal Actor_SpawnAttached +/* 02620 80912C60 0C00C916 */ jal Actor_SpawnAsChild /* 02624 80912C64 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02628 80912C68 AE30011C */ sw $s0, 0x011C($s1) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index 3b68f738df..5ebb8bd15c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -423,7 +423,7 @@ glabel L809131C4 /* 02BD0 80913210 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 02BD4 80913214 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02BD8 80913218 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 02BDC 8091321C 0C00C916 */ jal Actor_SpawnAttached +/* 02BDC 8091321C 0C00C916 */ jal Actor_SpawnAsChild /* 02BE0 80913220 E7A80018 */ swc1 $f8, 0x0018($sp) /* 02BE4 80913224 AE50011C */ sw $s0, 0x011C($s2) ## 0000011C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 22620c4a31..278515b4f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -91,7 +91,7 @@ glabel BossGoma_Init /* 00384 80915D94 AFA00028 */ sw $zero, 0x0028($sp) /* 00388 80915D98 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0038C 80915D9C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00390 80915DA0 0C00C916 */ jal Actor_SpawnAttached +/* 00390 80915DA0 0C00C916 */ jal Actor_SpawnAsChild /* 00394 80915DA4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00398 80915DA8 3C01C420 */ lui $at, 0xC420 ## $at = C4200000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index 1e46925b52..45e5d4af42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -131,7 +131,7 @@ glabel L80916D30 /* 013D8 80916DE8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 013DC 80916DEC E7B20014 */ swc1 $f18, 0x0014($sp) /* 013E0 80916DF0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 013E4 80916DF4 0C00C916 */ jal Actor_SpawnAttached +/* 013E4 80916DF4 0C00C916 */ jal Actor_SpawnAsChild /* 013E8 80916DF8 E7A40018 */ swc1 $f4, 0x0018($sp) /* 013EC 80916DFC 100003DB */ beq $zero, $zero, .L80917D6C @@ -335,7 +335,7 @@ glabel L80916F0C /* 016D8 809170E8 AFA00024 */ sw $zero, 0x0024($sp) /* 016DC 809170EC E7A40010 */ swc1 $f4, 0x0010($sp) /* 016E0 809170F0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 016E4 809170F4 0C00C916 */ jal Actor_SpawnAttached +/* 016E4 809170F4 0C00C916 */ jal Actor_SpawnAsChild /* 016E8 809170F8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 016EC 809170FC 86030194 */ lh $v1, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index 20bef3301f..b752add482 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -816,7 +816,7 @@ glabel func_80917D98 /* 02E80 80918890 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 02E84 80918894 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D /* 02E88 80918898 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 02E8C 8091889C 0C00C916 */ jal Actor_SpawnAttached +/* 02E8C 8091889C 0C00C916 */ jal Actor_SpawnAsChild /* 02E90 809188A0 E7B20014 */ swc1 $f18, 0x0014($sp) /* 02E94 809188A4 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s index cc46a28331..c585ebe972 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A9E8.s @@ -124,7 +124,7 @@ glabel func_8091A9E8 /* 05188 8091AB98 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 0518C 8091AB9C AFAD001C */ sw $t5, 0x001C($sp) /* 05190 8091ABA0 AFAE0020 */ sw $t6, 0x0020($sp) -/* 05194 8091ABA4 0C00C916 */ jal Actor_SpawnAttached +/* 05194 8091ABA4 0C00C916 */ jal Actor_SpawnAsChild /* 05198 8091ABA8 AFAF0024 */ sw $t7, 0x0024($sp) /* 0519C 8091ABAC 10400006 */ beq $v0, $zero, .L8091ABC8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s index 915dbb96fd..5cac8b1679 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091ADA8.s @@ -25,7 +25,7 @@ glabel func_8091ADA8 /* 053F4 8091AE04 AFAF0020 */ sw $t7, 0x0020($sp) /* 053F8 8091AE08 AFAE0028 */ sw $t6, 0x0028($sp) /* 053FC 8091AE0C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 05400 8091AE10 0C00C916 */ jal Actor_SpawnAttached +/* 05400 8091AE10 0C00C916 */ jal Actor_SpawnAsChild /* 05404 8091AE14 E7B00018 */ swc1 $f16, 0x0018($sp) /* 05408 8091AE18 87B90042 */ lh $t9, 0x0042($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s index e3b040f7c3..fa3dabf8cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s @@ -120,7 +120,7 @@ glabel BossMo_Init /* 00764 8091C264 AFA00024 */ sw $zero, 0x0024($sp) /* 00768 8091C268 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0076C 8091C26C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00770 8091C270 0C00C916 */ jal Actor_SpawnAttached +/* 00770 8091C270 0C00C916 */ jal Actor_SpawnAsChild /* 00774 8091C274 E7A80014 */ swc1 $f8, 0x0014($sp) /* 00778 8091C278 3C01C38C */ lui $at, 0xC38C ## $at = C38C0000 @@ -185,7 +185,7 @@ glabel BossMo_Init /* 00850 8091C350 AFA00020 */ sw $zero, 0x0020($sp) /* 00854 8091C354 AFA0001C */ sw $zero, 0x001C($sp) /* 00858 8091C358 240700C4 */ addiu $a3, $zero, 0x00C4 ## $a3 = 000000C4 -/* 0085C 8091C35C 0C00C916 */ jal Actor_SpawnAttached +/* 0085C 8091C35C 0C00C916 */ jal Actor_SpawnAsChild /* 00860 8091C360 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00864 8091C364 3C018092 */ lui $at, %hi(D_80925CD4) ## $at = 80920000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index 2bf5c5bee8..41fe2f3846 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -3250,7 +3250,7 @@ glabel L8091ED18 /* 035AC 8091F0AC AFA0001C */ sw $zero, 0x001C($sp) /* 035B0 8091F0B0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 035B4 8091F0B4 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 035B8 8091F0B8 0C00C916 */ jal Actor_SpawnAttached +/* 035B8 8091F0B8 0C00C916 */ jal Actor_SpawnAsChild /* 035BC 8091F0BC E7B20018 */ swc1 $f18, 0x0018($sp) /* 035C0 8091F0C0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 78782a40b3..236b7ad0f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -455,7 +455,7 @@ glabel BossTw_Init /* 01068 80939D38 AFA00024 */ sw $zero, 0x0024($sp) /* 0106C 80939D3C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01070 80939D40 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01074 80939D44 0C00C916 */ jal Actor_SpawnAttached +/* 01074 80939D44 0C00C916 */ jal Actor_SpawnAsChild /* 01078 80939D48 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0107C 80939D4C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 @@ -490,7 +490,7 @@ glabel BossTw_Init /* 010E8 80939DB8 AFA00024 */ sw $zero, 0x0024($sp) /* 010EC 80939DBC AFA00020 */ sw $zero, 0x0020($sp) /* 010F0 80939DC0 AFA0001C */ sw $zero, 0x001C($sp) -/* 010F4 80939DC4 0C00C916 */ jal Actor_SpawnAttached +/* 010F4 80939DC4 0C00C916 */ jal Actor_SpawnAsChild /* 010F8 80939DC8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 010FC 80939DCC 3C018095 */ lui $at, %hi(D_8094C844) ## $at = 80950000 @@ -509,7 +509,7 @@ glabel BossTw_Init /* 01130 80939E00 AFA00020 */ sw $zero, 0x0020($sp) /* 01134 80939E04 AFA0001C */ sw $zero, 0x001C($sp) /* 01138 80939E08 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 0113C 80939E0C 0C00C916 */ jal Actor_SpawnAttached +/* 0113C 80939E0C 0C00C916 */ jal Actor_SpawnAsChild /* 01140 80939E10 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01144 80939E14 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s index a245dbc263..e512ce9b1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A5C4.s @@ -118,7 +118,7 @@ glabel func_8093A5C4 /* 01A7C 8093A74C AFA00020 */ sw $zero, 0x0020($sp) /* 01A80 8093A750 AFA0001C */ sw $zero, 0x001C($sp) /* 01A84 8093A754 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 01A88 8093A758 0C00C916 */ jal Actor_SpawnAttached +/* 01A88 8093A758 0C00C916 */ jal Actor_SpawnAsChild /* 01A8C 8093A75C E7B20018 */ swc1 $f18, 0x0018($sp) /* 01A90 8093A760 10400067 */ beq $v0, $zero, .L8093A900 @@ -182,7 +182,7 @@ glabel func_8093A5C4 /* 01B6C 8093A83C AFA00020 */ sw $zero, 0x0020($sp) /* 01B70 8093A840 AFA0001C */ sw $zero, 0x001C($sp) /* 01B74 8093A844 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 01B78 8093A848 0C00C916 */ jal Actor_SpawnAttached +/* 01B78 8093A848 0C00C916 */ jal Actor_SpawnAsChild /* 01B7C 8093A84C E7B20018 */ swc1 $f18, 0x0018($sp) /* 01B80 8093A850 1040002B */ beq $v0, $zero, .L8093A900 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index f4eadf1dcf..8d4be961e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -245,7 +245,7 @@ glabel func_8093F9E4 /* 0705C 8093FD2C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 07060 8093FD30 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 07064 8093FD34 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 07068 8093FD38 0C00C916 */ jal Actor_SpawnAttached +/* 07068 8093FD38 0C00C916 */ jal Actor_SpawnAsChild /* 0706C 8093FD3C E7A60018 */ swc1 $f6, 0x0018($sp) /* 07070 8093FD40 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 @@ -262,7 +262,7 @@ glabel func_8093F9E4 /* 0709C 8093FD6C AFA00020 */ sw $zero, 0x0020($sp) /* 070A0 8093FD70 AFA0001C */ sw $zero, 0x001C($sp) /* 070A4 8093FD74 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 070A8 8093FD78 0C00C916 */ jal Actor_SpawnAttached +/* 070A8 8093FD78 0C00C916 */ jal Actor_SpawnAsChild /* 070AC 8093FD7C E7B00018 */ swc1 $f16, 0x0018($sp) /* 070B0 8093FD80 8E4D0004 */ lw $t5, 0x0004($s2) ## 00000004 @@ -854,7 +854,7 @@ glabel L809402FC /* 07920 809405F0 AFA00024 */ sw $zero, 0x0024($sp) /* 07924 809405F4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 07928 809405F8 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 0792C 809405FC 0C00C916 */ jal Actor_SpawnAttached +/* 0792C 809405FC 0C00C916 */ jal Actor_SpawnAsChild /* 07930 80940600 E7B20018 */ swc1 $f18, 0x0018($sp) /* 07934 80940604 3C014366 */ lui $at, 0x4366 ## $at = 43660000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s index 2a243fd851..7ca8e28367 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809499AC.s @@ -56,7 +56,7 @@ glabel func_809499AC /* 10DA0 80949A70 AFA00024 */ sw $zero, 0x0024($sp) /* 10DA4 80949A74 AFA00020 */ sw $zero, 0x0020($sp) /* 10DA8 80949A78 AFA0001C */ sw $zero, 0x001C($sp) -/* 10DAC 80949A7C 0C00C916 */ jal Actor_SpawnAttached +/* 10DAC 80949A7C 0C00C916 */ jal Actor_SpawnAsChild /* 10DB0 80949A80 E7A80018 */ swc1 $f8, 0x0018($sp) /* 10DB4 80949A84 10400007 */ beq $v0, $zero, .L80949AA4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index 8298861158..9f16a54ac6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -190,7 +190,7 @@ glabel L80950024 /* 00D9C 8095005C AFA00024 */ sw $zero, 0x0024($sp) /* 00DA0 80950060 E7A80014 */ swc1 $f8, 0x0014($sp) /* 00DA4 80950064 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00DA8 80950068 0C00C916 */ jal Actor_SpawnAttached +/* 00DA8 80950068 0C00C916 */ jal Actor_SpawnAsChild /* 00DAC 8095006C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DB0 80950070 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -368,7 +368,7 @@ glabel L80950024 /* 01044 80950304 866B0034 */ lh $t3, 0x0034($s3) ## 00000034 /* 01048 80950308 AFB20028 */ sw $s2, 0x0028($sp) /* 0104C 8095030C 014B6021 */ addu $t4, $t2, $t3 -/* 01050 80950310 0C00C916 */ jal Actor_SpawnAttached +/* 01050 80950310 0C00C916 */ jal Actor_SpawnAsChild /* 01054 80950314 AFAC0024 */ sw $t4, 0x0024($sp) /* 01058 80950318 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 0000000E @@ -459,7 +459,7 @@ glabel L80950024 /* 01198 80950458 866D0034 */ lh $t5, 0x0034($s3) ## 00000034 /* 0119C 8095045C AFB20028 */ sw $s2, 0x0028($sp) /* 011A0 80950460 018D7021 */ addu $t6, $t4, $t5 -/* 011A4 80950464 0C00C916 */ jal Actor_SpawnAttached +/* 011A4 80950464 0C00C916 */ jal Actor_SpawnAsChild /* 011A8 80950468 AFAE0024 */ sw $t6, 0x0024($sp) /* 011AC 8095046C 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index 72a9e486af..f7fee7b158 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -404,7 +404,7 @@ glabel L80950AC0 /* 019D0 80950C90 AFA30050 */ sw $v1, 0x0050($sp) /* 019D4 80950C94 01F8C821 */ addu $t9, $t7, $t8 /* 019D8 80950C98 AFB90024 */ sw $t9, 0x0024($sp) -/* 019DC 80950C9C 0C00C916 */ jal Actor_SpawnAttached +/* 019DC 80950C9C 0C00C916 */ jal Actor_SpawnAsChild /* 019E0 80950CA0 AFB00028 */ sw $s0, 0x0028($sp) /* 019E4 80950CA4 8FA30050 */ lw $v1, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s index 4a86d03a7a..30b8d6ca69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951AD8.s @@ -51,7 +51,7 @@ glabel func_80951AD8 /* 028D8 80951B98 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 /* 028DC 80951B9C AFB30028 */ sw $s3, 0x0028($sp) /* 028E0 80951BA0 018D7021 */ addu $t6, $t4, $t5 -/* 028E4 80951BA4 0C00C916 */ jal Actor_SpawnAttached +/* 028E4 80951BA4 0C00C916 */ jal Actor_SpawnAsChild /* 028E8 80951BA8 AFAE0024 */ sw $t6, 0x0024($sp) /* 028EC 80951BAC 2673FFFF */ addiu $s3, $s3, 0xFFFF ## $s3 = 00000009 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s index f5c6a88322..31d8f37e67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s @@ -342,7 +342,7 @@ glabel func_8095213C /* 032FC 809525BC 86780034 */ lh $t8, 0x0034($s3) ## 00000034 /* 03300 809525C0 AFB20028 */ sw $s2, 0x0028($sp) /* 03304 809525C4 01F8C821 */ addu $t9, $t7, $t8 -/* 03308 809525C8 0C00C916 */ jal Actor_SpawnAttached +/* 03308 809525C8 0C00C916 */ jal Actor_SpawnAsChild /* 0330C 809525CC AFB90024 */ sw $t9, 0x0024($sp) /* 03310 809525D0 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 0000000E diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s index a23dddaff2..b189a38d69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80966F84.s @@ -61,7 +61,7 @@ glabel func_80966F84 /* 006FC 8096704C AFA00024 */ sw $zero, 0x0024($sp) /* 00700 80967050 AFA00020 */ sw $zero, 0x0020($sp) /* 00704 80967054 AFA0001C */ sw $zero, 0x001C($sp) -/* 00708 80967058 0C00C916 */ jal Actor_SpawnAttached +/* 00708 80967058 0C00C916 */ jal Actor_SpawnAsChild /* 0070C 8096705C E7A60018 */ swc1 $f6, 0x0018($sp) /* 00710 80967060 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s index 9da851276d..44cb7c03b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s @@ -16,7 +16,7 @@ glabel func_80969EDC /* 00444 80969F14 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D /* 00448 80969F18 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0044C 80969F1C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00450 80969F20 0C00C916 */ jal Actor_SpawnAttached +/* 00450 80969F20 0C00C916 */ jal Actor_SpawnAsChild /* 00454 80969F24 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 00458 80969F28 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s index 57fbbb823e..295793ef50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s @@ -21,7 +21,7 @@ glabel func_80969F38 /* 004B4 80969F84 AFA0001C */ sw $zero, 0x001C($sp) /* 004B8 80969F88 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B /* 004BC 80969F8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004C0 80969F90 0C00C916 */ jal Actor_SpawnAttached +/* 004C0 80969F90 0C00C916 */ jal Actor_SpawnAsChild /* 004C4 80969F94 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 004C8 80969F98 8FA4003C */ lw $a0, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s index a39cd46fbd..28b4e8d122 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s @@ -25,7 +25,7 @@ glabel func_8096B4A8 /* 01A34 8096B504 AFA00024 */ sw $zero, 0x0024($sp) /* 01A38 8096B508 AFA00020 */ sw $zero, 0x0020($sp) /* 01A3C 8096B50C AFA0001C */ sw $zero, 0x001C($sp) -/* 01A40 8096B510 0C00C916 */ jal Actor_SpawnAttached +/* 01A40 8096B510 0C00C916 */ jal Actor_SpawnAsChild /* 01A44 8096B514 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01A48 8096B518 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s index 1e713b7e28..8f6fc864e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s @@ -463,7 +463,7 @@ glabel L809715E0 /* 00700 80971650 AFA00024 */ sw $zero, 0x0024($sp) /* 00704 80971654 AFA00020 */ sw $zero, 0x0020($sp) /* 00708 80971658 AFA0001C */ sw $zero, 0x001C($sp) -/* 0070C 8097165C 0C00C916 */ jal Actor_SpawnAttached +/* 0070C 8097165C 0C00C916 */ jal Actor_SpawnAsChild /* 00710 80971660 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00714 80971664 10400005 */ beq $v0, $zero, .L8097167C @@ -488,7 +488,7 @@ glabel L809715E0 /* 00758 809716A8 AFA00020 */ sw $zero, 0x0020($sp) /* 0075C 809716AC AFA0001C */ sw $zero, 0x001C($sp) /* 00760 809716B0 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 00764 809716B4 0C00C916 */ jal Actor_SpawnAttached +/* 00764 809716B4 0C00C916 */ jal Actor_SpawnAsChild /* 00768 809716B8 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0076C 809716BC 10400085 */ beq $v0, $zero, .L809718D4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s index 84bf3f4b9f..22fd530dd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s @@ -38,7 +38,7 @@ glabel func_80972EA8 /* 01FE8 80972F38 AFA00024 */ sw $zero, 0x0024($sp) /* 01FEC 80972F3C AFA00020 */ sw $zero, 0x0020($sp) /* 01FF0 80972F40 AFA0001C */ sw $zero, 0x001C($sp) -/* 01FF4 80972F44 0C00C916 */ jal Actor_SpawnAttached +/* 01FF4 80972F44 0C00C916 */ jal Actor_SpawnAsChild /* 01FF8 80972F48 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01FFC 80972F4C 10400007 */ beq $v0, $zero, .L80972F6C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s index c90d196369..4fa42fab12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s @@ -49,7 +49,7 @@ glabel func_8097322C /* 02378 809732C8 AFA00024 */ sw $zero, 0x0024($sp) /* 0237C 809732CC AFA00020 */ sw $zero, 0x0020($sp) /* 02380 809732D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 02384 809732D4 0C00C916 */ jal Actor_SpawnAttached +/* 02384 809732D4 0C00C916 */ jal Actor_SpawnAsChild /* 02388 809732D8 E7B00018 */ swc1 $f16, 0x0018($sp) /* 0238C 809732DC 10400008 */ beq $v0, $zero, .L80973300 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s index 1b229ccfd4..4a3b994e04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789A4.s @@ -3,7 +3,7 @@ glabel func_809789A4 /* 00078 809789A8 AFA40018 */ sw $a0, 0x0018($sp) /* 0007C 809789AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00080 809789B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00084 809789B4 0C00CD90 */ jal func_80033640 +/* 00084 809789B4 0C00CD90 */ jal Actor_GetCollidedExplosive /* 00088 809789B8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 0008C 809789BC 10400003 */ beq $v0, $zero, .L809789CC /* 00090 809789C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s index e5a70147cd..589683b8ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s @@ -233,7 +233,7 @@ glabel L809890DC /* 002BC 8098913C AFA00024 */ sw $zero, 0x0024($sp) /* 002C0 80989140 AFA00020 */ sw $zero, 0x0020($sp) /* 002C4 80989144 AFA0001C */ sw $zero, 0x001C($sp) -/* 002C8 80989148 0C00C916 */ jal Actor_SpawnAttached +/* 002C8 80989148 0C00C916 */ jal Actor_SpawnAsChild /* 002CC 8098914C E7A80018 */ swc1 $f8, 0x0018($sp) /* 002D0 80989150 1000003D */ beq $zero, $zero, .L80989248 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s index 07bcce855d..c6d6ee87a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s @@ -58,7 +58,7 @@ glabel func_80995A84 .L80995B58: /* 00F08 80995B58 8FA40044 */ lw $a0, 0x0044($sp) /* 00F0C 80995B5C 26050220 */ addiu $a1, $s0, 0x0220 ## $a1 = 00000220 -/* 00F10 80995B60 0C00CD90 */ jal func_80033640 +/* 00F10 80995B60 0C00CD90 */ jal Actor_GetCollidedExplosive /* 00F14 80995B64 AFA7003C */ sw $a3, 0x003C($sp) /* 00F18 80995B68 1040000E */ beq $v0, $zero, .L80995BA4 /* 00F1C 80995B6C 8FA7003C */ lw $a3, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s index 3a6d3626de..fa7b1b788a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s @@ -61,7 +61,7 @@ glabel EnArrow_Update /* 00E64 809B4784 AFA00024 */ sw $zero, 0x0024($sp) /* 00E68 809B4788 AFA00020 */ sw $zero, 0x0020($sp) /* 00E6C 809B478C AFA0001C */ sw $zero, 0x001C($sp) -/* 00E70 809B4790 0C00C916 */ jal Actor_SpawnAttached +/* 00E70 809B4790 0C00C916 */ jal Actor_SpawnAsChild /* 00E74 809B4794 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00E78 809B4798 10000015 */ beq $zero, $zero, .L809B47F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s index d3d4ba86b5..33fdedfa0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9B64.s @@ -199,7 +199,7 @@ glabel func_809B9B64 /* 01B34 809B9E14 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 01B38 809B9E18 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC /* 01B3C 809B9E1C A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -/* 01B40 809B9E20 0C00CD90 */ jal func_80033640 +/* 01B40 809B9E20 0C00CD90 */ jal Actor_GetCollidedExplosive /* 01B44 809B9E24 8FA4005C */ lw $a0, 0x005C($sp) /* 01B48 809B9E28 10400003 */ beq $v0, $zero, .L809B9E38 /* 01B4C 809B9E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index 82e842348e..088b6838cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -349,7 +349,7 @@ glabel func_809BA628 /* 027E0 809BAAC0 460A3480 */ add.s $f18, $f6, $f10 /* 027E4 809BAAC4 46128100 */ add.s $f4, $f16, $f18 /* 027E8 809BAAC8 E6040274 */ swc1 $f4, 0x0274($s0) ## 00000274 -/* 027EC 809BAACC 0C00CD90 */ jal func_80033640 +/* 027EC 809BAACC 0C00CD90 */ jal Actor_GetCollidedExplosive /* 027F0 809BAAD0 8FA40074 */ lw $a0, 0x0074($sp) /* 027F4 809BAAD4 54400008 */ bnel $v0, $zero, .L809BAAF8 /* 027F8 809BAAD8 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s index a4d38f52aa..48dd2aeb68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C441C.s @@ -107,7 +107,7 @@ glabel L809C44C8 /* 00F40 809C4570 E7B20014 */ swc1 $f18, 0x0014($sp) /* 00F44 809C4574 AFA00024 */ sw $zero, 0x0024($sp) /* 00F48 809C4578 AFA0001C */ sw $zero, 0x001C($sp) -/* 00F4C 809C457C 0C00C916 */ jal Actor_SpawnAttached +/* 00F4C 809C457C 0C00C916 */ jal Actor_SpawnAsChild /* 00F50 809C4580 AFAF0020 */ sw $t7, 0x0020($sp) /* 00F54 809C4584 86190232 */ lh $t9, 0x0232($s0) ## 00000232 @@ -128,7 +128,7 @@ glabel L809C44C8 /* 00F90 809C45C0 AFA00028 */ sw $zero, 0x0028($sp) /* 00F94 809C45C4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00F98 809C45C8 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00F9C 809C45CC 0C00C916 */ jal Actor_SpawnAttached +/* 00F9C 809C45CC 0C00C916 */ jal Actor_SpawnAsChild /* 00FA0 809C45D0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00FA4 809C45D4 10400007 */ beq $v0, $zero, .L809C45F4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s index 26b00b7ce6..2d628ce870 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C5360.s @@ -23,7 +23,7 @@ glabel func_809C5360 /* 00574 809C53B4 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 /* 00578 809C53B8 E7B00018 */ swc1 $f16, 0x0018($sp) /* 0057C 809C53BC 860F015A */ lh $t7, 0x015A($s0) ## 0000015A -/* 00580 809C53C0 0C00C916 */ jal Actor_SpawnAttached +/* 00580 809C53C0 0C00C916 */ jal Actor_SpawnAsChild /* 00584 809C53C4 AFAF0028 */ sw $t7, 0x0028($sp) /* 00588 809C53C8 10400004 */ beq $v0, $zero, .L809C53DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s index 6fa8da6395..a48ed1d021 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Pit/func_809C55B0.s @@ -2,7 +2,7 @@ glabel func_809C55B0 /* 00770 809C55B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00774 809C55B4 AFBF001C */ sw $ra, 0x001C($sp) /* 00778 809C55B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0077C 809C55BC 0C00BD04 */ jal func_8002F410 +/* 0077C 809C55BC 0C00BD04 */ jal Actor_HasParent /* 00780 809C55C0 AFA40020 */ sw $a0, 0x0020($sp) /* 00784 809C55C4 10400005 */ beq $v0, $zero, .L809C55DC /* 00788 809C55C8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s index ca975cfd98..5b36393f29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5DDC.s @@ -22,7 +22,7 @@ glabel func_809C5DDC /* 005F8 809C5E28 10000042 */ beq $zero, $zero, .L809C5F34 /* 005FC 809C5E2C 8FBF002C */ lw $ra, 0x002C($sp) .L809C5E30: -/* 00600 809C5E30 0C00BD68 */ jal func_8002F5A0 +/* 00600 809C5E30 0C00BD68 */ jal Actor_HasNoParent /* 00604 809C5E34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00608 809C5E38 1040003D */ beq $v0, $zero, .L809C5F30 /* 0060C 809C5E3C 8FB80034 */ lw $t8, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s index cd51422336..2b82619dd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s @@ -81,7 +81,7 @@ glabel func_809C9B28 /* 00E7C 809C9C3C AFAD0020 */ sw $t5, 0x0020($sp) /* 00E80 809C9C40 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 /* 00E84 809C9C44 AFAF0028 */ sw $t7, 0x0028($sp) -/* 00E88 809C9C48 0C00C916 */ jal Actor_SpawnAttached +/* 00E88 809C9C48 0C00C916 */ jal Actor_SpawnAsChild /* 00E8C 809C9C4C AFAE0024 */ sw $t6, 0x0024($sp) /* 00E90 809C9C50 0C03D719 */ jal func_800F5C64 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s index 2fe49f18bd..6545904ee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Changer/EnChanger_Init.s @@ -179,7 +179,7 @@ glabel EnChanger_Init /* 0016C 809D27FC AFA0001C */ sw $zero, 0x001C($sp) /* 00170 809D2800 AFA00024 */ sw $zero, 0x0024($sp) /* 00174 809D2804 A7A30068 */ sh $v1, 0x0068($sp) -/* 00178 809D2808 0C00C916 */ jal Actor_SpawnAttached +/* 00178 809D2808 0C00C916 */ jal Actor_SpawnAsChild /* 0017C 809D280C E7A40018 */ swc1 $f4, 0x0018($sp) /* 00180 809D2810 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -344,7 +344,7 @@ glabel EnChanger_Init /* 003D4 809D2A64 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 003D8 809D2A68 E7B00014 */ swc1 $f16, 0x0014($sp) /* 003DC 809D2A6C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 003E0 809D2A70 0C00C916 */ jal Actor_SpawnAttached +/* 003E0 809D2A70 0C00C916 */ jal Actor_SpawnAsChild /* 003E4 809D2A74 AFB90028 */ sw $t9, 0x0028($sp) /* 003E8 809D2A78 10400036 */ beq $v0, $zero, .L809D2B54 @@ -434,7 +434,7 @@ glabel EnChanger_Init /* 00510 809D2BA0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00514 809D2BA4 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00518 809D2BA8 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0051C 809D2BAC 0C00C916 */ jal Actor_SpawnAttached +/* 0051C 809D2BAC 0C00C916 */ jal Actor_SpawnAsChild /* 00520 809D2BB0 AFAE0028 */ sw $t6, 0x0028($sp) /* 00524 809D2BB4 10400038 */ beq $v0, $zero, .L809D2C98 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s index a7cc148a6e..855545b247 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E80D8.s @@ -8,7 +8,7 @@ glabel func_809E80D8 /* 02920 809E80F0 A48E01C6 */ sh $t6, 0x01C6($a0) ## 000001C6 .L809E80F4: /* 02924 809E80F4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02928 809E80F8 0C00BD04 */ jal func_8002F410 +/* 02928 809E80F8 0C00BD04 */ jal Actor_HasParent /* 0292C 809E80FC AFA40018 */ sw $a0, 0x0018($sp) /* 02930 809E8100 14400005 */ bne $v0, $zero, .L809E8118 /* 02934 809E8104 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s index e6b234ebd3..2f5456432e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s @@ -90,7 +90,7 @@ glabel EnDekunuts_Init /* 00140 809E96A0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 00144 809E96A4 AFB90028 */ sw $t9, 0x0028($sp) /* 00148 809E96A8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0014C 809E96AC 0C00C916 */ jal Actor_SpawnAttached +/* 0014C 809E96AC 0C00C916 */ jal Actor_SpawnAsChild /* 00150 809E96B0 AFB80020 */ sw $t8, 0x0020($sp) .L809E96B4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s index c592595bd9..2ec3b3cd6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB110.s @@ -22,7 +22,7 @@ glabel func_809EB110 /* 00404 809EB144 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 /* 00408 809EB148 8FA40034 */ lw $a0, 0x0034($sp) .L809EB14C: -/* 0040C 809EB14C 0C00CD90 */ jal func_80033640 +/* 0040C 809EB14C 0C00CD90 */ jal Actor_GetCollidedExplosive /* 00410 809EB150 26050260 */ addiu $a1, $s0, 0x0260 ## $a1 = 00000260 /* 00414 809EB154 10400002 */ beq $v0, $zero, .L809EB160 /* 00418 809EB158 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s index f9259215bc..7de55bb30d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s @@ -68,7 +68,7 @@ glabel func_809ED9E0 /* 00254 809EDAC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00258 809EDAC8 24070131 */ addiu $a3, $zero, 0x0131 ## $a3 = 00000131 /* 0025C 809EDACC AFA90024 */ sw $t1, 0x0024($sp) -/* 00260 809EDAD0 0C00C916 */ jal Actor_SpawnAttached +/* 00260 809EDAD0 0C00C916 */ jal Actor_SpawnAsChild /* 00264 809EDAD4 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00268 809EDAD8 10400006 */ beq $v0, $zero, .L809EDAF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s index 9c4b067469..b56ffd5561 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s @@ -7,7 +7,7 @@ glabel func_809EEA90 /* 01234 809EEAA4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01238 809EEAA8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0123C 809EEAAC 0C00BD04 */ jal func_8002F410 +/* 0123C 809EEAAC 0C00BD04 */ jal Actor_HasParent /* 01240 809EEAB0 8FA50024 */ lw $a1, 0x0024($sp) /* 01244 809EEAB4 10400005 */ beq $v0, $zero, .L809EEACC /* 01248 809EEAB8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s index 5fc574af0c..4517f16b45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EFF50.s @@ -2,7 +2,7 @@ glabel func_809EFF50 /* 00C00 809EFF50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00C04 809EFF54 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C08 809EFF58 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C0C 809EFF5C 0C00BD04 */ jal func_8002F410 +/* 00C0C 809EFF5C 0C00BD04 */ jal Actor_HasParent /* 00C10 809EFF60 AFA40018 */ sw $a0, 0x0018($sp) /* 00C14 809EFF64 10400006 */ beq $v0, $zero, .L809EFF80 /* 00C18 809EFF68 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s index 1e94e88089..85650ab719 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s @@ -76,7 +76,7 @@ glabel EnDntDemo_Init /* 000C8 809F09A8 AFA00024 */ sw $zero, 0x0024($sp) /* 000CC 809F09AC AFA00020 */ sw $zero, 0x0020($sp) /* 000D0 809F09B0 AFA0001C */ sw $zero, 0x001C($sp) -/* 000D4 809F09B4 0C00C916 */ jal Actor_SpawnAttached +/* 000D4 809F09B4 0C00C916 */ jal Actor_SpawnAsChild /* 000D8 809F09B8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 000DC 809F09BC 10400004 */ beq $v0, $zero, .L809F09D0 @@ -111,7 +111,7 @@ glabel EnDntDemo_Init /* 00148 809F0A28 240701A2 */ addiu $a3, $zero, 0x01A2 ## $a3 = 000001A2 /* 0014C 809F0A2C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00150 809F0A30 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00154 809F0A34 0C00C916 */ jal Actor_SpawnAttached +/* 00154 809F0A34 0C00C916 */ jal Actor_SpawnAsChild /* 00158 809F0A38 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 0015C 809F0A3C 10400005 */ beq $v0, $zero, .L809F0A54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s index 18bc4ad840..feb8e6e1d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s @@ -8,7 +8,7 @@ glabel func_809F26B0 /* 00BE8 809F26C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00BEC 809F26CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BF0 809F26D0 0C00BD04 */ jal func_8002F410 +/* 00BF0 809F26D0 0C00BD04 */ jal Actor_HasParent /* 00BF4 809F26D4 8FA5002C */ lw $a1, 0x002C($sp) /* 00BF8 809F26D8 10400005 */ beq $v0, $zero, .L809F26F0 /* 00BFC 809F26DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s index cac9e9d353..ac8b556024 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s @@ -36,7 +36,7 @@ glabel func_809F3F6C /* 00D30 809F3FF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D34 809F3FF4 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 /* 00D38 809F3FF8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00D3C 809F3FFC 0C00C916 */ jal Actor_SpawnAttached +/* 00D3C 809F3FFC 0C00C916 */ jal Actor_SpawnAsChild /* 00D40 809F4000 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 00D44 809F4004 14400006 */ bne $v0, $zero, .L809F4020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s index ef9c665766..7f9a6c06d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Init.s @@ -125,7 +125,7 @@ glabel EnDoor_Init /* 001B8 809FC388 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 001BC 809FC38C 2401FFBF */ addiu $at, $zero, 0xFFBF ## $at = FFFFFFBF /* 001C0 809FC390 01215024 */ and $t2, $t1, $at -/* 001C4 809FC394 0C00C916 */ jal Actor_SpawnAttached +/* 001C4 809FC394 0C00C916 */ jal Actor_SpawnAsChild /* 001C8 809FC398 AFAA0028 */ sw $t2, 0x0028($sp) /* 001CC 809FC39C 10400002 */ beq $v0, $zero, .L809FC3A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s index b880423608..258c6ea77d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s @@ -2,7 +2,7 @@ glabel func_809FEC70 /* 01040 809FEC70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01044 809FEC74 AFBF001C */ sw $ra, 0x001C($sp) /* 01048 809FEC78 AFA50024 */ sw $a1, 0x0024($sp) -/* 0104C 809FEC7C 0C00BD04 */ jal func_8002F410 +/* 0104C 809FEC7C 0C00BD04 */ jal Actor_HasParent /* 01050 809FEC80 AFA40020 */ sw $a0, 0x0020($sp) /* 01054 809FEC84 10400007 */ beq $v0, $zero, .L809FECA4 /* 01058 809FEC88 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s index 15775d1074..cc01a18802 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s @@ -68,7 +68,7 @@ glabel EnEiyer_Init /* 000F4 80A00094 AFA90028 */ sw $t1, 0x0028($sp) /* 000F8 80A00098 AFA00024 */ sw $zero, 0x0024($sp) /* 000FC 80A0009C 27284000 */ addiu $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 00100 80A000A0 0C00C916 */ jal Actor_SpawnAttached +/* 00100 80A000A0 0C00C916 */ jal Actor_SpawnAsChild /* 00104 80A000A4 AFA80020 */ sw $t0, 0x0020($sp) /* 00108 80A000A8 54400006 */ bnel $v0, $zero, .L80A000C4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s index f0fd0677e4..cdf226477e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s @@ -74,7 +74,7 @@ glabel func_80A0329C /* 01748 80A03378 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 0174C 80A0337C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A03380: -/* 01750 80A03380 0C00BD04 */ jal func_8002F410 +/* 01750 80A03380 0C00BD04 */ jal Actor_HasParent /* 01754 80A03384 8FA5003C */ lw $a1, 0x003C($sp) /* 01758 80A03388 10400005 */ beq $v0, $zero, .L80A033A0 /* 0175C 80A0338C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s index 96bfb19f68..80c191cd6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A0693C.s @@ -176,7 +176,7 @@ glabel func_80A0693C /* 00454 80A06B74 AFA00024 */ sw $zero, 0x0024($sp) /* 00458 80A06B78 AFB20028 */ sw $s2, 0x0028($sp) /* 0045C 80A06B7C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00460 80A06B80 0C00C916 */ jal Actor_SpawnAttached +/* 00460 80A06B80 0C00C916 */ jal Actor_SpawnAsChild /* 00464 80A06B84 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00468 80A06B88 10400030 */ beq $v0, $zero, .L80A06C4C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s index 286cbaae4e..d16bb6a1b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06CD0.s @@ -103,7 +103,7 @@ glabel func_80A06CD0 /* 006FC 80A06E1C AFAF0028 */ sw $t7, 0x0028($sp) /* 00700 80A06E20 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00704 80A06E24 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00708 80A06E28 0C00C916 */ jal Actor_SpawnAttached +/* 00708 80A06E28 0C00C916 */ jal Actor_SpawnAsChild /* 0070C 80A06E2C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00710 80A06E30 10400008 */ beq $v0, $zero, .L80A06E54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s index 8cc7296a6c..8f37d7b519 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s @@ -270,7 +270,7 @@ glabel func_80A06E88 /* 00B00 80A07220 AFA80028 */ sw $t0, 0x0028($sp) /* 00B04 80A07224 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00B08 80A07228 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00B0C 80A0722C 0C00C916 */ jal Actor_SpawnAttached +/* 00B0C 80A0722C 0C00C916 */ jal Actor_SpawnAsChild /* 00B10 80A07230 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00B14 80A07234 10400013 */ beq $v0, $zero, .L80A07284 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s index bed115395b..1384a3d02e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07CA4.s @@ -430,7 +430,7 @@ glabel func_80A07CA4 /* 0089C 80A0822C E7A80010 */ swc1 $f8, 0x0010($sp) /* 008A0 80A08230 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 008A4 80A08234 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 008A8 80A08238 0C00C916 */ jal Actor_SpawnAttached +/* 008A8 80A08238 0C00C916 */ jal Actor_SpawnAsChild /* 008AC 80A0823C AFB90028 */ sw $t9, 0x0028($sp) /* 008B0 80A08240 10400006 */ beq $v0, $zero, .L80A0825C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s index 59823f4003..ca39b4bc25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09978.s @@ -2,7 +2,7 @@ glabel func_80A09978 /* 00AD8 80A09978 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00ADC 80A0997C AFBF001C */ sw $ra, 0x001C($sp) /* 00AE0 80A09980 AFA50024 */ sw $a1, 0x0024($sp) -/* 00AE4 80A09984 0C00BD04 */ jal func_8002F410 +/* 00AE4 80A09984 0C00BD04 */ jal Actor_HasParent /* 00AE8 80A09988 AFA40020 */ sw $a0, 0x0020($sp) /* 00AEC 80A0998C 10400005 */ beq $v0, $zero, .L80A099A4 /* 00AF0 80A09990 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s index cd8a179143..7949a51334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B6C0.s @@ -25,7 +25,7 @@ glabel func_80A0B6C0 /* 00058 80A0B718 AFAF0020 */ sw $t7, 0x0020($sp) /* 0005C 80A0B71C 861804BA */ lh $t8, 0x04BA($s0) ## 000004BA /* 00060 80A0B720 AFA60044 */ sw $a2, 0x0044($sp) -/* 00064 80A0B724 0C00C916 */ jal Actor_SpawnAttached +/* 00064 80A0B724 0C00C916 */ jal Actor_SpawnAsChild /* 00068 80A0B728 AFB80028 */ sw $t8, 0x0028($sp) /* 0006C 80A0B72C 54400004 */ bnel $v0, $zero, .L80A0B740 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s index 609a6f864a..4675a8781b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0B7B8.s @@ -60,7 +60,7 @@ glabel func_80A0B7B8 /* 001C8 80A0B888 03281021 */ addu $v0, $t9, $t0 /* 001CC 80A0B88C 00021400 */ sll $v0, $v0, 16 /* 001D0 80A0B890 00021403 */ sra $v0, $v0, 16 -/* 001D4 80A0B894 0C00C916 */ jal Actor_SpawnAttached +/* 001D4 80A0B894 0C00C916 */ jal Actor_SpawnAsChild /* 001D8 80A0B898 AFA20020 */ sw $v0, 0x0020($sp) /* 001DC 80A0B89C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index 6e32d224d7..9352c73724 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -863,7 +863,7 @@ glabel func_80A10220 /* 01B80 80A10DE0 AFA00024 */ sw $zero, 0x0024($sp) /* 01B84 80A10DE4 AFA00020 */ sw $zero, 0x0020($sp) /* 01B88 80A10DE8 AFAD001C */ sw $t5, 0x001C($sp) -/* 01B8C 80A10DEC 0C00C916 */ jal Actor_SpawnAttached +/* 01B8C 80A10DEC 0C00C916 */ jal Actor_SpawnAsChild /* 01B90 80A10DF0 E7A40018 */ swc1 $f4, 0x0018($sp) /* 01B94 80A10DF4 8FA20050 */ lw $v0, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s index 48f961eeb1..a7d99ee3c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s @@ -78,7 +78,7 @@ glabel func_80A16C68 /* 01AE4 80A16D64 00000000 */ nop /* 01AE8 80A16D68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AEC 80A16D6C 0C00BD04 */ jal func_8002F410 +/* 01AEC 80A16D6C 0C00BD04 */ jal Actor_HasParent /* 01AF0 80A16D70 8FA5002C */ lw $a1, 0x002C($sp) /* 01AF4 80A16D74 1040000D */ beq $v0, $zero, .L80A16DAC /* 01AF8 80A16D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s index 5899c41184..413a9647bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s @@ -2,7 +2,7 @@ glabel func_80A1CAAC /* 0210C 80A1CAAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02110 80A1CAB0 AFBF001C */ sw $ra, 0x001C($sp) /* 02114 80A1CAB4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02118 80A1CAB8 0C00BD04 */ jal func_8002F410 +/* 02118 80A1CAB8 0C00BD04 */ jal Actor_HasParent /* 0211C 80A1CABC AFA40020 */ sw $a0, 0x0020($sp) /* 02120 80A1CAC0 10400006 */ beq $v0, $zero, .L80A1CADC /* 02124 80A1CAC4 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s index dff1092742..543874e860 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FBB0.s @@ -2,7 +2,7 @@ glabel func_80A2FBB0 /* 00A30 80A2FBB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00A34 80A2FBB4 AFBF001C */ sw $ra, 0x001C($sp) /* 00A38 80A2FBB8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A3C 80A2FBBC 0C00BD04 */ jal func_8002F410 +/* 00A3C 80A2FBBC 0C00BD04 */ jal Actor_HasParent /* 00A40 80A2FBC0 AFA40020 */ sw $a0, 0x0020($sp) /* 00A44 80A2FBC4 10400006 */ beq $v0, $zero, .L80A2FBE0 /* 00A48 80A2FBC8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s index 381eb60892..cc7f329ffc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3196C.s @@ -2,7 +2,7 @@ glabel func_80A3196C /* 00FFC 80A3196C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01000 80A31970 AFBF001C */ sw $ra, 0x001C($sp) /* 01004 80A31974 AFA5002C */ sw $a1, 0x002C($sp) -/* 01008 80A31978 0C00BD04 */ jal func_8002F410 +/* 01008 80A31978 0C00BD04 */ jal Actor_HasParent /* 0100C 80A3197C AFA40028 */ sw $a0, 0x0028($sp) /* 01010 80A31980 10400013 */ beq $v0, $zero, .L80A319D0 /* 01014 80A31984 8FA40028 */ lw $a0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s index dc9bc01128..55ae1af1b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33A0C.s @@ -2,7 +2,7 @@ glabel func_80A33A0C /* 00E3C 80A33A0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00E40 80A33A10 AFBF001C */ sw $ra, 0x001C($sp) /* 00E44 80A33A14 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E48 80A33A18 0C00BD04 */ jal func_8002F410 +/* 00E48 80A33A18 0C00BD04 */ jal Actor_HasParent /* 00E4C 80A33A1C AFA40020 */ sw $a0, 0x0020($sp) /* 00E50 80A33A20 10400006 */ beq $v0, $zero, .L80A33A3C /* 00E54 80A33A24 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s index a6a1c8a2ef..3f129b841a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s @@ -2,7 +2,7 @@ glabel func_80A34AA0 /* 00480 80A34AA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00484 80A34AA4 AFBF001C */ sw $ra, 0x001C($sp) /* 00488 80A34AA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0048C 80A34AAC 0C00BD04 */ jal func_8002F410 +/* 0048C 80A34AAC 0C00BD04 */ jal Actor_HasParent /* 00490 80A34AB0 AFA40020 */ sw $a0, 0x0020($sp) /* 00494 80A34AB4 10400006 */ beq $v0, $zero, .L80A34AD0 /* 00498 80A34AB8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s index bdc9f93d33..ae2d49dce8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DF00.s @@ -2,7 +2,7 @@ glabel func_80A3DF00 /* 00820 80A3DF00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00824 80A3DF04 AFBF001C */ sw $ra, 0x001C($sp) /* 00828 80A3DF08 AFA50024 */ sw $a1, 0x0024($sp) -/* 0082C 80A3DF0C 0C00BD04 */ jal func_8002F410 +/* 0082C 80A3DF0C 0C00BD04 */ jal Actor_HasParent /* 00830 80A3DF10 AFA40020 */ sw $a0, 0x0020($sp) /* 00834 80A3DF14 10400006 */ beq $v0, $zero, .L80A3DF30 /* 00838 80A3DF18 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s index abbd9087a4..a44f37a0f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s @@ -2,7 +2,7 @@ glabel func_80A40B74 /* 02604 80A40B74 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 02608 80A40B78 AFBF001C */ sw $ra, 0x001C($sp) /* 0260C 80A40B7C AFA50034 */ sw $a1, 0x0034($sp) -/* 02610 80A40B80 0C00BD04 */ jal func_8002F410 +/* 02610 80A40B80 0C00BD04 */ jal Actor_HasParent /* 02614 80A40B84 AFA40030 */ sw $a0, 0x0030($sp) /* 02618 80A40B88 10400009 */ beq $v0, $zero, .L80A40BB0 /* 0261C 80A40B8C 8FA40030 */ lw $a0, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s index 0fef056273..f29bea3ea0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s @@ -2,7 +2,7 @@ glabel func_80A470E8 /* 043B8 80A470E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 043BC 80A470EC AFBF001C */ sw $ra, 0x001C($sp) /* 043C0 80A470F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 043C4 80A470F4 0C00BD04 */ jal func_8002F410 +/* 043C4 80A470F4 0C00BD04 */ jal Actor_HasParent /* 043C8 80A470F8 AFA40020 */ sw $a0, 0x0020($sp) /* 043CC 80A470FC 10400006 */ beq $v0, $zero, .L80A47118 /* 043D0 80A47100 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s index 3affb6e61f..5bc5fb23dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4B3F0.s @@ -81,7 +81,7 @@ glabel func_80A4B3F0 /* 02634 80A4B4F4 4612C100 */ add.s $f4, $f24, $f18 /* 02638 80A4B4F8 AFA0001C */ sw $zero, 0x001C($sp) /* 0263C 80A4B4FC AFB80020 */ sw $t8, 0x0020($sp) -/* 02640 80A4B500 0C00C916 */ jal Actor_SpawnAttached +/* 02640 80A4B500 0C00C916 */ jal Actor_SpawnAsChild /* 02644 80A4B504 E7A40018 */ swc1 $f4, 0x0018($sp) /* 02648 80A4B508 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s index 2a04e98e14..00f38c9ed4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5A208.s @@ -46,7 +46,7 @@ glabel func_80A5A208 /* 00680 80A5A2B0 AFA80020 */ sw $t0, 0x0020($sp) /* 00684 80A5A2B4 86090018 */ lh $t1, 0x0018($s0) ## 00000018 /* 00688 80A5A2B8 AFAA0028 */ sw $t2, 0x0028($sp) -/* 0068C 80A5A2BC 0C00C916 */ jal Actor_SpawnAttached +/* 0068C 80A5A2BC 0C00C916 */ jal Actor_SpawnAsChild /* 00690 80A5A2C0 AFA90024 */ sw $t1, 0x0024($sp) /* 00694 80A5A2C4 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s index 34ca8650f2..1dceba0c1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s @@ -27,7 +27,7 @@ glabel func_80A6304C /* 07DB8 80A630A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07DBC 80A630AC 5520000E */ bnel $t1, $zero, .L80A630E8 /* 07DC0 80A630B0 8E0A020C */ lw $t2, 0x020C($s0) ## 0000020C -/* 07DC4 80A630B4 0C00BD86 */ jal func_8002F618 +/* 07DC4 80A630B4 0C00BD86 */ jal Actor_HasChild /* 07DC8 80A630B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 07DCC 80A630BC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 07DD0 80A630C0 14430008 */ bne $v0, $v1, .L80A630E4 @@ -46,7 +46,7 @@ glabel func_80A6304C /* 07DFC 80A630EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07E00 80A630F0 546A0011 */ bnel $v1, $t2, .L80A63138 /* 07E04 80A630F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 07E08 80A630F8 0C00BD9D */ jal func_8002F674 +/* 07E08 80A630F8 0C00BD9D */ jal Actor_HasNoChild /* 07E0C 80A630FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 07E10 80A63100 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 07E14 80A63104 1443000B */ bne $v0, $v1, .L80A63134 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s index 7d9e383d08..06fe4ce838 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s @@ -3,7 +3,7 @@ glabel func_80A6E740 /* 003A4 80A6E744 AFBF0024 */ sw $ra, 0x0024($sp) /* 003A8 80A6E748 AFB00020 */ sw $s0, 0x0020($sp) /* 003AC 80A6E74C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003B0 80A6E750 0C00BD04 */ jal func_8002F410 +/* 003B0 80A6E750 0C00BD04 */ jal Actor_HasParent /* 003B4 80A6E754 AFA5002C */ sw $a1, 0x002C($sp) /* 003B8 80A6E758 10400008 */ beq $v0, $zero, .L80A6E77C /* 003BC 80A6E75C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s index 62e870b4e3..d09f432908 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A714C4.s @@ -2,7 +2,7 @@ glabel func_80A714C4 /* 01F14 80A714C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01F18 80A714C8 AFBF001C */ sw $ra, 0x001C($sp) /* 01F1C 80A714CC AFA50024 */ sw $a1, 0x0024($sp) -/* 01F20 80A714D0 0C00BD04 */ jal func_8002F410 +/* 01F20 80A714D0 0C00BD04 */ jal Actor_HasParent /* 01F24 80A714D4 AFA40020 */ sw $a0, 0x0020($sp) /* 01F28 80A714D8 10400005 */ beq $v0, $zero, .L80A714F0 /* 01F2C 80A714DC 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s index ccdb2241e9..038f30e311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s @@ -4,7 +4,7 @@ glabel func_80A734F8 /* 00510 80A73500 AFB10020 */ sw $s1, 0x0020($sp) /* 00514 80A73504 AFB0001C */ sw $s0, 0x001C($sp) /* 00518 80A73508 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0051C 80A7350C 0C00BD04 */ jal func_8002F410 +/* 0051C 80A7350C 0C00BD04 */ jal Actor_HasParent /* 00520 80A73510 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00524 80A73514 10400003 */ beq $v0, $zero, .L80A73524 /* 00528 80A73518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s index 825fdc49ea..4a340b8a59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s @@ -7,7 +7,7 @@ glabel func_80A7F0A8 /* 00C5C 80A7F0BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00C60 80A7F0C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C64 80A7F0C4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00C68 80A7F0C8 0C00BD04 */ jal func_8002F410 +/* 00C68 80A7F0C8 0C00BD04 */ jal Actor_HasParent /* 00C6C 80A7F0CC A7AF0032 */ sh $t7, 0x0032($sp) /* 00C70 80A7F0D0 50400017 */ beql $v0, $zero, .L80A7F130 /* 00C74 80A7F0D4 920B0161 */ lbu $t3, 0x0161($s0) ## 00000161 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s index 5205a9f7a5..c12214bdb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s @@ -3,7 +3,7 @@ glabel func_80A7F31C /* 00EC0 80A7F320 AFBF0024 */ sw $ra, 0x0024($sp) /* 00EC4 80A7F324 AFB00020 */ sw $s0, 0x0020($sp) /* 00EC8 80A7F328 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ECC 80A7F32C 0C00BD68 */ jal func_8002F5A0 +/* 00ECC 80A7F32C 0C00BD68 */ jal Actor_HasNoParent /* 00ED0 80A7F330 AFA5002C */ sw $a1, 0x002C($sp) /* 00ED4 80A7F334 10400027 */ beq $v0, $zero, .L80A7F3D4 /* 00ED8 80A7F338 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index 5c2c172373..c18f300efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -86,7 +86,7 @@ glabel EnJj_Init /* 00144 80A87944 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 00148 80A87948 AFA00028 */ sw $zero, 0x0028($sp) /* 0014C 80A8794C AFA00024 */ sw $zero, 0x0024($sp) -/* 00150 80A87950 0C00C916 */ jal Actor_SpawnAttached +/* 00150 80A87950 0C00C916 */ jal Actor_SpawnAsChild /* 00154 80A87954 AFA90020 */ sw $t1, 0x0020($sp) /* 00158 80A87958 AE020300 */ sw $v0, 0x0300($s0) ## 00000300 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s index 461c8a48ca..440c807330 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87D94.s @@ -60,7 +60,7 @@ glabel func_80A87D94 /* 0065C 80A87E5C AFA00028 */ sw $zero, 0x0028($sp) /* 00660 80A87E60 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00664 80A87E64 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00668 80A87E68 0C00C916 */ jal Actor_SpawnAttached +/* 00668 80A87E68 0C00C916 */ jal Actor_SpawnAsChild /* 0066C 80A87E6C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00670 80A87E70 960B030A */ lhu $t3, 0x030A($s0) ## 0000030A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index e165f0fc4e..07c058d569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -141,7 +141,7 @@ glabel L80A922CC /* 003E8 80A92388 AFAC0020 */ sw $t4, 0x0020($sp) /* 003EC 80A9238C 862D00B8 */ lh $t5, 0x00B8($s1) ## 000000B8 /* 003F0 80A92390 AFAE0028 */ sw $t6, 0x0028($sp) -/* 003F4 80A92394 0C00C916 */ jal Actor_SpawnAttached +/* 003F4 80A92394 0C00C916 */ jal Actor_SpawnAsChild /* 003F8 80A92398 AFAD0024 */ sw $t5, 0x0024($sp) /* 003FC 80A9239C 10400161 */ beq $v0, $zero, .L80A92924 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s index a5397cad35..abe7eb599a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A96048.s @@ -8,7 +8,7 @@ glabel func_80A96048 /* 00D10 80A96060 A48E001C */ sh $t6, 0x001C($a0) ## 0000001C .L80A96064: /* 00D14 80A96064 8FA5001C */ lw $a1, 0x001C($sp) -/* 00D18 80A96068 0C00BD04 */ jal func_8002F410 +/* 00D18 80A96068 0C00BD04 */ jal Actor_HasParent /* 00D1C 80A9606C AFA40018 */ sw $a0, 0x0018($sp) /* 00D20 80A96070 14400005 */ bne $v0, $zero, .L80A96088 /* 00D24 80A96074 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index e785a0736c..2e57355e3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -192,7 +192,7 @@ glabel func_80A99048 /* 0254C 80A992FC AFA0001C */ sw $zero, 0x001C($sp) /* 02550 80A99300 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 02554 80A99304 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 02558 80A99308 0C00C916 */ jal Actor_SpawnAttached +/* 02558 80A99308 0C00C916 */ jal Actor_SpawnAsChild /* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02560 80A99310 860D001C */ lh $t5, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s index b6561d2273..85653111e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99504.s @@ -2,7 +2,7 @@ glabel func_80A99504 /* 02754 80A99504 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02758 80A99508 AFBF001C */ sw $ra, 0x001C($sp) /* 0275C 80A9950C AFA50024 */ sw $a1, 0x0024($sp) -/* 02760 80A99510 0C00BD04 */ jal func_8002F410 +/* 02760 80A99510 0C00BD04 */ jal Actor_HasParent /* 02764 80A99514 AFA40020 */ sw $a0, 0x0020($sp) /* 02768 80A99518 10400006 */ beq $v0, $zero, .L80A99534 /* 0276C 80A9951C 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s index 4da61ea306..dda005b5e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s @@ -4,7 +4,7 @@ glabel func_80A9B8D8 /* 00940 80A9B8E0 AFB10018 */ sw $s1, 0x0018($sp) /* 00944 80A9B8E4 AFB00014 */ sw $s0, 0x0014($sp) /* 00948 80A9B8E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0094C 80A9B8EC 0C00BD04 */ jal func_8002F410 +/* 0094C 80A9B8EC 0C00BD04 */ jal Actor_HasParent /* 00950 80A9B8F0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00954 80A9B8F4 5040000B */ beql $v0, $zero, .L80A9B924 /* 00958 80A9B8F8 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s index 6f7b038b2c..232524d614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BAD8.s @@ -10,7 +10,7 @@ glabel func_80A9BAD8 /* 00B3C 80A9BADC AFBF0024 */ sw $ra, 0x0024($sp) /* 00B40 80A9BAE0 AFB00020 */ sw $s0, 0x0020($sp) /* 00B44 80A9BAE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B48 80A9BAE8 0C00BD68 */ jal func_8002F5A0 +/* 00B48 80A9BAE8 0C00BD68 */ jal Actor_HasNoParent /* 00B4C 80A9BAEC AFA5002C */ sw $a1, 0x002C($sp) /* 00B50 80A9BAF0 1040002A */ beq $v0, $zero, .L80A9BB9C /* 00B54 80A9BAF4 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s index a0b3c172fe..51b049e24f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s @@ -301,7 +301,7 @@ glabel func_80A9F408 /* 00804 80A9F7E4 921901C7 */ lbu $t9, 0x01C7($s0) ## 000001C7 /* 00808 80A9F7E8 AFA3004C */ sw $v1, 0x004C($sp) /* 0080C 80A9F7EC 27290002 */ addiu $t1, $t9, 0x0002 ## $t1 = 00000002 -/* 00810 80A9F7F0 0C00C916 */ jal Actor_SpawnAttached +/* 00810 80A9F7F0 0C00C916 */ jal Actor_SpawnAsChild /* 00814 80A9F7F4 AFA90028 */ sw $t1, 0x0028($sp) /* 00818 80A9F7F8 3C0180AA */ lui $at, %hi(D_80AA04F8) ## $at = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s index a6feda66c6..0b20ac6ac1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s @@ -2,7 +2,7 @@ glabel func_80AACA94 /* 00194 80AACA94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00198 80AACA98 AFBF001C */ sw $ra, 0x001C($sp) /* 0019C 80AACA9C AFA40020 */ sw $a0, 0x0020($sp) -/* 001A0 80AACAA0 0C00BD04 */ jal func_8002F410 +/* 001A0 80AACAA0 0C00BD04 */ jal Actor_HasParent /* 001A4 80AACAA4 AFA50024 */ sw $a1, 0x0024($sp) /* 001A8 80AACAA8 1040000D */ beq $v0, $zero, .L80AACAE0 /* 001AC 80AACAAC 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s index 39339bd681..373d383e71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s @@ -2,7 +2,7 @@ glabel func_80AACFA0 /* 006A0 80AACFA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 006A4 80AACFA4 AFBF001C */ sw $ra, 0x001C($sp) /* 006A8 80AACFA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 006AC 80AACFAC 0C00BD04 */ jal func_8002F410 +/* 006AC 80AACFAC 0C00BD04 */ jal Actor_HasParent /* 006B0 80AACFB0 AFA40020 */ sw $a0, 0x0020($sp) /* 006B4 80AACFB4 1040000B */ beq $v0, $zero, .L80AACFE4 /* 006B8 80AACFB8 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s index 1db7b0ef19..a9751c2ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1578.s @@ -16,7 +16,7 @@ glabel func_80AB1578 /* 00820 80AB15B0 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D /* 00824 80AB15B4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00828 80AB15B8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 0082C 80AB15BC 0C00C916 */ jal Actor_SpawnAttached +/* 0082C 80AB15BC 0C00C916 */ jal Actor_SpawnAsChild /* 00830 80AB15C0 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 00834 80AB15C4 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s index 3cadf080de..ea1447564e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB15D4.s @@ -21,7 +21,7 @@ glabel func_80AB15D4 /* 00890 80AB1620 AFA0001C */ sw $zero, 0x001C($sp) /* 00894 80AB1624 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B /* 00898 80AB1628 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0089C 80AB162C 0C00C916 */ jal Actor_SpawnAttached +/* 0089C 80AB162C 0C00C916 */ jal Actor_SpawnAsChild /* 008A0 80AB1630 E7AC0018 */ swc1 $f12, 0x0018($sp) /* 008A4 80AB1634 8FA4003C */ lw $a0, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s index 6c49e78cd7..11bdad7024 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1A94.s @@ -25,7 +25,7 @@ glabel func_80AB1A94 /* 00D60 80AB1AF0 AFA00024 */ sw $zero, 0x0024($sp) /* 00D64 80AB1AF4 AFA00020 */ sw $zero, 0x0020($sp) /* 00D68 80AB1AF8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00D6C 80AB1AFC 0C00C916 */ jal Actor_SpawnAttached +/* 00D6C 80AB1AFC 0C00C916 */ jal Actor_SpawnAsChild /* 00D70 80AB1B00 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00D74 80AB1B04 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s index 3447462cb1..82b26aaf16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB5FA0.s @@ -84,7 +84,7 @@ glabel func_80AB5FA0 /* 00924 80AB60A4 24070144 */ addiu $a3, $zero, 0x0144 ## $a3 = 00000144 /* 00928 80AB60A8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 0092C 80AB60AC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00930 80AB60B0 0C00C916 */ jal Actor_SpawnAttached +/* 00930 80AB60B0 0C00C916 */ jal Actor_SpawnAsChild /* 00934 80AB60B4 E7A20018 */ swc1 $f2, 0x0018($sp) /* 00938 80AB60B8 10400007 */ beq $v0, $zero, .L80AB60D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s index ccfbe15a17..fc84450505 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6450.s @@ -32,7 +32,7 @@ glabel func_80AB6450 /* 00D48 80AB64C8 E492006C */ swc1 $f18, 0x006C($a0) ## 0000006C /* 00D4C 80AB64CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AB64D0: -/* 00D50 80AB64D0 0C00BD04 */ jal func_8002F410 +/* 00D50 80AB64D0 0C00BD04 */ jal Actor_HasParent /* 00D54 80AB64D4 AFA5002C */ sw $a1, 0x002C($sp) /* 00D58 80AB64D8 10400015 */ beq $v0, $zero, .L80AB6530 /* 00D5C 80AB64DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s index 6fb7a959cd..b9659df94e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s @@ -35,7 +35,7 @@ glabel func_80AB6570 /* 00E34 80AB65B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E38 80AB65B8 8FA50044 */ lw $a1, 0x0044($sp) /* 00E3C 80AB65BC E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00E40 80AB65C0 0C00BD04 */ jal func_8002F410 +/* 00E40 80AB65C0 0C00BD04 */ jal Actor_HasParent /* 00E44 80AB65C4 E7AE0030 */ swc1 $f14, 0x0030($sp) /* 00E48 80AB65C8 C7A20034 */ lwc1 $f2, 0x0034($sp) /* 00E4C 80AB65CC 10400012 */ beq $v0, $zero, .L80AB6618 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s index 5d94531d10..2a7e3698ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6BF8.s @@ -47,7 +47,7 @@ glabel func_80AB6BF8 /* 014F0 80AB6C70 440C4000 */ mfc1 $t4, $f8 /* 014F4 80AB6C74 00000000 */ nop /* 014F8 80AB6C78 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 -/* 014FC 80AB6C7C 0C00BD68 */ jal func_8002F5A0 +/* 014FC 80AB6C7C 0C00BD68 */ jal Actor_HasNoParent /* 01500 80AB6C80 8FA50024 */ lw $a1, 0x0024($sp) /* 01504 80AB6C84 10400018 */ beq $v0, $zero, .L80AB6CE8 /* 01508 80AB6C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s index 64fddcbf2f..98daf50722 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6D08.s @@ -75,7 +75,7 @@ glabel func_80AB6D08 .L80AB6E20: /* 016A0 80AB6E20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AB6E24: -/* 016A4 80AB6E24 0C00BD04 */ jal func_8002F410 +/* 016A4 80AB6E24 0C00BD04 */ jal Actor_HasParent /* 016A8 80AB6E28 8FA50024 */ lw $a1, 0x0024($sp) /* 016AC 80AB6E2C 10400011 */ beq $v0, $zero, .L80AB6E74 /* 016B0 80AB6E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s index 4f40eae18d..052f613b05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s @@ -2,7 +2,7 @@ glabel func_80ABAC00 /* 00FC0 80ABAC00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00FC4 80ABAC04 AFBF001C */ sw $ra, 0x001C($sp) /* 00FC8 80ABAC08 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FCC 80ABAC0C 0C00BD04 */ jal func_8002F410 +/* 00FCC 80ABAC0C 0C00BD04 */ jal Actor_HasParent /* 00FD0 80ABAC10 AFA40020 */ sw $a0, 0x0020($sp) /* 00FD4 80ABAC14 10400005 */ beq $v0, $zero, .L80ABAC2C /* 00FD8 80ABAC18 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s index 65a3578eec..a9725d1b86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s @@ -3,7 +3,7 @@ glabel func_80AC5D40 /* 030A4 80AC5D44 AFBF001C */ sw $ra, 0x001C($sp) /* 030A8 80AC5D48 AFA50024 */ sw $a1, 0x0024($sp) /* 030AC 80AC5D4C AFA60028 */ sw $a2, 0x0028($sp) -/* 030B0 80AC5D50 0C00BD04 */ jal func_8002F410 +/* 030B0 80AC5D50 0C00BD04 */ jal Actor_HasParent /* 030B4 80AC5D54 AFA40020 */ sw $a0, 0x0020($sp) /* 030B8 80AC5D58 10400005 */ beq $v0, $zero, .L80AC5D70 /* 030BC 80AC5D5C 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index c02336cc85..0a596194fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s @@ -64,7 +64,7 @@ glabel func_80AC6B3C /* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) /* 03F90 80AC6C30 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 03F94 80AC6C34 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 03F98 80AC6C38 0C00C916 */ jal Actor_SpawnAttached +/* 03F98 80AC6C38 0C00C916 */ jal Actor_SpawnAsChild /* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) /* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s index 2af3b51d75..2f703c6f90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s @@ -108,7 +108,7 @@ glabel func_80ACF920 /* 005F4 80ACFA94 46080280 */ add.s $f10, $f0, $f8 /* 005F8 80ACFA98 AFA00020 */ sw $zero, 0x0020($sp) /* 005FC 80ACFA9C AFA0001C */ sw $zero, 0x001C($sp) -/* 00600 80ACFAA0 0C00C916 */ jal Actor_SpawnAttached +/* 00600 80ACFAA0 0C00C916 */ jal Actor_SpawnAsChild /* 00604 80ACFAA4 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00608 80ACFAA8 1040000C */ beq $v0, $zero, .L80ACFADC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s index 4b920b9a43..fa43e6bdcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s @@ -80,7 +80,7 @@ glabel func_80ACFEF8 /* 00B60 80AD0000 46080280 */ add.s $f10, $f0, $f8 /* 00B64 80AD0004 AFA00020 */ sw $zero, 0x0020($sp) /* 00B68 80AD0008 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B6C 80AD000C 0C00C916 */ jal Actor_SpawnAttached +/* 00B6C 80AD000C 0C00C916 */ jal Actor_SpawnAsChild /* 00B70 80AD0010 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00B74 80AD0014 1040000D */ beq $v0, $zero, .L80AD004C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s index eda49b8d01..bc9f97766e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s @@ -25,7 +25,7 @@ glabel func_80AE78D4 /* 00680 80AE7930 AFA00024 */ sw $zero, 0x0024($sp) /* 00684 80AE7934 AFA00020 */ sw $zero, 0x0020($sp) /* 00688 80AE7938 AFA0001C */ sw $zero, 0x001C($sp) -/* 0068C 80AE793C 0C00C916 */ jal Actor_SpawnAttached +/* 0068C 80AE793C 0C00C916 */ jal Actor_SpawnAsChild /* 00690 80AE7940 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00694 80AE7944 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index 2b53e4bdbf..d7c3a3c603 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -170,7 +170,7 @@ glabel L80AF637C /* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) /* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) /* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) -/* 00EA4 80AF6404 0C00C916 */ jal Actor_SpawnAttached +/* 00EA4 80AF6404 0C00C916 */ jal Actor_SpawnAsChild /* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s index 7397b6e1cb..139d44bfa0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFE44.s @@ -3,7 +3,7 @@ glabel func_80AFFE44 /* 01B98 80AFFE48 AFBF0024 */ sw $ra, 0x0024($sp) /* 01B9C 80AFFE4C AFB00020 */ sw $s0, 0x0020($sp) /* 01BA0 80AFFE50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BA4 80AFFE54 0C00BD04 */ jal func_8002F410 +/* 01BA4 80AFFE54 0C00BD04 */ jal Actor_HasParent /* 01BA8 80AFFE58 AFA50034 */ sw $a1, 0x0034($sp) /* 01BAC 80AFFE5C 10400005 */ beq $v0, $zero, .L80AFFE74 /* 01BB0 80AFFE60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s index b1cd7eef1c..7cd7c8f54e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B010C4.s @@ -2,7 +2,7 @@ glabel func_80B010C4 /* 02E14 80B010C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 02E18 80B010C8 AFBF001C */ sw $ra, 0x001C($sp) /* 02E1C 80B010CC AFA50024 */ sw $a1, 0x0024($sp) -/* 02E20 80B010D0 0C00BD04 */ jal func_8002F410 +/* 02E20 80B010D0 0C00BD04 */ jal Actor_HasParent /* 02E24 80B010D4 AFA40020 */ sw $a0, 0x0020($sp) /* 02E28 80B010D8 10400006 */ beq $v0, $zero, .L80B010F4 /* 02E2C 80B010DC 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s index c5fb92bf08..28bd5a18fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07C88.s @@ -3,7 +3,7 @@ glabel func_80B07C88 /* 0074C 80B07C8C AFBF001C */ sw $ra, 0x001C($sp) /* 00750 80B07C90 AFB00018 */ sw $s0, 0x0018($sp) /* 00754 80B07C94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00758 80B07C98 0C00BD04 */ jal func_8002F410 +/* 00758 80B07C98 0C00BD04 */ jal Actor_HasParent /* 0075C 80B07C9C AFA50024 */ sw $a1, 0x0024($sp) /* 00760 80B07CA0 1040000C */ beq $v0, $zero, .L80B07CD4 /* 00764 80B07CA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s index bac66894ec..79a14cbf93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s @@ -72,7 +72,7 @@ glabel func_80B0D878 /* 01BD8 80B0D988 AFA0001C */ sw $zero, 0x001C($sp) /* 01BDC 80B0D98C E7A80018 */ swc1 $f8, 0x0018($sp) /* 01BE0 80B0D990 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 01BE4 80B0D994 0C00C916 */ jal Actor_SpawnAttached +/* 01BE4 80B0D994 0C00C916 */ jal Actor_SpawnAsChild /* 01BE8 80B0D998 AFAC0028 */ sw $t4, 0x0028($sp) /* 01BEC 80B0D99C 10400002 */ beq $v0, $zero, .L80B0D9A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s index 09b99441aa..1f87f3496b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/EnSyatekiItm_Init.s @@ -38,7 +38,7 @@ glabel EnSyatekiItm_Init /* 00068 80B0F718 240700C1 */ addiu $a3, $zero, 0x00C1 ## $a3 = 000000C1 /* 0006C 80B0F71C E7A40010 */ swc1 $f4, 0x0010($sp) /* 00070 80B0F720 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00074 80B0F724 0C00C916 */ jal Actor_SpawnAttached +/* 00074 80B0F724 0C00C916 */ jal Actor_SpawnAsChild /* 00078 80B0F728 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0007C 80B0F72C 14400008 */ bne $v0, $zero, .L80B0F750 @@ -75,7 +75,7 @@ glabel EnSyatekiItm_Init /* 000E8 80B0F798 AFA00024 */ sw $zero, 0x0024($sp) /* 000EC 80B0F79C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 000F0 80B0F7A0 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 000F4 80B0F7A4 0C00C916 */ jal Actor_SpawnAttached +/* 000F4 80B0F7A4 0C00C916 */ jal Actor_SpawnAsChild /* 000F8 80B0F7A8 E7B20018 */ swc1 $f18, 0x0018($sp) /* 000FC 80B0F7AC 14400008 */ bne $v0, $zero, .L80B0F7D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s index 8ffd79af7b..09286e63bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Itm/func_80B0FABC.s @@ -253,7 +253,7 @@ glabel L80B0FD40 /* 00738 80B0FDE8 AFA00020 */ sw $zero, 0x0020($sp) /* 0073C 80B0FDEC AFA0001C */ sw $zero, 0x001C($sp) /* 00740 80B0FDF0 24070117 */ addiu $a3, $zero, 0x0117 ## $a3 = 00000117 -/* 00744 80B0FDF4 0C00C916 */ jal Actor_SpawnAttached +/* 00744 80B0FDF4 0C00C916 */ jal Actor_SpawnAsChild /* 00748 80B0FDF8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0074C 80B0FDFC 14400008 */ bne $v0, $zero, .L80B0FE20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s index 21a3046282..0408d739c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B11164.s @@ -8,7 +8,7 @@ glabel func_80B11164 /* 0090C 80B1117C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00910 80B11180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00914 80B11184 0C00BD04 */ jal func_8002F410 +/* 00914 80B11184 0C00BD04 */ jal Actor_HasParent /* 00918 80B11188 8FA5002C */ lw $a1, 0x002C($sp) /* 0091C 80B1118C 10400005 */ beq $v0, $zero, .L80B111A4 /* 00920 80B11190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s index 9c70d05d23..38aeef7a8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s @@ -3,7 +3,7 @@ glabel func_80B15E80 /* 023E4 80B15E84 AFBF0024 */ sw $ra, 0x0024($sp) /* 023E8 80B15E88 AFB00020 */ sw $s0, 0x0020($sp) /* 023EC 80B15E8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023F0 80B15E90 0C00BD04 */ jal func_8002F410 +/* 023F0 80B15E90 0C00BD04 */ jal Actor_HasParent /* 023F4 80B15E94 AFA5002C */ sw $a1, 0x002C($sp) /* 023F8 80B15E98 10400011 */ beq $v0, $zero, .L80B15EE0 /* 023FC 80B15E9C 8FA5002C */ lw $a1, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s index a81efe7cee..9416a8f0d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s @@ -2,7 +2,7 @@ glabel func_80B17A6C /* 0050C 80B17A6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00510 80B17A70 AFBF001C */ sw $ra, 0x001C($sp) /* 00514 80B17A74 AFA50024 */ sw $a1, 0x0024($sp) -/* 00518 80B17A78 0C00BD04 */ jal func_8002F410 +/* 00518 80B17A78 0C00BD04 */ jal Actor_HasParent /* 0051C 80B17A7C AFA40020 */ sw $a0, 0x0020($sp) /* 00520 80B17A80 10400005 */ beq $v0, $zero, .L80B17A98 /* 00524 80B17A84 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s index 052bb0f4a5..e6e36c6320 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B20768.s @@ -46,7 +46,7 @@ glabel func_80B20768 /* 00698 80B20808 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0069C 80B2080C 14610012 */ bne $v1, $at, .L80B20858 /* 006A0 80B20810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A4 80B20814 0C00BD04 */ jal func_8002F410 +/* 006A4 80B20814 0C00BD04 */ jal Actor_HasParent /* 006A8 80B20818 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 006AC 80B2081C 10400005 */ beq $v0, $zero, .L80B20834 /* 006B0 80B20820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s index ef1135d633..ef5e8451dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s @@ -92,7 +92,7 @@ glabel func_80B22F28 /* 00388 80B23078 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0038C 80B2307C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00390 80B23080 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00394 80B23084 0C00C916 */ jal Actor_SpawnAttached +/* 00394 80B23084 0C00C916 */ jal Actor_SpawnAsChild /* 00398 80B23088 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0039C 80B2308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index 70716ff9f0..ef04f8361b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -207,7 +207,7 @@ glabel EnVbBall_Update /* 008E0 80B29880 AFAB0024 */ sw $t3, 0x0024($sp) /* 008E4 80B29884 8628001C */ lh $t0, 0x001C($s1) ## 0000001C /* 008E8 80B29888 250C0001 */ addiu $t4, $t0, 0x0001 ## $t4 = 00000001 -/* 008EC 80B2988C 0C00C916 */ jal Actor_SpawnAttached +/* 008EC 80B2988C 0C00C916 */ jal Actor_SpawnAsChild /* 008F0 80B29890 AFAC0028 */ sw $t4, 0x0028($sp) /* 008F4 80B29894 10400031 */ beq $v0, $zero, .L80B2995C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s index 3d635e0317..4abc6bedfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Init.s @@ -44,7 +44,7 @@ glabel EnViewer_Init /* 000A8 80B2A2A8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 000AC 80B2A2AC E7A00010 */ swc1 $f0, 0x0010($sp) /* 000B0 80B2A2B0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 000B4 80B2A2B4 0C00C916 */ jal Actor_SpawnAttached +/* 000B4 80B2A2B4 0C00C916 */ jal Actor_SpawnAsChild /* 000B8 80B2A2B8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 000BC 80B2A2BC 3C0180B3 */ lui $at, %hi(D_80B2D440) ## $at = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index 6f4195c067..7da93ce2a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -157,7 +157,7 @@ glabel func_80B2A75C /* 00740 80B2A940 AFA00024 */ sw $zero, 0x0024($sp) /* 00744 80B2A944 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00748 80B2A948 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0074C 80B2A94C 0C00C916 */ jal Actor_SpawnAttached +/* 0074C 80B2A94C 0C00C916 */ jal Actor_SpawnAsChild /* 00750 80B2A950 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00754 80B2A954 8FA6005C */ lw $a2, 0x005C($sp) @@ -488,7 +488,7 @@ glabel L80B2AD44 /* 00BDC 80B2ADDC AFA00028 */ sw $zero, 0x0028($sp) /* 00BE0 80B2ADE0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00BE4 80B2ADE4 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00BE8 80B2ADE8 0C00C916 */ jal Actor_SpawnAttached +/* 00BE8 80B2ADE8 0C00C916 */ jal Actor_SpawnAsChild /* 00BEC 80B2ADEC E7A60018 */ swc1 $f6, 0x0018($sp) /* 00BF0 80B2ADF0 8FA6005C */ lw $a2, 0x005C($sp) @@ -513,7 +513,7 @@ glabel L80B2AD44 /* 00C38 80B2AE38 AFA80028 */ sw $t0, 0x0028($sp) /* 00C3C 80B2AE3C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00C40 80B2AE40 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00C44 80B2AE44 0C00C916 */ jal Actor_SpawnAttached +/* 00C44 80B2AE44 0C00C916 */ jal Actor_SpawnAsChild /* 00C48 80B2AE48 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00C4C 80B2AE4C 8FA6005C */ lw $a2, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s index 89585fd9aa..95cfd72586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2E034.s @@ -11,7 +11,7 @@ glabel func_80B2E034 /* 00BE0 80B2E040 AFBF0034 */ sw $ra, 0x0034($sp) /* 00BE4 80B2E044 AFA5003C */ sw $a1, 0x003C($sp) /* 00BE8 80B2E048 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00BEC 80B2E04C 0C00CD90 */ jal func_80033640 +/* 00BEC 80B2E04C 0C00CD90 */ jal Actor_GetCollidedExplosive /* 00BF0 80B2E050 26050268 */ addiu $a1, $s0, 0x0268 ## $a1 = 00000268 /* 00BF4 80B2E054 5040000B */ beql $v0, $zero, .L80B2E084 /* 00BF8 80B2E058 92020345 */ lbu $v0, 0x0345($s0) ## 00000345 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s index d468ab74a6..a3c0cd6a20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/func_80B3B094.s @@ -106,7 +106,7 @@ glabel func_80B3B094 /* 002AC 80B3B21C AFA20028 */ sw $v0, 0x0028($sp) /* 002B0 80B3B220 AFA00024 */ sw $zero, 0x0024($sp) /* 002B4 80B3B224 AFAE001C */ sw $t6, 0x001C($sp) -/* 002B8 80B3B228 0C00C916 */ jal Actor_SpawnAttached +/* 002B8 80B3B228 0C00C916 */ jal Actor_SpawnAsChild /* 002BC 80B3B22C AFAF0020 */ sw $t7, 0x0020($sp) /* 002C0 80B3B230 5040000D */ beql $v0, $zero, .L80B3B268 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s index af35578cda..dbe9b2ffc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s @@ -29,7 +29,7 @@ glabel func_80B54F18 /* 01BD4 80B54F84 46105080 */ add.s $f2, $f10, $f16 /* 01BD8 80B54F88 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01BDC 80B54F8C E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 01BE0 80B54F90 0C00C916 */ jal Actor_SpawnAttached +/* 01BE0 80B54F90 0C00C916 */ jal Actor_SpawnAsChild /* 01BE4 80B54F94 E7A20014 */ swc1 $f2, 0x0014($sp) /* 01BE8 80B54F98 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s index 0831f7607c..3cdf270cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DAD8.s @@ -196,7 +196,7 @@ glabel L80B5DCB4 /* 025C8 80B5DD78 92030208 */ lbu $v1, 0x0208($s0) ## 00000208 glabel L80B5DD7C /* 025CC 80B5DD7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025D0 80B5DD80 0C00BD04 */ jal func_8002F410 +/* 025D0 80B5DD80 0C00BD04 */ jal Actor_HasParent /* 025D4 80B5DD84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 025D8 80B5DD88 1040000A */ beq $v0, $zero, .L80B5DDB4 /* 025DC 80B5DD8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index fc9ee664e6..ea1e9ba871 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -171,7 +171,7 @@ glabel L80B62CA4 /* 00340 80B62D00 AFA00024 */ sw $zero, 0x0024($sp) /* 00344 80B62D04 E7A20010 */ swc1 $f2, 0x0010($sp) /* 00348 80B62D08 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0034C 80B62D0C 0C00C916 */ jal Actor_SpawnAttached +/* 0034C 80B62D0C 0C00C916 */ jal Actor_SpawnAsChild /* 00350 80B62D10 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00354 80B62D14 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -290,7 +290,7 @@ glabel L80B62E10 /* 004F4 80B62EB4 AFA00020 */ sw $zero, 0x0020($sp) /* 004F8 80B62EB8 AFA00024 */ sw $zero, 0x0024($sp) /* 004FC 80B62EBC E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00500 80B62EC0 0C00C916 */ jal Actor_SpawnAttached +/* 00500 80B62EC0 0C00C916 */ jal Actor_SpawnAsChild /* 00504 80B62EC4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00508 80B62EC8 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -1175,7 +1175,7 @@ glabel L80B63988 /* 01170 80B63B30 AFA00024 */ sw $zero, 0x0024($sp) /* 01174 80B63B34 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01178 80B63B38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 3E4C1C24 -/* 0117C 80B63B3C 0C00C916 */ jal Actor_SpawnAttached +/* 0117C 80B63B3C 0C00C916 */ jal Actor_SpawnAsChild /* 01180 80B63B40 AFB90020 */ sw $t9, 0x0020($sp) /* 01184 80B63B44 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index 9f078047ff..fcf9701b22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -148,7 +148,7 @@ glabel func_80B6404C /* 01860 80B64220 AFB80028 */ sw $t8, 0x0028($sp) /* 01864 80B64224 AFA00024 */ sw $zero, 0x0024($sp) /* 01868 80B64228 01C17821 */ addu $t7, $t6, $at -/* 0186C 80B6422C 0C00C916 */ jal Actor_SpawnAttached +/* 0186C 80B6422C 0C00C916 */ jal Actor_SpawnAsChild /* 01870 80B64230 AFAF0020 */ sw $t7, 0x0020($sp) /* 01874 80B64234 A200014F */ sb $zero, 0x014F($s0) ## 0000014F diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index 7820d8e976..149542fe34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -179,7 +179,7 @@ glabel func_80B6424C /* 01AAC 80B6446C AFA00024 */ sw $zero, 0x0024($sp) /* 01AB0 80B64470 AFA00020 */ sw $zero, 0x0020($sp) /* 01AB4 80B64474 AFA0001C */ sw $zero, 0x001C($sp) -/* 01AB8 80B64478 0C00C916 */ jal Actor_SpawnAttached +/* 01AB8 80B64478 0C00C916 */ jal Actor_SpawnAsChild /* 01ABC 80B6447C E7A40018 */ swc1 $f4, 0x0018($sp) /* 01AC0 80B64480 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 @@ -323,7 +323,7 @@ glabel func_80B6424C /* 01CB0 80B64670 E7A20054 */ swc1 $f2, 0x0054($sp) /* 01CB4 80B64674 AFA90028 */ sw $t1, 0x0028($sp) /* 01CB8 80B64678 AFA00024 */ sw $zero, 0x0024($sp) -/* 01CBC 80B6467C 0C00C916 */ jal Actor_SpawnAttached +/* 01CBC 80B6467C 0C00C916 */ jal Actor_SpawnAsChild /* 01CC0 80B64680 AFA80020 */ sw $t0, 0x0020($sp) /* 01CC4 80B64684 C7A20054 */ lwc1 $f2, 0x0054($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index afab12aa13..df591b0a53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -202,7 +202,7 @@ glabel func_80B6476C /* 02050 80B64A10 AFA00024 */ sw $zero, 0x0024($sp) /* 02054 80B64A14 01215021 */ addu $t2, $t1, $at /* 02058 80B64A18 AFAA0020 */ sw $t2, 0x0020($sp) -/* 0205C 80B64A1C 0C00C916 */ jal Actor_SpawnAttached +/* 0205C 80B64A1C 0C00C916 */ jal Actor_SpawnAsChild /* 02060 80B64A20 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 .L80B64A24: diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s index aeb33e2023..20870f038c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B64AA8.s @@ -166,7 +166,7 @@ glabel func_80B64AA8 /* 022F8 80B64CB8 AFA00020 */ sw $zero, 0x0020($sp) /* 022FC 80B64CBC AFA0001C */ sw $zero, 0x001C($sp) /* 02300 80B64CC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 02304 80B64CC4 0C00C916 */ jal Actor_SpawnAttached +/* 02304 80B64CC4 0C00C916 */ jal Actor_SpawnAsChild /* 02308 80B64CC8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 0230C 80B64CCC 3C0480B6 */ lui $a0, %hi(D_80B6533C) ## $a0 = 80B60000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index 863c34d5ba..f549d5050e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -443,7 +443,7 @@ glabel Fishing_Init /* 0118C 80B6AB2C AFA00024 */ sw $zero, 0x0024($sp) /* 01190 80B6AB30 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01194 80B6AB34 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 01198 80B6AB38 0C00C916 */ jal Actor_SpawnAttached +/* 01198 80B6AB38 0C00C916 */ jal Actor_SpawnAsChild /* 0119C 80B6AB3C E7A40018 */ swc1 $f4, 0x0018($sp) /* 011A0 80B6AB40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s index 51a7741c08..b77e23aa10 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B77404.s @@ -988,7 +988,7 @@ glabel L80B7819C /* 0E7FC 80B7819C 3C0180B8 */ lui $at, %hi(D_80B7A674) ## $at = 80B80000 /* 0E800 80B781A0 A020A674 */ sb $zero, %lo(D_80B7A674)($at) /* 0E804 80B781A4 8FA40038 */ lw $a0, 0x0038($sp) -/* 0E808 80B781A8 0C00BD04 */ jal func_8002F410 +/* 0E808 80B781A8 0C00BD04 */ jal Actor_HasParent /* 0E80C 80B781AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0E810 80B781B0 10400005 */ beq $v0, $zero, .L80B781C8 /* 0E814 80B781B4 8FA40038 */ lw $a0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s index 1e9f0b0c63..a18359428d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86AC8.s @@ -7,7 +7,7 @@ glabel func_80B86AC8 /* 001BC 80B86ADC AFA5002C */ sw $a1, 0x002C($sp) /* 001C0 80B86AE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 80B86AE4 0C00BD04 */ jal func_8002F410 +/* 001C4 80B86AE4 0C00BD04 */ jal Actor_HasParent /* 001C8 80B86AE8 8FA5002C */ lw $a1, 0x002C($sp) /* 001CC 80B86AEC 10400005 */ beq $v0, $zero, .L80B86B04 /* 001D0 80B86AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s index 8c218dbe96..c1f30774df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s @@ -8,7 +8,7 @@ glabel func_80B86BC8 /* 002AC 80B86BCC AFBF0024 */ sw $ra, 0x0024($sp) /* 002B0 80B86BD0 AFB00020 */ sw $s0, 0x0020($sp) /* 002B4 80B86BD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B8 80B86BD8 0C00BD04 */ jal func_8002F410 +/* 002B8 80B86BD8 0C00BD04 */ jal Actor_HasParent /* 002BC 80B86BDC AFA50034 */ sw $a1, 0x0034($sp) /* 002C0 80B86BE0 10400005 */ beq $v0, $zero, .L80B86BF8 /* 002C4 80B86BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s index 66f39f91f9..a208555c74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s @@ -4,7 +4,7 @@ glabel func_80B9534C /* 006B4 80B95354 AFB10020 */ sw $s1, 0x0020($sp) /* 006B8 80B95358 AFB0001C */ sw $s0, 0x001C($sp) /* 006BC 80B9535C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006C0 80B95360 0C00BD04 */ jal func_8002F410 +/* 006C0 80B95360 0C00BD04 */ jal Actor_HasParent /* 006C4 80B95364 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 006C8 80B95368 50400006 */ beql $v0, $zero, .L80B95384 /* 006CC 80B9536C 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s index e36776169a..7af9358413 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s @@ -8,7 +8,7 @@ glabel func_80B95574 /* 008D8 80B95578 AFBF0024 */ sw $ra, 0x0024($sp) /* 008DC 80B9557C AFB00020 */ sw $s0, 0x0020($sp) /* 008E0 80B95580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008E4 80B95584 0C00BD68 */ jal func_8002F5A0 +/* 008E4 80B95584 0C00BD68 */ jal Actor_HasNoParent /* 008E8 80B95588 AFA5002C */ sw $a1, 0x002C($sp) /* 008EC 80B9558C 10400025 */ beq $v0, $zero, .L80B95624 /* 008F0 80B95590 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s index 4722aab1da..c6ea64474e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s @@ -108,7 +108,7 @@ glabel ObjLightswitch_Init /* 00534 80B970D4 AFAE0028 */ sw $t6, 0x0028($sp) /* 00538 80B970D8 AFA00024 */ sw $zero, 0x0024($sp) /* 0053C 80B970DC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00540 80B970E0 0C00C916 */ jal Actor_SpawnAttached +/* 00540 80B970E0 0C00C916 */ jal Actor_SpawnAsChild /* 00544 80B970E4 AFAD0020 */ sw $t5, 0x0020($sp) /* 00548 80B970E8 1440000F */ bne $v0, $zero, .L80B97128 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s index 56c21485cb..9303996f4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure/func_80B9910C.s @@ -43,7 +43,7 @@ glabel func_80B9910C .L80B991A0: /* 00700 80B991A0 5080000B */ beql $a0, $zero, .L80B991D0 /* 00704 80B991A4 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000008 -/* 00708 80B991A8 0C00BD04 */ jal func_8002F410 +/* 00708 80B991A8 0C00BD04 */ jal Actor_HasParent /* 0070C 80B991AC 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 00710 80B991B0 10400003 */ beq $v0, $zero, .L80B991C0 /* 00714 80B991B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s index 304247a70b..fa97bb0a8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure2/func_80B9A438.s @@ -25,7 +25,7 @@ glabel func_80B9A438 /* 00550 80B9A490 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00554 80B9A494 5080001D */ beql $a0, $zero, .L80B9A50C /* 00558 80B9A498 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 0055C 80B9A49C 0C00BD04 */ jal func_8002F410 +/* 0055C 80B9A49C 0C00BD04 */ jal Actor_HasParent /* 00560 80B9A4A0 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00564 80B9A4A4 10400007 */ beq $v0, $zero, .L80B9A4C4 /* 00568 80B9A4A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s index 723161e506..beb8736b0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ACE4.s @@ -29,7 +29,7 @@ glabel func_80B9ACE4 /* 0037C 80B9AD4C 8E240000 */ lw $a0, 0x0000($s1) ## 00000150 /* 00380 80B9AD50 50800012 */ beql $a0, $zero, .L80B9AD9C /* 00384 80B9AD54 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 -/* 00388 80B9AD58 0C00BD04 */ jal func_8002F410 +/* 00388 80B9AD58 0C00BD04 */ jal Actor_HasParent /* 0038C 80B9AD5C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 00390 80B9AD60 54400006 */ bnel $v0, $zero, .L80B9AD7C /* 00394 80B9AD64 964C016C */ lhu $t4, 0x016C($s2) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s index 1dee3287e6..eaaa65db38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Mure3/func_80B9ADCC.s @@ -30,7 +30,7 @@ glabel func_80B9ADCC /* 00468 80B9AE38 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 0046C 80B9AE3C 55600014 */ bnel $t3, $zero, .L80B9AE90 /* 00470 80B9AE40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -/* 00474 80B9AE44 0C00BD04 */ jal func_8002F410 +/* 00474 80B9AE44 0C00BD04 */ jal Actor_HasParent /* 00478 80B9AE48 8E040000 */ lw $a0, 0x0000($s0) ## 00000150 /* 0047C 80B9AE4C 50400006 */ beql $v0, $zero, .L80B9AE68 /* 00480 80B9AE50 8E0C0000 */ lw $t4, 0x0000($s0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s index 7ef153cbfa..d64dc8bc2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D4D8.s @@ -22,7 +22,7 @@ glabel func_80B9D4D8 /* 00318 80B9D528 00194203 */ sra $t0, $t9, 8 /* 0031C 80B9D52C 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 /* 00320 80B9D530 00095200 */ sll $t2, $t1, 8 -/* 00324 80B9D534 0C00C916 */ jal Actor_SpawnAttached +/* 00324 80B9D534 0C00C916 */ jal Actor_SpawnAsChild /* 00328 80B9D538 AFAA0028 */ sw $t2, 0x0028($sp) /* 0032C 80B9D53C 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s index 925e423eb9..586747c093 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s @@ -4,7 +4,7 @@ glabel func_80BA15BC /* 00864 80BA15C4 AFB10020 */ sw $s1, 0x0020($sp) /* 00868 80BA15C8 AFB0001C */ sw $s0, 0x001C($sp) /* 0086C 80BA15CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00870 80BA15D0 0C00BD04 */ jal func_8002F410 +/* 00870 80BA15D0 0C00BD04 */ jal Actor_HasParent /* 00874 80BA15D4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00878 80BA15D8 50400006 */ beql $v0, $zero, .L80BA15F4 /* 0087C 80BA15DC 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s index 23ccd196c3..559850d2ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA180C.s @@ -3,7 +3,7 @@ glabel func_80BA180C /* 00AB0 80BA1810 AFBF0024 */ sw $ra, 0x0024($sp) /* 00AB4 80BA1814 AFB00020 */ sw $s0, 0x0020($sp) /* 00AB8 80BA1818 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ABC 80BA181C 0C00BD68 */ jal func_8002F5A0 +/* 00ABC 80BA181C 0C00BD68 */ jal Actor_HasNoParent /* 00AC0 80BA1820 AFA5002C */ sw $a1, 0x002C($sp) /* 00AC4 80BA1824 10400014 */ beq $v0, $zero, .L80BA1878 /* 00AC8 80BA1828 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s index a9527b4d78..44314fc53e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s @@ -36,7 +36,7 @@ glabel func_808337D4 /* 01648 80833858 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 0164C 8083385C AFA00028 */ sw $zero, 0x0028($sp) /* 01650 80833860 AFA00024 */ sw $zero, 0x0024($sp) -/* 01654 80833864 0C00C916 */ jal Actor_SpawnAttached +/* 01654 80833864 0C00C916 */ jal Actor_SpawnAsChild /* 01658 80833868 AFA80020 */ sw $t0, 0x0020($sp) /* 0165C 8083386C 8FA60050 */ lw $a2, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s index f5a1734b69..4ca2c21712 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s @@ -20,7 +20,7 @@ glabel func_80833910 /* 01748 80833958 AFA5003C */ sw $a1, 0x003C($sp) /* 0174C 8083395C AFA00028 */ sw $zero, 0x0028($sp) /* 01750 80833960 AFA00024 */ sw $zero, 0x0024($sp) -/* 01754 80833964 0C00C916 */ jal Actor_SpawnAttached +/* 01754 80833964 0C00C916 */ jal Actor_SpawnAsChild /* 01758 80833968 AFB90020 */ sw $t9, 0x0020($sp) /* 0175C 8083396C 8FA5003C */ lw $a1, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s index fe1a81ba8d..c76d943a65 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s @@ -83,7 +83,7 @@ glabel func_8083442C /* 02350 80834560 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 /* 02354 80834564 AFA00024 */ sw $zero, 0x0024($sp) /* 02358 80834568 AFAD0028 */ sw $t5, 0x0028($sp) -/* 0235C 8083456C 0C00C916 */ jal Actor_SpawnAttached +/* 0235C 8083456C 0C00C916 */ jal Actor_SpawnAsChild /* 02360 80834570 AFAC0020 */ sw $t4, 0x0020($sp) /* 02364 80834574 AE0203AC */ sw $v0, 0x03AC($s0) ## 000003AC diff --git a/include/functions.h b/include/functions.h index 7414e66dab..f231f04cc0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -370,16 +370,16 @@ s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx); u32 func_8002F334(Actor* actor, GlobalContext* globalCtx); s8 func_8002F368(GlobalContext* globalCtx); void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3); -u32 func_8002F410(Actor* actor, GlobalContext* globalCtx); +u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx); s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange); void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId); void func_8002F580(Actor* actor, GlobalContext* globalCtx); -u32 func_8002F5A0(Actor* actor, GlobalContext* globalCtx); +u32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx); void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx); void func_8002F5F0(Actor* actor, GlobalContext* globalCtx); -u32 func_8002F618(GlobalContext* globalCtx, Actor* actor); +u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor); u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2); -u32 func_8002F674(GlobalContext* globalCtx, Actor* actor); +u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor); void func_8002F698(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); void func_8002F6D4(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_8002F71C(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4); @@ -402,8 +402,8 @@ void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx); void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx); Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); -Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, f32 posX, - f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); +Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, GlobalContext* globalCtx, s16 actorId, f32 posX, + f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCtx); Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, GlobalContext* globalCtx); Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalCtx); @@ -414,7 +414,7 @@ void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx); void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6, s16 arg7, u8 arg8); void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6); -Actor* func_80033640(GlobalContext* globalCtx, Collider* collider); +Actor* Actor_GetCollidedExplosive(GlobalContext* globalCtx, Collider* collider); Actor* func_80033684(GlobalContext* globalCtx, Actor* explosiveActor); void Actor_ChangeType(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actor, u8 actorType); void Actor_SetTextWithPrefix(GlobalContext* globalCtx, Actor* actor, s16 textIdLower); diff --git a/include/z64actor.h b/include/z64actor.h index 938bb4a9dc..c96431d61e 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -152,8 +152,8 @@ typedef struct Actor { /* 0x115 */ u8 isDrawn; // Indicates whether the actor is currently being drawn (but not seen through lens) /* 0x116 */ u8 unk_116; /* 0x117 */ u8 naviEnemyId; // Sets what 0600 dialog to display when talking to navi. Default 0xFF - /* 0x118 */ struct Actor* attachedA; // Attached By? - /* 0x11C */ struct Actor* attachedB; // Attached To? + /* 0x118 */ struct Actor* parent; + /* 0x11C */ struct Actor* child; /* 0x120 */ struct Actor* prev; // Previous Actor of this type /* 0x124 */ struct Actor* next; // Next Actor of this type /* 0x128 */ ActorFunc init; // Initialization Routine. Called by Actor_Init or Actor_UpdateAll diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d111a02528..5f26570d6e 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1028,7 +1028,7 @@ void func_8002DE74(GlobalContext* globalCtx, Player* player) { void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor) { player->rideActor = actor; player->stateFlags1 |= 0x800000; - actor->attachedB = &player->actor; + actor->child = &player->actor; } s32 func_8002DEEC(Player* player) { @@ -1542,11 +1542,11 @@ void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) *arg3 = sp1C.y * sp18 * -120.0f + 120.0f; } -u32 func_8002F410(Actor* actor, GlobalContext* globalCtx) { - if (actor->attachedA != NULL) { - return 1; +u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { + if (actor->parent != NULL) { + return true; } else { - return 0; + return false; } } @@ -1583,26 +1583,26 @@ void func_8002F580(Actor* actor, GlobalContext* globalCtx) { func_8002F554(actor, globalCtx, 0); } -u32 func_8002F5A0(Actor* actor, GlobalContext* globalCtx) { - if (actor->attachedA == NULL) { - return 1; +u32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx) { + if (actor->parent == NULL) { + return true; } else { - return 0; + return false; } } void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx) { - Actor* actorAttachedA = actorA->attachedA; + Actor* parent = actorA->parent; - if (actorAttachedA->id == ACTOR_PLAYER) { - Player* player = (Player*)actorAttachedA; + if (parent->id == ACTOR_PLAYER) { + Player* player = (Player*)parent; player->heldActor = actorB; player->interactRangeActor = actorB; } - actorAttachedA->attachedB = actorB; - actorB->attachedA = actorAttachedA; - actorA->attachedA = NULL; + parent->child = actorB; + actorB->parent = parent; + actorA->parent = NULL; } void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) { @@ -1613,11 +1613,11 @@ void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) { } } -u32 func_8002F618(GlobalContext* globalCtx, Actor* actor) { - if (actor->attachedB != NULL) { - return 1; +u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor) { + if (actor->child != NULL) { + return true; } else { - return 0; + return false; } } @@ -1633,11 +1633,11 @@ u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2) { return 0; } -u32 func_8002F674(GlobalContext* globalCtx, Actor* actor) { - if (actor->attachedB == NULL) { - return 1; +u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor) { + if (actor->child == NULL) { + return true; } else { - return 0; + return false; } } @@ -2073,7 +2073,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { actor = actor->next; } else if ((unkFlag && !(actor->flags & unkFlag)) || (!unkFlag && unkCondition && (sp74 != actor) && (actor != player->navi) && - (actor != player->heldActor) && (&player->actor != actor->attachedA))) { + (actor != player->heldActor) && (&player->actor != actor->parent))) { func_80061E8C(&actor->colChkInfo); actor = actor->next; } else if (actor->update == NULL) { @@ -2804,18 +2804,18 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId return actor; } -Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, f32 posX, - f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) { +Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, GlobalContext* globalCtx, s16 actorId, f32 posX, + f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) { Actor* spawnedActor = Actor_Spawn(actorCtx, globalCtx, actorId, posX, posY, posZ, rotX, rotY, rotZ, params); if (spawnedActor == NULL) { return NULL; } - attachedTo->attachedB = spawnedActor; - spawnedActor->attachedA = attachedTo; + parent->child = spawnedActor; + spawnedActor->parent = parent; if (spawnedActor->room >= 0) { - spawnedActor->room = attachedTo->room; + spawnedActor->room = parent->room; } return spawnedActor; @@ -3147,8 +3147,8 @@ s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, } mtx = &arg1->unk_00[arg1->unk_08]; - spawnedEnPart = (EnPart*)Actor_SpawnAttached(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, mtx->wx, - mtx->wy, mtx->wz, 0, 0, objBankIndex, params); + spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, mtx->wx, + mtx->wy, mtx->wz, 0, 0, objBankIndex, params); if (spawnedEnPart != NULL) { func_800D20CC(&arg1->unk_00[arg1->unk_08], &spawnedEnPart->actor.shape.rot, 0); spawnedEnPart->unk_150 = arg1->unk_0C[arg1->unk_08]; @@ -3220,7 +3220,7 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 } } -Actor* func_80033640(GlobalContext* globalCtx, Collider* collider) { +Actor* Actor_GetCollidedExplosive(GlobalContext* globalCtx, Collider* collider) { if ((collider->acFlags & 0x2) && (collider->ac->type == ACTORTYPE_EXPLOSIVES)) { collider->acFlags &= ~0x2; return collider->ac; @@ -3916,7 +3916,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { switch (actor->params) { case 0: - if (func_8002F410(actor, globalCtx)) { + if (Actor_HasParent(actor, globalCtx)) { actor->params = 1; } else if (!(actor->bgCheckFlags & 1)) { Actor_MoveForward(actor); @@ -3929,7 +3929,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { } break; case 1: - if (func_8002F5A0(actor, globalCtx)) { + if (Actor_HasNoParent(actor, globalCtx)) { actor->params = 0; } break; @@ -4109,15 +4109,15 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { } /** - * Spawns En_Part (Dissipating Flames) actor attached to the given actor. + * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg3, s32 arg4, s32 unused, GlobalContext* globalCtx, s16 params, s32 arg8) { EnPart* spawnedEnPart; spawnedEnPart = - (EnPart*)Actor_SpawnAttached(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, spawnPos->x, spawnPos->y, - spawnPos->z, spawnRot->x, spawnRot->y, actor->objBankIndex, params); + (EnPart*)Actor_SpawnAsChild(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, spawnPos->x, spawnPos->y, + spawnPos->z, spawnRot->x, spawnRot->y, actor->objBankIndex, params); if (spawnedEnPart != NULL) { spawnedEnPart->actor.scale = actor->scale; spawnedEnPart->actor.speedXZ = arg3->x; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 2e14720d91..9eea31b153 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -264,7 +264,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) { break; } - if ((getItemId != 0) && !func_8002F410(&this->actor, globalCtx)) { + if ((getItemId != 0) && !Actor_HasParent(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, getItemId); } @@ -409,7 +409,7 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (this->unk_152 != 0) { - if (!func_8002F410(&this->actor, globalCtx)) { + if (!Actor_HasParent(&this->actor, globalCtx)) { func_8002F434(&this->actor, globalCtx, this->unk_152, 50.0f, 80.0f); this->unk_15A++; } else { @@ -520,7 +520,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { if (!((this->actor.xzDistFromLink <= 30.0f) && (this->actor.yDistFromLink >= -50.0f) && (this->actor.yDistFromLink <= 50.0f))) { - if (!func_8002F410(&this->actor, globalCtx)) { + if (!Actor_HasParent(&this->actor, globalCtx)) { return; } } @@ -609,7 +609,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { params = &this->actor.params; - if ((getItemId != 0) && !func_8002F410(&this->actor, globalCtx)) { + if ((getItemId != 0) && !Actor_HasParent(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, getItemId); } @@ -621,7 +621,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { case ITEM00_SHIELD_HYLIAN: case ITEM00_TUNIC_ZORA: case ITEM00_TUNIC_GORON: - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { Flags_SetCollectible(globalCtx, this->collectibleFlag); Actor_Kill(&this->actor); } @@ -631,7 +631,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { if ((*params <= ITEM00_RUPEE_RED) || (*params == ITEM00_RUPEE_ORANGE)) { Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if (getItemId != 0) { - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { Flags_SetCollectible(globalCtx, this->collectibleFlag); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 6a42782443..73098c669b 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -74,29 +74,29 @@ void ArmsHook_Wait(ArmsHook* this, GlobalContext* globalCtx) { Player* player; s32 length; - if (this->actor.attachedA == NULL) { + if (this->actor.parent == NULL) { player = PLAYER; // get correct timer length for hookshot or longshot length = (player->heldItemActionParam == 0x10) ? 13 : 26; ArmsHook_SetupAction(this, ArmsHook_Shoot); func_8002D9A4(&this->actor, 20.0f); - this->actor.attachedA = &PLAYER->actor; + this->actor.parent = &PLAYER->actor; this->timer = length; } } void func_80865044(ArmsHook* this) { - this->actor.attachedB = this->actor.attachedA; - this->actor.attachedA->attachedA = &this->actor; + this->actor.child = this->actor.parent; + this->actor.parent->parent = &this->actor; } s32 ArmsHook_AttachToPlayer(ArmsHook* this, Player* player) { - player->actor.attachedB = &this->actor; + player->actor.child = &this->actor; player->heldActor = &this->actor; - if (this->actor.attachedB != NULL) { - player->actor.attachedA = NULL; - this->actor.attachedB = NULL; + if (this->actor.child != NULL) { + player->actor.parent = NULL; + this->actor.child = NULL; return 1; } return 0; @@ -110,7 +110,7 @@ void ArmsHook_DetachHookFromActor(ArmsHook* this) { } s32 ArmsHook_CheckForCancel(ArmsHook* this) { - Player* player = (Player*)this->actor.attachedA; + Player* player = (Player*)this->actor.parent; if (func_8008F104(player)) { if ((player->unk_154 != player->heldItemActionParam) || ((player->actor.flags & 0x100)) || ((player->stateFlags1 & 0x4000080))) { @@ -151,7 +151,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { f32 velocity; s32 pad1; - if ((this->actor.attachedA == NULL) || (!func_8008F104(player))) { + if ((this->actor.parent == NULL) || (!func_8008F104(player))) { ArmsHook_DetachHookFromActor(this); Actor_Kill(&this->actor); return; @@ -185,7 +185,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { grabbed = NULL; this->grabbed = NULL; } else { - if (this->actor.attachedB != NULL) { + if (this->actor.child != NULL) { sp94 = func_8002DB48(this, grabbed); sp90 = sqrtf(SQ(this->grabbedDistDiff.x) + SQ(this->grabbedDistDiff.y) + SQ(this->grabbedDistDiff.z)); @@ -203,7 +203,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { velocity = 0.0f; phi_f16 = 0.0f; } else { - if (this->actor.attachedB != NULL) { + if (this->actor.child != NULL) { velocity = 30.0f; } else { if (grabbed != NULL) { @@ -223,7 +223,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { newPos.y = bodyDistDiffVec.y * velocity; newPos.z = bodyDistDiffVec.z * velocity; - if (this->actor.attachedB == NULL) { + if (this->actor.child == NULL) { if ((grabbed != NULL) && (grabbed->id == ACTOR_BG_SPOT06_OBJECTS)) { Math_Vec3f_Diff(&grabbed->posRot.pos, &this->grabbedDistDiff, &this->actor.posRot.pos); phi_f16 = 1.0f; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 0b709b98cc..50f8a4e49d 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -1,7 +1,7 @@ /* * File: z_arrow_fire.c * Overlay: ovl_Arrow_Fire - * Description: Fire Arrow. Spawned by and attached to a normal arrow. + * Description: Fire Arrow. Spawned as a child of a normal arrow. */ #include "z_arrow_fire.h" @@ -64,7 +64,7 @@ void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) { void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -73,14 +73,14 @@ void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { if (this->radius < 10) { this->radius += 1; } - // copy position and rotation from the attached arrow + // copy position and rotation from arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG); - // If arrow's attached is null, Link has fired the arrow - if (arrow->actor.attachedA == NULL) { + // if arrow has no parent, player has fired the arrow + if (arrow->actor.parent == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowFire_SetupAction(this, ArrowFire_Fly); @@ -151,12 +151,12 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; } - // copy position and rotation from the attached arrow + // copy position and rotation from arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); @@ -200,7 +200,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index d1e8506b3f..b82c519cd0 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -1,7 +1,7 @@ /* * File: z_arrow_ice.c * Overlay: ovl_Arrow_Ice - * Description: Ice Arrow. Spawned by and attached to a normal arrow. + * Description: Ice Arrow. Spawned as a child of a normal arrow. */ #include "z_arrow_ice.h" @@ -65,7 +65,7 @@ void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) { void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -74,14 +74,14 @@ void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { if (this->radius < 10) { this->radius += 1; } - // copy position and rotation from the attached arrow + // copy position and rotation from arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG); - // If arrow's attached is null, Link has fired the arrow - if (arrow->actor.attachedA == NULL) { + // if arrow has no parent, player has fired the arrow + if (arrow->actor.parent == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowIce_SetupAction(this, ArrowIce_Fly); @@ -152,12 +152,12 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; } - // copy position and rotation from the attached arrow + // copy position and rotation from arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); @@ -201,7 +201,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index c1c85ce2d5..a8ad430c9e 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -1,7 +1,7 @@ /* * File: z_arrow_light.c * Overlay: ovl_Arrow_Light - * Description: Light Arrow. Spawned by and attached to a normal arrow. + * Description: Light Arrow. Spawned as a child of a normal arrow. */ #include "z_arrow_light.h" @@ -65,7 +65,7 @@ void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) { void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { EnArrow* arrow; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; @@ -74,14 +74,14 @@ void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { if (this->radius < 10) { this->radius += 1; } - // copy position and rotation from the attached arrow + // copy position and rotation from arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG); - // If arrow's attached is null, Link has fired the arrow - if (arrow->actor.attachedA == NULL) { + // if arrow has no parent, player has fired the arrow + if (arrow->actor.parent == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowLight_SetupAction(this, ArrowLight_Fly); @@ -152,12 +152,12 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) { f32 distanceScaled; s32 pad; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); return; } - // copy position and rotation from the attached arrow + // copy position and rotation from parent arrow this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); @@ -201,7 +201,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx* dispRefs[4]; stateFrames = globalCtx->state.frames; - arrow = (EnArrow*)this->actor.attachedA; + arrow = (EnArrow*)this->actor.parent; if (1) {} if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 02c0d6edf3..5c2fadc328 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -121,10 +121,10 @@ void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_8086C6EC; } else { if (BgBdanObjects_GetContactRu1(this, 4)) { - if (Actor_SpawnAttached(&globalCtx->actorCtx, this, globalCtx, ACTOR_EN_BIGOKUTA, - thisx->initPosRot.pos.x, thisx->initPosRot.pos.y, thisx->initPosRot.pos.z, 0, - thisx->shape.rot.y + 0x8000, 0, 3) != NULL) { - thisx->attachedB->posRot.pos.z = thisx->attachedB->initPosRot.pos.z + 263.0f; + if (Actor_SpawnAsChild(&globalCtx->actorCtx, this, globalCtx, ACTOR_EN_BIGOKUTA, + thisx->initPosRot.pos.x, thisx->initPosRot.pos.y, thisx->initPosRot.pos.z, 0, + thisx->shape.rot.y + 0x8000, 0, 3) != NULL) { + thisx->child->posRot.pos.z = thisx->child->initPosRot.pos.z + 263.0f; } thisx->posRot.rot.y = 0; this->actionFunc = func_8086C618; @@ -228,9 +228,9 @@ void func_8086C29C(BgBdanObjects* this, GlobalContext* globalCtx) { } if (BgBdanObjects_GetContactRu1(this, 3)) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_BIGOKUTA, - this->dyna.actor.posRot.pos.x, this->dyna.actor.posRot.pos.y + 140.0f, - this->dyna.actor.posRot.pos.z, 0, this->dyna.actor.shape.rot.y + 0x8000, 0, 0); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_BIGOKUTA, + this->dyna.actor.posRot.pos.x, this->dyna.actor.posRot.pos.y + 140.0f, + this->dyna.actor.posRot.pos.z, 0, this->dyna.actor.shape.rot.y + 0x8000, 0, 0); BgBdanObjects_SetContactRu1(this, 4); this->unk_16A = 0xA; this->actionFunc = func_8086C55C; @@ -247,9 +247,9 @@ void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { this->dyna.actor.posRot.rot.y = 0; this->unk_16A = 0x3C; Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_U); - this->dyna.actor.attachedB->posRot.pos.y = this->dyna.actor.posRot.pos.y + 140.0f; + this->dyna.actor.child->posRot.pos.y = this->dyna.actor.posRot.pos.y + 140.0f; this->actionFunc = func_8086C5BC; - func_800800F8(globalCtx, 0xC08, -0x63, this->dyna.actor.attachedB, 0); + func_800800F8(globalCtx, 0xC08, -0x63, this->dyna.actor.child, 0); player->actor.posRot.pos.x = -1130.0f; player->actor.posRot.pos.y = -1025.0f; player->actor.posRot.pos.z = -3500.0f; @@ -265,8 +265,8 @@ void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { func_800AA000(0.0f, 0x78, 0x14, 0xA); this->unk_16A = 0xB; } - if (this->dyna.actor.attachedB != NULL) { - this->dyna.actor.attachedB->posRot.pos.y = this->dyna.actor.posRot.pos.y + 140.0f; + if (this->dyna.actor.child != NULL) { + this->dyna.actor.child->posRot.pos.y = this->dyna.actor.posRot.pos.y + 140.0f; } } } @@ -287,11 +287,11 @@ void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx) { this->unk_16A -= 1; } if (this->unk_16A == 0) { - if (this->dyna.actor.attachedB != NULL) { - if (this->dyna.actor.attachedB->params == 2) { + if (this->dyna.actor.child != NULL) { + if (this->dyna.actor.child->params == 2) { this->actionFunc = func_8086C618; - } else if (this->dyna.actor.attachedB->params == 0) { - this->dyna.actor.attachedB->params = 1; + } else if (this->dyna.actor.child->params == 0) { + this->dyna.actor.child->params = 1; } } } diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 6a84dadbc3..d72b8c68a4 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -60,7 +60,7 @@ void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; s32 sp24 = 0; - this->previousCollidingExplosion = NULL; + this->prevExplosive = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyInfo_SetActorMove(&this->dyna.actor, 1); @@ -86,26 +86,25 @@ void BgDdanKd_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void BgDdanKd_CheckForExplosions(BgDdanKd* this, GlobalContext* globalCtx) { - Actor* currentCollidingExplosion; + Actor* explosive; - currentCollidingExplosion = func_80033640(globalCtx, &this->collider); - if (currentCollidingExplosion != NULL) { + explosive = Actor_GetCollidedExplosive(globalCtx, &this->collider); + if (explosive != NULL) { osSyncPrintf("dam %d\n", this->dyna.actor.colChkInfo.damage); - currentCollidingExplosion->params = 2; + explosive->params = 2; } - if ((currentCollidingExplosion != NULL) && (this->previousCollidingExplosion != NULL) && - (currentCollidingExplosion != this->previousCollidingExplosion) && - (Math_Vec3f_DistXZ(&this->previousCollidingExplosionPos, ¤tCollidingExplosion->posRot.pos) > 80.0f)) { + if ((explosive != NULL) && (this->prevExplosive != NULL) && (explosive != this->prevExplosive) && + (Math_Vec3f_DistXZ(&this->prevExplosivePos, &explosive->posRot.pos) > 80.0f)) { BgDdanKd_SetupAction(this, BgDdanKd_LowerStairs); func_800800F8(globalCtx, 0xBEA, 0x3E7, this, 0); } else { if (this->timer != 0) { this->timer -= 1; } else { - this->previousCollidingExplosion = currentCollidingExplosion; - if (currentCollidingExplosion != NULL) { + this->prevExplosive = explosive; + if (explosive != NULL) { this->timer = 13; - this->previousCollidingExplosionPos = currentCollidingExplosion->posRot.pos; + this->prevExplosivePos = explosive->posRot.pos; } } Collider_CylinderUpdate(&this->dyna.actor, &this->collider); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h index 902f1cec5a..7dd699f0a1 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h @@ -10,9 +10,9 @@ typedef void (*BgDdanKdActionFunc)(struct BgDdanKd*, GlobalContext*); typedef struct BgDdanKd { /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ Actor* previousCollidingExplosion; + /* 0x0164 */ Actor* prevExplosive; /* 0x0168 */ s16 timer; - /* 0x016C */ Vec3f previousCollidingExplosionPos; + /* 0x016C */ Vec3f prevExplosivePos; /* 0x0178 */ ColliderCylinder collider; /* 0x01C4 */ BgDdanKdActionFunc actionFunc; } BgDdanKd; // size = 0x01C8 diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 2fbc875250..1482e484d2 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -45,7 +45,7 @@ static ColliderCylinderInit sColCylinderInit1 = { { 50, 60, 280, { 0, 0, 0 } }, }; -s16 slsAttached = false; +s16 sHasParent = false; Color_RGBA8_n D_8087259C = { 100, 100, 100, 0 }; Color_RGBA8_n D_808725A0 = { 40, 40, 40, 0 }; @@ -122,13 +122,12 @@ void BgDodoago_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80871CF4(BgDodoago* this, GlobalContext* globalCtx) { - Actor* attachedActor = func_80033640(globalCtx, &this->colliders[0].base); + Actor* explosive = Actor_GetCollidedExplosive(globalCtx, &this->colliders[0].base); - if (attachedActor != NULL) { + if (explosive != NULL) { this->unk_164 = - (Math_Vec3f_Yaw(&this->dyna.actor.posRot.pos, &attachedActor->posRot.pos) >= this->dyna.actor.shape.rot.y) - ? 1 - : 0; + (Math_Vec3f_Yaw(&this->dyna.actor.posRot.pos, &explosive->posRot.pos) >= this->dyna.actor.shape.rot.y) ? 1 + : 0; if (((globalCtx->unk_11D30[0] == 0xFF) && (this->unk_164 == 1)) || ((globalCtx->unk_11D30[1] == 0xFF) && (this->unk_164 == 0))) { @@ -148,9 +147,9 @@ void func_80871CF4(BgDodoago* this, GlobalContext* globalCtx) { return; } - if (!slsAttached) { - this->dyna.actor.attachedA = attachedActor; - slsAttached = true; + if (!sHasParent) { + this->dyna.actor.parent = explosive; + sHasParent = true; D_80872824 = 0x32; } } else { @@ -219,9 +218,11 @@ void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx) { if (Math_SmoothScaleMaxMinS(&this->dyna.actor.shape.rot.x, 0x1333, 0x6E - this->unk_164, 0x3E8, 0x32) == 0) { BgDodoago_SetupAction(this, func_8087227C); - Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); } else { - Audio_PlaySoundGeneral(NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } @@ -240,8 +241,8 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) { BgDodoago* this = THIS; EnBom* bomb; - if (this->dyna.actor.attachedA == NULL) { - if ((s32)(this->colliders[1].base.maskA & 2) || (this->colliders[2].base.maskA & 2)) { + if (this->dyna.actor.parent == NULL) { + if ((s32)(this->colliders[1].base.maskA & 2) || (this->colliders[2].base.maskA & 2)) { if ((s32)(this->colliders[1].base.maskA & 2)) { bomb = (EnBom*)this->colliders[1].base.oc; @@ -251,7 +252,7 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) { this->colliders[1].base.maskA &= ~2; this->colliders[2].base.maskA &= ~2; if (bomb->actor.type == ACTORTYPE_EXPLOSIVES && bomb->actor.id == ACTOR_EN_BOM && bomb->actor.params == 0) { - this->dyna.actor.attachedA = &bomb->actor; + this->dyna.actor.parent = &bomb->actor; bomb->timer = 50; bomb->actor.speedXZ = 0.0f; D_80872824 = 0; @@ -264,7 +265,7 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F)) { D_808727C0[0]++; } else { - this->dyna.actor.attachedA = NULL; + this->dyna.actor.parent = NULL; } } } diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index dba3c6abcf..fcf45902ef 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -323,8 +323,8 @@ void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, GlobalContext* globalCtx) { void BgHeavyBlock_Wait(BgHeavyBlock* this, GlobalContext* globalCtx) { s32 quakeIndex; - // if attached A is set, start onepointdemo (cutscene) and quake - if (func_8002F410(&this->dyna.actor, globalCtx)) { + // if block has a parent link has lifted it, start onepointdemo (cutscene) and quake + if (Actor_HasParent(&this->dyna.actor, globalCtx)) { this->timer = 0; switch (this->dyna.actor.params & 0xFF) { @@ -376,8 +376,8 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, player, 8); - // if attachedA is NULL, link threw it - if (func_8002F5A0(&this->dyna.actor, globalCtx)) { + // if parent is NULL, link threw it + if (Actor_HasNoParent(&this->dyna.actor, globalCtx)) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_HEAVY_THROW); this->actionFunc = BgHeavyBlock_Fly; } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index e76bc4ce21..c00c6a07aa 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -51,8 +51,8 @@ void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyInfo_SetActorMove(thisx, 1); DynaPolyInfo_Alloc(&D_0600E1E8, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); - if (Actor_SpawnAttached(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_HSBLOCK, thisx->posRot.pos.x, - thisx->posRot.pos.y + 40.0f, thisx->posRot.pos.z + -28.0f, 0, 0, 0, 2) == NULL) { + if (Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_HSBLOCK, thisx->posRot.pos.x, + thisx->posRot.pos.y + 40.0f, thisx->posRot.pos.z + -28.0f, 0, 0, 0, 2) == NULL) { Actor_Kill(thisx); return; } @@ -62,13 +62,13 @@ void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx) { void func_80886F24(BgHidanFslift* this) { Actor* thisx = &this->dyna.actor; - if (thisx->attachedB != NULL && thisx->attachedB->update != NULL) { - thisx->attachedB->posRot.pos.x = thisx->posRot.pos.x; - thisx->attachedB->posRot.pos.y = thisx->posRot.pos.y + 40.0f; - thisx->attachedB->posRot.pos.z = thisx->posRot.pos.z + -28.0f; + if (thisx->child != NULL && thisx->child->update != NULL) { + thisx->child->posRot.pos.x = thisx->posRot.pos.x; + thisx->child->posRot.pos.y = thisx->posRot.pos.y + 40.0f; + thisx->child->posRot.pos.z = thisx->posRot.pos.z + -28.0f; return; } - thisx->attachedB = NULL; + thisx->child = NULL; } void BgHidanFslift_Destroy(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 8fc28addb6..6695ff7a2d 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -1,8 +1,8 @@ /* -* File: z_bg_spot17_bakudankabe.c -* Overlay: ovl_Bg_Spot17_Bakudankabe -* Description: Death Mountain Crater Bombable Wall -*/ + * File: z_bg_spot17_bakudankabe.c + * Overlay: ovl_Bg_Spot17_Bakudankabe + * Description: Death Mountain Crater Bombable Wall + */ #include "z_bg_spot17_bakudankabe.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 18d7eee03f..0150303393 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -58,7 +58,7 @@ void BgSpot18Futa_Update(Actor* thisx, GlobalContext* globalCtx) { BgSpot18Futa* this = THIS; s32 iVar1; - if (this->actor.attachedA == NULL) { + if (this->actor.parent == NULL) { iVar1 = Math_ApproxF(&this->actor.scale.x, 0, 0.005); if (iVar1 != 0) { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index abd9b8135b..300c5657a6 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -94,7 +94,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { gSaveContext.cutsceneTrigger = 1; } if (LINK_IS_CHILD || ((gSaveContext.eventChkInf[5] & 0x20))) { - if (func_8002F410(&this->actor, globalCtx) != 0) { + if (Actor_HasParent(&this->actor, globalCtx)) { if (LINK_IS_CHILD) { Item_Give(globalCtx, ITEM_SWORD_MASTER); globalCtx->csCtx.segment = D_808BB2F0; @@ -104,7 +104,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { Audio_SetBGM(NA_BGM_STOP); Audio_SetBGM(0x53); gSaveContext.cutsceneTrigger = 1; - this->actor.attachedA = NULL; + this->actor.parent = NULL; BgTokiSwd_SetupAction(this, func_808BB0AC); } else { if (func_8002E084(&this->actor, 0x2000) != 0) { @@ -124,8 +124,8 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx) { Player* player; - // if attached is set, sword has been pulled/placed from the pedestal - if (func_8002F410(&this->actor, globalCtx) != 0) { + // if sword has a parent it has been pulled/placed from the pedestal + if (Actor_HasParent(&this->actor, globalCtx)) { if (LINK_IS_CHILD) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_SWORD_PUTAWAY_STN); this->actor.draw = NULL; // sword has been pulled, dont draw sword diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 164667de17..184219ca8b 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -310,7 +310,7 @@ void func_80985358(DemoIm* this, GlobalContext* globalCtx) { f32 posY = this->actor.posRot.pos.y; f32 posZ = this->actor.posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); } void func_809853B4(DemoIm* this, GlobalContext* globalCtx) { @@ -319,8 +319,8 @@ void func_809853B4(DemoIm* this, GlobalContext* globalCtx) { f32 playerY = player->actor.posRot.pos.y + 80.0f; f32 playerZ = player->actor.posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0, - 0, 0, 0xD); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0, + 0, 0, 0xD); Item_Give(globalCtx, GI_BOMBCHUS_5); } @@ -440,8 +440,8 @@ void func_809858A8(void) { } void func_809858C8(DemoIm* this, GlobalContext* globalCtx) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, - (kREG(17) + 24.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 6); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + (kREG(17) + 24.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 6); } void func_80985948(DemoIm* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index efcde8f5c8..35b054cc55 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -223,7 +223,7 @@ void func_8098E86C(DemoSa* this, GlobalContext* globalCtx) { f32 posY = posRot->y; f32 posZ = posRot->z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); } void func_8098E8C8(DemoSa* this, GlobalContext* globalCtx) { @@ -232,8 +232,8 @@ void func_8098E8C8(DemoSa* this, GlobalContext* globalCtx) { f32 posY = player->actor.posRot.pos.y + 80.0f; f32 posZ = player->actor.posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, - 0xB); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + 0xB); Item_Give(globalCtx, ITEM_MEDALLION_FOREST); } @@ -371,8 +371,8 @@ void func_8098EE08(void) { } void func_8098EE28(DemoSa* this, GlobalContext* globalCtx) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, - (kREG(23) + 25.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 4); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + (kREG(23) + 25.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 4); } void func_8098EEA8(DemoSa* this, GlobalContext* globalCtx) { @@ -604,8 +604,8 @@ void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) { Vec3f* thisPos = &this->actor.posRot.pos; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0601113C, NULL, NULL, 0); - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, - 0, 0, 0, 3); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, + 0, 0, 0, 3); this->action = 16; this->drawConfig = 0; this->actor.shape.unk_14 = 0; diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index a6dbf29fb3..e0b9fb5e3b 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -116,8 +116,8 @@ void func_809B0524(EnAni* this, GlobalContext* globalCtx) { } void func_809B0558(EnAni* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; if (LINK_IS_CHILD) { EnAni_SetupAction(this, func_809B04F0); } else { diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 7a2a267ff9..4dcbc8a58a 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -52,8 +52,8 @@ void EnAnubiceTag_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { this->anubis = - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ANUBICE, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.yawTowardsLink, 0, 0); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ANUBICE, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.yawTowardsLink, 0, 0); if (this->anubis != NULL) { this->actionFunc = EnAnubiceTag_ManageAnubis; diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index aebcb23626..3bc61b9aae 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -65,9 +65,9 @@ void EnAttackNiw_Init(Actor* thisx, GlobalContext* globalCtx) { void EnAttackNiw_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnAttackNiw* this = THIS; - EnNiw* cucco = (EnNiw*)this->actor.attachedA; + EnNiw* cucco = (EnNiw*)this->actor.parent; - if (this->actor.attachedA != NULL) { + if (this->actor.parent != NULL) { if ((cucco->actor.update != NULL) && (cucco->unk_296 > 0)) { cucco->unk_296--; } @@ -356,8 +356,8 @@ void EnAttackNiw_Update(Actor* thisx, GlobalContext* globalCtx) { tmpf1 = 20.0f; if (this->actor.xyzDistFromLinkSq < SQ(tmpf1)) { - cucco = (EnNiw*)this->actor.attachedA; - if ((this->actor.attachedA->update != NULL) && (this->actor.attachedA != NULL) && (cucco != NULL) && + cucco = (EnNiw*)this->actor.parent; + if ((this->actor.parent->update != NULL) && (this->actor.parent != NULL) && (cucco != NULL) && (cucco->unk_26A == 0) && (player->invincibilityTimer == 0)) { func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.posRot.rot.y, 0.0f, 0x10); cucco->unk_26A = 0x46; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 450f73998a..f2d32b7ca1 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -94,8 +94,8 @@ void EnBom_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnBom_Move(EnBom* this, GlobalContext* globalCtx) { - // if attached A is not null, the bomb hasnt been released yet - if (func_8002F410(&this->actor, globalCtx)) { + // if bomb has a parent actor, the bomb hasnt been released yet + if (Actor_HasParent(&this->actor, globalCtx)) { EnBom_SetupAction(this, EnBom_WaitForRelease); this->actor.room = -1; return; @@ -134,8 +134,8 @@ void EnBom_Move(EnBom* this, GlobalContext* globalCtx) { } void EnBom_WaitForRelease(EnBom* this, GlobalContext* globalCtx) { - // if attachedA is NULL bomb has been released - if (func_8002F5A0(&this->actor, globalCtx)) { + // if parent is NULL bomb has been released + if (Actor_HasNoParent(&this->actor, globalCtx)) { EnBom_SetupAction(this, EnBom_Move); EnBom_Move(this, globalCtx); } @@ -183,7 +183,7 @@ void EnBom_Explode(EnBom* this, GlobalContext* globalCtx) { player = PLAYER; if ((player->stateFlags1 & 0x800) && (player->heldActor == &this->actor)) { - player->actor.attachedB = NULL; + player->actor.child = NULL; player->heldActor = NULL; player->interactRangeActor = NULL; player->stateFlags1 &= ~0x800; @@ -275,7 +275,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { effPos = thisx->posRot.pos; effPos.y += 10.0f; - if (func_8002F410(thisx, globalCtx)) { + if (Actor_HasParent(thisx, globalCtx)) { effPos.y += 30.0f; } @@ -305,7 +305,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { Collider_CylinderUpdate(thisx, &this->bombCollider); // if link is not holding the bomb anymore and bump conditions are met, subscribe to OC - if (!func_8002F410(thisx, globalCtx) && this->bumpOn) { + if (!Actor_HasParent(thisx, globalCtx) && this->bumpOn) { CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->bombCollider.base); } diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 4b8a1032f9..85c85a4a0c 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -125,7 +125,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { s32 pad2; if (this->flowerBombScale >= 1.0f) { - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { bombFlower = (EnBombf*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOMBF, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0); @@ -136,10 +136,10 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_PL_PULL_UP_ROCK); this->actor.flags &= ~1; } else { - player->actor.attachedB = NULL; + player->actor.child = NULL; player->heldActor = NULL; player->interactRangeActor = NULL; - this->actor.attachedA = NULL; + this->actor.parent = NULL; player->stateFlags1 &= ~0x800; } } else if (this->bombCollider.base.acFlags & 2) { @@ -169,13 +169,13 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { this->flowerBombScale = 0.0f; } } else { - if (!func_8002F410(&this->actor, globalCtx)) { + if (!Actor_HasParent(&this->actor, globalCtx)) { func_8002F580(&this->actor, globalCtx); } else { - player->actor.attachedB = NULL; + player->actor.child = NULL; player->heldActor = NULL; player->interactRangeActor = NULL; - this->actor.attachedA = NULL; + this->actor.parent = NULL; player->stateFlags1 &= ~0x800; this->actor.posRot.pos = this->actor.initPosRot.pos; } @@ -189,11 +189,11 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { } } - if (func_8002F410(&this->actor, globalCtx)) { - player->actor.attachedB = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + player->actor.child = NULL; player->heldActor = NULL; player->interactRangeActor = NULL; - this->actor.attachedA = NULL; + this->actor.parent = NULL; player->stateFlags1 &= ~0x800; this->actor.posRot.pos = this->actor.initPosRot.pos; } @@ -201,7 +201,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { } void EnBombf_Move(EnBombf* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { // setting flowerBombScale does not do anything in the context of a bomb that link picks up // this and the assignment below are probably left overs this->flowerBombScale = 0.0f; @@ -226,8 +226,8 @@ void EnBombf_Move(EnBombf* this, GlobalContext* globalCtx) { } void EnBombf_WaitForRelease(EnBombf* this, GlobalContext* globalCtx) { - // if attachedA is NULL bomb has been released - if (func_8002F5A0(&this->actor, globalCtx)) { + // if parent is NULL bomb has been released + if (Actor_HasNoParent(&this->actor, globalCtx)) { EnBombf_SetupAction(this, EnBombf_Move); EnBombf_Move(this, globalCtx); } else { @@ -278,7 +278,7 @@ void EnBombf_Explode(EnBombf* this, GlobalContext* globalCtx) { player = PLAYER; if ((player->stateFlags1 & 0x800) && (player->heldActor == &this->actor)) { - player->actor.attachedB = NULL; + player->actor.child = NULL; player->heldActor = NULL; player->interactRangeActor = NULL; player->stateFlags1 &= ~0x800; @@ -302,7 +302,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { this->timer--; } - if ((!this->bumpOn) && (!func_8002F410(thisx, globalCtx)) && + if ((!this->bumpOn) && (!Actor_HasParent(thisx, globalCtx)) && ((thisx->xzDistFromLink >= 20.0f) || (ABS(thisx->yDistFromLink) >= 80.0f))) { this->bumpOn = true; } @@ -387,7 +387,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { effPos.y += 10.0f; - if (func_8002F410(thisx, globalCtx)) { + if (Actor_HasParent(thisx, globalCtx)) { effPos.y += 30.0f; } diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index d167ecf116..64d8893109 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -121,8 +121,8 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { return; } } - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_COW, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, 1); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_COW, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, 1); this->unk_278 = Math_Rand_ZeroFloat(1000.0f) + 40.0f; this->unk_27A = 0; this->actor.unk_1F = 6; @@ -205,8 +205,8 @@ void func_809DF730(EnCow* this, GlobalContext* globalCtx) { } void func_809DF778(EnCow* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx)) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; this->actionFunc = func_809DF730; } else { func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 92cc4177c9..ae96c3ca4d 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -149,8 +149,8 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { if (globalCtx->unk_11D4C(globalCtx, player) != 0) { this->unk_1CA = 0; this->unk_1CC++; - if (this->actor.attachedA != NULL) { - this->actor.attachedA->params = 1; + if (this->actor.parent != NULL) { + this->actor.parent->params = 1; } Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_GRIP); } @@ -171,9 +171,9 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { this->unk_1D0.z = (((this->unk_1D0.z - this->actor.shape.rot.x) - this->unk_1CE) - this->unk_1D0.x); } else { if (player->stateFlags2 & 0x80) { - if (&this->actor == player->actor.attachedA) { + if (&this->actor == player->actor.parent) { player->stateFlags2 &= ~0x80; - player->actor.attachedA = NULL; + player->actor.parent = NULL; player->unk_850 = 200; } } @@ -209,9 +209,9 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { } else { unkVar = ~0x80; if (player->stateFlags2 & 0x80) { - if (&this->actor == player->actor.attachedA) { + if (&this->actor == player->actor.parent) { player->stateFlags2 &= unkVar; - player->actor.attachedA = NULL; + player->actor.parent = NULL; player->unk_850 = 200; } } @@ -231,9 +231,9 @@ void func_809ECF8C(EnDha* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (player->stateFlags2 & 0x80) { - if (&this->actor == player->actor.attachedA) { + if (&this->actor == player->actor.parent) { player->stateFlags2 &= ~0x80; - player->actor.attachedA = NULL; + player->actor.parent = NULL; player->unk_850 = 200; } } @@ -251,12 +251,12 @@ void EnDha_SetupDeath(EnDha* this) { this->unk_1C0 = 8; this->unk_1C8 = 300; - if (this->actor.attachedA != NULL) { - if (this->actor.attachedA->params != 0xA) { + if (this->actor.parent != NULL) { + if (this->actor.parent->params != 0xA) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_HAND_DEAD); } - if (this->actor.attachedA->params <= 0) { - this->actor.attachedA->params--; + if (this->actor.parent->params <= 0) { + this->actor.parent->params--; } } EnDha_SetupAction(this, EnDha_Die); @@ -268,9 +268,9 @@ void EnDha_Die(EnDha* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (player->stateFlags2 & 0x80) { - if (&this->actor == player->actor.attachedA) { + if (&this->actor == player->actor.parent) { player->stateFlags2 &= ~0x80; - player->actor.attachedA = NULL; + player->actor.parent = NULL; player->unk_850 = 200; } } @@ -287,8 +287,8 @@ void EnDha_Die(EnDha* this, GlobalContext* globalCtx) { return; } this->unk_1C8--; - if (this->actor.attachedA != 0) { - if (this->actor.attachedA->params == 0xA) { + if (this->actor.parent != 0) { + if (this->actor.parent->params == 0xA) { Actor_Kill(&this->actor); return; } @@ -321,8 +321,8 @@ void EnDha_UpdateHealth(EnDha* this, GlobalContext* globalCtx) { } } } - if (this->actor.attachedA != NULL) { - if (this->actor.attachedA->params == 0xA) { + if (this->actor.parent != NULL) { + if (this->actor.parent->params == 0xA) { EnDha_SetupDeath(this); } } @@ -334,8 +334,8 @@ void EnDha_Update(Actor* thisx, GlobalContext* globalCtx) { colChkCtx = &globalCtx->colChkCtx; - if (this->actor.attachedA == NULL) { - this->actor.attachedA = Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_DH, ACTORTYPE_ENEMY, 10000.0f); + if (this->actor.parent == NULL) { + this->actor.parent = Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_DH, ACTORTYPE_ENEMY, 10000.0f); } EnDha_UpdateHealth(this, globalCtx); this->actionFunc(this, globalCtx); diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index c9c3551ea2..9c13f555e3 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -88,8 +88,8 @@ void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx) { } void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; this->actionFunc = EnDs_DisplayOddPotionText; gSaveContext.timer2State = 0; } else { @@ -169,8 +169,8 @@ int EnDs_CheckRupeesAndBottle() { } void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; this->actionFunc = EnDs_Talk; } else { func_8002F434(&this->actor, globalCtx, GI_POTION_BLUE, 10000.0f, 50.0f); diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 7b0f15dad7..9bdd1cddc2 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -67,8 +67,8 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_150 = 1; } else { phi_f12 = 200.99f; - if ((thisx->attachedA != NULL) && (thisx->attachedA->update != NULL)) { - phi_f12 = 200.99f + ((EnDivingGame*)thisx->attachedA)->unk_2AA * 10.0f; + if ((thisx->parent != NULL) && (thisx->parent->update != NULL)) { + phi_f12 = 200.99f + ((EnDivingGame*)thisx->parent)->unk_2AA * 10.0f; } temp_v0 = Math_Rand_ZeroFloat(phi_f12); if ((temp_v0 >= 0) && (temp_v0 < 40)) { @@ -88,8 +88,8 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, this->unk_160); this->rupeeValue = 500; this->unk_150 = 3; - if ((thisx->attachedA != NULL) && (thisx->attachedA->update != NULL)) { - ((EnDivingGame*)thisx->attachedA)->unk_2AA = 0; + if ((thisx->parent != NULL) && (thisx->parent->update != NULL)) { + ((EnDivingGame*)thisx->parent)->unk_2AA = 0; } } } @@ -201,8 +201,8 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxF(&this->actor.gravity, -2.0f, 0.3f, 1.0f); EnExRuppy_SpawnSparkles(this, globalCtx, 2, 0); func_80078884(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); - if ((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL) && - (((((EnDivingGame*)this->actor.attachedA)->unk_296 == 0) || (this->actor.bgCheckFlags & 0x20)) || + if ((this->actor.parent != NULL) && (this->actor.parent->update != NULL) && + (((((EnDivingGame*)this->actor.parent)->unk_296 == 0) || (this->actor.bgCheckFlags & 0x20)) || (this->timer == 0))) { this->isFalling = 1; this->actor.speedXZ = 0.0f; @@ -219,8 +219,8 @@ void EnExRuppy_EnterWater(EnExRuppy* this, GlobalContext* globalCtx) { s32 pad; f32 temp_f2; - if (((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL)) && - (((EnDivingGame*)this->actor.attachedA)->unk_2A2 == 2)) { + if (((this->actor.parent != NULL) && (this->actor.parent->update != NULL)) && + (((EnDivingGame*)this->actor.parent)->unk_2A2 == 2)) { this->isFalling = 0; this->actor.posRot.pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 300.0f) + -260.0f; this->actor.posRot.pos.y = ((Math_Rand_ZeroOne() - 0.5f) * 200.0f) + 370.0f; @@ -250,8 +250,8 @@ void EnExRuppy_Sink(EnExRuppy* this, GlobalContext* globalCtx) { func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); this->actionFunc = func_80A0AD88; } - if (((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL) && - ((EnDivingGame*)this->actor.attachedA)->unk_29C == 0)) { + if (((this->actor.parent != NULL) && (this->actor.parent->update != NULL) && + ((EnDivingGame*)this->actor.parent)->unk_29C == 0)) { this->timer = 20; this->actionFunc = func_80A0AEE0; } @@ -267,8 +267,8 @@ void func_80A0AD88(EnExRuppy* this, GlobalContext* globalCtx) { this->timer = 10; func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Math_Rand_ZeroFloat(0.03f) + 0.07f); } - if (this->actor.attachedA != NULL) { - divingGame = this->actor.attachedA; + if (this->actor.parent != NULL) { + divingGame = this->actor.parent; if (divingGame->actor.update != NULL) { if (divingGame->unk_29C == 0) { this->timer = 20; @@ -306,9 +306,9 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx) { distToBlowUp = 30.0f; } if (this->actor.xyzDistFromLinkSq < SQ(distToBlowUp)) { - if (this->actor.attachedA != NULL) { - if (this->actor.attachedA->update != NULL) { - ((EnDivingGame*)this->actor.attachedA)->transitionDrawTable[15].z = 1; + if (this->actor.parent != NULL) { + if (this->actor.parent->update != NULL) { + ((EnDivingGame*)this->actor.parent)->transitionDrawTable[15].z = 1; } } else { // That idiot! error diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 850b63c72c..d577cb8ded 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -188,9 +188,9 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { this->unk_150.x = 0x25; this->actor.posRot.pos.y -= 200.0f; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 500, - 0, 0, 0x24); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 500, 0, + 0, 0x24); tmpVec = D_80A117BC; @@ -216,15 +216,15 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { randY = (Math_Rand_ZeroOne() < 0.5f) ? 0x1000 : 0; for (i = 0; i < 8; i++) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, - (i * 8192) + randY, 0x4000, i + 0x64); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + (i * 8192) + randY, 0x4000, i + 0x64); } for (i = 0; i < 8; i++) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, - (i * 8192) + randY, 0, 0x23); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + (i * 8192) + randY, 0, 0x23); } } @@ -374,7 +374,7 @@ void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { Vec3f sp54; osSyncPrintf("yari hikari 1\n"); - horse = (EnfHG*)this->actor.attachedA; + horse = (EnfHG*)this->actor.parent; if ((this->unk_156 % 2) != 0) { Actor_SetScale(&this->actor, 6.0f); } else { @@ -408,7 +408,7 @@ void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s") void func_80A10F18(EnFhgFire* this, GlobalContext* globalCtx) { - EnfHG* horse = (EnfHG*)this->actor.attachedA; + EnfHG* horse = (EnfHG*)this->actor.parent; f32 phi_f0; s32 tmp; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 21ead1029d..1aaf001d43 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -93,7 +93,7 @@ extern AnimationHeader D_06009244; void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = THIS; - GlobalContext* gctx = globalCtx; + GlobalContext* globalCtx2 = globalCtx; s32 invisble; s32 pad; @@ -120,28 +120,28 @@ void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = EnFloormas_SmWait; } else { // spawn first small floormaster - this->actor.attachedA = - Actor_Spawn(&gctx->actorCtx, gctx, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, this->actor.posRot.pos.y, - this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); - if (this->actor.attachedA == NULL) { + this->actor.parent = + Actor_Spawn(&globalCtx2->actorCtx, globalCtx2, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); + if (this->actor.parent == NULL) { Actor_Kill(&this->actor); return; } // spawn 2nd small floormaster - this->actor.attachedB = - Actor_Spawn(&gctx->actorCtx, gctx, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, this->actor.posRot.pos.y, - this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); - if (this->actor.attachedB == NULL) { - Actor_Kill(this->actor.attachedA); + this->actor.child = + Actor_Spawn(&globalCtx2->actorCtx, globalCtx2, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); + if (this->actor.child == NULL) { + Actor_Kill(this->actor.parent); Actor_Kill(&this->actor); return; } // link floormasters together - this->actor.attachedA->attachedB = &this->actor; - this->actor.attachedA->attachedA = this->actor.attachedB; - this->actor.attachedB->attachedA = &this->actor; - this->actor.attachedB->attachedB = this->actor.attachedA; + this->actor.parent->child = &this->actor; + this->actor.parent->parent = this->actor.child; + this->actor.child->parent = &this->actor; + this->actor.child->child = this->actor.parent; EnFloormas_SetupBigDecideAction(this); } } @@ -256,8 +256,8 @@ void EnFloormas_SetupSplit(EnFloormas* this) { } else { this->actor.draw = EnFloormas_Draw; } - this->actor.shape.rot.y = this->actor.attachedA->shape.rot.y + 0x5555; - this->actor.posRot.pos = this->actor.attachedA->posRot.pos; + this->actor.shape.rot.y = this->actor.parent->shape.rot.y + 0x5555; + this->actor.posRot.pos = this->actor.parent->posRot.pos; this->actor.params = 0x10; SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, SkelAnime_GetFrameCount(&D_060019CC), 2, 0.0f); this->collider.dim.radius = sCylinderInit.dim.radius * 0.6f; @@ -342,13 +342,13 @@ void EnFloormas_SetupMerge(EnFloormas* this) { } void EnFloormas_SetupSmWait(EnFloormas* this) { - EnFloormas* attachedA = (EnFloormas*)this->actor.attachedA; - EnFloormas* attachedB = (EnFloormas*)this->actor.attachedB; + EnFloormas* parent = (EnFloormas*)this->actor.parent; + EnFloormas* child = (EnFloormas*)this->actor.child; // if this is the last remaining small floor master, kill all. - if ((attachedA->actionFunc == EnFloormas_SmWait) && (attachedB->actionFunc == EnFloormas_SmWait)) { - Actor_Kill(&attachedA->actor); - Actor_Kill(&attachedB->actor); + if ((parent->actionFunc == EnFloormas_SmWait) && (child->actionFunc == EnFloormas_SmWait)) { + Actor_Kill(&parent->actor); + Actor_Kill(&child->actor); Actor_Kill(&this->actor); return; } @@ -398,8 +398,8 @@ void EnFloormas_Die(EnFloormas* this, GlobalContext* globalCtx) { if (this->actor.scale.x > 0.004f) { // split this->actor.shape.rot.y = this->actor.yawTowardsLink + 0x8000; - EnFloormas_SetupSplit((EnFloormas*)this->actor.attachedB); - EnFloormas_SetupSplit((EnFloormas*)this->actor.attachedA); + EnFloormas_SetupSplit((EnFloormas*)this->actor.child); + EnFloormas_SetupSplit((EnFloormas*)this->actor.parent); EnFloormas_SetupSplit(this); Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SPLIT); } else { @@ -678,10 +678,10 @@ void EnFloormas_SmDecideAction(EnFloormas* this, GlobalContext* globalCtx) { } if (this->actor.params == MERGE_SLAVE) { - if (this->actor.attachedA->params == MERGE_MASTER) { - primaryFloormas = this->actor.attachedA; - } else if (this->actor.attachedB->params == MERGE_MASTER) { - primaryFloormas = this->actor.attachedB; + if (this->actor.parent->params == MERGE_MASTER) { + primaryFloormas = this->actor.parent; + } else if (this->actor.child->params == MERGE_MASTER) { + primaryFloormas = this->actor.child; } else { this->actor.params = 0x10; return; @@ -730,8 +730,8 @@ void EnFloormas_JumpAtLink(EnFloormas* this, GlobalContext* globalCtx) { void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx) { Player* player = PLAYER; - EnFloormas* attachedA; - EnFloormas* attachedB; + EnFloormas* parent; + EnFloormas* child; f32 yDelta; f32 xzDelta; @@ -761,14 +761,14 @@ void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx) { // let go if (!(player->stateFlags2 & 0x80) || (player->invincibilityTimer < 0)) { - attachedA = this->actor.attachedA; - attachedB = this->actor.attachedB; + parent = this->actor.parent; + child = this->actor.child; - if (((attachedA->actionFunc == EnFloormas_GrabLink) || attachedA->actionFunc == EnFloormas_SmWait) && - (attachedB->actionFunc == EnFloormas_GrabLink || attachedB->actionFunc == EnFloormas_SmWait)) { + if (((parent->actionFunc == EnFloormas_GrabLink) || parent->actionFunc == EnFloormas_SmWait) && + (child->actionFunc == EnFloormas_GrabLink || child->actionFunc == EnFloormas_SmWait)) { - attachedA->actor.params = MERGE_SLAVE; - attachedB->actor.params = MERGE_SLAVE; + parent->actor.params = MERGE_SLAVE; + child->actor.params = MERGE_SLAVE; this->actor.params = MERGE_MASTER; } @@ -796,10 +796,10 @@ void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx) Actor* primFloormas; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (this->actor.attachedA->params == MERGE_MASTER) { - primFloormas = this->actor.attachedA; - } else if (this->actor.attachedB->params == MERGE_MASTER) { - primFloormas = this->actor.attachedB; + if (this->actor.parent->params == MERGE_MASTER) { + primFloormas = this->actor.parent; + } else if (this->actor.child->params == MERGE_MASTER) { + primFloormas = this->actor.child; } else { if (this->actor.bgCheckFlags & 2) { this->actor.params = 0x10; @@ -830,8 +830,8 @@ void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx) } void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx) { - EnFloormas* attachedA; - EnFloormas* attachedB; + EnFloormas* parent; + EnFloormas* child; s32 mergeCnt; f32 prevScale; f32 curScale; @@ -840,23 +840,23 @@ void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx) { DECR(this->smActionTimer); - attachedA = this->actor.attachedA; - attachedB = this->actor.attachedB; + parent = this->actor.parent; + child = this->actor.child; if (this->smActionTimer == 0) { - if (attachedA->actionFunc != EnFloormas_SmWait) { - EnFloormas_SetupSmShrink(attachedA, globalCtx); + if (parent->actionFunc != EnFloormas_SmWait) { + EnFloormas_SetupSmShrink(parent, globalCtx); } - if (attachedB->actionFunc != EnFloormas_SmWait) { - EnFloormas_SetupSmShrink(attachedB, globalCtx); + if (child->actionFunc != EnFloormas_SmWait) { + EnFloormas_SetupSmShrink(child, globalCtx); } } else { - if ((attachedA->actionFunc != EnFloormas_SmWait) && (attachedA->actionFunc != EnFloormas_SmShrink)) { + if ((parent->actionFunc != EnFloormas_SmWait) && (parent->actionFunc != EnFloormas_SmShrink)) { mergeCnt++; } - if ((attachedB->actionFunc != EnFloormas_SmWait) && (attachedB->actionFunc != EnFloormas_SmShrink)) { + if ((child->actionFunc != EnFloormas_SmWait) && (child->actionFunc != EnFloormas_SmShrink)) { mergeCnt++; } } diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 9d9bc86c53..df8d920c6b 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -43,7 +43,7 @@ void EnGanonOrgan_Update(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("ORGAN MOVE 1\n"); if (thisx->params == 1) { - dorf = (BossGanon*)thisx->attachedA; + dorf = (BossGanon*)thisx->parent; if (dorf->organFadeTimer == 0) { Actor_Kill(thisx); } @@ -97,7 +97,7 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx; Gfx* dispRefs[4]; - dorf = (BossGanon*)thisx->attachedA; + dorf = (BossGanon*)thisx->parent; gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205); osSyncPrintf("ORGAN DRAW 1\n"); diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 2f5db00f38..7b7668e01c 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -116,8 +116,8 @@ void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->path == 3) { for (i = 0; i < ARRAY_COUNT(sRupeePositions); i++) { rupeePos = sRupeePositions[i]; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_RUPPY, rupeePos.x, - rupeePos.y, rupeePos.z, 0, 0, 0, 3); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_RUPPY, rupeePos.x, rupeePos.y, + rupeePos.z, 0, 0, 0, 3); } } diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index c65c8cd875..63fd4738ba 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -289,7 +289,7 @@ void func_80A53638(EnHeishi2* this, GlobalContext* globalCtx) { if (ACTOR_BG_SPOT15_SAKU != actor->dyna.actor.id) { actor = (BgSpot15Saku*)(actor->dyna.actor.next); } else { - this->attachedGate = actor; + this->gate = actor; actor->unk_168 = 1; break; } @@ -325,7 +325,7 @@ void func_80A53850(EnHeishi2* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); - gate = (BgSpot15Saku*)this->attachedGate; + gate = (BgSpot15Saku*)this->gate; if ((this->unk_2F2[0] == 0) || (gate->unk_168 == 0)) { Gameplay_ClearCamera(globalCtx, this->cameraId); Gameplay_ChangeCameraStatus(globalCtx, 0, 7); @@ -453,10 +453,10 @@ void func_80A53D0C(EnHeishi2* this, GlobalContext* globalCtx) { } if (this->unk_2EC <= frameCount) { while (gate != NULL) { - if (ACTOR_BG_GATE_SHUTTER != gate->dyna.actor.id) { + if (gate->dyna.actor.id != ACTOR_BG_GATE_SHUTTER) { gate = (BgGateShutter*)gate->dyna.actor.next; } else { - this->attachedGate = gate; + this->gate = gate; gate->openingState = 1; break; } @@ -496,7 +496,7 @@ void func_80A53F30(EnHeishi2* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); - gate = (BgGateShutter*)this->attachedGate; + gate = (BgGateShutter*)this->gate; if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) { Gameplay_ClearCamera(globalCtx, this->cameraId); Gameplay_ChangeCameraStatus(globalCtx, 0, 7); @@ -619,7 +619,7 @@ void func_80A543A0(EnHeishi2* this, GlobalContext* globalCtx) { if (ACTOR_BG_GATE_SHUTTER != gate->dyna.actor.id) { gate = (BgGateShutter*)(gate->dyna.actor.next); } else { - this->attachedGate = gate; + this->gate = gate; if (this->unk_30A != 2) { gate->openingState = -1; break; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h index 6cdfc2e06c..fbb32cdc4f 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h @@ -43,7 +43,7 @@ typedef struct EnHeishi2 { /* 0x030D */ char unk_30D; /* 0x030E */ s16 unk_30E; /* 0x0310 */ s16 cameraId; - /* 0x0314 */ Actor* attachedGate; + /* 0x0314 */ Actor* gate; // first BgGateShutter that can be found in the actor list /* 0x0318 */ char unk_318[0x18]; /* 0x0330 */ MtxF mtxf_330; /* 0x0370 */ char unk_370[0x28]; diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 2cea6c8558..badb4460ce 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -98,8 +98,8 @@ void EnHintnuts_Init(Actor* thisx, GlobalContext* globalCtx) { } } EnHintnuts_SetupWait(this); - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_HINTNUTS, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.posRot.rot.y, 0, 0xA); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_HINTNUTS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.posRot.rot.y, 0, 0xA); } } @@ -443,8 +443,8 @@ void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx) { Flags_SetClear(globalCtx, this->actor.room); sPuzzleCounter = 3; } - if (this->actor.attachedB != NULL) { - Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP); + if (this->actor.child != NULL) { + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.child, ACTORTYPE_PROP); } Actor_Kill(&this->actor); } @@ -458,8 +458,8 @@ void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx) { } if (this->animFlagAndTimer == 0) { if (sPuzzleCounter == 3) { - if (this->actor.attachedB != NULL) { - Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP); + if (this->actor.child != NULL) { + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.child, ACTORTYPE_PROP); } this->animFlagAndTimer = 1; } else if (sPuzzleCounter == -4) { diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index a6565eecd8..f23e916672 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -275,9 +275,9 @@ void func_80A7C5EC(EnInsect* this, GlobalContext* globalCtx) { (this->unk_31A < 4)) { Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), 2000); - } else if (this->actor.attachedB != NULL && &this->actor != this->actor.attachedB) { + } else if (this->actor.child != NULL && &this->actor != this->actor.child) { Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, - Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.attachedB->posRot.pos), 2000); + Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.child->posRot.pos), 2000); } this->actor.shape.rot.y = this->actor.posRot.rot.y; @@ -713,10 +713,10 @@ void EnInsect_Update(Actor* thisx, GlobalContext* globalCtx) { EnInsect* this = THIS; s32 phi_v0; - if (this->actor.attachedB != NULL) { - if (this->actor.attachedB->update == NULL) { - if (&this->actor != this->actor.attachedB) { - this->actor.attachedB = NULL; + if (this->actor.child != NULL) { + if (this->actor.child->update == NULL) { + if (&this->actor != this->actor.child) { + this->actor.child = NULL; } } } @@ -758,8 +758,8 @@ void EnInsect_Update(Actor* thisx, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, &this->actor, 8.0f, 5.0f, 0.0f, phi_v0); } - if (func_8002F410(&this->actor, globalCtx) != 0) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; phi_v0 = this->actor.params & 3; if (phi_v0 == 2 || phi_v0 == 3) { diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 25ebcdafbf..6d7585dbae 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -58,8 +58,8 @@ void EnJs_Init(Actor* thisx, GlobalContext* globalCtx) { En_Js_SetupAction(this, func_80A89304); this->unk_284 = 0; this->actor.gravity = -1.0f; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_JSJUTAN, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_JSJUTAN, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0); } void EnJs_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -115,8 +115,8 @@ void func_80A8910C(EnJs* this, GlobalContext* globalCtx) { } void func_80A89160(EnJs* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx)) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; En_Js_SetupAction(this, func_80A8910C); } else { func_8002F434(&this->actor, globalCtx, GI_BOMBCHUS_10, 10000.0f, 50.0f); diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 19b4d83dd0..6e99d389e1 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -318,9 +318,9 @@ void EnKz_Init(Actor* thisx, GlobalContext* globalCtx) { if (LINK_IS_ADULT) { if (!(gSaveContext.infTable[19] & 0x100)) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_BG_ICE_SHELTER, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, - 0x04FF); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_BG_ICE_SHELTER, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, + 0x04FF); } this->actionFunc = EnKz_Wait; } else { @@ -409,8 +409,8 @@ void EnKz_SetupGetItem(EnKz* this, GlobalContext* globalCtx) { f32 xzRange; f32 yRange; - if (func_8002F410(this, globalCtx)) { - this->actor.attachedA = NULL; + if (Actor_HasParent(this, globalCtx)) { + this->actor.parent = NULL; this->unk_1E0.unk_00 = 1; this->actionFunc = EnKz_StartTimer; } else { diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index c4055b0948..084f1beea4 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -84,8 +84,8 @@ void EnLight_UpdatePosRot(EnLight* this, GlobalContext* globalCtx) { // update yaw for billboard effect this->actor.shape.rot.y = func_8005A9F4(ACTIVE_CAM) + 0x8000; - if (this->actor.attachedA != NULL) { - Math_Vec3f_Copy(&this->actor.posRot.pos, &(this->actor.attachedA)->posRot.pos); + if (this->actor.parent != NULL) { + Math_Vec3f_Copy(&this->actor.posRot.pos, &(this->actor.parent)->posRot.pos); this->actor.posRot.pos.y += 17.0f; } diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 1dfcdfe6e3..ed170c4180 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -73,11 +73,11 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) { EnLightbox* this = THIS; if (this->dyna.unk_162 != 0) { - if (func_8002F5A0(thisx, globalCtx)) { + if (Actor_HasNoParent(thisx, globalCtx)) { this->dyna.unk_162 = 0; } } else { - if (func_8002F410(thisx, globalCtx)) { + if (Actor_HasParent(thisx, globalCtx)) { this->dyna.unk_162++; } else { if (thisx->speedXZ) { diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 134567adc3..7bdf6020e9 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -303,8 +303,8 @@ void func_80AA0D88(EnMa1* this, GlobalContext* globalCtx) { } void func_80AA0EA0(EnMa1* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx)) { - this->actor.attachedA = NULL; + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; this->actionFunc = func_80AA0EFC; } else { func_8002F434(&this->actor, globalCtx, GI_WEIRD_EGG, 120.0f, 10.0f); diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index fbe67d63a1..6ce4abeaf6 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -601,8 +601,8 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01f); this->actor.unk_1F = 6; this->alpha = 255; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3); if (((globalCtx->sceneNum == SCENE_SPOT04) && !(gSaveContext.eventChkInf[0] & 0x10)) || ((globalCtx->sceneNum == SCENE_SPOT04) && (gSaveContext.eventChkInf[0] & 0x10) && diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 60a3038052..494eac4e8d 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -142,9 +142,9 @@ void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { } void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { // if attached is set + if (Actor_HasParent(&this->actor, globalCtx)) { Rupees_ChangeBy(-sPrices[BEANS_BOUGHT]); - this->actor.attachedA = NULL; + this->actor.parent = NULL; this->actionFunc = EnMs_TalkAfterPurchase; return; } diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 3d1abb4efc..eeaf336797 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -68,7 +68,7 @@ void EnNiwGirl_Init(Actor* thisx, GlobalContext* globalCtx) { vec1.x = vec1.y = 0.0f; vec1.z = 50.0; Matrix_MultVec3f(&vec1, &vec2); - this->chasedEnNiw = (EnNiw*)Actor_SpawnAttached( + this->chasedEnNiw = (EnNiw*)Actor_SpawnAsChild( &globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_NIW, this->actor.posRot.pos.x + vec2.x, this->actor.posRot.pos.y + vec2.y, this->actor.posRot.pos.z + vec2.z, 0, this->actor.posRot.rot.y, 0, 0xA); if (this->chasedEnNiw != NULL) { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index ebe12c074e..7a2844d55a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1028,8 +1028,8 @@ void func_80AECCB0(EnRu1* this, GlobalContext* globalCtx) { spawnX = ((kREG(1) + 12.0f) * Math_Sins(yawTowardsLink)) + pos->x; spawnY = pos->y; spawnZ = ((kREG(1) + 12.0f) * Math_Coss(yawTowardsLink)) + pos->z; - this->unk_278 = Actor_SpawnAttached(&globalCtx->actorCtx, this, globalCtx, ACTOR_DOOR_WARP1, spawnX, spawnY, spawnZ, - 0, yawTowardsLink, 0, 5); + this->unk_278 = Actor_SpawnAsChild(&globalCtx->actorCtx, this, globalCtx, ACTOR_DOOR_WARP1, spawnX, spawnY, spawnZ, + 0, yawTowardsLink, 0, 5); } void func_80AECDA0(EnRu1* this, GlobalContext* globalCtx) { @@ -1595,7 +1595,7 @@ void func_80AEE488(EnRu1* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; s8 curRoomNum; - if (func_8002F410(thisx, globalCtx)) { + if (Actor_HasParent(thisx, globalCtx)) { curRoomNum = globalCtx->roomCtx.curRoom.num; this->roomNum3 = curRoomNum; this->action = 31; @@ -1663,7 +1663,7 @@ void func_80AEE7C4(EnRu1* this, GlobalContext* globalCtx) { Player* player; f32* unk_370 = &this->unk_370; - if (func_8002F5A0(this, globalCtx)) { + if (Actor_HasNoParent(this, globalCtx)) { frameCount = SkelAnime_GetFrameCount(&D_06006B9C.genericHeader); SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0, frameCount, 0, -8.0f); func_80AED6DC(this, globalCtx); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 323750c31b..a461297bf7 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -252,7 +252,7 @@ void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { f32 posY = thisx->posRot.pos.y; f32 posZ = thisx->posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); } void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { @@ -261,8 +261,7 @@ void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { f32 posY = player->actor.posRot.pos.y + 50.0f; f32 posZ = player->actor.posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, - 10); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10); Item_Give(globalCtx, ITEM_MEDALLION_WATER); } @@ -391,8 +390,8 @@ void func_80AF2E64() { } void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, - kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); } void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 9db3499921..a95ac414c4 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -513,11 +513,11 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { break; } case 2: - if (func_8002F410(this, globalCtx) != 0) { + if (Actor_HasParent(this, globalCtx)) { func_800C078C(globalCtx, 0, this->unk_1E8); Gameplay_ChangeCameraStatus(globalCtx, 0, 7); Gameplay_ClearCamera(globalCtx, this->unk_1E8); - this->actor.attachedA = NULL; + this->actor.parent = NULL; this->unk_1E2 += 1; } else { func_8002F434(this, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index d86adb5539..fe41a23239 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -709,19 +709,19 @@ void func_80B4FFF0(EnZl2* this, GlobalContext* globalCtx) { posY = this->actor.posRot.pos.y + (kREG(5) + -26.0f); posZ = this->actor.posRot.pos.z; - Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, - 0x4000, 0, 3); + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000, + 0, 3); this->unk_248 = 1; } } void func_80B5008C(EnZl2* this) { - Actor* attachedB = this->actor.attachedB; + Actor* child = this->actor.child; - if (attachedB != NULL) { - attachedB->posRot.pos.x = this->actor.posRot.pos.x; - attachedB->posRot.pos.y = this->actor.posRot.pos.y + (kREG(5) + -26.0f); - attachedB->posRot.pos.z = this->actor.posRot.pos.z; + if (child != NULL) { + child->posRot.pos.x = this->actor.posRot.pos.x; + child->posRot.pos.y = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + child->posRot.pos.z = this->actor.posRot.pos.z; } } @@ -751,8 +751,8 @@ void func_80B500E0(EnZl2* this, GlobalContext* globalCtx) { } void func_80B501C4(EnZl2* this, s32 alpha) { - if (this->actor.attachedB != NULL) { - ((DoorWarp1*)this->actor.attachedB)->alpha = alpha; + if (this->actor.child != NULL) { + ((DoorWarp1*)this->actor.child)->alpha = alpha; } } @@ -1200,12 +1200,12 @@ void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) { } void func_80B51310(EnZl2* this, GlobalContext* globalCtx) { - Actor* attachedB; + Actor* child; if (EnZl2_GetNpcAction(globalCtx, 0) == NULL) { - attachedB = this->actor.attachedB; - if (attachedB != NULL) { - Actor_Kill(attachedB); + child = this->actor.child; + if (child != NULL) { + Actor_Kill(child); } Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index a03be28746..1925630457 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -58,7 +58,7 @@ void ItemBHeart_Update(Actor* thisx, GlobalContext* globalCtx) { func_80B85264(this, globalCtx); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { Flags_SetCollectible(globalCtx, 0x1F); Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 3ccf73f320..cef3268d68 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -117,7 +117,7 @@ void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx) { } void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { + if (Actor_HasParent(&this->actor, globalCtx)) { if ((this->actor.params & 0xFF) == 1) { gSaveContext.eventChkInf[3] |= 2; Flags_SetSwitch(globalCtx, 0xB); @@ -129,7 +129,7 @@ void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx) { } void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx) != 0) { + if (Actor_HasParent(&this->actor, globalCtx)) { if ((this->actor.params & 0xFF) == 1) { gSaveContext.eventChkInf[3] |= 2; Flags_SetSwitch(globalCtx, 0xB); diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 25cfc49a76..e1d18e55af 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -177,7 +177,7 @@ void ItemOcarina_StartSoTCutscene(ItemOcarina* this, GlobalContext* globalCtx) { } void ItemOcarina_WaitInWater(ItemOcarina* this, GlobalContext* globalCtx) { - if (func_8002F410(&this->actor, globalCtx)) { + if (Actor_HasParent(&this->actor, globalCtx)) { gSaveContext.eventChkInf[4] |= 8; Flags_SetSwitch(globalCtx, 3); this->actionFunc = ItemOcarina_StartSoTCutscene; diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index d3aa946a8b..9a4f7c39bd 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -69,9 +69,9 @@ void func_80B93B68(ObjHsblock* this, GlobalContext* globalCtx, UNK_TYPE arg2, Dy void func_80B93BF0(ObjHsblock* this, GlobalContext* globalCtx) { if ((this->dyna.actor.params >> 5) & 1) { - Actor_SpawnAttached(&globalCtx->actorCtx, this, globalCtx, ACTOR_OBJ_ICE_POLY, this->dyna.actor.posRot.pos.x, - this->dyna.actor.posRot.pos.y, this->dyna.actor.posRot.pos.z, this->dyna.actor.posRot.rot.x, - this->dyna.actor.posRot.rot.y, this->dyna.actor.posRot.rot.z, 1); + Actor_SpawnAsChild(&globalCtx->actorCtx, this, globalCtx, ACTOR_OBJ_ICE_POLY, this->dyna.actor.posRot.pos.x, + this->dyna.actor.posRot.pos.y, this->dyna.actor.posRot.pos.z, this->dyna.actor.posRot.rot.x, + this->dyna.actor.posRot.rot.y, this->dyna.actor.posRot.rot.z, 1); } } diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 6449f640d5..ba07ee8888 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -67,9 +67,9 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { spawnPos = &block->posVecs[typeIdx]; - if (Actor_SpawnAttached(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, - spawnPos->z, 0, block->rotY, 0, - ((block->paramVal1 << 6) & 0xC0) | (block->paramVal2 & 0xF) | 0xFF00) == NULL) { + if (Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, + spawnPos->z, 0, block->rotY, 0, + ((block->paramVal1 << 6) & 0xC0) | (block->paramVal2 & 0xF) | 0xFF00) == NULL) { // Push-pull block failure osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); @@ -78,7 +78,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { return; } if (block->unk_24[typeIdx] & 2) { - ((ObjOshihiki*)thisx->attachedB)->unk_1BE = 1; + ((ObjOshihiki*)thisx->child)->unk_1BE = 1; } thisx->posRot.rot.z = thisx->shape.rot.z = 0; osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, @@ -94,7 +94,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 cond2; for (i = 0; i < 3; i++) { - if (Math3D_Vec3fDistSq(&thisx->attachedB->posRot.pos, &block->posVecs[i]) < 0.001f) { + if (Math3D_Vec3fDistSq(&thisx->child->posRot.pos, &block->posVecs[i]) < 0.001f) { if (block->unk_24[i] & 1) { if ((thisx->params >> 6) & 1) { sfxCond1 = false; @@ -127,7 +127,7 @@ void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { sFlagSwitchFuncs[sFlags[i][1]](globalCtx, (thisx->params >> 8) & 0x3F); if (block->unk_24[i] & 2) { - ((ObjOshihiki*)thisx->attachedB)->unk_1BE = 1; + ((ObjOshihiki*)thisx->child)->unk_1BE = 1; } break;