From 0f644b7545af96c41050da1787cf1ba0260b70c6 Mon Sep 17 00:00:00 2001 From: Lucas Shaw <49287729+shawlucas@users.noreply.github.com> Date: Thu, 5 Aug 2021 08:53:58 -0700 Subject: [PATCH] Decompiled A LOT of objects (#815) * . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw Co-authored-by: Dragorn421 Co-authored-by: Fig02 --- .../actors/ovl_Obj_Lift/ObjLift_Draw.s | 4 +- .../actors/ovl_Obj_Lift/ObjLift_Init.s | 4 +- .../actors/ovl_Obj_Lift/func_80B96160.s | 4 +- assets/xml/objects/object_ane.xml | 59 ++ assets/xml/objects/object_ani.xml | 66 ++ assets/xml/objects/object_aob.xml | 59 ++ assets/xml/objects/object_bdan_objects.xml | 61 ++ assets/xml/objects/object_bombf.xml | 14 + assets/xml/objects/object_bowl.xml | 18 + assets/xml/objects/object_bubble.xml | 6 + assets/xml/objects/object_cow.xml | 55 ++ assets/xml/objects/object_d_hsblock.xml | 10 + assets/xml/objects/object_d_lift.xml | 8 + assets/xml/objects/object_ddan_objects.xml | 32 + assets/xml/objects/object_door_gerudo.xml | 7 + assets/xml/objects/object_ds.xml | 38 ++ assets/xml/objects/object_dy_obj.xml | 121 ++++ assets/xml/objects/object_efc_doughnut.xml | 8 + assets/xml/objects/object_ei.xml | 56 ++ assets/xml/objects/object_fw.xml | 105 ++++ assets/xml/objects/object_fz.xml | 12 + assets/xml/objects/object_geff.xml | 7 + assets/xml/objects/object_gjyo_objects.xml | 7 + assets/xml/objects/object_goroiwa.xml | 6 + assets/xml/objects/object_gs.xml | 8 + assets/xml/objects/object_gt.xml | 38 ++ assets/xml/objects/object_haka.xml | 10 + assets/xml/objects/object_heavy_object.xml | 9 + assets/xml/objects/object_ingate.xml | 7 + assets/xml/objects/object_js.xml | 55 ++ assets/xml/objects/object_kibako2.xml | 19 + assets/xml/objects/object_mag.xml | 23 + assets/xml/objects/object_mamenoki.xml | 15 + assets/xml/objects/object_mastergolon.xml | 5 + .../xml/objects/object_masterkokirihead.xml | 14 + assets/xml/objects/object_masterzoora.xml | 5 + assets/xml/objects/object_md.xml | 87 +++ assets/xml/objects/object_menkuri_objects.xml | 18 + assets/xml/objects/object_ms.xml | 43 ++ assets/xml/objects/object_nb.xml | 2 +- assets/xml/objects/object_niw.xml | 49 ++ assets/xml/objects/object_nwc.xml | 15 + assets/xml/objects/object_os_anime.xml | 69 +++ assets/xml/objects/object_owl.xml | 65 ++ assets/xml/objects/object_peehat.xml | 53 ++ assets/xml/objects/object_relay_objects.xml | 19 + assets/xml/objects/object_rr.xml | 8 + assets/xml/objects/object_ru2.xml | 90 +++ assets/xml/objects/object_shopnuts.xml | 67 ++ assets/xml/objects/object_spot00_break.xml | 13 + assets/xml/objects/object_spot00_objects.xml | 14 + assets/xml/objects/object_spot01_matoya.xml | 30 + assets/xml/objects/object_spot01_matoyab.xml | 16 + assets/xml/objects/object_spot01_objects.xml | 16 + assets/xml/objects/object_spot04_objects.xml | 10 + assets/xml/objects/object_spot06_objects.xml | 24 + assets/xml/objects/object_spot08_obj.xml | 27 + assets/xml/objects/object_spot12_obj.xml | 13 + assets/xml/objects/object_spot15_obj.xml | 13 + assets/xml/objects/object_spot18_obj.xml | 36 ++ assets/xml/objects/object_timeblock.xml | 7 + assets/xml/objects/object_tk.xml | 2 +- assets/xml/objects/object_trap.xml | 11 + assets/xml/objects/object_umajump.xml | 8 + assets/xml/objects/object_vm.xml | 41 ++ assets/xml/objects/object_yukabyun.xml | 9 + assets/xml/objects/object_zg.xml | 8 + assets/xml/objects/object_zl1.xml | 114 ++++ assets/xml/scenes/overworld/spot00.xml | 1 + assets/xml/textures/map_48x85_static.xml | 72 +++ .../gamestates/z_file_nameset_PAL.data.s | 2 +- spec | 193 ++++-- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 26 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 13 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 7 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 16 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 8 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 8 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 8 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 126 ++-- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 10 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 8 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 11 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 14 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 58 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.h | 10 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 4 +- .../z_bg_menkuri_kaiten.c | 9 +- .../z_bg_menkuri_nisekabe.c | 7 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 14 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 14 +- .../z_bg_spot00_hanebasi.c | 14 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 6 +- .../z_bg_spot01_idohashira.c | 9 +- .../z_bg_spot01_idomizu.c | 5 +- .../z_bg_spot01_idosoko.c | 9 +- .../z_bg_spot01_objects2.c | 4 +- .../z_bg_spot06_objects.c | 23 +- .../z_bg_spot08_bakudankabe.c | 8 +- .../z_bg_spot08_iceblock.c | 14 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 8 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 8 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 8 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 8 +- .../z_bg_spot16_doughnut.c | 10 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 8 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 8 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 16 +- .../z_bg_spot18_shutter.c | 8 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 8 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 8 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 8 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 5 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 44 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 7 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 12 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 25 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 6 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 11 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 5 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 44 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 16 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 9 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 8 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 25 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 27 +- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 21 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 15 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 5 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 11 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 5 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 68 +-- src/overlays/actors/ovl_En_Js/z_en_js.c | 18 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 35 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 47 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 7 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 18 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 42 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 26 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 47 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 42 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 2 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 5 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 40 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 29 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 16 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 5 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 23 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 21 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 10 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 104 ++-- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 1 - .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 5 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 19 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 7 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 11 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 4 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 8 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 8 +- undefined_syms.txt | 575 +++++------------- 162 files changed, 2973 insertions(+), 1386 deletions(-) create mode 100644 assets/xml/objects/object_ane.xml create mode 100644 assets/xml/objects/object_ani.xml create mode 100644 assets/xml/objects/object_aob.xml create mode 100644 assets/xml/objects/object_bdan_objects.xml create mode 100644 assets/xml/objects/object_bombf.xml create mode 100644 assets/xml/objects/object_bowl.xml create mode 100644 assets/xml/objects/object_bubble.xml create mode 100644 assets/xml/objects/object_cow.xml create mode 100644 assets/xml/objects/object_d_hsblock.xml create mode 100644 assets/xml/objects/object_d_lift.xml create mode 100644 assets/xml/objects/object_ddan_objects.xml create mode 100644 assets/xml/objects/object_door_gerudo.xml create mode 100644 assets/xml/objects/object_ds.xml create mode 100644 assets/xml/objects/object_dy_obj.xml create mode 100644 assets/xml/objects/object_efc_doughnut.xml create mode 100644 assets/xml/objects/object_ei.xml create mode 100644 assets/xml/objects/object_fw.xml create mode 100644 assets/xml/objects/object_fz.xml create mode 100644 assets/xml/objects/object_geff.xml create mode 100644 assets/xml/objects/object_gjyo_objects.xml create mode 100644 assets/xml/objects/object_goroiwa.xml create mode 100644 assets/xml/objects/object_gs.xml create mode 100644 assets/xml/objects/object_gt.xml create mode 100644 assets/xml/objects/object_haka.xml create mode 100644 assets/xml/objects/object_heavy_object.xml create mode 100644 assets/xml/objects/object_ingate.xml create mode 100644 assets/xml/objects/object_js.xml create mode 100644 assets/xml/objects/object_kibako2.xml create mode 100644 assets/xml/objects/object_mag.xml create mode 100644 assets/xml/objects/object_mamenoki.xml create mode 100644 assets/xml/objects/object_mastergolon.xml create mode 100644 assets/xml/objects/object_masterkokirihead.xml create mode 100644 assets/xml/objects/object_masterzoora.xml create mode 100644 assets/xml/objects/object_md.xml create mode 100644 assets/xml/objects/object_menkuri_objects.xml create mode 100644 assets/xml/objects/object_ms.xml create mode 100644 assets/xml/objects/object_niw.xml create mode 100644 assets/xml/objects/object_nwc.xml create mode 100644 assets/xml/objects/object_os_anime.xml create mode 100644 assets/xml/objects/object_owl.xml create mode 100644 assets/xml/objects/object_peehat.xml create mode 100644 assets/xml/objects/object_relay_objects.xml create mode 100644 assets/xml/objects/object_rr.xml create mode 100644 assets/xml/objects/object_ru2.xml create mode 100644 assets/xml/objects/object_shopnuts.xml create mode 100644 assets/xml/objects/object_spot00_break.xml create mode 100644 assets/xml/objects/object_spot00_objects.xml create mode 100644 assets/xml/objects/object_spot01_matoya.xml create mode 100644 assets/xml/objects/object_spot01_matoyab.xml create mode 100644 assets/xml/objects/object_spot01_objects.xml create mode 100644 assets/xml/objects/object_spot04_objects.xml create mode 100644 assets/xml/objects/object_spot06_objects.xml create mode 100644 assets/xml/objects/object_spot08_obj.xml create mode 100644 assets/xml/objects/object_spot12_obj.xml create mode 100644 assets/xml/objects/object_spot15_obj.xml create mode 100644 assets/xml/objects/object_spot18_obj.xml create mode 100644 assets/xml/objects/object_timeblock.xml create mode 100644 assets/xml/objects/object_trap.xml create mode 100644 assets/xml/objects/object_umajump.xml create mode 100644 assets/xml/objects/object_vm.xml create mode 100644 assets/xml/objects/object_yukabyun.xml create mode 100644 assets/xml/objects/object_zg.xml create mode 100644 assets/xml/objects/object_zl1.xml create mode 100644 assets/xml/textures/map_48x85_static.xml diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s index d833490ca8..4214533830 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s @@ -3,10 +3,10 @@ glabel ObjLift_Draw /* 008A8 80B96978 AFA40018 */ sw $a0, 0x0018($sp) /* 008AC 80B9697C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008B0 80B96980 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008B4 80B96984 3C050600 */ lui $a1, %hi(D_06000140) ## $a1 = 06000000 +/* 008B4 80B96984 3C050600 */ lui $a1, %hi(gCollapsingPlatformDL) ## $a1 = 06000000 /* 008B8 80B96988 0C00D498 */ jal Gfx_DrawDListOpa -/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, %lo(D_06000140) ## $a1 = 06000140 +/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, %lo(gCollapsingPlatformDL) ## $a1 = 06000140 /* 008C0 80B96990 8FBF0014 */ lw $ra, 0x0014($sp) /* 008C4 80B96994 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 /* 008C8 80B96998 03E00008 */ jr $ra diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s index d0108fa654..53ec6cc658 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s @@ -16,10 +16,10 @@ glabel ObjLift_Init /* 00314 80B963E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00318 80B963E8 AFBF001C */ sw $ra, 0x001C($sp) /* 0031C 80B963EC AFB00018 */ sw $s0, 0x0018($sp) -/* 00320 80B963F0 3C060600 */ lui $a2, %hi(D_060003D0) ## $a2 = 06000000 +/* 00320 80B963F0 3C060600 */ lui $a2, %hi(gCollapsingPlatformCol) ## $a2 = 06000000 /* 00324 80B963F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00328 80B963F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, %lo(D_060003D0) ## $a2 = 060003D0 +/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, %lo(gCollapsingPlatformCol) ## $a2 = 060003D0 /* 00330 80B96400 0C2E5836 */ jal func_80B960D8 /* 00334 80B96404 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00338 80B96408 8605001C */ lh $a1, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s index 548765128f..cfce44987f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s @@ -28,14 +28,14 @@ glabel func_80B96160 /* 000E4 80B961B4 F7B40048 */ sdc1 $f20, 0x0048($sp) /* 000E8 80B961B8 3C0180B9 */ lui $at, %hi(D_80B96A94) ## $at = 80B90000 /* 000EC 80B961BC 3C1080B9 */ lui $s0, %hi(D_80B969D0) ## $s0 = 80B90000 -/* 000F0 80B961C0 3C160600 */ lui $s6, %hi(D_06000140) ## $s6 = 06000000 +/* 000F0 80B961C0 3C160600 */ lui $s6, %hi(gCollapsingPlatformDL) ## $s6 = 06000000 /* 000F4 80B961C4 3C1780B9 */ lui $s7, %hi(D_80B969F4) ## $s7 = 80B90000 /* 000F8 80B961C8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 000FC 80B961CC 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 /* 00100 80B961D0 AFBF0094 */ sw $ra, 0x0094($sp) /* 00104 80B961D4 AFB10074 */ sw $s1, 0x0074($sp) /* 00108 80B961D8 26F769F4 */ addiu $s7, $s7, %lo(D_80B969F4) ## $s7 = 80B969F4 -/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, %lo(D_06000140) ## $s6 = 06000140 +/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, %lo(gCollapsingPlatformDL) ## $s6 = 06000140 /* 00110 80B961E0 261069D0 */ addiu $s0, $s0, %lo(D_80B969D0) ## $s0 = 80B969D0 /* 00114 80B961E4 C4346A94 */ lwc1 $f20, %lo(D_80B96A94)($at) /* 00118 80B961E8 24930024 */ addiu $s3, $a0, 0x0024 ## $s3 = 00000024 diff --git a/assets/xml/objects/object_ane.xml b/assets/xml/objects/object_ane.xml new file mode 100644 index 0000000000..f21ddfbbde --- /dev/null +++ b/assets/xml/objects/object_ane.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml new file mode 100644 index 0000000000..4d3ee0e982 --- /dev/null +++ b/assets/xml/objects/object_ani.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml new file mode 100644 index 0000000000..56d0c52b6f --- /dev/null +++ b/assets/xml/objects/object_aob.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml new file mode 100644 index 0000000000..dcd56d3856 --- /dev/null +++ b/assets/xml/objects/object_bdan_objects.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bombf.xml b/assets/xml/objects/object_bombf.xml new file mode 100644 index 0000000000..83e60248d1 --- /dev/null +++ b/assets/xml/objects/object_bombf.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bowl.xml b/assets/xml/objects/object_bowl.xml new file mode 100644 index 0000000000..ffe6d43db7 --- /dev/null +++ b/assets/xml/objects/object_bowl.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_bubble.xml b/assets/xml/objects/object_bubble.xml new file mode 100644 index 0000000000..f5de186920 --- /dev/null +++ b/assets/xml/objects/object_bubble.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml new file mode 100644 index 0000000000..2340129dc2 --- /dev/null +++ b/assets/xml/objects/object_cow.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml new file mode 100644 index 0000000000..b9111b38ba --- /dev/null +++ b/assets/xml/objects/object_d_hsblock.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_d_lift.xml b/assets/xml/objects/object_d_lift.xml new file mode 100644 index 0000000000..2912385190 --- /dev/null +++ b/assets/xml/objects/object_d_lift.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml new file mode 100644 index 0000000000..2ae6d679b7 --- /dev/null +++ b/assets/xml/objects/object_ddan_objects.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_door_gerudo.xml b/assets/xml/objects/object_door_gerudo.xml new file mode 100644 index 0000000000..2f17262041 --- /dev/null +++ b/assets/xml/objects/object_door_gerudo.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml new file mode 100644 index 0000000000..2e68a30992 --- /dev/null +++ b/assets/xml/objects/object_ds.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml new file mode 100644 index 0000000000..7506038760 --- /dev/null +++ b/assets/xml/objects/object_dy_obj.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_efc_doughnut.xml b/assets/xml/objects/object_efc_doughnut.xml new file mode 100644 index 0000000000..7f12c56f53 --- /dev/null +++ b/assets/xml/objects/object_efc_doughnut.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml new file mode 100644 index 0000000000..f6dbd02381 --- /dev/null +++ b/assets/xml/objects/object_ei.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml new file mode 100644 index 0000000000..35579eaf62 --- /dev/null +++ b/assets/xml/objects/object_fw.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml new file mode 100644 index 0000000000..dad6fec5ce --- /dev/null +++ b/assets/xml/objects/object_fz.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_geff.xml b/assets/xml/objects/object_geff.xml new file mode 100644 index 0000000000..f0667743b0 --- /dev/null +++ b/assets/xml/objects/object_geff.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_gjyo_objects.xml b/assets/xml/objects/object_gjyo_objects.xml new file mode 100644 index 0000000000..ea4f8444fb --- /dev/null +++ b/assets/xml/objects/object_gjyo_objects.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_goroiwa.xml b/assets/xml/objects/object_goroiwa.xml new file mode 100644 index 0000000000..5d406e9578 --- /dev/null +++ b/assets/xml/objects/object_goroiwa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/objects/object_gs.xml b/assets/xml/objects/object_gs.xml new file mode 100644 index 0000000000..55124c27f7 --- /dev/null +++ b/assets/xml/objects/object_gs.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_gt.xml b/assets/xml/objects/object_gt.xml new file mode 100644 index 0000000000..1d79d4e39e --- /dev/null +++ b/assets/xml/objects/object_gt.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_haka.xml b/assets/xml/objects/object_haka.xml new file mode 100644 index 0000000000..f6b263c375 --- /dev/null +++ b/assets/xml/objects/object_haka.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_heavy_object.xml b/assets/xml/objects/object_heavy_object.xml new file mode 100644 index 0000000000..ecc7953211 --- /dev/null +++ b/assets/xml/objects/object_heavy_object.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_ingate.xml b/assets/xml/objects/object_ingate.xml new file mode 100644 index 0000000000..e6be42bebf --- /dev/null +++ b/assets/xml/objects/object_ingate.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml new file mode 100644 index 0000000000..6f16b4f6e0 --- /dev/null +++ b/assets/xml/objects/object_js.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kibako2.xml b/assets/xml/objects/object_kibako2.xml new file mode 100644 index 0000000000..a701b294de --- /dev/null +++ b/assets/xml/objects/object_kibako2.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mag.xml b/assets/xml/objects/object_mag.xml new file mode 100644 index 0000000000..d528754db3 --- /dev/null +++ b/assets/xml/objects/object_mag.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mamenoki.xml b/assets/xml/objects/object_mamenoki.xml new file mode 100644 index 0000000000..819d890225 --- /dev/null +++ b/assets/xml/objects/object_mamenoki.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_mastergolon.xml b/assets/xml/objects/object_mastergolon.xml new file mode 100644 index 0000000000..6dd9d16592 --- /dev/null +++ b/assets/xml/objects/object_mastergolon.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml new file mode 100644 index 0000000000..1e489323c2 --- /dev/null +++ b/assets/xml/objects/object_masterkokirihead.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_masterzoora.xml b/assets/xml/objects/object_masterzoora.xml new file mode 100644 index 0000000000..2c703274e1 --- /dev/null +++ b/assets/xml/objects/object_masterzoora.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml new file mode 100644 index 0000000000..96f6adde24 --- /dev/null +++ b/assets/xml/objects/object_md.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_menkuri_objects.xml b/assets/xml/objects/object_menkuri_objects.xml new file mode 100644 index 0000000000..4c2b51df5b --- /dev/null +++ b/assets/xml/objects/object_menkuri_objects.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml new file mode 100644 index 0000000000..14dfbc71da --- /dev/null +++ b/assets/xml/objects/object_ms.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml index 81b538d05d..2e0c7f1003 100644 --- a/assets/xml/objects/object_nb.xml +++ b/assets/xml/objects/object_nb.xml @@ -86,7 +86,7 @@ - + diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml new file mode 100644 index 0000000000..59e61ff58e --- /dev/null +++ b/assets/xml/objects/object_niw.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml new file mode 100644 index 0000000000..96ffa32383 --- /dev/null +++ b/assets/xml/objects/object_nwc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_os_anime.xml b/assets/xml/objects/object_os_anime.xml new file mode 100644 index 0000000000..c90e37b376 --- /dev/null +++ b/assets/xml/objects/object_os_anime.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml new file mode 100644 index 0000000000..25ad7f46db --- /dev/null +++ b/assets/xml/objects/object_owl.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_peehat.xml b/assets/xml/objects/object_peehat.xml new file mode 100644 index 0000000000..31036330fc --- /dev/null +++ b/assets/xml/objects/object_peehat.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_relay_objects.xml b/assets/xml/objects/object_relay_objects.xml new file mode 100644 index 0000000000..47b92fcd2d --- /dev/null +++ b/assets/xml/objects/object_relay_objects.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rr.xml b/assets/xml/objects/object_rr.xml new file mode 100644 index 0000000000..98726b14bb --- /dev/null +++ b/assets/xml/objects/object_rr.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml new file mode 100644 index 0000000000..2a2b785d25 --- /dev/null +++ b/assets/xml/objects/object_ru2.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml new file mode 100644 index 0000000000..cbfe9f5125 --- /dev/null +++ b/assets/xml/objects/object_shopnuts.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot00_break.xml b/assets/xml/objects/object_spot00_break.xml new file mode 100644 index 0000000000..6726685e5b --- /dev/null +++ b/assets/xml/objects/object_spot00_break.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot00_objects.xml b/assets/xml/objects/object_spot00_objects.xml new file mode 100644 index 0000000000..10fb13aeac --- /dev/null +++ b/assets/xml/objects/object_spot00_objects.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml new file mode 100644 index 0000000000..d44b944e0e --- /dev/null +++ b/assets/xml/objects/object_spot01_matoya.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml new file mode 100644 index 0000000000..1564f0e86d --- /dev/null +++ b/assets/xml/objects/object_spot01_matoyab.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot01_objects.xml b/assets/xml/objects/object_spot01_objects.xml new file mode 100644 index 0000000000..413e032a9c --- /dev/null +++ b/assets/xml/objects/object_spot01_objects.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot04_objects.xml b/assets/xml/objects/object_spot04_objects.xml new file mode 100644 index 0000000000..66293d7523 --- /dev/null +++ b/assets/xml/objects/object_spot04_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/objects/object_spot06_objects.xml b/assets/xml/objects/object_spot06_objects.xml new file mode 100644 index 0000000000..e3da63b0f0 --- /dev/null +++ b/assets/xml/objects/object_spot06_objects.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot08_obj.xml b/assets/xml/objects/object_spot08_obj.xml new file mode 100644 index 0000000000..4d71f3473f --- /dev/null +++ b/assets/xml/objects/object_spot08_obj.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot12_obj.xml b/assets/xml/objects/object_spot12_obj.xml new file mode 100644 index 0000000000..d619c781e4 --- /dev/null +++ b/assets/xml/objects/object_spot12_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot15_obj.xml b/assets/xml/objects/object_spot15_obj.xml new file mode 100644 index 0000000000..bd59b8cd18 --- /dev/null +++ b/assets/xml/objects/object_spot15_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_spot18_obj.xml b/assets/xml/objects/object_spot18_obj.xml new file mode 100644 index 0000000000..cc12b78946 --- /dev/null +++ b/assets/xml/objects/object_spot18_obj.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_timeblock.xml b/assets/xml/objects/object_timeblock.xml new file mode 100644 index 0000000000..1d6b9e698c --- /dev/null +++ b/assets/xml/objects/object_timeblock.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml index 59f14e0cc7..781cb3138c 100644 --- a/assets/xml/objects/object_tk.xml +++ b/assets/xml/objects/object_tk.xml @@ -5,7 +5,7 @@ - + diff --git a/assets/xml/objects/object_trap.xml b/assets/xml/objects/object_trap.xml new file mode 100644 index 0000000000..56195cf41b --- /dev/null +++ b/assets/xml/objects/object_trap.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/objects/object_umajump.xml b/assets/xml/objects/object_umajump.xml new file mode 100644 index 0000000000..2ee4ade46a --- /dev/null +++ b/assets/xml/objects/object_umajump.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml new file mode 100644 index 0000000000..94a5fc348b --- /dev/null +++ b/assets/xml/objects/object_vm.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_yukabyun.xml b/assets/xml/objects/object_yukabyun.xml new file mode 100644 index 0000000000..d594ebbb89 --- /dev/null +++ b/assets/xml/objects/object_yukabyun.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/objects/object_zg.xml b/assets/xml/objects/object_zg.xml new file mode 100644 index 0000000000..79005516c4 --- /dev/null +++ b/assets/xml/objects/object_zg.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml new file mode 100644 index 0000000000..f808e1c543 --- /dev/null +++ b/assets/xml/objects/object_zl1.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot00.xml b/assets/xml/scenes/overworld/spot00.xml index f93b6ba266..70c5bf80e8 100644 --- a/assets/xml/scenes/overworld/spot00.xml +++ b/assets/xml/scenes/overworld/spot00.xml @@ -1,5 +1,6 @@ + diff --git a/assets/xml/textures/map_48x85_static.xml b/assets/xml/textures/map_48x85_static.xml new file mode 100644 index 0000000000..b5b1d1a859 --- /dev/null +++ b/assets/xml/textures/map_48x85_static.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/overlays/gamestates/z_file_nameset_PAL.data.s b/data/overlays/gamestates/z_file_nameset_PAL.data.s index f2adfb76b4..e57be5e96e 100644 --- a/data/overlays/gamestates/z_file_nameset_PAL.data.s +++ b/data/overlays/gamestates/z_file_nameset_PAL.data.s @@ -160,7 +160,7 @@ glabel D_808128B4 glabel D_808128C8 .word 0x00FF00FF, 0x00FF0064, 0x00640064 glabel D_808128D4 - .word 0x02000400, 0x02000900 + .word gHeartFullTex, gDefenseHeartFullTex glabel D_808128DC .word 0x00FF0046, 0x003200C8, 0x00000000 glabel D_808128E8 diff --git a/spec b/spec index 5710d7410f..8ad13e58e1 100644 --- a/spec +++ b/spec @@ -268,7 +268,8 @@ endseg beginseg name "map_48x85_static" romalign 0x1000 - include "build/baserom/map_48x85_static.o" + include "build/assets/textures/map_48x85_static/map_48x85_static.o" + number 11 endseg beginseg @@ -3496,7 +3497,8 @@ endseg beginseg name "object_dy_obj" romalign 0x1000 - include "build/baserom/object_dy_obj.o" + include "build/assets/objects/object_dy_obj/object_dy_obj.o" + number 6 endseg beginseg @@ -3523,7 +3525,8 @@ endseg beginseg name "object_niw" romalign 0x1000 - include "build/baserom/object_niw.o" + include "build/assets/objects/object_niw/object_niw.o" + number 6 endseg beginseg @@ -3543,7 +3546,8 @@ endseg beginseg name "object_peehat" romalign 0x1000 - include "build/baserom/object_peehat.o" + include "build/assets/objects/object_peehat/object_peehat.o" + number 6 endseg beginseg @@ -3577,7 +3581,8 @@ endseg beginseg name "object_zl1" romalign 0x1000 - include "build/baserom/object_zl1.o" + include "build/assets/objects/object_zl1/object_zl1.o" + number 6 endseg beginseg @@ -3590,7 +3595,8 @@ endseg beginseg name "object_bubble" romalign 0x1000 - include "build/baserom/object_bubble.o" + include "build/assets/objects/object_bubble/object_bubble.o" + number 6 endseg beginseg @@ -3645,7 +3651,8 @@ endseg beginseg name "object_ei" romalign 0x1000 - include "build/baserom/object_ei.o" + include "build/assets/objects/object_ei/object_ei.o" + number 6 endseg beginseg @@ -3672,13 +3679,15 @@ endseg beginseg name "object_spot04_objects" romalign 0x1000 - include "build/baserom/object_spot04_objects.o" + include "build/assets/objects/object_spot04_objects/object_spot04_objects.o" + number 6 endseg beginseg name "object_ddan_objects" romalign 0x1000 - include "build/baserom/object_ddan_objects.o" + include "build/assets/objects/object_ddan_objects/object_ddan_objects.o" + number 6 endseg beginseg @@ -3705,7 +3714,8 @@ endseg beginseg name "object_spot00_objects" romalign 0x1000 - include "build/baserom/object_spot00_objects.o" + include "build/assets/objects/object_spot00_objects/object_spot00_objects.o" + number 6 endseg beginseg @@ -3718,7 +3728,8 @@ endseg beginseg name "object_bombf" romalign 0x1000 - include "build/baserom/object_bombf.o" + include "build/assets/objects/object_bombf/object_bombf.o" + number 6 endseg beginseg @@ -3906,7 +3917,8 @@ endseg beginseg name "object_menkuri_objects" romalign 0x1000 - include "build/baserom/object_menkuri_objects.o" + include "build/assets/objects/object_menkuri_objects/object_menkuri_objects.o" + number 6 endseg beginseg @@ -4030,7 +4042,8 @@ endseg beginseg name "object_yukabyun" romalign 0x1000 - include "build/baserom/object_yukabyun.o" + include "build/assets/objects/object_yukabyun/object_yukabyun.o" + number 6 endseg beginseg @@ -4106,7 +4119,8 @@ endseg beginseg name "object_spot06_objects" romalign 0x1000 - include "build/baserom/object_spot06_objects.o" + include "build/assets/objects/object_spot06_objects/object_spot06_objects.o" + number 6 endseg beginseg @@ -4119,7 +4133,8 @@ endseg beginseg name "object_relay_objects" romalign 0x1000 - include "build/baserom/object_relay_objects.o" + include "build/assets/objects/object_relay_objects/object_relay_objects.o" + number 6 endseg beginseg @@ -4160,7 +4175,8 @@ endseg beginseg name "object_spot08_obj" romalign 0x1000 - include "build/baserom/object_spot08_obj.o" + include "build/assets/objects/object_spot08_obj/object_spot08_obj.o" + number 6 endseg beginseg @@ -4208,7 +4224,8 @@ endseg beginseg name "object_trap" romalign 0x1000 - include "build/baserom/object_trap.o" + include "build/assets/objects/object_trap/object_trap.o" + number 6 endseg beginseg @@ -4249,7 +4266,8 @@ endseg beginseg name "object_vm" romalign 0x1000 - include "build/baserom/object_vm.o" + include "build/assets/objects/object_vm/object_vm.o" + number 6 endseg beginseg @@ -4331,7 +4349,8 @@ endseg beginseg name "object_bdan_objects" romalign 0x1000 - include "build/baserom/object_bdan_objects.o" + include "build/assets/objects/object_bdan_objects/object_bdan_objects.o" + number 6 endseg beginseg @@ -4358,7 +4377,8 @@ endseg beginseg name "object_heavy_object" romalign 0x1000 - include "build/baserom/object_heavy_object.o" + include "build/assets/objects/object_heavy_object/object_heavy_object.o" + number 6 endseg beginseg @@ -4385,7 +4405,8 @@ endseg beginseg name "object_fw" romalign 0x1000 - include "build/baserom/object_fw.o" + include "build/assets/objects/object_fw/object_fw.o" + number 6 endseg beginseg @@ -4405,7 +4426,8 @@ endseg beginseg name "object_haka" romalign 0x1000 - include "build/baserom/object_haka.o" + include "build/assets/objects/object_haka/object_haka.o" + number 6 endseg beginseg @@ -4495,7 +4517,8 @@ endseg beginseg name "object_spot18_obj" romalign 0x1000 - include "build/baserom/object_spot18_obj.o" + include "build/assets/objects/object_spot18_obj/object_spot18_obj.o" + number 6 endseg beginseg @@ -4647,7 +4670,8 @@ endseg beginseg name "object_os_anime" romalign 0x1000 - include "build/baserom/object_os_anime.o" + include "build/assets/objects/object_os_anime/object_os_anime.o" + number 6 endseg beginseg @@ -4681,7 +4705,8 @@ endseg beginseg name "object_ru2" romalign 0x1000 - include "build/baserom/object_ru2.o" + include "build/assets/objects/object_ru2/object_ru2.o" + number 6 endseg beginseg @@ -4749,7 +4774,8 @@ endseg beginseg name "object_rr" romalign 0x1000 - include "build/baserom/object_rr.o" + include "build/assets/objects/object_rr/object_rr.o" + number 6 endseg beginseg @@ -4902,7 +4928,8 @@ endseg beginseg name "object_ani" romalign 0x1000 - include "build/baserom/object_ani.o" + include "build/assets/objects/object_ani/object_ani.o" + number 6 endseg beginseg @@ -4929,7 +4956,8 @@ endseg beginseg name "object_spot15_obj" romalign 0x1000 - include "build/baserom/object_spot15_obj.o" + include "build/assets/objects/object_spot15_obj/object_spot15_obj.o" + number 6 endseg beginseg @@ -4991,13 +5019,15 @@ endseg beginseg name "object_spot01_objects" romalign 0x1000 - include "build/baserom/object_spot01_objects.o" + include "build/assets/objects/object_spot01_objects/object_spot01_objects.o" + number 6 endseg beginseg name "object_md" romalign 0x1000 - include "build/baserom/object_md.o" + include "build/assets/objects/object_md/object_md.o" + number 6 endseg beginseg @@ -5032,7 +5062,8 @@ endseg beginseg name "object_umajump" romalign 0x1000 - include "build/baserom/object_umajump.o" + include "build/assets/objects/object_umajump/object_umajump.o" + number 6 endseg beginseg @@ -5045,31 +5076,36 @@ endseg beginseg name "object_masterkokirihead" romalign 0x1000 - include "build/baserom/object_masterkokirihead.o" + include "build/assets/objects/object_masterkokirihead/object_masterkokirihead.o" + number 6 endseg beginseg name "object_mastergolon" romalign 0x1000 - include "build/baserom/object_mastergolon.o" + include "build/assets/objects/object_mastergolon/object_mastergolon.o" + number 6 endseg beginseg name "object_masterzoora" romalign 0x1000 - include "build/baserom/object_masterzoora.o" + include "build/assets/objects/object_masterzoora/object_masterzoora.o" + number 6 endseg beginseg name "object_aob" romalign 0x1000 - include "build/baserom/object_aob.o" + include "build/assets/objects/object_aob/object_aob.o" + number 6 endseg beginseg name "object_ik" romalign 0x1000 include "build/baserom/object_ik.o" + number 6 endseg beginseg @@ -5131,13 +5167,15 @@ endseg beginseg name "object_ds" romalign 0x1000 - include "build/baserom/object_ds.o" + include "build/assets/objects/object_ds/object_ds.o" + number 6 endseg beginseg name "object_ane" romalign 0x1000 - include "build/baserom/object_ane.o" + include "build/assets/objects/object_ane/object_ane.o" + number 6 endseg beginseg @@ -5164,7 +5202,8 @@ endseg beginseg name "object_fz" romalign 0x1000 - include "build/baserom/object_fz.o" + include "build/assets/objects/object_fz/object_fz.o" + number 6 endseg beginseg @@ -5219,25 +5258,29 @@ endseg beginseg name "object_d_hsblock" romalign 0x1000 - include "build/baserom/object_d_hsblock.o" + include "build/assets/objects/object_d_hsblock/object_d_hsblock.o" + number 6 endseg beginseg name "object_d_lift" romalign 0x1000 - include "build/baserom/object_d_lift.o" + include "build/assets/objects/object_d_lift/object_d_lift.o" + number 6 endseg beginseg name "object_mamenoki" romalign 0x1000 - include "build/baserom/object_mamenoki.o" + include "build/assets/objects/object_mamenoki/object_mamenoki.o" + number 6 endseg beginseg name "object_goroiwa" romalign 0x1000 - include "build/baserom/object_goroiwa.o" + include "build/assets/objects/object_goroiwa/object_goroiwa.o" + number 6 endseg beginseg @@ -5257,7 +5300,8 @@ endseg beginseg name "object_nwc" romalign 0x1000 - include "build/baserom/object_nwc.o" + include "build/assets/objects/object_nwc/object_nwc.o" + number 6 endseg beginseg @@ -5277,7 +5321,8 @@ endseg beginseg name "object_ms" romalign 0x1000 - include "build/baserom/object_ms.o" + include "build/assets/objects/object_ms/object_ms.o" + number 6 endseg beginseg @@ -5290,7 +5335,8 @@ endseg beginseg name "object_ingate" romalign 0x1000 - include "build/baserom/object_ingate.o" + include "build/assets/objects/object_ingate/object_ingate.o" + number 6 endseg beginseg @@ -5338,13 +5384,15 @@ endseg beginseg name "object_gjyo_objects" romalign 0x1000 - include "build/baserom/object_gjyo_objects.o" + include "build/assets/objects/object_gjyo_objects/object_gjyo_objects.o" + number 6 endseg beginseg name "object_owl" romalign 0x1000 - include "build/baserom/object_owl.o" + include "build/assets/objects/object_owl/object_owl.o" + number 6 endseg beginseg @@ -5476,7 +5524,8 @@ endseg beginseg name "object_js" romalign 0x1000 - include "build/baserom/object_js.o" + include "build/assets/objects/object_js/object_js.o" + number 6 endseg beginseg @@ -5517,19 +5566,22 @@ endseg beginseg name "object_mag" romalign 0x1000 - include "build/baserom/object_mag.o" + include "build/assets/objects/object_mag/object_mag.o" + number 6 endseg beginseg name "object_door_gerudo" romalign 0x1000 - include "build/baserom/object_door_gerudo.o" + include "build/assets/objects/object_door_gerudo/object_door_gerudo.o" + number 6 endseg beginseg name "object_gt" romalign 0x1000 - include "build/baserom/object_gt.o" + include "build/assets/objects/object_gt/object_gt.o" + number 6 endseg beginseg @@ -5598,7 +5650,8 @@ endseg beginseg name "object_zg" romalign 0x1000 - include "build/baserom/object_zg.o" + include "build/assets/objects/object_zg/object_zg.o" + number 6 endseg beginseg @@ -5681,7 +5734,8 @@ endseg beginseg name "object_spot12_obj" romalign 0x1000 - include "build/baserom/object_spot12_obj.o" + include "build/assets/objects/object_spot12_obj/object_spot12_obj.o" + number 6 endseg beginseg @@ -5708,7 +5762,8 @@ endseg beginseg name "object_spot00_break" romalign 0x1000 - include "build/baserom/object_spot00_break.o" + include "build/assets/objects/object_spot00_break/object_spot00_break.o" + number 6 endseg beginseg @@ -5721,7 +5776,8 @@ endseg beginseg name "object_shopnuts" romalign 0x1000 - include "build/baserom/object_shopnuts.o" + include "build/assets/objects/object_shopnuts/object_shopnuts.o" + number 6 endseg beginseg @@ -5774,7 +5830,8 @@ endseg beginseg name "object_kibako2" romalign 0x1000 - include "build/baserom/object_kibako2.o" + include "build/assets/objects/object_kibako2/object_kibako2.o" + number 6 endseg beginseg @@ -5829,7 +5886,8 @@ endseg beginseg name "object_bowl" romalign 0x1000 - include "build/baserom/object_bowl.o" + include "build/assets/objects/object_bowl/object_bowl.o" + number 6 endseg beginseg @@ -5849,7 +5907,8 @@ endseg beginseg name "object_efc_doughnut" romalign 0x1000 - include "build/baserom/object_efc_doughnut.o" + include "build/assets/objects/object_efc_doughnut/object_efc_doughnut.o" + number 6 endseg beginseg @@ -5890,13 +5949,15 @@ endseg beginseg name "object_spot01_matoya" romalign 0x1000 - include "build/baserom/object_spot01_matoya.o" + include "build/assets/objects/object_spot01_matoya/object_spot01_matoya.o" + number 6 endseg beginseg name "object_spot01_matoyab" romalign 0x1000 - include "build/baserom/object_spot01_matoyab.o" + include "build/assets/objects/object_spot01_matoyab/object_spot01_matoyab.o" + number 6 endseg beginseg @@ -5937,7 +5998,8 @@ endseg beginseg name "object_geff" romalign 0x1000 - include "build/baserom/object_geff.o" + include "build/assets/objects/object_geff/object_geff.o" + number 6 endseg beginseg @@ -5950,7 +6012,8 @@ endseg beginseg name "object_gs" romalign 0x1000 - include "build/baserom/object_gs.o" + include "build/assets/objects/object_gs/object_gs.o" + number 6 endseg beginseg @@ -5977,7 +6040,8 @@ endseg beginseg name "object_cow" romalign 0x1000 - include "build/baserom/object_cow.o" + include "build/assets/objects/object_cow/object_cow.o" + number 6 endseg beginseg @@ -6011,7 +6075,8 @@ endseg beginseg name "object_timeblock" romalign 0x1000 - include "build/baserom/object_timeblock.o" + include "build/assets/objects/object_timeblock/object_timeblock.o" + number 6 endseg beginseg 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 145216a9a6..11fd1955e0 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 @@ -5,6 +5,7 @@ */ #include "z_bg_bdan_objects.h" +#include "objects/object_bdan_objects/object_bdan_objects.h" #define FLAGS 0x00000010 @@ -68,18 +69,13 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0x64, ICHAIN_STOP), }; -static Gfx* D_8086CDA0[] = { - 0x06008618, - 0x06004BE8, - 0x060038E8, - 0x06005200, +static Gfx* sDLists[] = { + gJabuObjectsLargeRotatingSpikePlatformDL, + gJabuElevatorPlatformDL, + gJabuWaterDL, + gJabuFallingPlatformDL, }; -extern Gfx D_060038E8[]; -extern CollisionHeader D_06005048; -extern CollisionHeader D_06005580; -extern CollisionHeader D_06008CE0; - s32 BgBdanObjects_GetContactRu1(BgBdanObjects* this, s32 arg1) { switch (arg1) { case 0: @@ -126,7 +122,7 @@ void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) { return; } if (thisx->params == 0) { - CollisionHeader_GetVirtual(&D_06008CE0, &colHeader); + CollisionHeader_GetVirtual(&gJabuBigOctoPlatformCol, &colHeader); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit); thisx->world.pos.y += -79.0f; @@ -151,12 +147,12 @@ void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) { } } else { if (thisx->params == 1) { - CollisionHeader_GetVirtual(&D_06005048, &colHeader); + CollisionHeader_GetVirtual(&gJabuElevatorCol, &colHeader); this->timer = 512; this->unk_168 = 0; this->actionFunc = func_8086C874; } else { - CollisionHeader_GetVirtual(&D_06005580, &colHeader); + CollisionHeader_GetVirtual(&gJabuLoweringPlatformCol, &colHeader); if (Flags_GetSwitch(globalCtx, this->unk_168)) { this->actionFunc = BgBdanObjects_DoNothing; thisx->world.pos.y = thisx->home.pos.y - 400.0f; @@ -462,8 +458,8 @@ void BgBdanObjects_Draw(Actor* thisx, GlobalContext* globalCtx) { } if (thisx->params == 2) { - Gfx_DrawDListXlu(globalCtx, D_060038E8); + Gfx_DrawDListXlu(globalCtx, gJabuWaterDL); } else { - Gfx_DrawDListOpa(globalCtx, D_8086CDA0[thisx->params]); + Gfx_DrawDListOpa(globalCtx, sDLists[thisx->params]); } } diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 07f81903db..8af05499ec 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -5,6 +5,7 @@ */ #include "z_bg_bdan_switch.h" +#include "objects/object_bdan_objects/object_bdan_objects.h" #define FLAGS 0x00000010 @@ -55,10 +56,6 @@ const ActorInit Bg_Bdan_Switch_InitVars = { (ActorFunc)BgBdanSwitch_Draw, }; -extern CollisionHeader D_06005CF8; -extern Gfx D_060061A0[]; -extern Gfx D_06005A20[]; - static ColliderJntSphElementInit sJntSphElementsInit[] = { { { @@ -160,7 +157,7 @@ void BgBdanSwitch_Init(Actor* thisx, GlobalContext* globalCtx) { case BLUE: case YELLOW_HEAVY: case YELLOW: - func_8086D010(this, globalCtx, &D_06005CF8, DPM_PLAYER); + func_8086D010(this, globalCtx, &gJabuFloorSwitchCol, DPM_PLAYER); break; case YELLOW_TALL_1: case YELLOW_TALL_2: @@ -518,15 +515,15 @@ void BgBdanSwitch_Draw(Actor* thisx, GlobalContext* globalCtx) { switch (this->dyna.actor.params & 0xFF) { case YELLOW_HEAVY: case YELLOW: - func_8086DF58(this, globalCtx, D_060061A0); + func_8086DF58(this, globalCtx, gJabuYellowFloorSwitchDL); break; case YELLOW_TALL_1: case YELLOW_TALL_2: - func_8086DF58(this, globalCtx, D_060061A0); + func_8086DF58(this, globalCtx, gJabuYellowFloorSwitchDL); Collider_UpdateSpheres(0, &this->collider); Matrix_MultVec3f(&D_8086E0E0, &this->dyna.actor.focus.pos); break; case BLUE: - func_8086DF58(this, globalCtx, D_06005A20); + func_8086DF58(this, globalCtx, gJabuBlueFloorSwitchDL); } } diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index ebffccccb0..f516291b09 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -4,9 +4,10 @@ * Description: Bombchu Bowling Alley Walls */ -#include "vt.h" #include "z_bg_bom_guard.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" +#include "objects/object_bowl/object_bowl.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -30,8 +31,6 @@ const ActorInit Bg_Bom_Guard_InitVars = { NULL, }; -extern CollisionHeader D_06001C40; - void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -42,7 +41,7 @@ void BgBomGuard_Init(Actor* thisx, GlobalContext* globalCtx) { CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001C40, &colHeader); + CollisionHeader_GetVirtual(&gBowlingDefaultCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); osSyncPrintf("\n\n"); diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 08c07b7dc3..78b195308b 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -5,9 +5,10 @@ */ #include "z_bg_bowl_wall.h" -#include "vt.h" #include "overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "objects/object_bowl/object_bowl.h" +#include "vt.h" #define FLAGS 0x00000030 @@ -24,11 +25,6 @@ void BgBowlWall_FallDoEffects(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_FinishFall(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Reset(BgBowlWall* this, GlobalContext* globalCtx); -extern CollisionHeader D_06000CB8; -extern CollisionHeader D_06001B00; -extern Gfx D_06000610[]; -extern Gfx D_06001390[]; - const ActorInit Bg_Bowl_Wall_InitVars = { ACTOR_BG_BOWL_WALL, ACTORCAT_PROP, @@ -59,9 +55,9 @@ void BgBowlWall_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_UNK); if (this->dyna.actor.params == 0) { - CollisionHeader_GetVirtual(&D_06000CB8, &colHeader); + CollisionHeader_GetVirtual(&gBowlingFirstAndFinalRoundCol, &colHeader); } else { - CollisionHeader_GetVirtual(&D_06001B00, &colHeader); + CollisionHeader_GetVirtual(&gBowlingSecondRoundCol, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -217,9 +213,9 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->dyna.actor.params == 0) { - gSPDisplayList(POLY_OPA_DISP++, D_06000610); + gSPDisplayList(POLY_OPA_DISP++, gBowlingRound1WallDL); } else { - gSPDisplayList(POLY_OPA_DISP++, D_06001390); + gSPDisplayList(POLY_OPA_DISP++, gBowlingRound2WallDL); } CLOSE_DISPS(globalCtx2->state.gfxCtx, "../z_bg_bowl_wall.c", 464); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index 606c107e68..d7689d9fff 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -5,6 +5,7 @@ */ #include "z_bg_ddan_jd.h" +#include "objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS 0x00000030 @@ -18,9 +19,6 @@ void BgDdanJd_Draw(Actor* thisx, GlobalContext* globalCtx); void BgDdanJd_Idle(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Move(BgDdanJd* this, GlobalContext* globalCtx); -extern Gfx D_060037B8[]; -extern CollisionHeader D_06003CE0; - const ActorInit Bg_Ddan_Jd_InitVars = { ACTOR_BG_DDAN_JD, ACTORCAT_BG, @@ -61,7 +59,7 @@ void BgDdanJd_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_PLAYER); - CollisionHeader_GetVirtual(&D_06003CE0, &colHeader); + CollisionHeader_GetVirtual(&gDodongoRisingPlatformCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->idleTimer = IDLE_FRAMES; this->state = STATE_GO_BOTTOM; @@ -179,5 +177,5 @@ void BgDdanJd_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgDdanJd_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060037B8); + Gfx_DrawDListOpa(globalCtx, gDodongoRisingPlatformDL); } 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 95915c4e14..30214a14d2 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 @@ -5,6 +5,7 @@ */ #include "z_bg_ddan_kd.h" +#include "objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS 0x00000010 @@ -58,9 +59,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 32767, ICHAIN_STOP), }; -extern CollisionHeader D_06004F30; -extern Gfx D_060048A8[]; - void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -76,7 +74,7 @@ void BgDdanKd_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_PLAYER); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit); - CollisionHeader_GetVirtual(&D_06004F30, &colHeader); + CollisionHeader_GetVirtual(&gDodongoFallingStairsCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -187,5 +185,5 @@ void BgDdanKd_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgDdanKd_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060048A8); + Gfx_DrawDListOpa(globalCtx, gDodongoFallingStairsDL); } 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 2edeb585d1..e23865341a 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -6,6 +6,7 @@ #include "z_bg_dodoago.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" +#include "objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS 0x00000000 @@ -75,9 +76,6 @@ static ColliderCylinderInit sColCylinderInit1 = { static s16 sHasParent = false; -extern Gfx D_60013500[]; -extern CollisionHeader D_06001DDC; - void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -116,7 +114,7 @@ void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001DDC, &colHeader); + CollisionHeader_GetVirtual(&gDodongoLowerJawCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f); @@ -305,7 +303,7 @@ void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 677), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_60013500); + gSPDisplayList(POLY_OPA_DISP++, gDodongoLowerJarDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 681); diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 28ef2e62ac..3bd16c4a9e 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -5,6 +5,7 @@ */ #include "z_bg_dy_yoseizo.h" +#include "objects/object_dy_obj/object_dy_obj.h" #include "vt.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" #include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h" @@ -67,20 +68,12 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = { NULL, }; -extern AnimationHeader D_0600092C; // Giving spell to spin-shrink, arms, leg, hair up -extern AnimationHeader D_06001DF0; // Lounging -extern AnimationHeader D_060031C0; // Upright to Lounging -extern AnimationHeader D_06004344; // Horizontal, giving spell -extern AnimationHeader D_06005810; // Lounging to horizontal -extern u64 D_06005860[]; -extern UNK_TYPE D_06005868; -extern u64 D_060058D8[]; -extern AnimationHeader D_06005E60; // Upright, arms out, disappearing after giving magic -extern AnimationHeader D_060069E8; // Blowing kiss: cross-legged to giving magic -extern AnimationHeader D_06007CA8; // Upright, arms forward, giving magic -extern AnimationHeader D_06008698; // Spin-grow to cross-legged -extern FlexSkeletonHeader D_0601C450; -extern AnimationHeader D_0601D514; // Cross-legged, resting on right arm +extern CutsceneData D_02000130; +extern CutsceneData D_02000160; +extern CutsceneData D_02001020; +extern CutsceneData D_020013E0; +extern CutsceneData D_02001F40; +extern CutsceneData D_020025D0; void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; @@ -99,13 +92,13 @@ void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { // Great Fairy Fountain osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601C450, &D_06008698, this->jointTable, this->morphTable, - 28); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGreatFairySkel, &gGreatFairySittingTransitionAnim, + this->jointTable, this->morphTable, 28); } else { // Stone/Jewel Fairy Fountain osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601C450, &D_060031C0, this->jointTable, this->morphTable, - 28); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGreatFairySkel, &gGreatFairyLayingDownTransitionAnim, + this->jointTable, this->morphTable, 28); } this->actionFunc = BgDyYoseizo_CheckMagicAcquired; } @@ -322,11 +315,12 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) { // Sets animations for spingrow void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_06008698); - Animation_Change(&this->skelAnime, &D_06008698, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairySittingTransitionAnim); + Animation_Change(&this->skelAnime, &gGreatFairySittingTransitionAnim, 1.0f, 0.0f, this->frameCount, 2, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_060031C0); - Animation_Change(&this->skelAnime, &D_060031C0, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyLayingDownTransitionAnim); + Animation_Change(&this->skelAnime, &gGreatFairyLayingDownTransitionAnim, 1.0f, 0.0f, this->frameCount, 2, + -10.0f); } Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0); @@ -378,11 +372,11 @@ void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* glo func_8002DF54(globalCtx, &this->actor, 1); if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_0601D514); - Animation_Change(&this->skelAnime, &D_0601D514, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairySittingAnim); + Animation_Change(&this->skelAnime, &gGreatFairySittingAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06001DF0); - Animation_Change(&this->skelAnime, &D_06001DF0, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyLayingSidewaysAnim); + Animation_Change(&this->skelAnime, &gGreatFairyLayingSidewaysAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } this->actor.textId = 0xDB; @@ -414,11 +408,11 @@ void BgDyYoseizo_GreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCt void BgDyYoseizo_SetupHealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_060069E8); - Animation_Change(&this->skelAnime, &D_060069E8, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyGivingUpgradeAnim); + Animation_Change(&this->skelAnime, &gGreatFairyGivingUpgradeAnim, 1.0f, 0.0f, this->frameCount, 2, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06005810); - Animation_Change(&this->skelAnime, &D_06005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAnim_005810); + Animation_Change(&this->skelAnime, &gGreatFairyAnim_005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); } Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_SMILE_0); @@ -442,11 +436,11 @@ void BgDyYoseizo_HealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx SkelAnime_Update(&this->skelAnime); if ((this->frameCount <= curFrame) && !(this->animationChanged)) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_06007CA8); - Animation_Change(&this->skelAnime, &D_06007CA8, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAfterUpgradeAnim); + Animation_Change(&this->skelAnime, &gGreatFairyAfterUpgradeAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06004344); - Animation_Change(&this->skelAnime, &D_06004344, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAfterSpellAnim); + Animation_Change(&this->skelAnime, &gGreatFairyAfterSpellAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } this->healingTimer = 150; this->animationChanged = true; @@ -519,11 +513,13 @@ void BgDyYoseizo_SayFarewell_NoReward(BgDyYoseizo* this, GlobalContext* globalCt void BgDyYoseizo_SetupSpinShrink(BgDyYoseizo* this, GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_06005E60); - Animation_Change(&this->skelAnime, &D_06005E60, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyJewelFountainSpinShrinkAnim); + Animation_Change(&this->skelAnime, &gGreatFairyJewelFountainSpinShrinkAnim, 1.0f, 0.0f, this->frameCount, 2, + -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_0600092C); - Animation_Change(&this->skelAnime, &D_0600092C, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairySpellFountainSpinShrinkAnim); + Animation_Change(&this->skelAnime, &gGreatFairySpellFountainSpinShrinkAnim, 1.0f, 0.0f, this->frameCount, 2, + -10.0f); } this->vanishTimer = 5; @@ -581,11 +577,13 @@ void BgDyYoseizo_SetupSpinGrow_Reward(BgDyYoseizo* this, GlobalContext* globalCt this->finishedSpinGrow = false; if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_06008698); - Animation_Change(&this->skelAnime, &D_06008698, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairySittingTransitionAnim); + Animation_Change(&this->skelAnime, &gGreatFairySittingTransitionAnim, 1.0f, 0.0f, this->frameCount, 2, + -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_060031C0); - Animation_Change(&this->skelAnime, &D_060031C0, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyLayingDownTransitionAnim); + Animation_Change(&this->skelAnime, &gGreatFairyLayingDownTransitionAnim, 1.0f, 0.0f, this->frameCount, + 2, -10.0f); } Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_APPEAR); @@ -622,11 +620,12 @@ void BgDyYoseizo_SpinGrowSetupGive_Reward(BgDyYoseizo* this, GlobalContext* glob if ((this->frameCount <= curFrame) && !this->animationChanged) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_0601D514); - Animation_Change(&this->skelAnime, &D_0601D514, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairySittingAnim); + Animation_Change(&this->skelAnime, &gGreatFairySittingAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06001DF0); - Animation_Change(&this->skelAnime, &D_06001DF0, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyLayingSidewaysAnim); + Animation_Change(&this->skelAnime, &gGreatFairyLayingSidewaysAnim, 1.0f, 0.0f, this->frameCount, 0, + -10.0f); } this->animationChanged = true; } @@ -635,11 +634,12 @@ void BgDyYoseizo_SpinGrowSetupGive_Reward(BgDyYoseizo* this, GlobalContext* glob ((globalCtx->csCtx.npcActions[0] != NULL) && (globalCtx->csCtx.npcActions[0]->action == 3))) { this->finishedSpinGrow = this->animationChanged = false; if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_060069E8); - Animation_Change(&this->skelAnime, &D_060069E8, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyGivingUpgradeAnim); + Animation_Change(&this->skelAnime, &gGreatFairyGivingUpgradeAnim, 1.0f, 0.0f, this->frameCount, 2, + -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06005810); - Animation_Change(&this->skelAnime, &D_06005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAnim_005810); + Animation_Change(&this->skelAnime, &gGreatFairyAnim_005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); } this->mouthState = 1; this->actionFunc = BgDyYoseizo_Give_Reward; @@ -673,11 +673,11 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) { if ((this->frameCount <= curFrame) && !this->animationChanged) { if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { - this->frameCount = Animation_GetLastFrame(&D_06007CA8); - Animation_Change(&this->skelAnime, &D_06007CA8, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAfterUpgradeAnim); + Animation_Change(&this->skelAnime, &gGreatFairyAfterUpgradeAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } else { - this->frameCount = Animation_GetLastFrame(&D_06004344); - Animation_Change(&this->skelAnime, &D_06004344, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + this->frameCount = Animation_GetLastFrame(&gGreatFairyAfterSpellAnim); + Animation_Change(&this->skelAnime, &gGreatFairyAfterSpellAnim, 1.0f, 0.0f, this->frameCount, 0, -10.0f); } this->animationChanged = true; } @@ -877,15 +877,15 @@ s32 BgDyYoseizo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** return 0; } -static u64* sEyeTextures[] = { - 0x06017930, // Open - 0x06018130, // Half - 0x06018930, // Closed +static void* sEyeTextures[] = { + &gGreatFairyEyeOpenTex, // Open + &gGreatFairyEyeHalfTex, // Half + &gGreatFairyEyeClosedTex, // Closed }; -static u64* sMouthTextures[] = { - 0x06019130, // Closed - 0x0601A130, // Open +static void* sMouthTextures[] = { + &gGreatFairyMouthClosedTex, // Closed + &gGreatFairyMouthOpenTex, // Open }; void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -1013,7 +1013,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { for (i = 0; i < 200; i++, particle++) { if (particle->alive == 1) { if (phi_s3 == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_06005860)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleAppearDL)); gDPPipeSync(POLY_XLU_DISP++); phi_s3++; @@ -1030,7 +1030,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_bg_dy_yoseizo.c", 1810), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_060058D8)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gGreatFairyParticleAliveDL)); } } diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 144f967170..d4ba856a42 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -4,8 +4,9 @@ * Description: Death Mountain Trail Gate */ -#include "vt.h" #include "z_bg_gate_shutter.h" +#include "objects/object_spot01_matoyab/object_spot01_matoyab.h" +#include "vt.h" #define FLAGS 0x00000000 @@ -33,16 +34,13 @@ const ActorInit Bg_Gate_Shutter_InitVars = { (ActorFunc)BgGateShutter_Draw, }; -extern Gfx D_06001CD0[]; -extern CollisionHeader D_06001DA8; - void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) { BgGateShutter* this = THIS; s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001DA8, &colHeader); + CollisionHeader_GetVirtual(&gKakarikoGuardGateCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); this->somePos.x = thisx->world.pos.x; this->somePos.y = thisx->world.pos.y; @@ -133,7 +131,7 @@ void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001CD0); + gSPDisplayList(POLY_OPA_DISP++, gKakarikoGuardGateDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); } diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index e7ccd01fdc..a39b91e3a9 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -5,6 +5,7 @@ */ #include "z_bg_gjyo_bridge.h" +#include "objects/object_gjyo_objects/object_gjyo_objects.h" #include "scenes/dungeons/ganon_tou/ganon_tou_scene.h" #define FLAGS 0x00000000 @@ -37,8 +38,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_06000600[]; -extern CollisionHeader D_06000DB8; +extern CutsceneData D_02002640[]; void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) { BgGjyoBridge* this = THIS; @@ -49,7 +49,7 @@ void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000DB8, &colHeader); + CollisionHeader_GetVirtual(&gRainbowBridgeCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); @@ -118,7 +118,7 @@ void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06000600); + gSPDisplayList(POLY_XLU_DISP++, gRainbowBridgeDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); } diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index bdaff7b6f4..273ed52576 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -5,6 +5,7 @@ */ #include "z_bg_haka.h" +#include "objects/object_haka/object_haka.h" #define FLAGS 0x00000000 @@ -38,10 +39,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_06000428; -extern Gfx D_060001B0[]; -extern Gfx D_060002A8[]; - void BgHaka_Init(Actor* thisx, GlobalContext* globalCtx) { BgHaka* this = THIS; s32 pad; @@ -49,7 +46,7 @@ void BgHaka_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000428, &colHeader); + CollisionHeader_GetVirtual(&gGravestoneCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->actionFunc = func_8087B7E8; } @@ -159,11 +156,11 @@ void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 406), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_060001B0); + gSPDisplayList(POLY_OPA_DISP++, gGravestoneStoneDL); Matrix_Translate(0.0f, 0.0f, thisx->minVelocityY * 10.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 416), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060002A8); + gSPDisplayList(POLY_XLU_DISP++, gGravestoneEarthDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka.c", 421); } 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 f5b58f0202..f9340f444c 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 @@ -5,6 +5,7 @@ */ #include "z_bg_heavy_block.h" +#include "objects/object_heavy_object/object_heavy_object.h" #include "vt.h" #define FLAGS 0x00000000 @@ -46,11 +47,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), }; -extern CollisionHeader D_0600169C; -extern Gfx D_060013C0[]; -extern Gfx D_06001A30[]; -extern Gfx D_060018A0[]; - void BgHeavyBlock_SetPieceRandRot(BgHeavyBlock* this, f32 scale) { this->dyna.actor.world.rot.x = Rand_CenteredFloat(1024.0f) * scale; this->dyna.actor.world.rot.y = Rand_CenteredFloat(1024.0f) * scale; @@ -83,7 +79,7 @@ void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, GlobalContext* globalCtx) { CollisionHeader* colHeader = NULL; this->dyna.actor.flags |= 0x20030; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_0600169C, &colHeader); + CollisionHeader_GetVirtual(&gHeavyBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } @@ -509,7 +505,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 931), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_060013C0); + gSPDisplayList(POLY_OPA_DISP++, gHeavyBlockEntirePillarDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 935); } @@ -518,11 +514,11 @@ void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx) { switch (thisx->params & 0xFF) { case HEAVYBLOCK_BIG_PIECE: Matrix_Translate(50.0f, -260.0f, -20.0f, MTXMODE_APPLY); - Gfx_DrawDListOpa(globalCtx, D_060018A0); + Gfx_DrawDListOpa(globalCtx, gHeavyBlockBigPieceDL); break; case HEAVYBLOCK_SMALL_PIECE: Matrix_Translate(45.0f, -280.0f, -5.0f, MTXMODE_APPLY); - Gfx_DrawDListOpa(globalCtx, D_06001A30); + Gfx_DrawDListOpa(globalCtx, gHeavyBlockSmallPieceDL); break; } } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index b0028723fb..132237d74c 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -5,46 +5,44 @@ */ #include "z_bg_ingate.h" +#include "objects/object_ingate/object_ingate.h" #define FLAGS 0x00000000 -#define THIS ((BgIngate*)thisx) +#define THIS ((BgInGate*)thisx) -void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx); -void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx); -void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx); -void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx); +void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx); +void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx); +void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_80892890(BgIngate* this, GlobalContext* globalCtx); -void BgIngate_DoNothing(BgIngate* this, GlobalContext* globalCtx); +void func_80892890(BgInGate* this, GlobalContext* globalCtx); +void BgInGate_DoNothing(BgInGate* this, GlobalContext* globalCtx); const ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, ACTORCAT_PROP, FLAGS, OBJECT_INGATE, - sizeof(BgIngate), - (ActorFunc)BgIngate_Init, - (ActorFunc)BgIngate_Destroy, - (ActorFunc)BgIngate_Update, - (ActorFunc)BgIngate_Draw, + sizeof(BgInGate), + (ActorFunc)BgInGate_Init, + (ActorFunc)BgInGate_Destroy, + (ActorFunc)BgInGate_Update, + (ActorFunc)BgInGate_Draw, }; -extern CollisionHeader D_060011B8; -extern Gfx D_06001040[]; - -void BgIngate_SetupAction(BgIngate* this, BgIngateActionFunc actionFunc) { +void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) { this->actionFunc = actionFunc; } -void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx) { - BgIngate* this = THIS; +void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx) { + BgInGate* this = THIS; s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_060011B8, &colHeader); + CollisionHeader_GetVirtual(&gIngoGateCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -57,19 +55,19 @@ void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->dyna.actor, 0.1f); if (((this->dyna.actor.params & 1) != 0) && ((gSaveContext.eventInf[0] & 0xF) == 6)) { globalCtx->csCtx.frames = 0; - BgIngate_SetupAction(this, func_80892890); + BgInGate_SetupAction(this, func_80892890); } else { - BgIngate_SetupAction(this, BgIngate_DoNothing); + BgInGate_SetupAction(this, BgInGate_DoNothing); } } -void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx) { - BgIngate* this = THIS; +void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgInGate* this = THIS; DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); } -void func_80892890(BgIngate* this, GlobalContext* globalCtx) { +void func_80892890(BgInGate* this, GlobalContext* globalCtx) { s32 phi0; s16 phi1; s16 csFrames; @@ -80,7 +78,7 @@ void func_80892890(BgIngate* this, GlobalContext* globalCtx) { phi0 = -0x4000; } this->dyna.actor.shape.rot.y = this->dyna.actor.world.rot.y + phi0; - BgIngate_SetupAction(this, &BgIngate_DoNothing); + BgInGate_SetupAction(this, &BgInGate_DoNothing); } else if (globalCtx->csCtx.frames >= 10) { csFrames = globalCtx->csCtx.frames - 10; csFrames *= 400; @@ -97,16 +95,16 @@ void func_80892890(BgIngate* this, GlobalContext* globalCtx) { } } -void BgIngate_DoNothing(BgIngate* this, GlobalContext* globalCtx) { +void BgInGate_DoNothing(BgInGate* this, GlobalContext* globalCtx) { } -void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx) { - BgIngate* this = THIS; +void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) { + BgInGate* this = THIS; this->actionFunc(this, globalCtx); } -void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) { +void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 240); func_80093D18(globalCtx->state.gfxCtx); @@ -114,7 +112,7 @@ void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 245), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001040); + gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 250); } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index f4f2fb97be..857e99e377 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -4,14 +4,14 @@ #include "ultra64.h" #include "global.h" -struct BgIngate; +struct BgInGate; -typedef void (*BgIngateActionFunc)(struct BgIngate*, GlobalContext*); +typedef void (*BgInGateActionFunc)(struct BgInGate*, GlobalContext*); -typedef struct BgIngate { +typedef struct BgInGate { /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ BgIngateActionFunc actionFunc; -} BgIngate; // size = 0x0168 + /* 0x0164 */ BgInGateActionFunc actionFunc; +} BgInGate; // size = 0x0168 extern const ActorInit Bg_Ingate_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index a0228273ab..cb6b9d95be 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -6,6 +6,7 @@ */ #include "z_bg_jya_goroiwa.h" +#include "objects/object_goroiwa/object_goroiwa.h" #define FLAGS 0x00000010 @@ -35,7 +36,6 @@ const ActorInit Bg_Jya_Goroiwa_InitVars = { (ActorFunc)BgJyaGoroiwa_Update, (ActorFunc)BgJyaGoroiwa_Draw, }; -extern Gfx D_060006B0[]; static ColliderJntSphElementInit sJntSphElementsInit[] = { { @@ -222,5 +222,5 @@ void BgJyaGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx) { void BgJyaGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { BgJyaGoroiwa* this = THIS; - Gfx_DrawDListOpa(globalCtx, D_060006B0); + Gfx_DrawDListOpa(globalCtx, gRollingRockDL); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 8064bc9110..7fa0dd63ec 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -5,6 +5,7 @@ */ #include "z_bg_menkuri_eye.h" +#include "objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0x00000020 @@ -27,7 +28,6 @@ const ActorInit Bg_Menkuri_Eye_InitVars = { (ActorFunc)BgMenkuriEye_Draw, }; -extern Gfx D_06002D20[]; static s32 D_8089C1A0; static ColliderJntSphElementInit sJntSphElementsInit[1] = { @@ -138,6 +138,6 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 331), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06002D20); + gSPDisplayList(POLY_XLU_DISP++, gGTGEyeStatueEyeDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 335); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 50a350b39c..b1a0a84dea 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -5,6 +5,7 @@ */ #include "z_bg_menkuri_kaiten.h" +#include "objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0x00000030 @@ -31,8 +32,8 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_060038D0[]; -extern CollisionHeader D_060042D8; +extern Gfx gGTGRotatingRingPlatformDL[]; +extern CollisionHeader gGTGRotatingRingPlatformCol; void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { BgMenkuriKaiten* this = THIS; @@ -41,7 +42,7 @@ void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK3); - CollisionHeader_GetVirtual(&D_060042D8, &colHeader); + CollisionHeader_GetVirtual(&gGTGRotatingRingPlatformCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } @@ -61,5 +62,5 @@ void BgMenkuriKaiten_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgMenkuriKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060038D0); + Gfx_DrawDListOpa(globalCtx, gGTGRotatingRingPlatformDL); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 76668f9744..007f99b6e1 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -5,6 +5,7 @@ */ #include "z_bg_menkuri_nisekabe.h" +#include "objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0x00000000 @@ -27,7 +28,7 @@ const ActorInit Bg_Menkuri_Nisekabe_InitVars = { (ActorFunc)BgMenkuriNisekabe_Draw, }; -static u32 segmentAddr[] = { 0x06002280, 0x06002BC0 }; +static Gfx* sDLists[] = { gGTGFakeWallDL, gGTGFakeCeilingDL }; void BgMenkuriNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) { BgMenkuriNisekabe* this = THIS; @@ -53,8 +54,8 @@ void BgMenkuriNisekabe_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { - Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); + Gfx_DrawDListXlu(globalCtx, sDLists[index]); } else { - Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); + Gfx_DrawDListOpa(globalCtx, sDLists[index]); } } diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 551925a329..d97990736d 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -5,6 +5,7 @@ */ #include "z_bg_relay_objects.h" +#include "objects/object_relay_objects/object_relay_objects.h" #define FLAGS 0x00000010 @@ -27,11 +28,6 @@ void BgRelayObjects_DoNothing(BgRelayObjects* this, GlobalContext* globalCtx); void func_808A932C(BgRelayObjects* this, GlobalContext* globalCtx); void func_808A939C(BgRelayObjects* this, GlobalContext* globalCtx); -extern Gfx D_060001A0[]; -extern UNK_TYPE D_060003C4; -extern Gfx D_06001AB0[]; -extern UNK_TYPE D_060025FC; - const ActorInit Bg_Relay_Objects_InitVars = { ACTOR_BG_RELAY_OBJECTS, ACTORCAT_BG, @@ -60,7 +56,7 @@ void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) { thisx->params = (thisx->params >> 8) & 0xFF; DynaPolyActor_Init(&this->dyna, 3); if (thisx->params == WINDMILL_ROTATING_GEAR) { - CollisionHeader_GetVirtual(&D_060025FC, &colHeader); + CollisionHeader_GetVirtual(&gWindmillRotatingPlatformCol, &colHeader); if (gSaveContext.eventChkInf[6] & 0x20) { thisx->world.rot.y = 0x400; } else { @@ -77,7 +73,7 @@ void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_808A939C; } } else { - CollisionHeader_GetVirtual(&D_060003C4, &colHeader); + CollisionHeader_GetVirtual(&gDampeRaceDoorCol, &colHeader); if (thisx->room == 0) { this->unk_169 = this->switchFlag - 0x33; } else { @@ -208,8 +204,8 @@ void BgRelayObjects_Draw(Actor* thisx, GlobalContext* globalCtx) { BgRelayObjects* this = THIS; if (this->dyna.actor.params == WINDMILL_ROTATING_GEAR) { - Gfx_DrawDListOpa(globalCtx, D_06001AB0); + Gfx_DrawDListOpa(globalCtx, gWindmillRotatingPlatformDL); } else { - Gfx_DrawDListOpa(globalCtx, D_060001A0); + Gfx_DrawDListOpa(globalCtx, gDampeRaceDoorDL); } } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 076dbe871f..d40a69b726 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot00_break.h" +#include "objects/object_spot00_break/object_spot00_break.h" #define FLAGS 0x00000000 @@ -34,11 +35,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -extern CollisionHeader D_06000AF0; -extern CollisionHeader D_06000908; -extern Gfx D_06000980[]; -extern Gfx D_06000440[]; - void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot00Break* this = THIS; s32 pad; @@ -48,9 +44,9 @@ void BgSpot00Break_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_UNK); if (this->dyna.actor.params == 1) { - CollisionHeader_GetVirtual(&D_06000AF0, &colHeader); + CollisionHeader_GetVirtual(&gBarbedWireFenceCol, &colHeader); } else { - CollisionHeader_GetVirtual(&D_06000908, &colHeader); + CollisionHeader_GetVirtual(&gBrokenDrawbridgeCol, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -73,8 +69,8 @@ void BgSpot00Break_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot00Break* this = THIS; if (this->dyna.actor.params == 1) { - Gfx_DrawDListOpa(globalCtx, D_06000980); + Gfx_DrawDListOpa(globalCtx, gBarbedWireFenceDL); } else { - Gfx_DrawDListOpa(globalCtx, D_06000440); + Gfx_DrawDListOpa(globalCtx, gBrokenDrawbridgeDL); } } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 36c4008046..e86cb37faa 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot00_hanebasi.h" +#include "objects/object_spot00_objects/object_spot00_objects.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000010 @@ -26,11 +27,6 @@ void BgSpot00Hanebasi_DrawbridgeWait(BgSpot00Hanebasi* this, GlobalContext* glob void BgSpot00Hanebasi_DrawbridgeRiseAndFall(BgSpot00Hanebasi* this, GlobalContext* globalCtx); void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, GlobalContext* globalCtx); -extern Gfx D_060000C0[]; // bridge chains -extern CollisionHeader D_06000280; // chains collision -extern Gfx D_06000430[]; // drawbridge -extern CollisionHeader D_060005E0; // drawbridge collision - const ActorInit Bg_Spot00_Hanebasi_InitVars = { ACTOR_BG_SPOT00_HANEBASI, ACTORCAT_BG, @@ -62,9 +58,9 @@ void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, 1); if (this->dyna.actor.params == DT_DRAWBRIDGE) { - CollisionHeader_GetVirtual(&D_060005E0, &colHeader); + CollisionHeader_GetVirtual(&gHyruleFieldCastleDrawbridgeCol, &colHeader); } else { - CollisionHeader_GetVirtual(&D_06000280, &colHeader); + CollisionHeader_GetVirtual(&gHyruleFieldCastleDrawbridgeChainsCol, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -311,7 +307,7 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (thisx->params == DT_DRAWBRIDGE) { - gSPDisplayList(POLY_OPA_DISP++, D_06000430); + gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeDL); Matrix_MultVec3f(&basePos, &newPos); thisx->child->world.pos.x = newPos.x; @@ -332,7 +328,7 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } else { - gSPDisplayList(POLY_OPA_DISP++, D_060000C0); + gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeChainsDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 733); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 3d593c0493..4a2f78f039 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_fusya.h" - +#include "objects/object_spot01_objects/object_spot01_objects.h" #define FLAGS 0x00000010 #define THIS ((BgSpot01Fusya*)thisx) @@ -36,8 +36,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 1300, ICHAIN_STOP), }; -extern Gfx D_06000100[]; - void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, BgSpot01FusyaActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -84,7 +82,7 @@ void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000100); + gSPDisplayList(POLY_OPA_DISP++, gKakarikoWindmillSailsDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 9a1f96a0fa..6207a92cda 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_idohashira.h" - +#include "objects/object_spot01_objects/object_spot01_objects.h" #include "vt.h" #define FLAGS 0x00000010 @@ -50,9 +50,6 @@ const ActorInit Bg_Spot01_Idohashira_InitVars = { (ActorFunc)BgSpot01Idohashira_Draw, }; -extern Gfx D_06000420[]; -extern CollisionHeader D_0600075C; - void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) { func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK); } @@ -303,7 +300,7 @@ void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); colHeader = NULL; - CollisionHeader_GetVirtual(&D_0600075C, &colHeader); + CollisionHeader_GetVirtual(&gKakarikoWellArchCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (gSaveContext.sceneSetupIndex < 4) { @@ -332,7 +329,7 @@ void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_spot01_idohashira.c", 699), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_808AAF34(this, globalCtx); - gSPDisplayList(POLY_OPA_DISP++, D_06000420); + gSPDisplayList(POLY_OPA_DISP++, gKakarikoWellArchDL); CLOSE_DISPS(localGfxCtx, "../z_bg_spot01_idohashira.c", 708); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 604c22a284..4eed5a61fb 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot01_idomizu.h" +#include "objects/object_spot01_objects/object_spot01_objects.h" #define FLAGS 0x00000020 @@ -33,8 +34,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_060007D0[]; - void BgSpot01Idomizu_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot01Idomizu* this = THIS; @@ -84,7 +83,7 @@ void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - frames % 128, frames & 0x7F, 32, 32, 1, frames % 128, frames & 0x7F, 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, D_060007D0); + gSPDisplayList(POLY_XLU_DISP++, gKakarikoWellWaterDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 244); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index e386c12ab5..61f1054752 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot01_idosoko.h" +#include "objects/object_spot01_matoya/object_spot01_matoya.h" #define FLAGS 0x00000010 @@ -33,8 +34,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_06003C64; - void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, BgSpot01IdosokoActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -47,7 +46,7 @@ void BgSpot01Idosoko_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_PLAYER); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); - CollisionHeader_GetVirtual(&D_06003C64, &colHeader); + CollisionHeader_GetVirtual(&gKakarikoBOTWStoneCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (LINK_IS_CHILD) { Actor_Kill(&this->dyna.actor); @@ -71,8 +70,6 @@ void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -extern u32 D_06003B20; - void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162); @@ -80,7 +77,7 @@ void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, &D_06003B20); + gSPDisplayList(POLY_OPA_DISP++, &gKakarikoBOTWStoneDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 1735959f8c..2adea7d611 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot01_objects2.h" +#include "objects/object_spot01_matoya/object_spot01_matoya.h" #define FLAGS 0x00000010 @@ -39,7 +40,6 @@ static InitChainEntry sInitChain[] = { static Gfx* D_808AC510[] = { 0x06001EB0, 0x06002780, 0x06003078, 0x06001228, 0x06001528 }; -extern CollisionHeader D_06001A38; extern CollisionHeader D_06001C58; void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -101,7 +101,7 @@ void func_808AC2BC(BgSpot01Objects2* this, GlobalContext* globalCtx) { switch (this->dyna.actor.params & 7) { case 4: // Shooting gallery - CollisionHeader_GetVirtual(&D_06001A38, &colHeader); + CollisionHeader_GetVirtual(&gKakarikoShootingGalleryCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); break; case 3: // Shooting Gallery, spawns Carpenter Sabooro during the day diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 7b712be454..acdb582ac9 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot06_objects.h" +#include "objects/object_spot06_objects/object_spot06_objects.h" #define FLAGS 0x00000200 @@ -45,14 +46,6 @@ void BgSpot06Objects_LockFloat(BgSpot06Objects* this, GlobalContext* globalCtx); void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, GlobalContext* globalCtx); void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, GlobalContext* globalCtx); -extern Gfx D_06000120[]; // Lake Hylia lowered water -extern Gfx D_06000470[]; // Lake Hylia raised water -extern Gfx D_06000E10[]; // Water Temple entrance gate -extern CollisionHeader D_06000EE8; // Water Temple entrance gate collision -extern Gfx D_06001160[]; // Zora's Domain entrance block of ice -extern CollisionHeader D_06001238; // Zora's Domain entrance block of ice collision -extern Gfx D_06002490[]; // Water Temple entrance lock - const ActorInit Bg_Spot06_Objects_InitVars = { ACTOR_BG_SPOT06_OBJECTS, ACTORCAT_PROP, @@ -114,7 +107,7 @@ void BgSpot06Objects_Init(Actor* thisx, GlobalContext* globalCtx) { case LHO_WATER_TEMPLE_ENTRACE_GATE: Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000EE8, &colHeader); + CollisionHeader_GetVirtual(&gLakeHyliaWaterTempleGateCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (LINK_IS_ADULT && Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -180,7 +173,7 @@ void BgSpot06Objects_Init(Actor* thisx, GlobalContext* globalCtx) { case LHO_ICE_BLOCK: Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001238, &colHeader); + CollisionHeader_GetVirtual(&gLakeHyliaZoraShortcutIceblockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); this->actionFunc = BgSpot06Objects_DoNothing; @@ -455,9 +448,9 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* gl gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128); if ((this->lakeHyliaWaterLevel < -680.0f) && (gSaveContext.sceneSetupIndex < 4)) { - gSPDisplayList(POLY_XLU_DISP++, D_06000120); + gSPDisplayList(POLY_XLU_DISP++, gLakeHyliaLowWaterDL); } else { - gSPDisplayList(POLY_XLU_DISP++, D_06000470); + gSPDisplayList(POLY_XLU_DISP++, gLakeHyliaHighWaterDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 879); @@ -468,10 +461,10 @@ void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx) { switch (this->dyna.actor.params) { case LHO_WATER_TEMPLE_ENTRACE_GATE: - Gfx_DrawDListOpa(globalCtx, D_06000E10); + Gfx_DrawDListOpa(globalCtx, gLakeHyliaWaterTempleGateDL); break; case LHO_WATER_TEMPLE_ENTRANCE_LOCK: - Gfx_DrawDListOpa(globalCtx, D_06002490); + Gfx_DrawDListOpa(globalCtx, gLakeHyliaWaterTempleKeyDL); if (this->actionFunc == BgSpot06Objects_LockSwimToSurface) { Collider_UpdateSpheres(1, &this->collider); @@ -481,7 +474,7 @@ void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot06Objects_DrawLakeHyliaWater(this, globalCtx); break; case LHO_ICE_BLOCK: - Gfx_DrawDListOpa(globalCtx, D_06001160); + Gfx_DrawDListOpa(globalCtx, gLakeHyliaZoraShortcutIceblockDL); break; } } diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index e0930fa3dc..250ef0faa6 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot08_bakudankabe.h" +#include "objects/object_spot08_obj/object_spot08_obj.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "objects/gameplay_field_keep/gameplay_field_keep.h" @@ -32,9 +33,6 @@ const ActorInit Bg_Spot08_Bakudankabe_InitVars = { (ActorFunc)BgSpot08Bakudankabe_Draw, }; -extern CollisionHeader D_060039D4; -extern Gfx D_06003898[]; - static ColliderJntSphElementInit sJntSphElementsInit[] = { { { @@ -171,7 +169,7 @@ void BgSpot08Bakudankabe_Init(Actor* thisx, GlobalContext* globalCtx) { return; } func_808B02D0(this, globalCtx); - CollisionHeader_GetVirtual(&D_060039D4, &colHeader); + CollisionHeader_GetVirtual(&gZorasFountainBombableWallCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); } @@ -203,5 +201,5 @@ void BgSpot08Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->collider); Collider_UpdateSpheres(1, &this->collider); Collider_UpdateSpheres(2, &this->collider); - Gfx_DrawDListOpa(globalCtx, D_06003898); + Gfx_DrawDListOpa(globalCtx, gZorasFountainBombableWallDL); } diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index fc638bbf21..8ab200bce5 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot08_iceblock.h" +#include "objects/object_spot08_obj/object_spot08_obj.h" #define FLAGS 0x00000000 @@ -35,11 +36,6 @@ const ActorInit Bg_Spot08_Iceblock_InitVars = { (ActorFunc)BgSpot08Iceblock_Draw, }; -extern Gfx D_06000DE0[]; // Large iceberg spawned in place of Jabu -extern CollisionHeader D_06001904; // Large iceberg spawned in place of Jabu -extern Gfx D_06002BD0[]; // Hexagonal ice floe -extern CollisionHeader D_06002FD8; // Hexagonal ice floe - void BgSpot08Iceblock_SetupAction(BgSpot08Iceblock* this, BgSpot08IceblockActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -295,10 +291,10 @@ void BgSpot08Iceblock_Init(Actor* thisx, GlobalContext* globalCtx) { switch (this->dyna.actor.params & 0x200) { case 0: - colHeader = &D_06002FD8; + colHeader = &gZorasFountainIcebergCol; break; case 0x200: - colHeader = &D_06001904; + colHeader = &gZorasFountainIceRampCol; break; } @@ -440,10 +436,10 @@ void BgSpot08Iceblock_Draw(Actor* thisx, GlobalContext* globalCtx) { switch (this->dyna.actor.params & 0x200) { case 0: - dList = D_06002BD0; + dList = gZorasFountainIcebergDL; break; case 0x200: - dList = D_06000DE0; + dList = gZorasFountainIceRampDL; break; } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index c2c755ab84..f9a9af2607 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot12_gate.h" +#include "objects/object_spot12_obj/object_spot12_obj.h" #define FLAGS 0x00000000 @@ -43,9 +44,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), }; -extern Gfx D_06001080[]; -extern CollisionHeader D_060011EC; - void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, GlobalContext* globalCtx, CollisionHeader* collision, DynaPolyMoveFlag flags) { s32 pad; @@ -64,7 +62,7 @@ void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, GlobalContext* globalCtx, Col void BgSpot12Gate_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot12Gate* this = THIS; - BgSpot12Gate_InitDynaPoly(this, globalCtx, &D_060011EC, DPM_UNK); + BgSpot12Gate_InitDynaPoly(this, globalCtx, &gGerudoFortressWastelandGateCol, DPM_UNK); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F)) { @@ -143,5 +141,5 @@ void BgSpot12Gate_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot12Gate_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06001080); + Gfx_DrawDListOpa(globalCtx, gGerudoFortressWastelandGateDL); } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 70cc743fb9..af627ab727 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot12_saku.h" +#include "objects/object_spot12_obj/object_spot12_obj.h" #define FLAGS 0x00000000 @@ -41,9 +42,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), }; -extern Gfx D_06002260[]; -extern CollisionHeader D_0600238C; - void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, CollisionHeader* collision, DynaPolyMoveFlag flags) { s32 pad; CollisionHeader* colHeader = NULL; @@ -61,7 +59,7 @@ void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, CollisionHeader void BgSpot12Saku_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot12Saku* this = THIS; - func_808B3420(this, globalCtx, &D_0600238C, DPM_UNK); + func_808B3420(this, globalCtx, &gGerudoFortressGTGShutterCol, DPM_UNK); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F)) { func_808B3714(this); @@ -135,5 +133,5 @@ void BgSpot12Saku_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot12Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06002260); + Gfx_DrawDListOpa(globalCtx, gGerudoFortressGTGShutterDL); } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index ed5853ede3..942597e093 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot15_rrbox.h" +#include "objects/object_spot15_obj/object_spot15_obj.h" #define FLAGS 0x00000000 @@ -26,9 +27,6 @@ void func_808B44CC(BgSpot15Rrbox* this, GlobalContext* globalCtx); static s16 D_808B4590 = 0; -extern CollisionHeader D_06000348; -extern Gfx D_06000180[]; - const ActorInit Bg_Spot15_Rrbox_InitVars = { ACTOR_BG_SPOT15_RRBOX, ACTORCAT_BG, @@ -124,7 +122,7 @@ s32 func_808B3AAC(BgSpot15Rrbox* this, GlobalContext* globalCtx) { void BgSpot15Rrbox_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot15Rrbox* this = THIS; - func_808B3960(this, globalCtx, &D_06000348, DPM_UNK); + func_808B3960(this, globalCtx, &gLonLonMilkCrateCol, DPM_UNK); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); func_808B3A34(this); if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x3F))) { @@ -367,5 +365,5 @@ void BgSpot15Rrbox_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot15Rrbox_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000180); + Gfx_DrawDListOpa(globalCtx, gLonLonMilkCrateDL); } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index a930ad55a5..c16f7a5dd7 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot15_saku.h" +#include "objects/object_spot15_obj/object_spot15_obj.h" #define FLAGS 0x00000000 @@ -31,9 +32,6 @@ const ActorInit Bg_Spot15_Saku_InitVars = { (ActorFunc)BgSpot15Saku_Draw, }; -extern Gfx D_060003C0[]; -extern CollisionHeader D_060004D0; - void BgSpot15Saku_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgSpot15Saku* this = THIS; @@ -41,7 +39,7 @@ void BgSpot15Saku_Init(Actor* thisx, GlobalContext* globalCtx) { CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_060004D0, &colHeader); + CollisionHeader_GetVirtual(&gLonLonCorralFenceCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->dyna.actor.scale.x = 0.1f; this->dyna.actor.scale.y = 0.1f; @@ -104,7 +102,7 @@ void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060003C0); + gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index cebf006b04..2da429ca92 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot16_doughnut.h" +#include "objects/object_efc_doughnut/object_efc_doughnut.h" #include "vt.h" #define FLAGS 0x00000000 @@ -41,9 +42,6 @@ static s16 sScales[] = { 0, 0, 70, 210, 300, }; -extern Gfx D_06000660[]; -extern Gfx D_06000FC0[]; - void BgSpot16Doughnut_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot16Doughnut* this = THIS; s32 params; @@ -138,11 +136,11 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32)); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, this->envColorAlpha); - gSPDisplayList(POLY_XLU_DISP++, D_06000660); + gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleFieryDL); } else { gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); - gSPDisplayList(POLY_XLU_DISP++, D_06000FC0); + gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238); @@ -160,7 +158,7 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); - gSPDisplayList(POLY_XLU_DISP++, D_06000FC0); + gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 6c092bc9fa..1a30000f99 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,4 +1,5 @@ #include "z_bg_spot18_basket.h" +#include "objects/object_spot18_obj/object_spot18_obj.h" #include "vt.h" #define FLAGS 0x00000010 @@ -23,9 +24,6 @@ void func_808B7D50(BgSpot18Basket* this, GlobalContext* globalCtx); void func_808B7FC0(BgSpot18Basket* this, GlobalContext* globalCtx); void func_808B81A0(BgSpot18Basket* this, GlobalContext* globalCtx); -extern CollisionHeader D_06002154; -extern Gfx D_060018B0[]; - const ActorInit Bg_Spot18_Basket_InitVars = { ACTOR_BG_SPOT18_BASKET, ACTORCAT_PROP, @@ -139,7 +137,7 @@ void BgSpot18Basket_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_UNK3); func_808B7710(&this->dyna.actor, globalCtx); - CollisionHeader_GetVirtual(&D_06002154, &colHeader); + CollisionHeader_GetVirtual(&gGoronCityVaseCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -452,5 +450,5 @@ void BgSpot18Basket_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->colliderJntSph); Collider_UpdateSpheres(1, &this->colliderJntSph); - Gfx_DrawDListOpa(globalCtx, D_060018B0); + Gfx_DrawDListOpa(globalCtx, gGoronCityVaseDL); } 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 ecedc4f4ef..757f8ef264 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 @@ -5,6 +5,7 @@ */ #include "z_bg_spot18_futa.h" +#include "objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS 0x00000000 @@ -34,16 +35,13 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), }; -extern CollisionHeader D_06000368; -extern Gfx D_06000150[]; - void BgSpot18Futa_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot18Futa* this = THIS; s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000368, &colHeader); + CollisionHeader_GetVirtual(&gGoronCityVaseLidCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); } @@ -71,5 +69,5 @@ void BgSpot18Futa_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot18Futa_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000150); + Gfx_DrawDListOpa(globalCtx, gGoronCityVaseLidDL); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 30160d9be0..5612e872ef 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -1,3 +1,4 @@ + /* * File: z_bg_spot18_obj.c * Overlay: ovl_Bg_Spot18_Obj @@ -5,6 +6,7 @@ */ #include "z_bg_spot18_obj.h" +#include "objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS 0x00000000 @@ -49,12 +51,9 @@ static f32 D_808B90F4[] = { 0.1f, }; -extern CollisionHeader D_06002FE4; -extern CollisionHeader D_0600261C; - static CollisionHeader* D_808B90FC[] = { - &D_06002FE4, - &D_0600261C, + &gGoronCityStatueCol, + &gGoronCityStatueSpearCol, }; static u32 D_808B9104[] = { @@ -86,12 +85,9 @@ static BgSpot18ObjInitFunc D_808B913C[] = { func_808B8C90, }; -extern Gfx D_06002BC0[]; -extern Gfx D_06002370[]; - static Gfx(*sDlists[]) = { - D_06002BC0, - D_06002370, + gGoronCityStatueDL, + gGoronCityStatueSpearDL, }; s32 func_808B8910(BgSpot18Obj* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 4d4249b631..3c7b064d5d 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot18_shutter.h" +#include "objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS 0x00000030 @@ -37,9 +38,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_06000420[]; -extern CollisionHeader D_06000534; - void BgSpot18Shutter_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgSpot18Shutter* this = THIS; @@ -75,7 +73,7 @@ void BgSpot18Shutter_Init(Actor* thisx, GlobalContext* globalCtx) { } } - CollisionHeader_GetVirtual(&D_06000534, &colHeader); + CollisionHeader_GetVirtual(&gGoronCityDoorCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } @@ -139,5 +137,5 @@ void BgSpot18Shutter_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot18Shutter_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000420); + Gfx_DrawDListOpa(globalCtx, gGoronCityDoorDL); } diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 5579652f3f..39234028e8 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -5,6 +5,7 @@ */ #include "z_bg_treemouth.h" +#include "objects/object_spot04_objects/object_spot04_objects.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS 0x00000030 @@ -52,9 +53,6 @@ static f32 D_808BD9C4[] = { -2746.0f, 545.0f, 4694.0f, -2654.0f, 146.0f, 4534.0f, }; -extern Gfx D_060009D0[]; -extern CollisionHeader D_06000E94; - void BgTreemouth_SetupAction(BgTreemouth* this, BgTreemouthActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -66,7 +64,7 @@ void BgTreemouth_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000E94, &colHeader); + CollisionHeader_GetVirtual(&gDekuTreeMouthCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); Actor_SetFocus(thisx, 50.0f); @@ -246,7 +244,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, &D_060009D0); + gSPDisplayList(POLY_OPA_DISP++, &gDekuTreeMouthDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 937); } diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index a1d0893437..10addd5dbe 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -5,6 +5,7 @@ */ #include "z_bg_umajump.h" +#include "objects/object_umajump/object_umajump.h" #define FLAGS 0x00000000 @@ -27,9 +28,6 @@ const ActorInit Bg_Umajump_InitVars = { (ActorFunc)BgUmaJump_Draw, }; -extern CollisionHeader D_06001438; -extern Gfx D_06001220[]; - static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -41,7 +39,7 @@ void BgUmaJump_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001438, &colHeader); + CollisionHeader_GetVirtual(&gJumpableHorseFenceCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.actor.params == 1) { @@ -63,5 +61,5 @@ void BgUmaJump_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgUmaJump_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06001220); + Gfx_DrawDListOpa(globalCtx, gJumpableHorseFenceDL); } diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 7f9b140640..10acb51fc4 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -5,6 +5,7 @@ */ #include "z_bg_zg.h" +#include "objects/object_zg/object_zg.h" #include "vt.h" #define FLAGS 0x00000010 @@ -48,9 +49,6 @@ const ActorInit Bg_Zg_InitVars = { (ActorFunc)BgZg_Draw, }; -extern Gfx D_06001080[]; -extern CollisionHeader D_060011D4; - void BgZg_Destroy(Actor* thisx, GlobalContext* globalCtx) { BgZg* this = THIS; @@ -108,7 +106,7 @@ void BgZg_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); colHeader = NULL; - CollisionHeader_GetVirtual(&D_060011D4, &colHeader); + CollisionHeader_GetVirtual(&gTowerCollapseBarsCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if ((func_808C0CC8(this) == 8) || (func_808C0CC8(this) == 9)) { this->dyna.actor.scale.x = this->dyna.actor.scale.x * 1.3f; @@ -131,7 +129,7 @@ void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { func_80093D18(localGfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_zg.c", 315), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001080); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseBarsDL); CLOSE_DISPS(localGfxCtx, "../z_bg_zg.c", 320); } diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 0db66fbc48..463008442f 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -5,6 +5,7 @@ */ #include "z_demo_geff.h" +#include "objects/object_geff/object_geff.h" #include "vt.h" #define FLAGS 0x00000030 @@ -55,7 +56,7 @@ const ActorInit Demo_Geff_InitVars = { (ActorFunc)DemoGeff_Draw, }; -extern Gfx D_06000EA0[]; +extern Gfx gGanonRubbleDL[]; void DemoGeff_Destroy(Actor* thisx, GlobalContext* globalCtx) { } @@ -172,7 +173,7 @@ void func_80978308(DemoGeff* this, GlobalContext* globalCtx) { } void func_80978344(DemoGeff* this, GlobalContext* globalCtx) { - func_80977EA8(globalCtx, D_06000EA0); + func_80977EA8(globalCtx, gGanonRubbleDL); } void func_80978370(DemoGeff* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index e6e14d867f..6a7bfe67a9 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,4 +1,6 @@ #include "z_demo_gt.h" +#include "objects/object_gt/object_gt.h" +#include "objects/object_geff/object_geff.h" #include "vt.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" @@ -11,18 +13,6 @@ void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoGt_Update(Actor* thisx, GlobalContext* globalCtx); void DemoGt_Draw(Actor* thisx, GlobalContext* globalCtx); -extern CollisionHeader D_06005CB8; -extern CollisionHeader D_060091E4; - -extern Gfx D_06009970[]; -extern Gfx D_06007630[]; -extern Gfx D_06004F90[]; -extern Gfx D_06009610[]; -extern Gfx D_06002910[]; -extern Gfx D_060041A0[]; -extern Gfx D_06009B08[]; -extern Gfx D_06000EA0[]; - void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx) { DemoGt* this = THIS; @@ -140,7 +130,7 @@ void func_8097DAC8(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, (s32)(Rand_ZeroOne() * 10.0f + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30, - KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL); angle += 0x1555; } } @@ -181,7 +171,7 @@ void func_8097DD28(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, (s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 0x1E, - KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL); angle += 0x2000; } @@ -223,7 +213,7 @@ void func_8097DF70(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0, Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30, - KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL); angle += 0x1555; } } @@ -264,7 +254,7 @@ void func_8097E1D4(GlobalContext* globalCtx, Vec3f* arg1, s16 arg2) { EffectSsKakera_Spawn(globalCtx, &pos, &velocity, arg1, -247, phi_s0, 3, 0, 0, (s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30, - KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL); angle += 0x10000; } @@ -690,14 +680,14 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk188[0], unk188[1], unk188[2], 0x80)); gSPMatrix(POLY_OPA_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06002910); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsExteriorStructureDL); func_80093D84(gfxCtx); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); gSPSegment( POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(gfxCtx, 0, 0, gameplayFrames * 0x14, 0x10, 0x200, 1, 0, gameplayFrames * 0x1E, 0x10, 0x200)); gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060041A0); + gSPDisplayList(POLY_XLU_DISP++, gTowerCollapseCsFlameSmokeDL); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part1.c", 557); } @@ -706,7 +696,7 @@ void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) { this->dyna.actor.scale.x *= 10.0f; this->dyna.actor.scale.y *= 10.0f; this->dyna.actor.scale.z *= 10.0f; - func_8097EE44(this, globalCtx, 1, 2, &D_06005CB8); + func_8097EE44(this, globalCtx, 1, 2, &gTowerCollapseCsCollapsedStructureInnerCol); } void func_8097F960(DemoGt* this, GlobalContext* globalCtx) { @@ -874,7 +864,7 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { unk178[1], unk178[2], 128)); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part2.c", 485), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06004F90); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureInnerDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part2.c", 489); @@ -884,7 +874,7 @@ void func_80980110_Init2(DemoGt* this, GlobalContext* globalCtx) { this->dyna.actor.scale.x *= 10.0f; this->dyna.actor.scale.y *= 10.0f; this->dyna.actor.scale.z *= 10.0f; - func_8097EE44(this, globalCtx, 2, 3, &D_060091E4); + func_8097EE44(this, globalCtx, 2, 3, &gTowerCollapseCsCollapsedStructureOuterCol); } void func_8098016C(DemoGt* this, GlobalContext* globalCtx) { @@ -1184,7 +1174,7 @@ void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part3.c", 1028), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06007630); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1032); @@ -1306,7 +1296,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 246); @@ -1425,7 +1415,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 241); @@ -1517,7 +1507,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 307); @@ -1609,7 +1599,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06009970); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsWalkwayDL); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part5.c", 160); } @@ -1700,7 +1690,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06009B08); + gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsAlternativeWalkwayDL); CLOSE_DISPS(gfxCtx, "../z_demo_gt_part6.c", 163); } diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 791b4fa39a..87e346ad19 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -5,6 +5,7 @@ */ #include "z_door_gerudo.h" +#include "objects/object_door_gerudo/object_door_gerudo.h" #define FLAGS 0x00000000 @@ -36,8 +37,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_STOP), }; -extern Gfx D_06000040[]; -extern CollisionHeader D_06000170; extern UNK_TYPE D_80994B70; void DoorGerudo_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -46,7 +45,7 @@ void DoorGerudo_Init(Actor* thisx, GlobalContext* globalCtx) { CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); - CollisionHeader_GetVirtual(&D_06000170, &colHeader); + CollisionHeader_GetVirtual(&gGerudoCellDoorCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { @@ -154,7 +153,7 @@ void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 365), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000040); + gSPDisplayList(POLY_OPA_DISP++, gGerudoCellDoorDL); if (this->unk_166 != 0) { Matrix_Scale(0.01f, 0.01f, 0.025f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index d808a92c61..eab5cfeed2 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -14,6 +14,7 @@ #include "objects/object_hidan_objects/object_hidan_objects.h" #include "objects/object_jya_door/object_jya_door.h" #include "objects/object_mizu_objects/object_mizu_objects.h" +#include "objects/object_bdan_objects/object_bdan_objects.h" #define FLAGS 0x00000010 @@ -91,7 +92,7 @@ static ShutterInfo sShutterInfo[] = { { gDTDungeonDoor1DL, gDoorMetalBarsDL, 130, 12, 20, 15 }, { gDTDungeonDoor2DL, gDoorMetalBarsDL, 130, 12, 20, 15 }, { 0x060000C0, 0x060001F0, 240, 14, 70, 15 }, - { 0x06000590, 0x06006460, 0, 110, 50, 15 }, + { gJabuDoorSection1DL, 0x06006460, 0, 110, 50, 15 }, { gPhantomGanonBarsDL, NULL, 130, 12, 50, 15 }, { gGohmaDoorDL, NULL, 130, 12, 50, 15 }, { gSpiritDoorDL, gJyaDoorMetalBarsDL, 240, 14, 50, 15 }, @@ -151,8 +152,9 @@ static BossDoorInfo D_80998288[] = { { -1, -1, 0x00 }, }; -static Gfx* D_809982B4[] = { - 0x06000590, 0x06000BF0, 0x06002BD0, 0x060018B0, 0x06001F10, 0x060018B0, 0x06001250, 0x06000BF0, +static Gfx* sJabuDoorDLists[] = { + gJabuDoorSection1DL, gJabuDoorSection2DL, gJabuDoorSection7DL, gJabuDoorSection4DL, + gJabuDoorSection5DL, gJabuDoorSection4DL, gJabuDoorSection3DL, gJabuDoorSection2DL, }; // boss door textures? @@ -641,7 +643,7 @@ Gfx* func_80997838(GlobalContext* globalCtx, DoorShutter* this, Gfx* p) { s32 i; Matrix_Get(&mtx); - for (i = 0; i < ARRAY_COUNT(D_809982B4); i++) { + for (i = 0; i < ARRAY_COUNT(sJabuDoorDLists); i++) { Matrix_RotateZ(angle, MTXMODE_APPLY); if (i % 2 == 0) { Matrix_Translate(0.0f, 800.0f, 0.0f, MTXMODE_APPLY); @@ -655,7 +657,7 @@ Gfx* func_80997838(GlobalContext* globalCtx, DoorShutter* this, Gfx* p) { } gSPMatrix(p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 1991), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(p++, D_809982B4[i]); + gSPDisplayList(p++, sJabuDoorDLists[i]); angle -= M_PI / 4; Matrix_Put(&mtx); } 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 c485c8e4f0..ba571c54af 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -5,6 +5,7 @@ */ #include "z_en_ani.h" +#include "objects/object_ani/object_ani.h" #define FLAGS 0x00000009 @@ -27,11 +28,6 @@ void func_809B0994(EnAni* this, GlobalContext* globalCtx); void func_809B0A28(EnAni* this, GlobalContext* globalCtx); void func_809B0A6C(EnAni* this, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_060000F0; -extern AnimationHeader D_060067B8; -extern AnimationHeader D_060070F0; -extern AnimationHeader D_060076EC; - const ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, ACTORCAT_NPC, @@ -79,8 +75,9 @@ void EnAni_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, -2800.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, &D_060076EC, this->jointTable, this->morphTable, 0x10); - Animation_PlayOnce(&this->skelAnime, &D_060076EC); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gRoofManSkel, &gRoofManIdleAnim, this->jointTable, + this->morphTable, 0x10); + Animation_PlayOnce(&this->skelAnime, &gRoofManIdleAnim); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; @@ -214,8 +211,8 @@ void func_809B0988(EnAni* this, GlobalContext* globalCtx) { void func_809B0994(EnAni* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.npcActions[0]->action == 4) { - Animation_Change(&this->skelAnime, &D_060070F0, 1.0f, 0.0f, Animation_GetLastFrame(&D_060070F0), ANIMMODE_ONCE, - -4.0f); + Animation_Change(&this->skelAnime, &gRoofManGettingUpAfterKnockbackAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gRoofManGettingUpAfterKnockbackAnim), ANIMMODE_ONCE, -4.0f); this->unk_2AA++; this->actor.shape.shadowDraw = ActorShadow_DrawCircle; } @@ -232,8 +229,8 @@ void func_809B0A6C(EnAni* this, GlobalContext* globalCtx) { this->skelAnime.curFrame = 0.0f; } if (globalCtx->csCtx.npcActions[0]->action == 2) { - Animation_Change(&this->skelAnime, &D_060067B8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060067B8), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &gRoofManKnockbackAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gRoofManKnockbackAnim), ANIMMODE_ONCE, 0.0f); this->actor.shape.shadowDraw = NULL; this->unk_2AA++; } @@ -317,9 +314,9 @@ void EnAni_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve } static u64* sEyeTextures[] = { - 0x06000408, - 0x06001518, - 0x06001D18, + gRoofManEyeOpenTex, + gRoofManEyeHalfTex, + gRoofManEyeClosedTex, }; void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) { 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 cdec504fa2..e7a506fa98 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 @@ -5,6 +5,7 @@ */ #include "z_en_attack_niw.h" +#include "objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" #define FLAGS 0x00000010 @@ -20,9 +21,6 @@ void func_809B5670(EnAttackNiw* this, GlobalContext* globalCtx); void func_809B5C18(EnAttackNiw* this, GlobalContext* globalCtx); void func_809B59B0(EnAttackNiw* this, GlobalContext* globalCtx); -extern AnimationHeader D_060000E8; -extern FlexSkeletonHeader D_06002530; - const ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, ACTORCAT_ENEMY, @@ -47,7 +45,7 @@ void EnAttackNiw_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06002530, &D_060000E8, this->jointTable, this->morphTable, 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCuccoSkel, &gCuccoAnim, this->jointTable, this->morphTable, 16); if (this->actor.params < 0) { this->actor.params = 0; } 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 1724346480..2fb31beeda 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -5,6 +5,7 @@ */ #include "z_en_bombf.h" +#include "objects/object_bombf/object_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000011 @@ -81,10 +82,6 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -extern Gfx D_06000340[]; -extern Gfx D_06000408[]; -extern Gfx D_06000530[]; - void EnBombf_SetupAction(EnBombf* this, EnBombfActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -494,8 +491,8 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { if (thisx->params != BOMBFLOWER_BODY) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1041), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000340); - gSPDisplayList(POLY_OPA_DISP++, D_06000530); + gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL); + gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL); Matrix_Translate(0.0f, 1000.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(this->flowerBombScale, this->flowerBombScale, this->flowerBombScale, MTXMODE_APPLY); @@ -508,7 +505,7 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(globalCtx->state.gfxCtx, globalCtx))); - gSPDisplayList(POLY_OPA_DISP++, D_06000408); + gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBombAndSparkDL); } else { Collider_UpdateSpheres(0, &this->explosionCollider); } diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 8413a88ee2..19b3b93707 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -1,4 +1,5 @@ #include "z_en_bubble.h" +#include "objects/object_bubble/object_bubble.h" #define FLAGS 0x00000001 @@ -13,8 +14,6 @@ void EnBubble_Wait(EnBubble* this, GlobalContext* globalCtx); void EnBubble_Pop(EnBubble* this, GlobalContext* globalCtx); void EnBubble_Regrow(EnBubble* this, GlobalContext* globalCtx); -extern Gfx D_06001000[]; - const ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, ACTORCAT_ENEMY, @@ -426,7 +425,7 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1220), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06001000); + gSPDisplayList(POLY_XLU_DISP++, gBubbleDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1226); 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 3b86d59a9e..ecf1aa0c8a 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -5,6 +5,7 @@ */ #include "z_en_cow.h" +#include "objects/object_cow/object_cow.h" #define FLAGS 0x00000009 @@ -60,13 +61,6 @@ static ColliderCylinderInit sCylinderInit = { static Vec3f D_809E010C = { 0.0f, -1300.0f, 1100.0f }; -extern AnimationHeader D_060001CC; -extern FlexSkeletonHeader D_06004010; -extern AnimationHeader D_06004264; -extern AnimationHeader D_06004348; -extern FlexSkeletonHeader D_06004C30; -extern AnimationHeader D_06004E98; - void func_809DEE00(Vec3f* vec, s16 rotY) { f32 xCalc; f32 rotCalcTemp; @@ -116,8 +110,8 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 72.0f); switch (this->actor.params) { case 0: - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable, 6); - Animation_PlayLoop(&this->skelAnime, &D_060001CC); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable, 6); + Animation_PlayLoop(&this->skelAnime, &gCowBodyChewAnim); Collider_InitCylinder(globalCtx, &this->colliders[0]); Collider_SetCylinder(globalCtx, &this->colliders[0], &this->actor, &sCylinderInit); Collider_InitCylinder(globalCtx, &this->colliders[1]); @@ -142,8 +136,8 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { DREG(53) = 0; break; case 1: - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable, 6); - Animation_PlayLoop(&this->skelAnime, &D_06004348); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable, 6); + Animation_PlayLoop(&this->skelAnime, &gCowTailIdleAnim); this->actor.update = func_809DFE98; this->actor.draw = func_809E0070; this->actionFunc = func_809DFA84; @@ -171,13 +165,13 @@ void func_809DF494(EnCow* this, GlobalContext* globalCtx) { this->unk_278 -= 1; } else { this->unk_278 = Rand_ZeroFloat(500.0f) + 40.0f; - Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, this->skelAnime.curFrame, - Animation_GetLastFrame(&D_060001CC), ANIMMODE_ONCE, 1.0f); + Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, this->skelAnime.curFrame, + Animation_GetLastFrame(&gCowBodyChewAnim), ANIMMODE_ONCE, 1.0f); } if ((this->actor.xzDistToPlayer < 150.0f) && (!(this->unk_276 & 2))) { this->unk_276 |= 2; - if (this->skelAnime.animation == &D_060001CC) { + if (this->skelAnime.animation == &gCowBodyChewAnim) { this->unk_278 = 0; } } @@ -287,14 +281,14 @@ void func_809DFA84(EnCow* this, GlobalContext* globalCtx) { this->unk_278--; } else { this->unk_278 = Rand_ZeroFloat(200.0f) + 40.0f; - Animation_Change(&this->skelAnime, &D_06004348, 1.0f, this->skelAnime.curFrame, - Animation_GetLastFrame(&D_06004348), ANIMMODE_ONCE, 1.0f); + Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, this->skelAnime.curFrame, + Animation_GetLastFrame(&gCowTailIdleAnim), ANIMMODE_ONCE, 1.0f); } if ((this->actor.xzDistToPlayer < 150.0f) && (ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) >= 0x61A9) && (!(this->unk_276 & 2))) { this->unk_276 |= 2; - if (this->skelAnime.animation == &D_06004348) { + if (this->skelAnime.animation == &gCowTailIdleAnim) { this->unk_278 = 0; } } @@ -313,12 +307,12 @@ void EnCow_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_MoveForward(thisx); Actor_UpdateBgCheckInfo(globalCtx, thisx, 0.0f, 0.0f, 0.0f, 4); if (SkelAnime_Update(&this->skelAnime) != 0) { - if (this->skelAnime.animation == &D_060001CC) { + if (this->skelAnime.animation == &gCowBodyChewAnim) { Audio_PlayActorSound2(thisx, NA_SE_EV_COW_CRY); - Animation_Change(&this->skelAnime, &D_06004264, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004264), - ANIMMODE_ONCE, 1.0f); + Animation_Change(&this->skelAnime, &gCowBodyMoveHeadAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gCowBodyMoveHeadAnim), ANIMMODE_ONCE, 1.0f); } else { - Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060001CC), + Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowBodyChewAnim), ANIMMODE_LOOP, 1.0f); } } @@ -353,11 +347,11 @@ void func_809DFE98(Actor* thisx, GlobalContext* globalCtx) { s32 pad; if (SkelAnime_Update(&this->skelAnime) != 0) { - if (this->skelAnime.animation == &D_06004348) { - Animation_Change(&this->skelAnime, &D_06004E98, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004E98), - ANIMMODE_ONCE, 1.0f); + if (this->skelAnime.animation == &gCowTailIdleAnim) { + Animation_Change(&this->skelAnime, &gCowTailSwishAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gCowTailSwishAnim), ANIMMODE_ONCE, 1.0f); } else { - Animation_Change(&this->skelAnime, &D_06004348, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004348), + Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowTailIdleAnim), ANIMMODE_LOOP, 1.0f); } } diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 21a325da3b..07c1e4fbd4 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -5,6 +5,7 @@ */ #include "z_en_dns.h" +#include "objects/object_shopnuts/object_shopnuts.h" #include "vt.h" #define FLAGS 0x00000009 @@ -128,15 +129,11 @@ typedef struct { } DnsAnimInfo; // size = 0xC DnsAnimInfo D_809F0538[] = { - { 0x06001108, 0x00, 0.0f }, - { 0x06004404, 0x02, 0.0f }, - { 0x060009A0, 0x02, 0.0f }, + { &gBusinessScrubNervousIdleAnim, 0x00, 0.0f }, + { &gBusinessScrubAnim_4404, 0x02, 0.0f }, + { &gBusinessScrubNervousTransitionAnim, 0x02, 0.0f }, }; -extern FlexSkeletonHeader D_060041A8; -extern AnimationHeader D_060009A0; -extern AnimationHeader D_06004404; - void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) { EnDns* this = THIS; @@ -154,7 +151,8 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_FGCOL(GREEN) "◆◆◆ 売りナッツ『%s』 ◆◆◆" VT_RST "\n", D_809F0424[this->actor.params], this->actor.params); Actor_ProcessInitChain(&this->actor, sInitChain); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060041A8, &D_060009A0, this->jointTable, this->morphTable, 18); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBusinessScrubSkel, &gBusinessScrubNervousTransitionAnim, + this->jointTable, this->morphTable, 18); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit); ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawCircle, 35.0f); @@ -438,7 +436,7 @@ void func_809F008C(EnDns* this, GlobalContext* globalCtx) { } void EnDns_SetupBurrow(EnDns* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06004404); + f32 frameCount = Animation_GetLastFrame(&gBusinessScrubAnim_4404); if (this->skelAnime.curFrame == frameCount) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); 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 ffb2c865fc..ec0ffbb9a7 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -5,6 +5,7 @@ */ #include "z_en_ds.h" +#include "objects/object_ds/object_ds.h" #define FLAGS 0x00000009 @@ -29,15 +30,13 @@ const ActorInit En_Ds_InitVars = { (ActorFunc)EnDs_Draw, }; -extern FlexSkeletonHeader D_06004768; -extern AnimationHeader D_0600039C; - void EnDs_Init(Actor* thisx, GlobalContext* globalCtx) { EnDs* this = THIS; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004768, &D_0600039C, this->jointTable, this->morphTable, 6); - Animation_PlayOnce(&this->skelAnime, &D_0600039C); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gPotionShopLadySkel, &gPotionShopLadyAnim, this->jointTable, + this->morphTable, 6); + Animation_PlayOnce(&this->skelAnime, &gPotionShopLadyAnim); this->actor.colChkInfo.mass = MASS_IMMOVABLE; diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 63fc23739d..64dfe95fda 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -5,6 +5,7 @@ */ #include "z_en_dy_extra.h" +#include "objects/object_dy_obj/object_dy_obj.h" #include "vt.h" #define FLAGS 0x00000030 @@ -31,9 +32,6 @@ const ActorInit En_Dy_Extra_InitVars = { (ActorFunc)EnDyExtra_Draw, }; -extern Vtx D_0601BFB0[]; -extern Gfx D_0601C160[]; - void EnDyExtra_Destroy(Actor* thisx, GlobalContext* globalCtx) { } @@ -99,7 +97,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDyExtra* this = THIS; s32 pad; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Vtx* vertices = SEGMENTED_TO_VIRTUAL(D_0601BFB0); + Vtx* vertices = SEGMENTED_TO_VIRTUAL(gGreatFairySpiralBeamVtx); s32 i; u8 unk[3]; @@ -125,7 +123,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g, primColors[this->type].b, 255); gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128); - gSPDisplayList(POLY_XLU_DISP++, D_0601C160); + gSPDisplayList(POLY_XLU_DISP++, gGreatFairySpiralBeamDL); CLOSE_DISPS(gfxCtx, "../z_en_dy_extra.c", 325); } diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index a449b09396..03932a6577 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -1,4 +1,5 @@ #include "z_en_eiyer.h" +#include "objects/object_ei/object_ei.h" #define FLAGS 0x00000005 @@ -36,13 +37,6 @@ void EnEiyer_Die(EnEiyer* this, GlobalContext* globalCtx); void EnEiyer_Dead(EnEiyer* this, GlobalContext* globalCtx); void EnEiyer_Stunned(EnEiyer* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000288; -extern AnimationHeader D_060004C4; -extern AnimationHeader D_06000704; -extern AnimationHeader D_06000FC0; -extern AnimationHeader D_060012AC; -extern SkeletonHeader D_06003410; - const ActorInit En_Eiyer_InitVars = { ACTOR_EN_EIYER, ACTORCAT_ENEMY, @@ -129,7 +123,8 @@ void EnEiyer_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 600.0f, ActorShadow_DrawCircle, 65.0f); - SkelAnime_Init(globalCtx, &this->skelanime, &D_06003410, &D_060012AC, this->jointTable, this->morphTable, 19); + SkelAnime_Init(globalCtx, &this->skelanime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable, + 19); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sColCylInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); @@ -187,7 +182,7 @@ void EnEiyer_RotateAroundHome(EnEiyer* this) { void EnEiyer_SetupAppearFromGround(EnEiyer* this) { this->collider.info.bumper.dmgFlags = 0x19; - Animation_PlayLoop(&this->skelanime, &D_060012AC); + Animation_PlayLoop(&this->skelanime, &gStingerIdleAnim); this->actor.world.pos.x = this->actor.home.pos.x; this->actor.world.pos.y = this->actor.home.pos.y - 40.0f; @@ -235,7 +230,7 @@ void EnEiyer_SetupInactive(EnEiyer* this) { void EnEiyer_SetupAmbush(EnEiyer* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; - Animation_PlayOnce(&this->skelanime, &D_06000704); + Animation_PlayOnce(&this->skelanime, &gStingerBackflipAnim); this->collider.info.bumper.dmgFlags = ~0x00300000; this->basePos = this->actor.world.pos; this->actor.world.rot.y = this->actor.shape.rot.y; @@ -251,7 +246,7 @@ void EnEiyer_SetupAmbush(EnEiyer* this, GlobalContext* globalCtx) { void EnEiyer_SetupGlide(EnEiyer* this) { this->targetYaw = this->actor.shape.rot.y; this->basePos.y = (cosf(-M_PI / 8) * 5.0f) + this->actor.world.pos.y; - Animation_MorphToLoop(&this->skelanime, &D_06000FC0, -5.0f); + Animation_MorphToLoop(&this->skelanime, &gStingerHitAnim, -5.0f); this->timer = 60; this->actionFunc = EnEiyer_Glide; } @@ -271,7 +266,7 @@ void EnEiyer_SetupDiveAttack(EnEiyer* this, GlobalContext* globalCtx) { } void EnEiyer_SetupLand(EnEiyer* this) { - Animation_MorphToPlayOnce(&this->skelanime, &D_060004C4, -3.0f); + Animation_MorphToPlayOnce(&this->skelanime, &gStingerDiveAnim, -3.0f); this->collider.base.atFlags &= ~AT_ON; this->actor.flags |= 0x10; @@ -284,7 +279,7 @@ void EnEiyer_SetupLand(EnEiyer* this) { void EnEiyer_SetupHurt(EnEiyer* this) { this->basePos.y = this->actor.world.pos.y; - Animation_Change(&this->skelanime, &D_06000FC0, 2.0f, 0.0f, 0.0f, 0, -3.0f); + Animation_Change(&this->skelanime, &gStingerHitAnim, 2.0f, 0.0f, 0.0f, 0, -3.0f); this->timer = 40; this->actor.gravity = 0.0f; this->actor.velocity.y = 0.0f; @@ -300,7 +295,7 @@ void EnEiyer_SetupDie(EnEiyer* this) { if (this->collider.info.bumper.dmgFlags != 0x19) { this->actor.speedXZ = 6.0f; - Animation_MorphToLoop(&this->skelanime, &D_06000FC0, -3.0f); + Animation_MorphToLoop(&this->skelanime, &gStingerHitAnim, -3.0f); } else { this->actor.speedXZ -= 6.0f; } @@ -319,7 +314,7 @@ void EnEiyer_SetupDead(EnEiyer* this) { } void EnEiyer_SetupStunned(EnEiyer* this) { - Animation_Change(&this->skelanime, &D_06000288, 2.0f, 0.0f, 0.0f, 0, -8.0f); + Animation_Change(&this->skelanime, &gStingerPopOutAnim, 2.0f, 0.0f, 0.0f, 0, -8.0f); this->timer = 80; this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 2864cc71b1..3996903834 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -6,6 +6,7 @@ #include "z_en_fd.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_fw/object_fw.h" #define FLAGS 0x00000215 @@ -31,12 +32,6 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx); void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx); void EnFd_Land(EnFd* this, GlobalContext* globalCtx); -extern Gfx D_060079F8[]; -extern Gfx D_06007A78[]; -extern Gfx D_06007928[]; -extern Gfx D_06007938[]; -extern FlexSkeletonHeader D_06005810; - const ActorInit En_Fd_InitVars = { ACTOR_EN_FD, ACTORCAT_ENEMY, @@ -200,11 +195,11 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit2 sColChkInit = { 24, 2, 25, 25, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x060010B4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, - { 0x06005C64, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, - { 0x06006044, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, - { 0x06006A18, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, - { 0x06006B64, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, + { &gFlareDancerCastingFireAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, + { &gFlareDancerBackflipAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, + { &gFlareDancerGettingUpAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, + { &gFlareDancerChasingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &gFlareDancerTwirlAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, }; s32 EnFd_SpawnCore(EnFd* this, GlobalContext* globalCtx) { @@ -450,7 +445,7 @@ void EnFd_Fade(EnFd* this, GlobalContext* globalCtx) { void EnFd_Init(Actor* thisx, GlobalContext* globalCtx) { EnFd* this = THIS; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06005810, NULL, this->jointTable, this->morphTable, 27); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gFlareDancerSkel, NULL, this->jointTable, this->morphTable, 27); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 32.0f); Collider_InitJntSph(globalCtx, &this->collider); Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colSphs); @@ -888,7 +883,7 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { if (eff->type == FD_EFFECT_FLAME) { if (!firstDone) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); - gSPDisplayList(POLY_XLU_DISP++, D_06007928); + gSPDisplayList(POLY_XLU_DISP++, gFlareDancerDL_7928); gDPSetEnvColor(POLY_XLU_DISP++, 255, 10, 0, (u8)((this->fadeAlpha / 255.0f) * 255)); firstDone = true; } @@ -901,7 +896,7 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); idx = eff->timer * (8.0f / eff->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80A0E0F8[idx])); - gSPDisplayList(POLY_XLU_DISP++, D_06007938); + gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL); } } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2020); @@ -921,7 +916,7 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { if (eff->type == FD_EFFECT_DOT) { if (!firstDone) { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, D_060079F8); + gSPDisplayList(POLY_XLU_DISP++, gFlareDancerDL_79F8); firstDone = true; } gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, eff->color.r, eff->color.g, eff->color.b, @@ -933,7 +928,7 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd.c", 2064), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06007A78); + gSPDisplayList(POLY_XLU_DISP++, gFlareDancerTriangleParticleDL); } } diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 81ec5a7cc3..872031fa24 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -5,6 +5,7 @@ */ #include "z_en_fw.h" +#include "objects/object_fw/object_fw.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" @@ -67,16 +68,11 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit2 D_80A1FB94 = { 8, 2, 25, 25, MASS_IMMOVABLE }; static struct_80034EC0_Entry D_80A1FBA0[] = { - { 0x06006CF8, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, - { 0x06007CD0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, - { 0x06007DC8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &gFlareDancerCoreInitRunCycleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, + { &gFlareDancerCoreRunCycleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &gFlareDancerCoreEndRunCycleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, }; -extern FlexSkeletonHeader D_06007C30; -extern Gfx D_06007928[]; -extern Gfx D_06007938[]; -extern AnimationHeader D_06006CF8; - s32 EnFw_DoBounce(EnFw* this, s32 totalBounces, f32 yVelocity) { s16 temp_v1; @@ -190,7 +186,8 @@ s32 EnFw_SpawnDust(EnFw* this, u8 timer, f32 scale, f32 scaleStep, s32 dustCnt, void EnFw_Init(Actor* thisx, GlobalContext* globalCtx) { EnFw* this = THIS; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007C30, NULL, this->jointTable, this->morphTable, 11); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gFlareDancerCoreSkel, NULL, this->jointTable, this->morphTable, + 11); func_80034EC0(&this->skelAnime, D_80A1FBA0, 0); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f); Collider_InitJntSph(globalCtx, &this->collider); @@ -222,7 +219,7 @@ void EnFw_Run(EnFw* this, GlobalContext* globalCtx) { Actor* flareDancer; Math_SmoothStepToF(&this->skelAnime.playSpeed, 1.0f, 0.1f, 1.0f, 0.0f); - if (this->skelAnime.animation == &D_06006CF8) { + if (this->skelAnime.animation == &gFlareDancerCoreInitRunCycleAnim) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame) == 0) { this->runRadius = Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->actor.parent->world.pos); func_80034EC0(&this->skelAnime, D_80A1FBA0, 2); @@ -466,7 +463,7 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { if (eff->type != 0) { if (!firstDone) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0U); - gSPDisplayList(POLY_XLU_DISP++, D_06007928); + gSPDisplayList(POLY_XLU_DISP++, gFlareDancerDL_7928); gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); firstDone = true; } @@ -481,7 +478,7 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); idx = eff->timer * (8.0f / eff->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80A1FC18[idx])); - gSPDisplayList(POLY_XLU_DISP++, &D_06007938); + gSPDisplayList(POLY_XLU_DISP++, &gFlareDancerSquareParticleDL); } } diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 6eba1d8372..cf6621c697 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,4 +1,5 @@ #include "z_en_fz.h" +#include "objects/object_fz/object_fz.h" #define FLAGS 0x00000415 @@ -46,10 +47,6 @@ void EnFz_SpawnIceSmokeFreeze(EnFz* this, Vec3f* pos, Vec3f* velocity, Vec3f* ac void EnFz_UpdateIceSmoke(EnFz* this, GlobalContext* globalCtx); void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx); -// Same effects as "z_eff_ss_ice_smoke.h" -extern Gfx* D_060030A0[]; -extern Gfx* D_06003158[]; - const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORCAT_ENEMY, @@ -710,9 +707,9 @@ void EnFz_Update(Actor* thisx, GlobalContext* globalCtx) { void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { static Gfx* displayLists[] = { - 0x06001130, // Body fully intact (5 or 6 health) - 0x060021A0, // Top right horn chipped off (from Freezards perspective) (3 or 4 health) - 0x06002CA0, // Entire head chipped off (1 or 2 health) + gFreezardIntactDL, // Body fully intact (5 or 6 health) + gFreezardTopRightHornChippedDL, // Top right horn chipped off (from Freezards perspective) (3 or 4 health) + gFreezardHeadChippedDL, // Entire head chipped off (1 or 2 health) }; EnFz* this = THIS; s32 pad; @@ -873,7 +870,7 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); if (!texLoaded) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_060030A0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gFreezardSteamStartDL)); texLoaded++; } @@ -886,7 +883,7 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { Matrix_Scale(iceSmoke->xyScale, iceSmoke->xyScale, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_fz.c", 1424), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_06003158)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gFreezardSteamDL)); } iceSmoke++; diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index ff831fb932..aa518f8a33 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -7,6 +7,7 @@ #include "z_en_goroiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_goroiwa/object_goroiwa.h" #include "vt.h" #define FLAGS 0x00000010 @@ -76,8 +77,6 @@ static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_HEAVY }; // Unused static f32 D_80A4DEBC[] = { 10.0f, 9.2f }; -extern Gfx D_060006B0[]; - void func_80A4BCA0(EnGoroiwa* this) { static f32 colliderHeightOffset[] = { 0.0f, 59.5f }; Sphere16* worldSphere = &this->collider.elements[0].dim.worldSphere; @@ -743,5 +742,5 @@ void EnGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060006B0); + Gfx_DrawDListOpa(globalCtx, gRollingRockDL); } diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index c78191275b..77842cc175 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -5,6 +5,7 @@ */ #include "z_en_gs.h" +#include "objects/object_gs/object_gs.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "objects/gameplay_keep/gameplay_keep.h" @@ -22,10 +23,6 @@ void func_80A4F700(EnGs* this, GlobalContext* globalCtx); void func_80A4F77C(EnGs* this); -extern Gfx D_06000950[]; -extern Gfx D_060009D0[]; -extern Gfx D_06000A60[]; - const ActorInit En_Gs_InitVars = { ACTOR_EN_GS, ACTORCAT_PROP, @@ -587,7 +584,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1064), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000950); + gSPDisplayList(POLY_OPA_DISP++, gGossipStoneSetupDL); if (this->unk_19E & 4) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->flashColor.r, this->flashColor.g, this->flashColor.b, @@ -596,8 +593,8 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); } - gSPDisplayList(POLY_OPA_DISP++, D_060009D0); - gSPDisplayList(POLY_OPA_DISP++, D_06000A60); + gSPDisplayList(POLY_OPA_DISP++, gGossipStoneDL); + gSPDisplayList(POLY_OPA_DISP++, gGossipStoneSquishedDL); Matrix_Pop(); if (this->unk_19E & 2) { diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index aa80f70da8..951a48e5e0 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -5,6 +5,7 @@ */ #include "z_en_guest.h" +#include "objects/object_os_anime/object_os_anime.h" #include "vt.h" #define FLAGS 0x00000019 @@ -92,8 +93,8 @@ void EnGuest_Update(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, NULL, this->jointTable, this->morphTable, 16); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->osAnimeBankIndex].segment); - Animation_Change(&this->skelAnime, &D_060042AC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060042AC), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &gObjOsAnim_42AC, 1.0f, 0.0f, Animation_GetLastFrame(&gObjOsAnim_42AC), + ANIMMODE_LOOP, 0.0f); this->actor.draw = EnGuest_Draw; this->actor.update = func_80A505CC; diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 29f40f2890..118203b7cc 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -5,6 +5,8 @@ */ #include "z_en_hy.h" +#include "objects/object_aob/object_aob.h" +#include "objects/object_os_anime/object_os_anime.h" #define FLAGS 0x00000019 @@ -25,12 +27,6 @@ void func_80A7127C(EnHy* this, GlobalContext* globalCtx); void func_80A712B4(EnHy* this, GlobalContext* globalCtx); void func_80A714C4(EnHy* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000BFC; -extern AnimationHeader D_06000FE4; -extern AnimationHeader D_060012E8; -extern AnimationHeader D_06002160; -extern AnimationHeader D_0600265C; -extern AnimationHeader D_060033B4; extern Gfx D_06005BC8[]; const ActorInit En_Hy_InitVars = { @@ -81,14 +77,14 @@ typedef struct { } EnHyUnknownStruct1; // size = 0xC static EnHyUnknownStruct1 D_80A71F50[] = { - { OBJECT_AOB, 0x06003C88, D_80A71EF8 }, { OBJECT_BOB, 0x06003B78, D_80A71F40 }, - { OBJECT_BOJ, 0x060026F0, D_80A71F30 }, { OBJECT_BOJ, 0x060052E0, NULL }, - { OBJECT_BOJ, 0x06005528, NULL }, { OBJECT_BOJ, 0x06005738, NULL }, - { OBJECT_BOJ, 0x060059B0, NULL }, { OBJECT_AHG, 0x060030F0, D_80A71F08 }, - { OBJECT_AHG, 0x06005508, NULL }, { OBJECT_AHG, 0x06005728, NULL }, - { OBJECT_BBA, 0x06002948, D_80A71F18 }, { OBJECT_CNE, 0x06001300, NULL }, - { OBJECT_CNE, 0x06002860, NULL }, { OBJECT_BJI, 0x06002560, D_80A71F20 }, - { OBJECT_BJI, 0x06003F68, NULL }, { OBJECT_COB, 0x06001300, NULL }, + { OBJECT_AOB, gDogLadyHeadDL, D_80A71EF8 }, { OBJECT_BOB, 0x06003B78, D_80A71F40 }, + { OBJECT_BOJ, 0x060026F0, D_80A71F30 }, { OBJECT_BOJ, 0x060052E0, NULL }, + { OBJECT_BOJ, 0x06005528, NULL }, { OBJECT_BOJ, 0x06005738, NULL }, + { OBJECT_BOJ, 0x060059B0, NULL }, { OBJECT_AHG, 0x060030F0, D_80A71F08 }, + { OBJECT_AHG, 0x06005508, NULL }, { OBJECT_AHG, 0x06005728, NULL }, + { OBJECT_BBA, 0x06002948, D_80A71F18 }, { OBJECT_CNE, 0x06001300, NULL }, + { OBJECT_CNE, 0x06002860, NULL }, { OBJECT_BJI, 0x06002560, D_80A71F20 }, + { OBJECT_BJI, 0x06003F68, NULL }, { OBJECT_COB, 0x06001300, NULL }, }; typedef struct { @@ -97,25 +93,25 @@ typedef struct { } EnHyUnknownStruct2; // size = 0x8 static EnHyUnknownStruct2 D_80A72010[] = { - { OBJECT_AOB, 0x060000F0 }, { OBJECT_BOB, 0x060000F0 }, { OBJECT_BOJ, 0x060000F0 }, { OBJECT_AHG, 0x060000F0 }, - { OBJECT_BBA, 0x060000F0 }, { OBJECT_CNE, 0x060000F0 }, { OBJECT_BJI, 0x060000F0 }, { OBJECT_COB, 0x060021F8 }, + { OBJECT_AOB, &gDogLadySkel }, { OBJECT_BOB, 0x060000F0 }, { OBJECT_BOJ, 0x060000F0 }, { OBJECT_AHG, 0x060000F0 }, + { OBJECT_BBA, 0x060000F0 }, { OBJECT_CNE, 0x060000F0 }, { OBJECT_BJI, 0x060000F0 }, { OBJECT_COB, 0x060021F8 }, }; static struct_80034EC0_Entry D_80A72050[] = { - { 0x0600092C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06000228, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x06004CF4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060016EC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x0600265C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060042AC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x060028DC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06002160, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, - { 0x0600265C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, { 0x06004E90, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x06001E7C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06000170, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x060000B4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06003D84, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x060041F8, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x0600300C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x060031B0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060031B0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { 0x06002D0C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06002DC0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x06004408, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06001F18, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x06004F28, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060033B4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { 0x060012E8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { 0x06000FE4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { 0x06000BFC, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gObjOsAnim_092C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_0228, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_4CF4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_16EC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_265C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_42AC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_28DC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_2160, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, + { &gObjOsAnim_265C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, { &gObjOsAnim_4E90, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_1E7C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_0170, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_00B4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_3D84, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_41F8, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_300C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_31B0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_31B0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gObjOsAnim_2D0C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_2DC0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_4408, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_1F18, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, + { &gObjOsAnim_4F28, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_33B4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gObjOsAnim_12E8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gObjOsAnim_0FE4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gObjOsAnim_0BFC, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, }; typedef struct { @@ -430,7 +426,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) { case 0x70F1: case 0x70F2: case 0x70F3: - if (this->skelAnime.animation != &D_060033B4) { + if (this->skelAnime.animation != &gObjOsAnim_33B4) { func_80034EC0(&this->skelAnime, D_80A72050, 23); func_800F5C64(0x922); } @@ -812,14 +808,14 @@ void func_80A70E34(EnHy* this, GlobalContext* globalCtx) { void func_80A710F8(EnHy* this, GlobalContext* globalCtx) { if (this->unk_1E8.unk_00 != 0) { - if (this->skelAnime.animation != &D_06000BFC) { + if (this->skelAnime.animation != &gObjOsAnim_0BFC) { func_80034EC0(&this->skelAnime, D_80A72050, 26); } } else if (gSaveContext.eventInf[3] & 1) { - if (this->skelAnime.animation != &D_06000FE4) { + if (this->skelAnime.animation != &gObjOsAnim_0FE4) { func_80034EC0(&this->skelAnime, D_80A72050, 25); } - } else if (this->skelAnime.animation != &D_060012E8) { + } else if (this->skelAnime.animation != &gObjOsAnim_12E8) { func_80034EC0(&this->skelAnime, D_80A72050, 24); } } @@ -861,11 +857,11 @@ void func_80A7134C(EnHy* this, GlobalContext* globalCtx) { s16 yaw; f32 distSq; - if ((this->skelAnime.animation == &D_06002160) && (this->unk_1E8.unk_00 != 0)) { + if ((this->skelAnime.animation == &gObjOsAnim_2160) && (this->unk_1E8.unk_00 != 0)) { func_80034EC0(&this->skelAnime, D_80A72050, 8); } - if ((this->skelAnime.animation == &D_0600265C) && (this->unk_1E8.unk_00 == 0)) { + if ((this->skelAnime.animation == &gObjOsAnim_265C) && (this->unk_1E8.unk_00 == 0)) { func_80034EC0(&this->skelAnime, D_80A72050, 7); } 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 73f9a05fda..b39aa9ebe5 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -5,6 +5,7 @@ */ #include "z_en_js.h" +#include "objects/object_js/object_js.h" #define FLAGS 0x00000009 @@ -49,10 +50,6 @@ static ColliderCylinderInit sCylinderInit = { { 30, 40, 0, { 0, 0, 0 } }, }; -extern FlexSkeletonHeader D_06005EA0; -extern AnimationHeader D_0600045C; -extern AnimationHeader D_0600018C; - void En_Js_SetupAction(EnJs* this, EnJsActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -62,8 +59,9 @@ void EnJs_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06005EA0, &D_0600045C, this->jointTable, this->morphTable, 13); - Animation_PlayOnce(&this->skelAnime, &D_0600045C); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCarpetMerchantSkel, &gCarpetMerchantSlappingKneeAnim, + this->jointTable, this->morphTable, 13); + Animation_PlayOnce(&this->skelAnime, &gCarpetMerchantSlappingKneeAnim); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; @@ -100,8 +98,8 @@ u8 func_80A88F64(EnJs* this, GlobalContext* globalCtx, u16 textId) { void func_80A89008(EnJs* this) { En_Js_SetupAction(this, func_80A89304); - Animation_Change(&this->skelAnime, &D_0600045C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600045C), ANIMMODE_ONCE, - -4.0f); + Animation_Change(&this->skelAnime, &gCarpetMerchantSlappingKneeAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gCarpetMerchantSlappingKneeAnim), ANIMMODE_ONCE, -4.0f); } void func_80A89078(EnJs* this, GlobalContext* globalCtx) { @@ -157,8 +155,8 @@ void func_80A891C4(EnJs* this, GlobalContext* globalCtx) { void func_80A89294(EnJs* this) { En_Js_SetupAction(this, func_80A891C4); - Animation_Change(&this->skelAnime, &D_0600018C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600018C), ANIMMODE_ONCE, - -4.0f); + Animation_Change(&this->skelAnime, &gCarpetMerchantIdleAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gCarpetMerchantIdleAnim), ANIMMODE_ONCE, -4.0f); } void func_80A89304(EnJs* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 0e78848abc..9a48a7d9cb 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -5,6 +5,7 @@ */ #include "z_en_mag.h" +#include "objects/object_mag/object_mag.h" #define FLAGS 0x00000030 @@ -15,13 +16,6 @@ void EnMag_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnMag_Update(Actor* thisx, GlobalContext* globalCtx); void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx); -extern u8 D_06000000[]; // Main Logo -extern u8 D_06019A00[]; // Copyright Notice -extern u8 D_0601A400[]; // Master Quest Sub Title -extern u8 D_06024800[]; // Logo Flame Effect -extern u8 D_06024C00[]; // "The Legend of" -extern u8 D_06024E40[]; // "Ocarina of Time" - const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORCAT_PROP, @@ -389,8 +383,10 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { static u8 pressStartFontIndexes[] = { 0x19, 0x1B, 0x0E, 0x1C, 0x1C, 0x1C, 0x1D, 0x0A, 0x1B, 0x1D, }; - static u8* effectMaskTextures[] = { - 0x06020000, 0x06020800, 0x06021000, 0x06021800, 0x06022000, 0x06022800, 0x06023000, 0x06023800, 0x06024000, + static void* effectMaskTextures[] = { + gTitleEffectMask00Tex, gTitleEffectMask01Tex, gTitleEffectMask02Tex, + gTitleEffectMask10Tex, gTitleEffectMask11Tex, gTitleEffectMask12Tex, + gTitleEffectMask20Tex, gTitleEffectMask21Tex, gTitleEffectMask22Tex, }; EnMag* this = THIS; Font* font = &this->font; @@ -420,8 +416,8 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { if ((s16)this->effectPrimLodFrac != 0) { for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) { for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) { - EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], D_06024800, 64, 64, 32, 32, rectLeft, rectTop, 64, - 64, 1024, 1024, 1, 1, k, this); + EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft, + rectTop, 64, 64, 1024, 1024, 1, 1, k, this); } } } @@ -429,7 +425,7 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha); if ((s16)this->mainAlpha != 0) { - EnMag_DrawImageRGBA32(&gfx, 152, 100, D_06000000, 160, 160); + EnMag_DrawImageRGBA32(&gfx, 152, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160); } func_8009457C(&gfx); @@ -449,20 +445,20 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { gDPSetEnvColor(gfx++, 0, 0, 100, 255); if ((s16)this->mainAlpha != 0) { - EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 146, 73, 72, 8, 1024, 1024); - EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 144, 127, 96, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 146, 73, 72, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 144, 127, 96, 8, 1024, 1024); gDPPipeSync(gfx++); gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha); gDPSetEnvColor(gfx++, 20, 80, 160, 255); - EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 145, 72, 72, 8, 1024, 1024); - EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 143, 126, 96, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 145, 72, 72, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 143, 126, 96, 8, 1024, 1024); gDPPipeSync(gfx++); gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha); - EnMag_DrawImageRGBA32(&gfx, 174, 145, D_0601A400, 128, 32); + EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32); } func_8009457C(&gfx); @@ -474,8 +470,9 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { (s16)this->copyrightAlpha); if ((s16)this->copyrightAlpha != 0) { - gDPLoadTextureBlock(gfx++, D_06019A00, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gfx++, gTitleCopyright19982003Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gfx++, 312, 792, 952, 856, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } 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 0ec9e03678..3dbfd3d829 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -5,6 +5,7 @@ */ #include "z_en_md.h" +#include "objects/object_md/object_md.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000019 @@ -57,18 +58,22 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x0600917C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06009E68, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { 0x06009B1C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06008E84, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { 0x060097F0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x060092B0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { 0x0600A138, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x06008FC0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, - { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { 0x06008510, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, - { 0x060095BC, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06008738, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &gMidoRaiseHand1Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoHaltAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoPutHandDownAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoAnnoyedPointedHeadIdle1Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoAnnoyedPointedHeadIdle2Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoAnim_92B0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoWalkingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoHandsOnHipsTransitionAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoHandsOnHipsIdleAnim, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &gMidoSlamAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { &gMidoRaiseHand2Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { &gMidoAngryHeadTurnAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, }; -extern AnimationHeader D_060002C8; -extern FlexSkeletonHeader D_06007FB8; - void func_80AAA250(EnMd* this) { f32 startFrame; @@ -319,7 +324,7 @@ void func_80AAAA24(EnMd* this) { } break; } - } else if (this->skelAnime.animation != &D_060002C8) { + } else if (this->skelAnime.animation != &gMidoHandsOnHipsIdleAnim) { func_80034EC0(&this->skelAnime, sAnimations, 10); func_80AAA92C(this, 0); } @@ -608,7 +613,7 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007FB8, NULL, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gMidoSkel, NULL, this->jointTable, this->morphTable, 17); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -647,7 +652,7 @@ void EnMd_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80AAB874(EnMd* this, GlobalContext* globalCtx) { - if (this->skelAnime.animation == &D_060002C8) { + if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { func_80034F54(globalCtx, this->unk_214, this->unk_236, 17); } else if ((this->unk_1E0.unk_00 == 0) && (this->unk_20B != 7)) { func_80AAA92C(this, 7); @@ -657,7 +662,7 @@ void func_80AAB874(EnMd* this, GlobalContext* globalCtx) { } void func_80AAB8F8(EnMd* this, GlobalContext* globalCtx) { - if (this->skelAnime.animation == &D_060002C8) { + if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { func_80034F54(globalCtx, this->unk_214, this->unk_236, 17); } func_80AAA93C(this); @@ -709,7 +714,7 @@ void func_80AAB948(EnMd* this, GlobalContext* globalCtx) { return; } - if (this->skelAnime.animation == &D_060002C8) { + if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { func_80034F54(globalCtx, this->unk_214, this->unk_236, 17); } @@ -822,20 +827,20 @@ void EnMd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec } void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) { - static UNK_PTR sEyesSegments[] = { - 0x06004FF0, - 0x06005930, - 0x06005D30, + static void* sEyeTextures[] = { + &gMidoEyeOpenTex, + &gMidoEyeHalfTex, + &gMidoEyeClosedTex, }; EnMd* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_md.c", 1280); if (this->alpha == 255) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIdx])); func_80034BA0(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } else if (this->alpha != 0) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIdx])); func_80034CC4(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } 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 36312014c7..31613872c2 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -5,6 +5,7 @@ */ #include "z_en_ms.h" +#include "objects/object_ms/object_ms.h" #define FLAGS 0x00000009 @@ -58,9 +59,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP), }; -extern AnimationHeader D_060005EC; -extern FlexSkeletonHeader D_06003DC0; - void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B); if (this->actor.textId == 0) { @@ -81,7 +79,8 @@ void EnMs_Init(Actor* thisx, GlobalContext* globalCtx) { return; } Actor_ProcessInitChain(&this->actor, sInitChain); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, this->jointTable, this->morphTable, 9); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBeanSalesmanSkel, &gBeanSalesmanEatingAnim, this->jointTable, + this->morphTable, 9); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f); diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 76c1ec5546..db89a01c59 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -4,9 +4,10 @@ * Description: Cucco */ -#include #include "z_en_niw.h" +#include "objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" +#include "vt.h" #define FLAGS 0x00800010 @@ -119,11 +120,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 0, ICHAIN_STOP), }; -extern FlexSkeletonHeader D_06002530; -extern AnimationHeader D_060000E8; -extern Gfx D_060023B0[]; -extern Gfx D_06002428[]; - void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx) { EnNiw* this = THIS; s32 pad; @@ -158,7 +154,7 @@ void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.flags |= 1; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06002530, &D_060000E8, this->jointTable, this->morphTable, 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCuccoSkel, &gCuccoAnim, this->jointTable, this->morphTable, 16); if (globalCtx->sceneNum == SCENE_SPOT01) { for (i = 0; i < ARRAY_COUNT(sKakarikoPosList); i++) { @@ -409,7 +405,7 @@ void func_80AB6100(EnNiw* this, GlobalContext* globalCtx, s32 arg2) { } void EnNiw_ResetAction(EnNiw* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), ANIMMODE_LOOP, + Animation_Change(&this->skelAnime, &gCuccoAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCuccoAnim), ANIMMODE_LOOP, -10.0f); switch (this->actor.params) { @@ -823,7 +819,7 @@ void func_80AB7204(EnNiw* this, GlobalContext* globalCtx) { } void func_80AB7290(EnNiw* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), ANIMMODE_LOOP, + Animation_Change(&this->skelAnime, &gCuccoAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCuccoAnim), ANIMMODE_LOOP, -10.0f); this->unk_2A0 = Rand_ZeroFloat(1.99f); this->actor.speedXZ = 4.0f; @@ -1215,7 +1211,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(this->feathers); i++, feather++) { if (feather->type == 1) { if (!flag) { - gSPDisplayList(POLY_XLU_DISP++, D_060023B0); + gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAppearDL); flag++; } Matrix_Translate(feather->pos.x, feather->pos.y, feather->pos.z, MTXMODE_NEW); @@ -1225,7 +1221,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_niw.c", 1913), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06002428); + gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); } } diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 0078c4d17c..6d3e6e4c61 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -1,4 +1,6 @@ #include "z_en_niw_lady.h" +#include "objects/object_ane/object_ane.h" +#include "objects/object_os_anime/object_os_anime.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" #include "vt.h" @@ -65,12 +67,6 @@ static ColliderCylinderInit sCylinderInit = { { 10, 10, 0, { 0, 0, 0 } }, }; -extern FlexSkeletonHeader D_060000F0; -extern AnimationHeader D_06000718; -extern AnimationHeader D_060007D0; -extern AnimationHeader D_06009F94; -extern AnimationHeader D_0600A630; - void EnNiwLady_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnNiwLady* this = THIS; @@ -115,8 +111,8 @@ void EnNiwLady_ChoseAnimation(EnNiwLady* this, GlobalContext* globalCtx, s32 arg case 10: this->unk_275 = 1; case 9: - frames = Animation_GetLastFrame(&D_060007D0); - Animation_Change(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_07D0); + Animation_Change(&this->skelAnime, &gObjOsAnim_07D0, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); break; case 0: case 1: @@ -130,8 +126,8 @@ void EnNiwLady_ChoseAnimation(EnNiwLady* this, GlobalContext* globalCtx, s32 arg case 22: case 24: case 29: - frames = Animation_GetLastFrame(&D_06009F94); - Animation_Change(&this->skelAnime, &D_06009F94, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_9F94); + Animation_Change(&this->skelAnime, &gObjOsAnim_9F94, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); break; case 7: case 20: @@ -140,12 +136,12 @@ void EnNiwLady_ChoseAnimation(EnNiwLady* this, GlobalContext* globalCtx, s32 arg case 26: case 27: case 28: - frames = Animation_GetLastFrame(&D_06000718); - Animation_Change(&this->skelAnime, &D_06000718, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_0718); + Animation_Change(&this->skelAnime, &gObjOsAnim_0718, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); break; case 100: - frames = Animation_GetLastFrame(&D_0600A630); - Animation_Change(&this->skelAnime, &D_0600A630, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_A630); + Animation_Change(&this->skelAnime, &gObjOsAnim_A630, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); this->unk_276 = 0; break; } @@ -160,7 +156,7 @@ void func_80AB9F24(EnNiwLady* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, this->objectAneIndex) && Object_IsLoaded(&globalCtx->objectCtx, this->objectOsAnimeIndex)) { gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectAneIndex].segment); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, NULL, this->jointTable, this->morphTable, 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCuccoLadySkel, NULL, this->jointTable, this->morphTable, 16); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectOsAnimeIndex].segment); this->unk_27E = 1; this->actor.gravity = -3.0f; @@ -174,11 +170,11 @@ void func_80AB9F24(EnNiwLady* this, GlobalContext* globalCtx) { switch (this->unk_278) { case 0: if (!(gSaveContext.itemGetInf[0] & 0x1000) && LINK_IS_CHILD) { - frames = Animation_GetLastFrame(&D_0600A630); - Animation_Change(&this->skelAnime, &D_0600A630, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_A630); + Animation_Change(&this->skelAnime, &gObjOsAnim_A630, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); } else { - frames = Animation_GetLastFrame(&D_060007D0); - Animation_Change(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_07D0); + Animation_Change(&this->skelAnime, &gObjOsAnim_07D0, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); } if (LINK_IS_ADULT) { this->actionFunc = func_80ABA778; @@ -187,8 +183,8 @@ void func_80AB9F24(EnNiwLady* this, GlobalContext* globalCtx) { } return; case 1: - frames = Animation_GetLastFrame(&D_060007D0); - Animation_Change(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); + frames = Animation_GetLastFrame(&gObjOsAnim_07D0); + Animation_Change(&this->skelAnime, &gObjOsAnim_07D0, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, 0.0f); this->actionFunc = func_80ABAD38; return; } @@ -570,7 +566,7 @@ s32 EnNiwLady_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL } void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* D_80ABB408[] = { 0x060008C8, 0x060010C8, 0x060018C8 }; + static void* sEyeTextures[] = { gCuccoLadyEyeOpenTex, gCuccoLadyEyeHalfTex, gCuccoLadyEyeClosedTex }; EnNiwLady* this = THIS; s32 pad; @@ -578,7 +574,7 @@ void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_27E != 0) { func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80ABB408[this->faceState])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->faceState])); gSPSegment(POLY_OPA_DISP++, 0x0C, func_80ABB0A0(globalCtx->state.gfxCtx)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnNiwLady_OverrideLimbDraw, NULL, this); diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index f2831ede29..ea2f8108ac 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -5,6 +5,7 @@ */ #include "z_en_nwc.h" +#include "objects/object_nwc/object_nwc.h" #define FLAGS 0x00000030 @@ -31,15 +32,6 @@ typedef enum { /* 1 */ CHICK_NORMAL } ChickTypes; -extern Gfx D_06000840[]; -extern Gfx D_060008B0[]; -extern Gfx D_06000BF0[]; -extern Gfx D_06000C68[]; -extern Gfx D_06000C88[]; -extern Gfx D_06000CE0[]; -extern Gfx D_06000D10[]; -extern Gfx D_06000D50[]; - const ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, ACTORCAT_PROP, @@ -170,9 +162,9 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { dList2 = dList1 + 3 * this->count + 1; dList3 = dList2 + 2 * this->count + 1; - gSPDisplayList(dList1++, D_06000840); - gSPDisplayList(dList2++, D_06000BF0); - gSPDisplayList(dList3++, D_06000C88); + gSPDisplayList(dList1++, gCuccoChickSetupBodyDL); + gSPDisplayList(dList2++, gCuccoChickSetupEyeDL); + gSPDisplayList(dList3++, gCuccoChickSetupBeakDL); chick = this->chicks; for (i = 0; i < this->count; i++, chick++) { @@ -184,18 +176,18 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 346); gDPSetEnvColor(dList1++, 0, 100, 255, 255); gSPMatrix(dList1++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(dList1++, D_060008B0); + gSPDisplayList(dList1++, gCuccoChickBodyDL); gSPMatrix(dList2++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(dList2++, D_06000C68); + gSPDisplayList(dList2++, gCuccoChickEyesDL); gSPMatrix(dList3++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(dList3++, D_06000CE0); + gSPDisplayList(dList3++, gCuccoChickBeakDL); } } chick = this->chicks; POLY_XLU_DISP = dList3; func_80094044(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, D_06000D10); + gSPDisplayList(POLY_XLU_DISP++, gCuccoChickSetupShadowDL); for (i = 0; i < this->count; i++, chick++) { if ((chick->type != CHICK_NONE) && (chick->floorPoly != NULL)) { @@ -205,7 +197,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 388), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06000D50); + gSPDisplayList(POLY_XLU_DISP++, gCuccoChickShadowDL); } } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nwc.c", 395); diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index cf198d0149..33eb947d51 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -5,6 +5,7 @@ */ #include "z_en_owl.h" +#include "objects/object_owl/object_owl.h" #include "scenes/overworld/spot06/spot06_scene.h" #include "scenes/overworld/spot16/spot16_scene.h" #include "vt.h" @@ -13,14 +14,6 @@ #define THIS ((EnOwl*)thisx) -extern AnimationHeader D_0600C1C4; -extern AnimationHeader D_06001168; -extern FlexSkeletonHeader D_0600C0E8; -extern FlexSkeletonHeader D_060100B0; -extern AnimationHeader D_060015CC; -extern AnimationHeader D_0600C8A0; -extern AnimationHeader D_0600C684; - void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx); void EnOwl_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx); @@ -121,15 +114,16 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C0E8, &D_060015CC, this->jointTable, this->morphTable, 21); - SkelAnime_InitFlex(globalCtx, &this->skelAnime2, &D_060100B0, &D_0600C8A0, this->jointTable2, this->morphTable2, - 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gOwlFlyingSkel, &gOwlFlyAnim, this->jointTable, this->morphTable, + 21); + SkelAnime_InitFlex(globalCtx, &this->skelAnime2, &gOwlPerchingSkel, &gOwlPerchAnim, this->jointTable2, + this->morphTable2, 16); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sOwlCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actor.minVelocityY = -10.0f; this->actor.targetArrowOffset = 500.0f; - EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime2, &D_0600C8A0, 0.0f); + EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime2, &gOwlPerchAnim, 0.0f); this->actionFlags = this->unk_406 = this->unk_409 = 0; this->unk_405 = 4; this->unk_404 = this->unk_407 = 0; @@ -305,7 +299,7 @@ s32 func_80ACA558(EnOwl* this, GlobalContext* globalCtx, u16 textId) { } void func_80ACA5C8(EnOwl* this) { - EnOwl_ChangeMode(this, func_80ACBEA0, func_80ACC540, &this->skelAnime, &D_0600C684, 0.0f); + EnOwl_ChangeMode(this, func_80ACBEA0, func_80ACC540, &this->skelAnime, &gOwlUnfoldWingsAnim, 0.0f); this->eyeTexIndex = 0; this->blinkTimer = Rand_S16Offset(60, 60); } @@ -820,15 +814,15 @@ void EnOwl_WaitDefault(EnOwl* this, GlobalContext* globalCtx) { void func_80ACBAB8(EnOwl* this, GlobalContext* globalCtx) { switch (globalCtx->csCtx.npcActions[7]->action - 1) { case 0: - EnOwl_ChangeMode(this, func_80ACB904, func_80ACC540, &this->skelAnime, &D_060015CC, 0.0f); + EnOwl_ChangeMode(this, func_80ACB904, func_80ACC540, &this->skelAnime, &gOwlFlyAnim, 0.0f); break; case 1: this->actor.draw = EnOwl_Draw; - EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime, &D_0600C8A0, 0.0f); + EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime, &gOwlPerchAnim, 0.0f); break; case 2: this->actor.draw = EnOwl_Draw; - EnOwl_ChangeMode(this, func_80ACB994, func_80ACC540, &this->skelAnime, &D_060015CC, 0.0f); + EnOwl_ChangeMode(this, func_80ACB994, func_80ACC540, &this->skelAnime, &gOwlFlyAnim, 0.0f); break; case 3: this->actor.draw = NULL; @@ -884,7 +878,7 @@ void func_80ACBD4C(EnOwl* this, GlobalContext* globalCtx) { } if (this->actionFlags & 1) { - EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &D_060015CC, 0.0f); + EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &gOwlFlyAnim, 0.0f); this->unk_3FE = 6; if (this->actionFlags & 0x40) { this->unk_400 += 0x2000; @@ -899,7 +893,7 @@ void func_80ACBD4C(EnOwl* this, GlobalContext* globalCtx) { void func_80ACBEA0(EnOwl* this, GlobalContext* GlobalContext) { if (this->actionFlags & 1) { this->unk_3FE = 3; - EnOwl_ChangeMode(this, func_80ACBD4C, func_80ACC540, &this->skelAnime, &D_06001168, 0.0f); + EnOwl_ChangeMode(this, func_80ACBD4C, func_80ACC540, &this->skelAnime, &gOwlTakeoffAnim, 0.0f); this->unk_3F8 = this->actor.world.pos.y; this->actor.velocity.y = 2.0f; if (this->actionFlags & 0x40) { @@ -917,7 +911,7 @@ void func_80ACBF50(EnOwl* this, GlobalContext* globalCtx) { this->actor.shape.rot.y = this->actor.world.rot.y; if (this->actionFlags & 1) { - EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &D_060015CC, 0.0f); + EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &gOwlFlyAnim, 0.0f); this->unk_3FE = 6; this->actor.velocity.y = 2.0f; this->actor.gravity = 0.0f; @@ -1004,7 +998,7 @@ void func_80ACC23C(EnOwl* this, GlobalContext* globalCtx) { void func_80ACC30C(EnOwl* this, GlobalContext* globalCtx) { if (this->actionFlags & 1) { this->unk_3FE = 3; - EnOwl_ChangeMode(this, func_80ACC23C, func_80ACC540, &this->skelAnime, &D_06001168, 0.0f); + EnOwl_ChangeMode(this, func_80ACC23C, func_80ACC540, &this->skelAnime, &gOwlTakeoffAnim, 0.0f); this->unk_3F8 = this->actor.world.pos.y; this->actor.velocity.y = 0.2f; } @@ -1021,8 +1015,7 @@ void func_80ACC390(EnOwl* this) { } else { this->unk_410 = func_80ACC460; this->unk_3FE = 6; - Animation_Change(this->curSkelAnime, &D_060015CC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060015CC), - ANIMMODE_ONCE, 5.0f); + Animation_Change(this->curSkelAnime, &gOwlFlyAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gOwlFlyAnim), 2, 5.0f); } } @@ -1035,8 +1028,8 @@ void func_80ACC460(EnOwl* this) { } else { this->unk_3FE = 0xA0; this->unk_410 = func_80ACC390; - Animation_Change(this->curSkelAnime, &D_0600C1C4, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C1C4), - ANIMMODE_LOOP, 5.0f); + Animation_Change(this->curSkelAnime, &gOwlGlideAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gOwlGlideAnim), 0, + 5.0f); } } } @@ -1101,11 +1094,11 @@ void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx) { } if (!(this->actionFlags & 0x80) && func_80ACC624(this, globalCtx)) { - if ((this->skelAnime.animation == &D_06001168 && + if ((this->skelAnime.animation == &gOwlTakeoffAnim && (this->skelAnime.curFrame == 2.0f || this->skelAnime.curFrame == 9.0f || this->skelAnime.curFrame == 23.0f || this->skelAnime.curFrame == 40.0f || this->skelAnime.curFrame == 58.0f)) || - (this->skelAnime.animation == &D_060015CC && this->skelAnime.curFrame == 4.0f)) { + (this->skelAnime.animation == &gOwlFlyAnim && this->skelAnime.curFrame == 4.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_OWL_FLUTTER); } } @@ -1320,7 +1313,7 @@ void EnOwl_PostLimbUpdate(GlobalContext* globalCtx, s32 limbIndex, Gfx** gfx, Ve } void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx) { - static u64* eyeTextures[] = { 0x060089A8, 0x06008DA8, 0x060091A8 }; + static void* eyeTextures[] = { gObjOwlEyeOpenTex, gObjOwlEyeHalfTex, gObjOwlEyeClosedTex }; EnOwl* this = THIS; s32 pad; diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 243abe72ec..bb0ddbb976 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,4 +1,5 @@ #include "z_en_peehat.h" +#include "objects/object_peehat/object_peehat.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" @@ -41,12 +42,6 @@ void EnPeehat_Adult_StateDie(EnPeehat* this, GlobalContext* globalCtx); void EnPeehat_SetStateExplode(EnPeehat* this); void EnPeehat_StateExplode(EnPeehat* this, GlobalContext* globalCtx); -extern SkeletonHeader D_06001C80; -extern AnimationHeader D_060009C4; -extern AnimationHeader D_06000844; -extern AnimationHeader D_060005C4; -extern AnimationHeader D_06000350; - const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORCAT_ENEMY, @@ -199,7 +194,8 @@ void EnPeehat_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); Actor_SetScale(thisx, 36.0f * 0.001f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001C80, &D_060009C4, this->jointTable, this->morphTable, 24); + SkelAnime_Init(globalCtx, &this->skelAnime, &gPeehatSkel, &gPeehatRisingAnim, this->jointTable, this->morphTable, + 24); ActorShape_Init(&this->actor.shape, 100.0f, ActorShadow_DrawCircle, 27.0f); this->actor.focus.pos = this->actor.world.pos; this->unk2D4 = 0; @@ -314,7 +310,8 @@ void EnPeehat_HitWhenGrounded(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Ground_SetStateGround(EnPeehat* this) { - Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, Animation_GetLastFrame(&D_060009C4), 2, 0.0f); + Animation_Change(&this->skelAnime, &gPeehatRisingAnim, 0.0f, 3.0f, Animation_GetLastFrame(&gPeehatRisingAnim), 2, + 0.0f); this->seekPlayerTimer = 600; this->unk2D4 = 0; this->unk2FA = 0; @@ -351,7 +348,8 @@ void EnPeehat_Ground_StateGround(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Flying_SetStateGround(EnPeehat* this) { - Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, Animation_GetLastFrame(&D_060009C4), 2, 0.0f); + Animation_Change(&this->skelAnime, &gPeehatRisingAnim, 0.0f, 3.0f, Animation_GetLastFrame(&gPeehatRisingAnim), 2, + 0.0f); this->seekPlayerTimer = 400; this->unk2D4 = 0; this->unk2FA = 0; // @bug: overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns @@ -380,7 +378,7 @@ void EnPeehat_Flying_StateGrounded(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Flying_SetStateFly(EnPeehat* this) { - Animation_PlayLoop(&this->skelAnime, &D_060005C4); + Animation_PlayLoop(&this->skelAnime, &gPeehatFlyingAnim); this->state = PEAHAT_STATE_FLY; EnPeehat_SetupAction(this, EnPeehat_Flying_StateFly); } @@ -408,9 +406,9 @@ void EnPeehat_Flying_StateFly(EnPeehat* this, GlobalContext* globalCtx) { void EnPeehat_Ground_SetStateRise(EnPeehat* this) { f32 lastFrame; - lastFrame = Animation_GetLastFrame(&D_060009C4); + lastFrame = Animation_GetLastFrame(&gPeehatRisingAnim); if (this->state != PEAHAT_STATE_STUNNED) { - Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, lastFrame, 2, 0.0f); + Animation_Change(&this->skelAnime, &gPeehatRisingAnim, 0.0f, 3.0f, lastFrame, 2, 0.0f); } this->state = PEAHAT_STATE_8; this->animTimer = lastFrame; @@ -449,9 +447,9 @@ void EnPeehat_Ground_StateRise(EnPeehat* this, GlobalContext* globalCtx) { void EnPeehat_Flying_SetStateRise(EnPeehat* this) { f32 lastFrame; - lastFrame = Animation_GetLastFrame(&D_060009C4); + lastFrame = Animation_GetLastFrame(&gPeehatRisingAnim); if (this->state != PEAHAT_STATE_STUNNED) { - Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, lastFrame, 2, 0.0f); + Animation_Change(&this->skelAnime, &gPeehatRisingAnim, 0.0f, 3.0f, lastFrame, 2, 0.0f); } this->state = PEAHAT_STATE_9; this->animTimer = lastFrame; @@ -489,7 +487,7 @@ void EnPeehat_Flying_StateRise(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Ground_SetStateSeekPlayer(EnPeehat* this) { - Animation_PlayLoop(&this->skelAnime, &D_060005C4); + Animation_PlayLoop(&this->skelAnime, &gPeehatFlyingAnim); this->state = PEAHAT_STATE_SEEK_PLAYER; this->unk2E0 = 0.0f; EnPeehat_SetupAction(this, EnPeehat_Ground_StateSeekPlayer); @@ -525,7 +523,7 @@ void EnPeehat_Ground_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Larva_SetStateSeekPlayer(EnPeehat* this) { - Animation_PlayLoop(&this->skelAnime, &D_060005C4); + Animation_PlayLoop(&this->skelAnime, &gPeehatFlyingAnim); this->state = PEAHAT_STATE_SEEK_PLAYER; this->unk2D4 = 0; EnPeehat_SetupAction(this, EnPeehat_Larva_StateSeekPlayer); @@ -597,7 +595,7 @@ void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) { void EnPeehat_Ground_SetStateLanding(EnPeehat* this) { this->state = PEAHAT_STATE_LANDING; - Animation_PlayOnce(&this->skelAnime, &D_06000350); + Animation_PlayOnce(&this->skelAnime, &gPeehatLandingAnim); EnPeehat_SetupAction(this, EnPeehat_Ground_StateLanding); } @@ -623,7 +621,7 @@ void EnPeehat_Ground_StateLanding(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Flying_SetStateLanding(EnPeehat* this) { - Animation_PlayOnce(&this->skelAnime, &D_06000350); + Animation_PlayOnce(&this->skelAnime, &gPeehatLandingAnim); this->state = PEAHAT_STATE_LANDING; EnPeehat_SetupAction(this, EnPeehat_Flying_StateLanding); } @@ -650,7 +648,7 @@ void EnPeehat_Flying_StateLanding(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_Ground_SetStateHover(EnPeehat* this) { - Animation_PlayLoop(&this->skelAnime, &D_060005C4); + Animation_PlayLoop(&this->skelAnime, &gPeehatFlyingAnim); this->actor.speedXZ = Rand_ZeroOne() * 0.5f + 2.5f; this->unk2D4 = Rand_ZeroOne() * 10 + 10; this->state = PEAHAT_STATE_15; @@ -737,7 +735,7 @@ void EnPeehat_Ground_StateReturnHome(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_SetStateAttackRecoil(EnPeehat* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06000844, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gPeehatRecoilAnim, -4.0f); this->state = PEAHAT_STATE_ATTACK_RECOIL; this->actor.speedXZ = -9.0f; this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -808,7 +806,7 @@ void EnPeehat_Adult_StateDie(EnPeehat* this, GlobalContext* globalCtx) { if (this->isStateDieFirstUpdate) { this->unk2D4--; if (this->unk2D4 <= 0 || this->actor.colChkInfo.health == 0) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06000844, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gPeehatRecoilAnim, -4.0f); this->bladeRotVel = 4000; this->unk2D4 = 14; this->actor.speedXZ = 0; @@ -854,7 +852,7 @@ void EnPeehat_Adult_StateDie(EnPeehat* this, GlobalContext* globalCtx) { } void EnPeehat_SetStateExplode(EnPeehat* this) { - Animation_PlayLoop(&this->skelAnime, &D_060005C4); + Animation_PlayLoop(&this->skelAnime, &gPeehatFlyingAnim); this->state = PEAHAT_STATE_EXPLODE; this->animTimer = 5; this->unk2E0 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index bca8f67e33..5e023a778e 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -82,7 +82,7 @@ static Vec3f D_80AD8D48 = { 0.0f, 1200.0f, 0.0f }; static u64* sEyesSegments[] = { gDampeEyeOpenTex, - gDampeEyeHalfOpenTex, + gDampeEyeHalfTex, gDampeEyeClosedTex, }; diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index b28ae4369f..ffc7770d0f 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -5,6 +5,7 @@ */ #include "z_en_rr.h" +#include "objects/object_rr/object_rr.h" #include "vt.h" #define FLAGS 0x00000435 @@ -65,8 +66,6 @@ void EnRr_Death(EnRr* this, GlobalContext* globalCtx); void EnRr_Retreat(EnRr* this, GlobalContext* globalCtx); void EnRr_Stunned(EnRr* this, GlobalContext* globalCtx); -extern Gfx D_06000470[]; - const ActorInit En_Rr_InitVars = { ACTOR_EN_RR, ACTORCAT_ENEMY, @@ -881,7 +880,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { } this->effectPos[0] = this->actor.world.pos; Matrix_MultVec3f(&zeroVec, &this->mouthPos); - gSPDisplayList(POLY_XLU_DISP++, D_06000470); + gSPDisplayList(POLY_XLU_DISP++, gLikeLikeDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rr.c", 1551); if (this->effectTimer != 0) { 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 1a1f3e44d7..dbc479d7af 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -5,6 +5,7 @@ */ #include "z_en_ru2.h" +#include "objects/object_ru2/object_ru2.h" #include "vt.h" #define FLAGS 0x00000010 @@ -55,10 +56,10 @@ static ColliderCylinderInitType1 sCylinderInit = { { 30, 100, 0, { 0 } }, }; -static UNK_PTR D_80AF410C[] = { - 0x06000F20, - 0x060022E0, - 0x06002AE0, +static void* sEyeTextures[] = { + &gAdultRutoEyeOpenTex, + &gAdultRutoEyeHalfTex, + &gAdultRutoEyeClosedTex, }; static UNK_TYPE D_80AF4118 = 0; @@ -89,15 +90,6 @@ const ActorInit En_Ru2_InitVars = { (ActorFunc)EnRu2_Draw, }; -extern AnimationHeader D_060004CC; -extern FlexSkeletonHeader D_0600C700; -extern AnimationHeader D_0600D3DC; -extern AnimationHeader D_0600DCAC; -extern AnimationHeader D_06000DE8; -extern AnimationHeader D_0600E630; -extern AnimationHeader D_0600F03C; -extern AnimationHeader D_0600F8B8; - void func_80AF2550(Actor* thisx, GlobalContext* globalCtx) { EnRu2* this = THIS; @@ -245,7 +237,7 @@ void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { } void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { - func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); this->actor.shape.yOffset = -10000.0f; } @@ -307,7 +299,7 @@ void func_80AF2B94(EnRu2* this) { } void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { - AnimationHeader* animation = &D_0600D3DC; + AnimationHeader* animation = &gAdultRutoRaisingArmsUpAnim; CsCmdActorAction* csCmdNPCAction; if (globalCtx->csCtx.state != CS_STATE_IDLE) { @@ -383,7 +375,7 @@ void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { } void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { - func_80AF28E8(this, &D_060004CC, 2, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoCrossingArmsAnim, 2, 0.0f, 0); this->action = 7; this->actor.shape.shadowAlpha = 0; } @@ -476,7 +468,7 @@ void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2]; s16 temp = this->unk_2A4; - UNK_PTR addr = D_80AF410C[temp]; + UNK_PTR addr = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); @@ -495,7 +487,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { } void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { - func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoIdleHandsOnHipsAnim, 0, 0.0f, 0); this->action = 10; this->drawConfig = 0; this->actor.shape.shadowAlpha = 0; @@ -533,13 +525,13 @@ void func_80AF34A4(EnRu2* this) { } void func_80AF34F0(EnRu2* this) { - func_80AF28E8(this, &D_0600DCAC, 2, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoHeadTurnDownLeftAnim, 2, 0.0f, 0); this->action = 13; } void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { if (arg1 != 0) { - func_80AF28E8(this, &D_0600F03C, 0, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoLookingDownLeftAnim, 0, 0.0f, 0); } } @@ -609,7 +601,7 @@ void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF3718(this, globalCtx)) { Actor_Kill(&this->actor); } else { - func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + func_80AF28E8(this, &gAdultRutoIdleAnim, 0, 0.0f, 0); this->action = 14; this->drawConfig = 1; } @@ -701,7 +693,7 @@ void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { this->unk_2C4 += 1.0f; if (this->unk_2C4 > kREG(5) + 100.0f) { - func_80AF28E8(this, &D_0600F8B8, 0, -12.0f, 0); + func_80AF28E8(this, &gAdultRutoSwimmingUpAnim, 0, -12.0f, 0); this->action = 19; func_80AF36EC(this, globalCtx); } @@ -777,7 +769,7 @@ void EnRu2_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); func_80AF2550(thisx, globalCtx); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C700, NULL, this->jointTable, this->morphTable, 23); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gAdultRutoSkel, NULL, this->jointTable, this->morphTable, 23); switch (func_80AF26A0(this)) { case 2: @@ -804,7 +796,7 @@ void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2]; s16 temp = this->unk_2A4; - UNK_PTR addr = D_80AF410C[temp]; + UNK_PTR addr = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index f3a8466c31..334f43fff0 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -1,4 +1,5 @@ #include "z_en_shopnuts.h" +#include "objects/object_shopnuts/object_shopnuts.h" #define FLAGS 0x00000005 @@ -17,15 +18,6 @@ void EnShopnuts_ThrowNut(EnShopnuts* this, GlobalContext* globalCtx); void EnShopnuts_Burrow(EnShopnuts* this, GlobalContext* globalCtx); void EnShopnuts_SpawnSalesman(EnShopnuts* this, GlobalContext* globalCtx); -extern AnimationHeader D_060001EC; -extern AnimationHeader D_0600039C; -extern AnimationHeader D_06000764; -extern AnimationHeader D_06000BA0; -extern AnimationHeader D_0600139C; -extern Gfx D_06003B68[]; -extern FlexSkeletonHeader D_060041A8; -extern AnimationHeader D_06004574; - const ActorInit En_Shopnuts_InitVars = { ACTOR_EN_SHOPNUTS, ACTORCAT_ENEMY, @@ -71,7 +63,8 @@ void EnShopnuts_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060041A8, &D_06004574, this->jointTable, this->morphTable, 18); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBusinessScrubSkel, &gBusinessScrubAnim_4574, this->jointTable, + this->morphTable, 18); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit); @@ -93,7 +86,7 @@ void EnShopnuts_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnShopnuts_SetupWait(EnShopnuts* this) { - Animation_PlayOnceSetSpeed(&this->skelAnime, &D_0600139C, 0.0f); + Animation_PlayOnceSetSpeed(&this->skelAnime, &gBusinessScrubAnim_139C, 0.0f); this->animFlagAndTimer = Rand_S16Offset(100, 50); this->collider.dim.height = 5; this->collider.base.acFlags &= ~AC_ON; @@ -101,18 +94,18 @@ void EnShopnuts_SetupWait(EnShopnuts* this) { } void EnShopnuts_SetupLookAround(EnShopnuts* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000BA0); + Animation_PlayLoop(&this->skelAnime, &gBusinessScrubLookAroundAnim); this->animFlagAndTimer = 2; this->actionFunc = EnShopnuts_LookAround; } void EnShopnuts_SetupThrowNut(EnShopnuts* this) { - Animation_PlayOnce(&this->skelAnime, &D_060001EC); + Animation_PlayOnce(&this->skelAnime, &gBusinessScrubAnim_1EC); this->actionFunc = EnShopnuts_ThrowNut; } void EnShopnuts_SetupStand(EnShopnuts* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06004574, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &gBusinessScrubAnim_4574, -3.0f); if (this->actionFunc == EnShopnuts_ThrowNut) { this->animFlagAndTimer = 2 | 0x1000; // sets timer and flag } else { @@ -122,13 +115,13 @@ void EnShopnuts_SetupStand(EnShopnuts* this) { } void EnShopnuts_SetupBurrow(EnShopnuts* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_0600039C, -5.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gBusinessScrubAnim_39C, -5.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN); this->actionFunc = EnShopnuts_Burrow; } void EnShopnuts_SetupSpawnSalesman(EnShopnuts* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06000764, -3.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gBusinessScrubRotateAnim, -3.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE); this->collider.base.acFlags &= ~AC_ON; this->actionFunc = EnShopnuts_SpawnSalesman; @@ -258,7 +251,7 @@ void EnShopnuts_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetFocus(&this->actor, this->skelAnime.curFrame); } else if (this->actionFunc == EnShopnuts_Burrow) { Actor_SetFocus(&this->actor, - 20.0f - ((this->skelAnime.curFrame * 20.0f) / Animation_GetLastFrame(&D_0600039C))); + 20.0f - ((this->skelAnime.curFrame * 20.0f) / Animation_GetLastFrame(&gBusinessScrubAnim_39C))); } else { Actor_SetFocus(&this->actor, 20.0f); } @@ -303,7 +296,7 @@ void EnShopnuts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis if (1) {} gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_shopnuts.c", 714), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06003B68); + gSPDisplayList(POLY_OPA_DISP++, gBusinessScrubNoseDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_shopnuts.c", 717); } } diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 5daf1a4bd6..b82e57d5e8 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -5,6 +5,7 @@ */ #include "z_en_syateki_niw.h" +#include "objects/object_niw/object_niw.h" #include "vt.h" #define FLAGS 0x00000010 @@ -27,11 +28,6 @@ void func_80B128D8(EnSyatekiNiw* this, GlobalContext* globalCtx); void func_80B131B8(EnSyatekiNiw* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4); -extern AnimationHeader D_060000E8; -extern Gfx D_060023B0[]; -extern Gfx D_06002428[]; -extern FlexSkeletonHeader D_06002530; - const ActorInit En_Syateki_Niw_InitVars = { ACTOR_EN_SYATEKI_NIW, ACTORCAT_PROP, @@ -76,7 +72,7 @@ void EnSyatekiNiw_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.flags &= ~1; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06002530, &D_060000E8, this->jointTable, this->morphTable, 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCuccoSkel, &gCuccoAnim, this->jointTable, this->morphTable, 16); this->unk_29E = this->actor.params; if (this->unk_29E < 0) { @@ -213,7 +209,7 @@ void func_80B11A94(EnSyatekiNiw* this, GlobalContext* globalCtx, s16 arg2) { } void func_80B11DEC(EnSyatekiNiw* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), ANIMMODE_LOOP, + Animation_Change(&this->skelAnime, &gCuccoAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCuccoAnim), ANIMMODE_LOOP, -10.0f); if (this->unk_29E != 0) { Actor_SetScale(&this->actor, this->unk_2F4); @@ -353,7 +349,7 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { } void func_80B123A8(EnSyatekiNiw* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), ANIMMODE_LOOP, + Animation_Change(&this->skelAnime, &gCuccoAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCuccoAnim), ANIMMODE_LOOP, -10.0f); this->unk_27C = 6000.0f; this->unk_288 = -10000.0f; @@ -778,7 +774,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { for (i = 0; i < 5; i++, ptr++) { if (ptr->unk_00 == 1) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, D_060023B0); + gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAppearDL); flag++; } @@ -790,7 +786,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_syateki_niw.c", 1251), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06002428); + gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); } } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index d432b48e25..f1f793cef5 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -719,7 +719,7 @@ void EnTk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) { static u64* sEyesSegments[] = { gDampeEyeOpenTex, - gDampeEyeHalfOpenTex, + gDampeEyeHalfTex, gDampeEyeClosedTex, }; EnTk* this = THIS; diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 7d9da023f2..afb35a7e8e 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -5,6 +5,7 @@ */ #include "z_en_trap.h" +#include "objects/object_trap/object_trap.h" #define FLAGS 0x00000010 @@ -60,8 +61,6 @@ static ColliderCylinderInit sCylinderInit = { { 30, 20, 0, { 0, 0, 0 } }, }; -extern Gfx D_06001400[]; - void EnTrap_Init(Actor* thisx, GlobalContext* globalCtx) { f32 trapDist; f32 trapSpeed; @@ -391,5 +390,5 @@ void EnTrap_Update(Actor* thisx, GlobalContext* globalCtx) { void EnTrap_Draw(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(thisx, globalCtx, 1); - Gfx_DrawDListOpa(globalCtx, D_06001400); + Gfx_DrawDListOpa(globalCtx, gSlidingBladeTrapDL); } diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 0d2219d241..85de6f6779 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -5,6 +5,7 @@ */ #include "z_en_vm.h" +#include "objects/object_vm/object_vm.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" @@ -122,16 +123,12 @@ static Vec3f D_80B2EB70 = { -500.0f, 0.0f, 0.0f }; static Vec3f D_80B2EB7C = { 0.4f, 0.4f, 0.4f }; -static UNK_PTR D_80B2EB88[] = { +static void* D_80B2EB88[] = { gEffEnemyDeathFlame1Tex, gEffEnemyDeathFlame2Tex, gEffEnemyDeathFlame3Tex, gEffEnemyDeathFlame4Tex, gEffEnemyDeathFlame5Tex, gEffEnemyDeathFlame6Tex, gEffEnemyDeathFlame7Tex, gEffEnemyDeathFlame8Tex, gEffEnemyDeathFlame9Tex, gEffEnemyDeathFlame10Tex, }; -extern SkeletonHeader D_06003F60; -extern AnimationHeader D_06000068; -extern Gfx D_06002728[]; - void EnVm_SetupAction(EnVm* this, EnVmActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -139,7 +136,7 @@ void EnVm_SetupAction(EnVm* this, EnVmActionFunc actionFunc) { void EnVm_Init(Actor* thisx, GlobalContext* globalCtx) { EnVm* this = THIS; - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06003F60, &D_06000068, this->jointTable, this->morphTable, 11); + SkelAnime_Init(globalCtx, &this->skelAnime, &gBeamosSkel, &gBeamosAnim, this->jointTable, this->morphTable, 11); ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); Collider_InitCylinder(globalCtx, &this->colliderCylinder); Collider_SetCylinder(globalCtx, &this->colliderCylinder, thisx, &sCylinderInit); @@ -169,9 +166,9 @@ void EnVm_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnVm_SetupWait(EnVm* this) { - f32 frameCount = Animation_GetLastFrame(&D_06000068); + f32 frameCount = Animation_GetLastFrame(&gBeamosAnim); - Animation_Change(&this->skelAnime, &D_06000068, 1.0f, frameCount, frameCount, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &gBeamosAnim, 1.0f, frameCount, frameCount, ANIMMODE_ONCE, 0.0f); this->unk_25E = this->unk_260 = 0; this->unk_21C = 0; this->timer = 10; @@ -253,7 +250,7 @@ void EnVm_Wait(EnVm* this, GlobalContext* globalCtx) { } void EnVm_SetupAttack(EnVm* this) { - Animation_Change(&this->skelAnime, &D_06000068, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &gBeamosAnim, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f); this->timer = 305; this->beamScale.x = 0.6f; this->beamSpeed = 40.0f; @@ -321,7 +318,7 @@ void EnVm_Attack(EnVm* this, GlobalContext* globalCtx) { } void EnVm_SetupStun(EnVm* this) { - Animation_Change(&this->skelAnime, &D_06000068, -1.0f, Animation_GetLastFrame(&D_06000068), 0.0f, ANIMMODE_ONCE, + Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE, 0.0f); this->unk_260 = 0; this->timer = 180; @@ -340,7 +337,7 @@ void EnVm_Stun(EnVm* this, GlobalContext* globalCtx) { if (this->unk_25E == 3) { EnVm_SetupWait(this); } else if (this->unk_25E == 1) { - Animation_Change(&this->skelAnime, &D_06000068, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000068), + Animation_Change(&this->skelAnime, &gBeamosAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gBeamosAnim), ANIMMODE_ONCE, 0.0f); } else { this->timer = 10; @@ -356,7 +353,7 @@ void EnVm_Stun(EnVm* this, GlobalContext* globalCtx) { } void EnVm_SetupDie(EnVm* this) { - Animation_Change(&this->skelAnime, &D_06000068, -1.0f, Animation_GetLastFrame(&D_06000068), 0.0f, ANIMMODE_ONCE, + Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE, 0.0f); this->timer = 33; this->unk_25E = this->unk_260 = 0; @@ -555,7 +552,7 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->beamScale.x * 0.1f, this->beamScale.x * 0.1f, this->beamScale.z * 0.0015f, 1); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vm.c", 1063), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06002728); + gSPDisplayList(POLY_OPA_DISP++, gBeamosLaserDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_vm.c", 1068); } diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 887441e8be..d41ebf84ab 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -5,6 +5,7 @@ */ #include "z_en_weiyer.h" +#include "objects/object_ei/object_ei.h" #define FLAGS 0x00000005 @@ -27,11 +28,6 @@ void func_80B332B4(EnWeiyer* this, GlobalContext* globalCtx); void func_80B33338(EnWeiyer* this, GlobalContext* globalCtx); void func_80B3349C(EnWeiyer* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000288; -extern AnimationHeader D_06000FC0; -extern AnimationHeader D_060012AC; -extern SkeletonHeader D_06003410; - const ActorInit En_Weiyer_InitVars = { ACTOR_EN_WEIYER, ACTORCAT_ENEMY, @@ -109,7 +105,8 @@ void EnWeiyer_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); ActorShape_Init(&this->actor.shape, 1000.0f, ActorShadow_DrawCircle, 65.0f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06003410, &D_060012AC, this->jointTable, this->morphTable, 19); + SkelAnime_Init(globalCtx, &this->skelAnime, &gStingerSkel, &gStingerIdleAnim, this->jointTable, this->morphTable, + 19); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); @@ -125,7 +122,7 @@ void EnWeiyer_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_80B32384(EnWeiyer* this) { this->unk_196 = this->actor.shape.rot.y; this->unk_27C = (cosf(-M_PI / 8) * 3.0f) + this->actor.world.pos.y; - Animation_MorphToLoop(&this->skelAnime, &D_06000FC0, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gStingerHitAnim, -5.0f); this->unk_194 = 30; this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 2.5f); this->collider.base.atFlags &= ~AT_ON; @@ -134,7 +131,7 @@ void func_80B32384(EnWeiyer* this) { } void func_80B32434(EnWeiyer* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06000FC0, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gStingerHitAnim, -5.0f); this->collider.base.atFlags |= AT_ON; this->unk_194 = 0; this->actor.speedXZ = 5.0f; @@ -142,7 +139,7 @@ void func_80B32434(EnWeiyer* this) { } void func_80B32494(EnWeiyer* this) { - Animation_Change(&this->skelAnime, &D_06000288, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); + Animation_Change(&this->skelAnime, &gStingerPopOutAnim, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); this->unk_194 = 40; this->collider.base.atFlags |= AT_ON; this->actionFunc = func_80B32D30; @@ -166,7 +163,7 @@ void func_80B32538(EnWeiyer* this) { } void func_80B325A0(EnWeiyer* this) { - Animation_Change(&this->skelAnime, &D_06000FC0, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -3.0f); + Animation_Change(&this->skelAnime, &gStingerHitAnim, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -3.0f); this->unk_194 = 40; this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; @@ -179,7 +176,7 @@ void func_80B325A0(EnWeiyer* this) { } void func_80B32660(EnWeiyer* this) { - Animation_Change(&this->skelAnime, &D_06000288, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); + Animation_Change(&this->skelAnime, &gStingerPopOutAnim, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); this->unk_194 = 80; this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; @@ -192,7 +189,7 @@ void func_80B32660(EnWeiyer* this) { } void func_80B32724(EnWeiyer* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06000FC0, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gStingerHitAnim, -5.0f); this->unk_194 = 20; Actor_SetColorFilter(&this->actor, 0x4000, 0xC8, 0, 0x28); this->collider.base.atFlags &= ~AT_ON; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 99e2c543e1..463dee20da 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -5,6 +5,7 @@ */ #include "z_en_yukabyun.h" +#include "objects/object_yukabyun/object_yukabyun.h" #define FLAGS 0x00000010 @@ -56,10 +57,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 16, ICHAIN_STOP), }; -static UNK_PTR D_80B43F64[] = { 0x06000AF0, 0x06000000 }; - -extern Gfx D_06000A60[]; -extern Gfx D_06000970[]; +static void* D_80B43F64[] = { gFloorTileEnemyTopTex, gFloorTileEnemyBottomTex }; void EnYukabyun_Init(Actor* thisx, GlobalContext* globalCtx) { EnYukabyun* this = THIS; @@ -112,7 +110,7 @@ void func_80B43B6C(EnYukabyun* this, GlobalContext* globalCtx) { void EnYukabyun_Break(EnYukabyun* this, GlobalContext* globalCtx) { EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 8.0f, 0, 1300, 300, 15, OBJECT_YUKABYUN, 10, - D_06000A60); + gFloorTileEnemyFragmentDL); Actor_Kill(&this->actor); } @@ -156,7 +154,7 @@ void EnYukabyun_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152])); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 373), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000970); + gSPDisplayList(POLY_OPA_DISP++, gFloorTileEnemyDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 378); } 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 d194372ea2..1375757d46 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -5,6 +5,7 @@ */ #include "z_en_zl1.h" +#include "objects/object_zl1/object_zl1.h" #define FLAGS 0x00000019 @@ -58,22 +59,9 @@ static ColliderCylinderInit sCylinderInit = { { 20, 46, 0, { 0, 0, 0 } }, }; -static u64* D_80B4E61C[] = { 0x06007208, 0x06009848, 0x06009C48, 0x06009848 }; -static u64* D_80B4E62C[] = { 0x06007608 }; - -extern AnimationHeader D_06000438; -extern u64 D_06008848[]; -extern u64 D_06008C48[]; -extern FlexSkeletonHeader D_0600F5D8; -extern AnimationHeader D_06010B38; -extern AnimationHeader D_06011348; -extern AnimationHeader D_060116E4; -extern AnimationHeader D_06011B88; -extern AnimationHeader D_06012118; -extern AnimationHeader D_060132D8; -extern AnimationHeader D_060138E0; -extern AnimationHeader D_06013F10; -extern AnimationHeader D_060143A8; +static void* D_80B4E61C[] = { gChildZelda1EyeOpenLookingUpRightTex, gChildZelda1EyeHalf2Tex, gChildZelda1EyeClosedTex, + gChildZelda1EyeHalf2Tex }; +static void* D_80B4E62C[] = { gChildZelda1MouthNeutralTex }; void func_80B4AB40(void) { } @@ -85,9 +73,9 @@ void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) { f32 frameCount; EnZl1* this = THIS; - frameCount = Animation_GetLastFrame(&D_06012118); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F5D8, NULL, NULL, NULL, 0); - Animation_Change(&this->skelAnime, &D_06012118, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_12118); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gChildZelda1Skel, NULL, NULL, NULL, 0); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_12118, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -96,21 +84,21 @@ void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.targetMode = 0; if (gSaveContext.sceneSetupIndex >= 4) { - frameCount = Animation_GetLastFrame(&D_06000438); - Animation_Change(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); this->unk_1E6 = 0; this->actionFunc = func_80B4BC78; } else if (Flags_GetEventChkInf(9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { Actor_Kill(&this->actor); } else if ((Flags_GetEventChkInf(9) && Flags_GetEventChkInf(0x25)) || (Flags_GetEventChkInf(9) && Flags_GetEventChkInf(0x37))) { - frameCount = Animation_GetLastFrame(&D_06000438); - Animation_Change(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); this->actor.textId = 0x703D; this->actionFunc = func_80B4AF18; } else if (Flags_GetEventChkInf(0x40)) { - frameCount = Animation_GetLastFrame(&D_06000438); - Animation_Change(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); this->actor.textId = 0x703C; this->actionFunc = func_80B4AF18; } else { @@ -127,9 +115,9 @@ void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80B4AE18(EnZl1* this) { - if ((this->skelAnime.animation == &D_06010B38) && (this->skelAnime.curFrame < 26.0f)) { - this->unk_1F4 = &D_06008C48; - this->unk_1F8 = &D_06008848; + if ((this->skelAnime.animation == &gChildZelda1Anim_10B38) && (this->skelAnime.curFrame < 26.0f)) { + this->unk_1F4 = &gChildZelda1EyeOpenLookingRightTex; + this->unk_1F8 = &gChildZelda1EyeOpenLookingLeftTex; this->unk_1FC = 2; } else { if (DECR(this->unk_1FC) == 0) { @@ -174,8 +162,8 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { s16 rotDiff; if (func_8002F194(&this->actor, globalCtx)) { - Animation_Change(&this->skelAnime, &D_06010B38, 1.0f, 0.0f, Animation_GetLastFrame(&D_06010B38), - ANIMMODE_ONCE_INTERP, -10.0f); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_10B38, 1.0f, 0.0f, + Animation_GetLastFrame(&gChildZelda1Anim_10B38), ANIMMODE_ONCE_INTERP, -10.0f); this->unk_1E8 = Gameplay_CreateSubCamera(globalCtx); Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT); Gameplay_ChangeCameraStatus(globalCtx, this->unk_1E8, CAM_STAT_ACTIVE); @@ -228,7 +216,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { } break; case 64: - animHeaderSeg = &D_06011348; + animHeaderSeg = &gChildZelda1Anim_11348; sp3C = 1; this->actor.textId = 0x702E; func_8010B680(globalCtx, this->actor.textId, NULL); @@ -250,20 +238,20 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { case 2: if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { if (msgCtx->choiceIndex == 0) { - animHeaderSeg = &D_06013F10; + animHeaderSeg = &gChildZelda1Anim_13F10; sp3C = 2; this->unk_1E2++; } else { - animHeaderSeg = &D_060116E4; + animHeaderSeg = &gChildZelda1Anim_116E4; sp3C = 2; this->unk_1E2 = 6; } } break; case 3: - frameCount = Animation_GetLastFrame(&D_06013F10); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_13F10); if (this->skelAnime.curFrame == frameCount) { - animHeaderSeg = &D_060143A8; + animHeaderSeg = &gChildZelda1Anim_143A8; sp3C = 1; this->actor.textId = 0x7032; func_8010B720(globalCtx, this->actor.textId); @@ -273,7 +261,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { case 4: if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { if (msgCtx->choiceIndex == 0) { - animHeaderSeg = &D_060132D8; + animHeaderSeg = &gChildZelda1Anim_132D8; sp3C = 2; this->unk_1E2 = 9; } else { @@ -291,9 +279,9 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { } break; case 6: - frameCount = Animation_GetLastFrame(&D_060116E4); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_116E4); if (this->skelAnime.curFrame == frameCount) { - animHeaderSeg = &D_06011B88; + animHeaderSeg = &gChildZelda1Anim_12B88; sp3C = 1; this->actor.textId = 0x7031; func_8010B720(globalCtx, this->actor.textId); @@ -310,7 +298,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { case 8: if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { if (msgCtx->choiceIndex == 0) { - animHeaderSeg = &D_060138E0; + animHeaderSeg = &gChildZelda1Anim_138E0; sp3C = 2; this->unk_1E2 = 3; } else { @@ -321,9 +309,9 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { } break; case 9: - frameCount = Animation_GetLastFrame(&D_060132D8); + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_132D8); if (this->skelAnime.curFrame == frameCount) { - animHeaderSeg = &D_06000438; + animHeaderSeg = &gChildZelda1Anim_00438; sp3C = 1; globalCtx->csCtx.segment = D_80B4C5D0; gSaveContext.cutsceneTrigger = 1; @@ -358,8 +346,16 @@ void func_80B4B874(EnZl1* this, GlobalContext* globalCtx) { void func_80B4B8B4(EnZl1* this, GlobalContext* globalCtx) { AnimationHeader* spB0[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &gChildZelda1Anim_12B04, + &gChildZelda1Anim_12118, + &gChildZelda1Anim_10B38, }; u8 spA4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, @@ -417,10 +413,10 @@ void func_80B4B8B4(EnZl1* this, GlobalContext* globalCtx) { void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx) { s32 pad; - f32 frameCount = Animation_GetLastFrame(&D_06000438); + f32 frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); Player* player = PLAYER; - Animation_Change(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); func_8002DF54(globalCtx, &this->actor, 1); func_8002F7DC(&player->actor, NA_SE_VO_LI_SURPRISE_KID); this->actor.textId = 0x7039; @@ -431,8 +427,16 @@ void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx) { void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx) { AnimationHeader* sp90[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &gChildZelda1Anim_12B04, + &gChildZelda1Anim_12118, + &gChildZelda1Anim_10B38, }; u8 sp84[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, @@ -446,9 +450,9 @@ void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx) { s32 pad; f32 frameCount; - if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &D_06010B38)) { - frameCount = Animation_GetLastFrame(&D_06011348); - Animation_Change(&this->skelAnime, &D_06011348, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, -10.0f); + if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &gChildZelda1Anim_10B38)) { + frameCount = Animation_GetLastFrame(&gChildZelda1Anim_11348); + Animation_Change(&this->skelAnime, &gChildZelda1Anim_11348, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, -10.0f); } func_80B4B874(this, globalCtx); npcAction = globalCtx->csCtx.npcActions[0]; diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 1b73e66fcc..713d04ca2c 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -6,7 +6,6 @@ #include "z_en_fhg.h" #include "objects/object_fhg/object_fhg.h" -#include "objects/object_fhg/object_fhg.h" #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" #include "overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h" 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 b4834c4fb0..bb47dccbd5 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -5,6 +5,7 @@ */ #include "z_item_ocarina.h" +#include "scenes/overworld/spot00/spot00_scene.h" #define FLAGS 0x00000010 @@ -35,8 +36,6 @@ const ActorInit Item_Ocarina_InitVars = { (ActorFunc)ItemOcarina_Draw, }; -extern CutsceneData D_0200F870[]; // song of time cutscene - void ItemOcarina_SetupAction(ItemOcarina* this, ItemOcarinaActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -171,7 +170,7 @@ void ItemOcarina_DoNothing(ItemOcarina* this, GlobalContext* globalCtx) { void ItemOcarina_StartSoTCutscene(ItemOcarina* this, GlobalContext* globalCtx) { if (func_8002F334(&this->actor, globalCtx)) { - globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_0200F870); + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldaSongOfTimeCs); gSaveContext.cutsceneTrigger = 1; } } diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index d7329c96db..53747bf80e 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -5,8 +5,9 @@ */ #include "z_obj_bean.h" -#include "vt.h" +#include "objects/object_mamenoki/object_mamenoki.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "vt.h" #define FLAGS 0x00400000 @@ -62,12 +63,6 @@ void ObjBean_SetupGrow(ObjBean* this); void ObjBean_SetupWaitForStepOff(ObjBean* this); void ObjBean_WaitForStepOff(ObjBean* this, GlobalContext* globalCtx); -extern Gfx D_06000090[]; -extern Gfx D_060001B0[]; -extern Gfx D_060003F0[]; -extern CollisionHeader D_060005DC; -extern Gfx D_06000650[]; - #define BEAN_STATE_DRAW_LEAVES (1 << 0) #define BEAN_STATE_DRAW_SOIL (1 << 1) #define BEAN_STATE_DRAW_PLANT (1 << 2) @@ -503,7 +498,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) { ObjBean_Move(this); ObjBean_SetupWaitForPlayer(this); - ObjBean_InitDynaPoly(this, globalCtx, &D_060005DC, DPM_UNK3); + ObjBean_InitDynaPoly(this, globalCtx, &gMagicBeanPlatformCol, DPM_UNK3); this->stateFlags |= BEAN_STATE_DYNAPOLY_SET; ObjBean_InitCollider(&this->dyna.actor, globalCtx); this->stateFlags |= BEAN_STATE_COLLIDER_SET; @@ -924,7 +919,7 @@ void ObjBean_DrawSoftSoilSpot(ObjBean* this, GlobalContext* globalCtx) { MTXMODE_NEW); Matrix_RotateY(this->dyna.actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); - Gfx_DrawDListOpa(globalCtx, D_06000650); + Gfx_DrawDListOpa(globalCtx, gMagicBeanSoftSoilDL); } void ObjBean_DrawBeanstalk(ObjBean* this, GlobalContext* globalCtx) { @@ -932,17 +927,17 @@ void ObjBean_DrawBeanstalk(ObjBean* this, GlobalContext* globalCtx) { MTXMODE_NEW); Matrix_RotateY(this->dyna.actor.shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(0.1f, this->stalkSizeMultiplier, 0.1f, MTXMODE_APPLY); - Gfx_DrawDListOpa(globalCtx, D_060001B0); + Gfx_DrawDListOpa(globalCtx, gMagicBeanStemDL); } void ObjBean_Draw(Actor* thisx, GlobalContext* globalCtx) { ObjBean* this = THIS; if (this->stateFlags & BEAN_STATE_DRAW_SOIL) { - Gfx_DrawDListOpa(globalCtx, D_06000090); + Gfx_DrawDListOpa(globalCtx, gMagicBeanSeedlingDL); } if (this->stateFlags & BEAN_STATE_DRAW_PLANT) { - Gfx_DrawDListOpa(globalCtx, D_060003F0); + Gfx_DrawDListOpa(globalCtx, gMagicBeanPlatformDL); } if (this->stateFlags & BEAN_STATE_DRAW_LEAVES) { ObjBean_DrawSoftSoilSpot(this, globalCtx); 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 2cb6fdf1c1..a6f43f6cb5 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -5,6 +5,7 @@ */ #include "z_obj_hsblock.h" +#include "objects/object_d_hsblock/object_d_hsblock.h" #define FLAGS 0x00000000 @@ -43,11 +44,11 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), }; -CollisionHeader* D_80B940DC[] = { 0x06000730, 0x06000730, 0x06000578 }; +static CollisionHeader* sCollisionHeaders[] = { &gHookshotTargetCol, &gHookshotTargetCol, &gHookshotPostCol }; static Color_RGB8 sFireTempleColor = { 165, 125, 55 }; -static Gfx* sDLists[] = { 0x06000210, 0x06000210, 0x06000470 }; +static Gfx* sDLists[] = { gHookshotPostDL, gHookshotPostDL, gHookshotTargetDL }; void ObjHsblock_SetupAction(ObjHsblock* this, ObjHsblockActionFunc actionFunc) { this->actionFunc = actionFunc; @@ -78,7 +79,7 @@ void func_80B93BF0(ObjHsblock* this, GlobalContext* globalCtx) { void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx) { ObjHsblock* this = THIS; - func_80B93B68(this, globalCtx, D_80B940DC[thisx->params & 3], DPM_UNK); + func_80B93B68(this, globalCtx, sCollisionHeaders[thisx->params & 3], DPM_UNK); Actor_ProcessInitChain(thisx, sInitChain); func_80B93BF0(this, globalCtx); diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 6d42214f55..ec5f44b3ac 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -5,6 +5,7 @@ */ #include "z_obj_kibako2.h" +#include "objects/object_kibako2/object_kibako2.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 @@ -18,10 +19,6 @@ void ObjKibako2_Draw(Actor* thisx, GlobalContext* globalCtx); void ObjKibako2_Idle(ObjKibako2* this, GlobalContext* globalCtx); void ObjKibako2_Kill(ObjKibako2* this, GlobalContext* globalCtx); -extern Gfx D_06000960[]; -extern UNK_TYPE D_06000B70; -extern Gfx D_06001000[]; - const ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, ACTORCAT_BG, @@ -103,7 +100,7 @@ void ObjKibako2_Break(ObjKibako2* this, GlobalContext* globalCtx) { phi_s0 = 0x20; } EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -200, phi_s0, 28, 2, 0, (Rand_ZeroOne() * 30.0f) + 5.0f, - 0, 0, 70, KAKERA_COLOR_NONE, OBJECT_KIBAKO2, D_06001000); + 0, 0, 70, KAKERA_COLOR_NONE, OBJECT_KIBAKO2, gLargeCrateFragmentDL); } func_80033480(globalCtx, thisPos, 90.0f, 6, 100, 160, 1); } @@ -128,7 +125,7 @@ void ObjKibako2_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, 0); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); ObjKibako2_InitCollider(thisx, globalCtx); - CollisionHeader_GetVirtual(&D_06000B70, &colHeader); + CollisionHeader_GetVirtual(&gLargeCrateCol, &colHeader); bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->collectibleFlag = this->dyna.actor.home.rot.z & 0x3F; this->dyna.bgId = bgId; @@ -180,5 +177,5 @@ void ObjKibako2_Update(Actor* thisx, GlobalContext* globalCtx) { } void ObjKibako2_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000960); + Gfx_DrawDListOpa(globalCtx, gLargeCrateDL); } diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 83ac69ace3..2a4450e1dc 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -5,6 +5,7 @@ */ #include "z_obj_lift.h" +#include "objects/object_d_lift/object_d_lift.h" #define FLAGS 0x00000010 @@ -15,9 +16,6 @@ void ObjLift_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjLift_Update(Actor* thisx, GlobalContext* globalCtx); void ObjLift_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000140; -extern UNK_TYPE D_060003D0; - /* const ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index e7d0087666..ce860c1b6f 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -5,6 +5,7 @@ */ #include "z_obj_timeblock.h" +#include "objects/object_timeblock/object_timeblock.h" #define FLAGS 0x0A000011 @@ -26,9 +27,6 @@ void ObjTimeblock_Normal(ObjTimeblock* this, GlobalContext* globalCtx); void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, GlobalContext* globalCtx); void ObjTimeblock_AltBehaviourNotVisible(ObjTimeblock* this, GlobalContext* globalCtx); -extern Gfx D_06000980[]; -extern CollisionHeader D_06000B30; - const ActorInit Obj_Timeblock_InitVars = { ACTOR_OBJ_TIMEBLOCK, ACTORCAT_ITEMACTION, @@ -106,7 +104,7 @@ void ObjTimeblock_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_UNK); this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z = 0; - CollisionHeader_GetVirtual(&D_06000B30, &colHeader); + CollisionHeader_GetVirtual(&gSongOfTimeBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -341,7 +339,7 @@ void ObjTimeblock_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_timeblock.c", 766), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, primColor->r, primColor->g, primColor->b, 255); - gSPDisplayList(POLY_OPA_DISP++, D_06000980); + gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_timeblock.c", 772); } diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 2444b93a88..405a895504 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -5,6 +5,7 @@ */ #include "z_obj_warp2block.h" +#include "objects/object_timeblock/object_timeblock.h" #include "vt.h" #define FLAGS 0x0A000011 @@ -29,9 +30,6 @@ void func_80BA24F8(ObjWarp2block* this, GlobalContext* globalCtx); void func_80BA2600(ObjWarp2block* this); void func_80BA2610(ObjWarp2block* this, GlobalContext* globalCtx); -extern Gfx D_06000980[]; -extern CollisionHeader D_06000B30; - const ActorInit Obj_Warp2block_InitVars = { ACTOR_OBJ_WARP2BLOCK, ACTORCAT_ITEMACTION, @@ -217,7 +215,7 @@ void ObjWarp2block_Init(Actor* thisx, GlobalContext* globalCtx2) { this->dyna.actor.draw = NULL; } DynaPolyActor_Init(&this->dyna, 0); - CollisionHeader_GetVirtual(&D_06000B30, &collisionHeader); + CollisionHeader_GetVirtual(&gSongOfTimeBlockCol, &collisionHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, collisionHeader); } else { ObjWarp2block_SetInactive(this); @@ -316,7 +314,7 @@ void ObjWarp2block_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", 588), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sp44->r, sp44->g, sp44->b, 255); - gSPDisplayList(POLY_OPA_DISP++, D_06000980); + gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", 594); } diff --git a/undefined_syms.txt b/undefined_syms.txt index 054fd277f9..1ec9e105d4 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -87,65 +87,17 @@ D_0703811C = 0x0703811C; // z_skelanime link_animetion_segment = 0x07000000; -// z_en_cow -D_060001CC = 0x060001CC; -D_06004010 = 0x06004010; -D_06004264 = 0x06004264; -D_06004348 = 0x06004348; -D_06004C30 = 0x06004C30; -D_06004E98 = 0x06004E98; - // z_door_toki D_06007888 = 0x06007888; -// z_bg_spot01_idomizu -D_060007D0 = 0x060007D0; - // z_bg_spot01_objects2 -D_06001A38 = 0x06001A38; D_06001C58 = 0x06001C58; -// z_bg_spot12_gate -D_06001080 = 0x06001080; -D_060011EC = 0x060011EC; +// z_bg_spot11_bakudankabe +D_0500A880 = 0x0500A880; -// z_bg_spot12_saku -D_06002260 = 0x06002260; -D_0600238C = 0x0600238C; - -// z_bg_spot15_rrbox -D_06000348 = 0x06000348; -D_06000180 = 0x06000180; - -// z_Bg_spot18_basket -D_06002154 = 0x06002154; -D_060018B0 = 0x060018B0; - -// z_bg_spot18_futa -D_06000368 = 0x06000368; -D_06000150 = 0x06000150; - -// z_bg_spot18_shutter -D_06000534 = 0x06000534; - -// z_bg_spot18_obj -D_06002FE4 = 0x06002FE4; -D_0600261C = 0x0600261C; -D_06002BC0 = 0x06002BC0; -D_06002370 = 0x06002370; - -// z_bg_umajump -D_06001438 = 0x06001438; -D_06001220 = 0x06001220; - -// z_item_b_heart -D_06001290 = 0x06001290; -D_06001470 = 0x06001470; - -// z_bg_bdan_switch -D_06005CF8 = 0x06005CF8; -D_060061A0 = 0x060061A0; -D_06005A20 = 0x06005A20; +// z_door_ana +D_05001390 = 0x05001390; // z_bg_elevator D_06000360 = 0x06000360; @@ -168,10 +120,6 @@ D_0600E568 = 0x0600E568; D_060038D0 = 0x060038D0; D_060042D8 = 0x060042D8; -// z_bg_spot01_idosoko -D_06003B20 = 0x06003B20; -D_06003C64 = 0x06003C64; - // z_bg_mizu_uzu D_060074EC = 0x060074EC; @@ -196,43 +144,6 @@ D_060066A8 = 0x060066A8; D_06008D88 = 0x06008D88; D_06006570 = 0x06006570; -// z_boss_goma -D_06000AE8 = 0x06000AE8; -D_0600193C = 0x0600193C; -D_06002360 = 0x06002360; -D_060029F0 = 0x060029F0; -D_06004318 = 0x06004318; -D_06004A20 = 0x06004A20; -D_06005330 = 0x06005330; -D_060058C0 = 0x060058C0; -D_06005F28 = 0x06005F28; -D_060066DC = 0x060066DC; -D_06006E60 = 0x06006E60; -D_0600B2FC = 0x0600B2FC; -D_0600C468 = 0x0600C468; -D_0600CCD8 = 0x0600CCD8; -D_0600F70C = 0x0600F70C; -D_06010918 = 0x06010918; -D_060113BC = 0x060113BC; -D_06012678 = 0x06012678; -D_060183A8 = 0x060183A8; -D_060185A8 = 0x060185A8; -D_060187A8 = 0x060187A8; -D_060189A8 = 0x060189A8; -D_060191A8 = 0x060191A8; -D_060193A8 = 0x060193A8; -D_06019BA8 = 0x06019BA8; -D_0601DCF8 = 0x0601DCF8; -D_0601EB4C = 0x0601EB4C; - -// z_en_mag -D_06000000 = 0x06000000; -D_06019A00 = 0x06019A00; -D_0601A400 = 0x0601A400; -D_06024800 = 0x06024800; -D_06024C00 = 0x06024C00; -D_06024E40 = 0x06024E40; - // z_en_dodongo D_06008318 = 0x06008318; D_06004C20 = 0x06004C20; @@ -260,46 +171,8 @@ D_06008D90 = 0x06008D90; D_060093BC = 0x060093BC; D_06009EE0 = 0x06009EE0; -// z_en_md -D_06007FB8 = 0x06007FB8; -D_060002C8 = 0x060002C8; - -// z_en_ms -D_060005EC = 0x060005EC; -D_06003DC0 = 0x06003DC0; - -// z_en_zl1 -D_06000438 = 0x06000438; -D_06008848 = 0x06008848; -D_06008C48 = 0x06008C48; -D_0600F5D8 = 0x0600F5D8; -D_06010B38 = 0x06010B38; -D_06011348 = 0x06011348; -D_060116E4 = 0x060116E4; -D_06011B88 = 0x06011B88; -D_06012118 = 0x06012118; -D_060132D8 = 0x060132D8; -D_060138E0 = 0x060138E0; -D_06013F10 = 0x06013F10; -D_060143A8 = 0x060143A8; - - -// z_bg_spot00_break -D_06000908 = 0x06000908; -D_06000AF0 = 0x06000AF0; -D_06000440 = 0x06000440; -D_06000980 = 0x06000980; - -// z_bg_spot01_idohashira -D_06000420 = 0x06000420; -D_0600075C = 0x0600075C; - -// z_bg_spot15_saku -D_060004D0 = 0x060004D0; - -// z_door_gerudo -D_06000040 = 0x06000040; -D_06000170 = 0x06000170; +// z_bg_spot17_bakudankabe +D_0500A880 = 0x0500A880; // z_en_hs2 D_060005C0 = 0x60005C0; @@ -340,8 +213,7 @@ D_06001CD0 = 0x06001CD0; D_06001DA8 = 0x06001DA8; // z_bg_gjyo_bridge -D_06000600 = 0x06000600; -D_06000DB8 = 0x06000DB8; +D_02002640 = 0x02002640; // z_bg_spot15_saku D_060003C0 = 0x060003C0; @@ -362,17 +234,18 @@ D_060081D0 = 0x60081D0; D_06008D10 = 0x6008D10; D_06009CD0 = 0x6009CD0; -// z_bg_spot01_fusya -D_06000100 = 0x06000100; - +// z_en_niw_girl +D_06009948 = 0x06009948; +D_06000378 = 0x06000378; +D_06009C78 = 0x06009C78; // z_title D_01002720 = 0x01002720; D_01001800 = 0x01001800; D_01000000 = 0x01000000; -// z_demo_geff -D_06000EA0 = 0x06000EA0; +// z_shot_sun +D_02007020 = 0x02007020; // z_demo_go D_060029A8 = 0x060029A8; @@ -380,17 +253,26 @@ D_06004930 = 0x06004930; D_0600E680 = 0x0600E680; D_0600FEF0 = 0x0600FEF0; -// z_demo_gt -D_06005CB8 = 0x06005CB8; -D_060091E4 = 0x060091E4; -D_06009970 = 0x06009970; -D_06007630 = 0x06007630; -D_06004F90 = 0x06004F90; -D_06000EA0 = 0x06000EA0; -D_06009610 = 0x06009610; -D_06002910 = 0x06002910; -D_060041A0 = 0x060041A0; -D_06009B08 = 0x06009B80; +// z_demo_ik +D_0600035C = 0x0600035C; +D_06000380 = 0x06000380; +D_06000634 = 0x06000634; +D_06000660 = 0x06000660; +D_060008DC = 0x060008DC; +D_06000C6C = 0x06000C6C; +D_06000C90 = 0x06000C90; +D_06000F0C = 0x06000F0C; +D_06016BE0 = 0x06016BE0; +D_06016CD8 = 0x06016CD8; +D_06016F88 = 0x06016F88; +D_06017028 = 0x06017028; +D_06017170 = 0x06017170; +D_0601EE60 = 0x0601EE60; +D_06000F30 = 0x06000F30; +D_0601EB14 = 0x0601EB14; +D_0601EB40 = 0x0601EB40; +D_0601EE34 = 0x0601EE34; +D_06000900 = 0x06000900; // z_demo_im D_06000710 = 0x06000710; @@ -501,28 +383,10 @@ D_0600BE40 = 0x0600BE40; D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0; -// z_bg_bdan_objects -D_060038E8 = 0x060038E8; -D_06005048 = 0x06005048; -D_06005580 = 0x06005580; -D_06008CE0 = 0x06008CE0; - -// z_bg_bom_guard -D_06001C40 = 0x06001C40; - -// z_bg_bowl_wall -D_06001B00 = 0x06001B00; -D_06000CB8 = 0x06000CB8; -D_06000610 = 0x06000610; -D_06001390 = 0x06001390; - -// z_bg_ddan_jd -D_06003CE0 = 0x06003CE0; -D_060037B8 = 0x060037B8; - -// z_bg_dodoago -D_06001DDC = 0x06001DDC; -D_60013500 = 0x06001350; +// z_bg_bombwall +D_050041B0 = 0x050041B0; +D_05003FC0 = 0x05003FC0; +D_05004088 = 0x05004088; // z_bg_dy_yoseizo D_06008698 = 0x06008698; @@ -564,18 +428,36 @@ D_06015380 = 0x06015380; D_06000000 = 0x06000000; D_06000350 = 0x06000350; -// z_en_ru2 -D_060004CC = 0x060004CC; -D_06000F20 = 0x06000F20; -D_060022E0 = 0x060022E0; -D_06002AE0 = 0x06002AE0; -D_0600C700 = 0x0600C700; -D_0600D3DC = 0x0600D3DC; -D_0600DCAC = 0x0600DCAC; -D_06000DE8 = 0x06000DE8; -D_0600E630 = 0x0600E630; -D_0600F03C = 0x0600F03C; -D_0600F8B8 = 0x0600F8B8; +// z_en_ru1 +D_06000690 = 0x06000690; +D_06000E54 = 0x06000E54; +D_06001488 = 0x06001488; +D_06002058 = 0x06002058; +D_06002990 = 0x06002990; +D_06002EC0 = 0x06002EC0; +D_06003608 = 0x06003608; +D_06003784 = 0x06003784; +D_06004074 = 0x06004074; +D_06004350 = 0x06004350; +D_06004648 = 0x06004648; +D_06004BF0 = 0x06004BF0; +D_060063F4 = 0x060063F4; +D_06006B9C = 0x06006B9C; +D_06007534 = 0x06007534; +D_060078E4 = 0x060078E4; +D_06008100 = 0x06008100; +D_06008AA8 = 0x06008AA8; +D_06009060 = 0x06009060; +D_060097B8 = 0x060097B8; +D_06012700 = 0x06012700; +D_06012E94 = 0x06012E94; +D_06013A64 = 0x06013A64; + +// z_bg_mjin +D_06000140 = 0x06000140; +D_06000330 = 0x06000330; +D_06000330_ = 0x06000330; +D_06000658 = 0x06000658; // z_en_lightbox D_06000B70 = 0x06000B70; @@ -684,10 +566,6 @@ D_06000194 = 0x06000194; D_06002BF0 = 0x06002BF0; D_06002C8C = 0x06002C8C; -// z_en_attack_niw -D_06002530 = 0x06002530; -D_060000E8 = 0x060000E8; - // z_en_hintnuts D_06000168 = 0x06000168; D_060014E0 = 0x060014E0; @@ -705,14 +583,32 @@ D_06003128 = 0x06003128; D_060042AC = 0x060042AC; D_060059B0 = 0x060059B0; -// z_en_goroiwa -D_060006B0 = 0x060006B0; +// z_obj_oshijiki +D_05004E98 = 0x05004E98; +D_05003350 = 0x05003350; +D_05003B50 = 0x05003B50; +D_05004350 = 0x05004350; +D_05004CD0 = 0x05004CD0; +// z_en_heishi1 +D_06005880 = 0x06005880; +D_06005C30 = 0x06005C30; +D_0600BAC8 = 0x0600BAC8; -// z_en_bombf -D_06000340 = 0x06000340; -D_06000408 = 0x06000408; -D_06000530 = 0x06000530; +// z_en_box +D_06000128 = 0x06000128; +D_0600024C = 0x0600024C; +D_0600043C = 0x0600043C; +D_060006F0 = 0x060006F0; +D_06000AE8 = 0x06000AE8; +D_060010C0 = 0x060010C0; +D_06001678 = 0x06001678; +D_060047D8 = 0x060047D8; +D_06005FC8 = 0x06005FC8; + +// z_en_butte +D_05002470 = 0x05002470; +D_050036F0 = 0x050036F0; // z_Bg_Spot16_Bombstone D_06000C20 = 0x06000C20; @@ -808,22 +704,6 @@ D_06004E60 = 0x06004E60; D_06004BB4 = 0x06004BB4; D_06009238 = 0x06009238; -// z_en_syateki_niw -D_060000E8 = 0x060000E8; -D_060023B0 = 0x060023B0; -D_06002428 = 0x06002428; -D_06002530 = 0x06002530; - -// z_en_nwc -D_06000840 = 0x06000840; -D_060008B0 = 0x060008B0; -D_06000BF0 = 0x06000BF0; -D_06000C68 = 0x06000C68; -D_06000C88 = 0x06000C88; -D_06000CE0 = 0x06000CE0; -D_06000D10 = 0x06000D10; -D_06000D50 = 0x06000D50; - // z_eff_ss_g_magma2 D_06025A90 = 0x06025A90; @@ -840,35 +720,6 @@ D_0600FCF8 = 0x0600FCF8; D_060105E0 = 0x060105E0; D_06012160 = 0x06012160; -//z_en_fHG -D_060059A0 = 0x060059A0; -D_0600B098 = 0x0600B098; -D_0600B4C8 = 0x0600B4C8; -D_0600B9D0 = 0x0600B9D0; -D_0600C65C = 0x0600C65C; -D_0600CB1C = 0x0600CB1C; -D_0600DDB8 = 0x0600DDB8; -D_0600E8A0 = 0x0600E8A0; - -// z_en_geldb -D_0600ADF8 = 0x0600ADF8; -D_0600B6D4 = 0x0600B6D4; -D_0600A458 = 0x0600A458; -D_06001390 = 0x06001390; -D_060024E8 = 0x060024E8; -D_0600A814 = 0x0600A814; -D_060003CC = 0x060003CC; -D_06000F5C = 0x06000F5C; -D_06002280 = 0x06002280; -D_06001E10 = 0x06001E10; -D_0600ADF8 = 0x0600ADF8; -D_06001578 = 0x06001578; - -// z_en_gs -D_06000950 = 0x06000950; -D_060009D0 = 0x060009D0; -D_06000A60 = 0x06000A60; - // z_en_ik D_06001C28 = 0x06001C28; D_06002538 = 0x06002538; @@ -896,6 +747,7 @@ D_0601E178 = 0x0601E178; D_060203D8 = 0x060203D8; D_060205C0 = 0x060205C0; + // z_obj_dekujr D_060030D0 = 0x060030D0; D_060032D8 = 0x060032D8; @@ -924,9 +776,6 @@ D_06006078 = 0x06006078; D_06000AE8 = 0x06000AE8; D_06001678 = 0x06001678; -// z_en_rr -D_06000470 = 0x06000470; - // z_bg_haka_tubo D_060108B8 = 0x060108B8; D_0600FE40 = 0x0600FE40; @@ -934,9 +783,6 @@ D_0600FE40 = 0x0600FE40; // z_bg_po_syokudai D_060003A0 = 0x060003A0; -// z_item_ocarina -D_0200F870 = 0x0200F870; - //z_bg_ice_shutter D_06002854 = 0x6002854; D_06002740 = 0x6002740; @@ -948,25 +794,16 @@ D_06001000 = 0x06001000; D_060011B8 = 0x060011B8; D_06001040 = 0x06001040; -// z_en_yukabyun -D_06000A60 = 0x06000A60; -D_06000970 = 0x06000970; - -// z_bg_jya_goroiwa -D_060006B0 = 0x060006B0; +// z_bg_haka_water +D_06001E50 = 0x06001E50; +D_06002010 = 0x06002010; // z_en_niw_lady -D_060000F0 = 0x060000F0; D_0600A630 = 0x0600A630; D_060007D0 = 0x060007D0; D_06000718 = 0x06000718; D_06009F94 = 0x06009F94; -// z_en_js -D_0600045C = 0x0600045C; -D_06005EA0 = 0x06005EA0; -D_0600018C = 0x0600018C; - // z_bg_gnd_darkmeiro D_0600C080 = 0x0600C080; D_060088B0 = 0x060088B0; @@ -1021,54 +858,11 @@ D_06000498 = 0x06000498; // z_bg_menkuri_eye D_06002D20 = 0x06002D20; -// z_boss_ganondrof -D_06004EC0 = 0x06004EC0; -D_0600C710 = 0x0600C710; -D_06003CA4 = 0x06003CA4; -D_06001144 = 0x06001144; -D_06002684 = 0x06002684; -D_060019A4 = 0x060019A4; -D_0600D99C = 0x0600D99C; -D_0600DF80 = 0x0600DF80; -D_0600189C = 0x0600189C; -D_06001AB0 = 0x06001AB0; -D_060108D8 = 0x060108D8; -D_06000D84 = 0x06000D84; -D_0600090C = 0x0600090C; -D_0600FAC8 = 0x0600FAC8; -D_06011BCC = 0x06011BCC; -D_06010060 = 0x06010060; -D_06011F44 = 0x06011F44; -D_0601267C = 0x0601267C; -D_06003080 = 0x06003080; -D_0600EC94 = 0x0600EC94; -D_06010344 = 0x06010344; -D_060129E0 = 0x060129E0; -D_0600F48C = 0x0600F48C; -D_0600B380 = 0x0600B380; -D_06003DB0 = 0x06003DB0; - -// z_en_fd -D_060079F8 = 0x060079F8; -D_06007A78 = 0x06007A78; -D_06007928 = 0x06007928; -D_06007938 = 0x06007938; -D_06005810 = 0x06005810; - -// z_en_fw -D_06007C30 = 0x06007C30; -D_06006CF8 = 0x06006CF8; - // z_en_gm D_060002B8 = 0x060002B8; D_0600FEF0 = 0x0600FEF0; D_0600DE80 = 0x0600DE80; -// z_en_vm -D_06003F60 = 0x06003F60; -D_06000068 = 0x06000068; -D_06002728 = 0x06002728; - // z_bg_spot03_taki D_06000C98 = 0x06000C98; D_06000800 = 0x06000800; @@ -1085,6 +879,43 @@ D_06006830 = 0x06006830; D_06006D60 = 0x06006D60; D_06007230 = 0x06007230; +// z_bg_mori_idomizu +D_060049D0 = 0x060049D0; + +// z_bg_mori_hashigo +D_060037D8 = 0x060037D8; +D_060036B0 = 0x060036B0; +D_06004770 = 0x06004770; + +// z_bg_mori_bigst +D_0600221C = 0x0600221C; +D_06001E50 = 0x06001E50; + +// z_bg_mori_hashira4 +D_06001AF8 = 0x06001AF8; +D_060089E0 = 0x060089E0; + +//z_boss_dodongo +D_06003CF8 = 0x06003CF8; +D_0601B310 = 0x0601B310; +D_0600F0D8 = 0x0600F0D8; +D_030021D8 = 0x030021D8; +D_06008EEC = 0x06008EEC; +D_06017410 = 0x06017410; +D_0601CAE0 = 0x0601CAE0; +D_06008EEC = 0x06008EEC; +D_060061D4 = 0x060061D4; +D_0600DF38 = 0x0600DF38; +D_0600E848 = 0x0600E848; +D_06004E0C = 0x06004E0C; +D_060042A8 = 0x060042A8; +D_06009D10 = 0x06009D10; +D_0601D934 = 0x0601D934; +D_06002D0C = 0x06002D0C; +D_060042A8 = 0x060042A8; +D_06009D50 = 0x06009D50; +D_06009DD0 = 0x06009DD0; +D_06001074 = 0x06001074; // z_obj_timeblock D_06000980 = 0x06000980; D_06000B30 = 0x06000B30; @@ -1103,12 +934,6 @@ D_06000730 = 0x06000730; // z_en_kusa D_060002E0 = 0x60002E0; -// z_en_niw -D_06002530 = 0x06002530; -D_060000E8 = 0x060000E8; -D_060023B0 = 0x060023B0; -D_06002428 = 0x06002428; - // z_bg_ice_turara D_060023D0 = 0x060023D0; D_06002594 = 0x06002594; @@ -1197,15 +1022,6 @@ D_06012BA4 = 0x06012BA4; D_06012D30 = 0x06012D30; D_060133EC = 0x060133EC; -// z_bg_spot06_objects -D_06000120 = 0x06000120; -D_06000470 = 0x06000470; -D_06000E10 = 0x06000E10; -D_06000EE8 = 0x06000EE8; -D_06001160 = 0x06001160; -D_06001238 = 0x06001238; -D_06002490 = 0x06002490; - // z_bg_spot07_taki D_06000460 = 0x06000460; D_06000BE0 = 0x06000BE0; @@ -1216,12 +1032,6 @@ D_06003210 = 0x06003210; D_060032D8 = 0x060032D8; D_060038FC = 0x060038FC; -// z_bg_spot08_iceblock -D_06000DE0 = 0x06000DE0; -D_06002BD0 = 0x06002BD0; -D_06002FD8 = 0x06002FD8; -D_06001904 = 0x06001904; - // z_bg_toki_hikari D_06000880 = 0x06000880; D_060009C0 = 0x060009C0; @@ -1230,35 +1040,6 @@ D_06007E20 = 0x06007E20; D_06007EE0 = 0x06007EE0; D_06008190 = 0x06008190; -// z_boss_dodongo -D_06001074 = 0x06001074; -D_06002D0C = 0x06002D0C; -D_06003CF8 = 0x06003CF8; -D_060042A8 = 0x060042A8; -D_06004E0C = 0x06004E0C; -D_060061D4 = 0x060061D4; -D_06008EEC = 0x06008EEC; -D_06009D10 = 0x06009D10; -D_06009D50 = 0x06009D50; -D_06009DD0 = 0x06009DD0; -D_0600DF38 = 0x0600DF38; -D_0600E848 = 0x0600E848; -D_0600F0D8 = 0x0600F0D8; -D_06015890 = 0x06015890; -D_06015990 = 0x06015990; -D_06015D90 = 0x06015D90; -D_06015F90 = 0x06015F90; -D_06016390 = 0x06016390; -D_06016590 = 0x06016590; -D_06016790 = 0x06016790; -D_06016990 = 0x06016990; -D_06016E10 = 0x06016E10; -D_06017210 = 0x06017210; -D_06017410 = 0x06017410; -D_0601B310 = 0x0601B310; -D_0601CAE0 = 0x0601CAE0; -D_0601D934 = 0x0601D934; - // z_boss_ganon D_02006C18 = 0x02006C18; D_02007418 = 0x02007418; @@ -1340,6 +1121,7 @@ D_060353C0 = 0x060353C0; // z_boss_mo D_06001010 = 0x06001010; +D_06000F20 = 0x06000F20; // z_boss_tw D_060004A4 = 0x060004A4; @@ -1542,9 +1324,6 @@ D_06001750 = 0x06001750; D_06001958 = 0x06001958; D_06001A70 = 0x06001A70; -// z_en_bubble -D_06001000 = 0x06001000; - // z_en_bw D_06000228 = 0x06000228; D_060020F0 = 0x060020F0; @@ -1598,14 +1377,6 @@ D_06000860 = 0x06000860; D_060009D4 = 0x060009D4; D_060020E0 = 0x060020E0; -// z_en_eiyer -D_06000288 = 0x06000288; -D_060004C4 = 0x060004C4; -D_06000704 = 0x06000704; -D_06000FC0 = 0x06000FC0; -D_060012AC = 0x060012AC; -D_06003410 = 0x06003410; - // z_en_encount2 D_06000DE0 = 0x06000DE0; @@ -1618,12 +1389,6 @@ D_06001534 = 0x06001534; D_0600B498 = 0x0600B498; D_060007BC = 0x060007BC; -// z_en_fz -D_060030A0 = 0x060030A0; -D_060030A8 = 0x060030A8; -D_06003158 = 0x06003158; -D_06003160 = 0x06003160; - // z_en_gb D_0600049C = 0x0600049C; D_0600C0B0 = 0x0600C0B0; @@ -1641,23 +1406,6 @@ D_0600A498 = 0x0600A498; D_06008968 = 0x06008968; D_06009ED4 = 0x06009ED4; -// z_en_ge3 -D_0600A458 = 0x0600A458; -D_0600B07C = 0x0600B07C; - -// z_en_geldb -D_060003CC = 0x060003CC; -D_06000F5C = 0x06000F5C; -D_06001390 = 0x06001390; -D_06001578 = 0x06001578; -D_06001E10 = 0x06001E10; -D_06002280 = 0x06002280; -D_060024E8 = 0x060024E8; -D_0600A458 = 0x0600A458; -D_0600A814 = 0x0600A814; -D_0600ADF8 = 0x0600ADF8; -D_0600B6D4 = 0x0600B6D4; - // z_en_go D_06004930 = 0x06004930; D_0600BD80 = 0x0600BD80; @@ -1796,22 +1544,6 @@ D_0600BFA8 = 0x0600BFA8; D_0600DE80 = 0x0600DE80; D_0600FEF0 = 0x0600FEF0; -// z_en_owl -D_06001168 = 0x06001168; -D_060015CC = 0x060015CC; -D_0600C0E8 = 0x0600C0E8; -D_0600C1C4 = 0x0600C1C4; -D_0600C684 = 0x0600C684; -D_0600C8A0 = 0x0600C8A0; -D_060100B0 = 0x060100B0; - -// z_en_peehat -D_06000350 = 0x06000350; -D_060005C4 = 0x060005C4; -D_06000844 = 0x06000844; -D_060009C4 = 0x060009C4; -D_06001C80 = 0x06001C80; - // z_en_sa D_02005730 = 0x02005730; D_02010E20 = 0x02010E20; @@ -1930,12 +1662,6 @@ D_06011348 = 0x06011348; D_060114E8 = 0x060114E8; D_060119E8 = 0x060119E8; -// z_en_weiyer -D_06000288 = 0x06000288; -D_06000FC0 = 0x06000FC0; -D_060012AC = 0x060012AC; -D_06003410 = 0x06003410; - // z_en_wf D_06004638 = 0x06004638; D_06004AD0 = 0x06004AD0; @@ -2008,39 +1734,10 @@ D_01000000 = 0x01000000; D_06005FF0 = 0x06005FF0; D_06009620 = 0x06009620; -// z_obj_bean -D_06000090 = 0x06000090; -D_060001B0 = 0x060001B0; -D_060003F0 = 0x060003F0; -D_060005DC = 0x060005DC; -D_06000650 = 0x06000650; +// z_obj_hamishi +D_0500A3B8 = 0x0500A3B8; +D_0500A5E8 = 0x0500A5E8; -// z_obj_kibako2 -D_06000960 = 0x06000960; -D_06000B70 = 0x06000B70; -D_06001000 = 0x06001000; -// z_obj_lift -D_06000140 = 0x06000140; -D_060003D0 = 0x060003D0; -// z_obj_warp2block -D_06000980 = 0x06000980; -D_06000B30 = 0x06000B30; -// z_en_dns -D_060041A8 = 0x060041A8; -D_060009A0 = 0x060009A0; -D_06004404 = 0x06004404; - -// z_en_peehat -D_06001C80 = 0x06001C80; -D_060009C4 = 0x060009C4; -D_06000844 = 0x06000844; -D_060005C4 = 0x060005C4; -D_06000350 = 0x06000350; - -// z_bg_haka -D_06000428 = 0x06000428; -D_060001B0 = 0x060001B0; -D_060002A8 = 0x060002A8;