From 7ed396f09e5ca595f1dfc3f45e9c76574f70351b Mon Sep 17 00:00:00 2001
From: Maide <34639600+Kelebek1@users.noreply.github.com>
Date: Sat, 22 Jan 2022 18:30:32 +0000
Subject: [PATCH] Cleanup object syms (#546)
* First
* Part2
* Save now or forever hold your peace
* Part3
* Building
* OK
* Cleanup
* Merge
* PR
* PR
* Merge
* PR
* PR
* Use oyu
* Use names
* TexturePtr
---
assets/xml/objects/gameplay_dangeon_keep.xml | 4 +-
assets/xml/objects/gameplay_keep.xml | 40 +-
assets/xml/objects/object_ani.xml | 7 +-
assets/xml/objects/object_bg.xml | 4 +-
assets/xml/objects/object_bji.xml | 5 +-
assets/xml/objects/object_boj.xml | 14 +-
assets/xml/objects/object_boss02.xml | 6 +-
assets/xml/objects/object_boss_hakugin.xml | 2 +-
assets/xml/objects/object_cow.xml | 12 +-
assets/xml/objects/object_dnk.xml | 4 +-
assets/xml/objects/object_dnp.xml | 5 +-
assets/xml/objects/object_dns.xml | 4 +-
assets/xml/objects/object_dy_obj.xml | 3 +
assets/xml/objects/object_f52_obj.xml | 12 +-
assets/xml/objects/object_fr.xml | 3 +-
assets/xml/objects/object_fsn.xml | 9 +-
assets/xml/objects/object_fu.xml | 5 +-
assets/xml/objects/object_hanareyama_obj.xml | 10 +-
assets/xml/objects/object_in.xml | 9 +-
assets/xml/objects/object_in2.xml | 10 +-
assets/xml/objects/object_jg.xml | 4 +-
assets/xml/objects/object_lightswitch.xml | 4 +-
assets/xml/objects/object_ma1.xml | 16 +-
assets/xml/objects/object_ma2.xml | 13 +-
assets/xml/objects/object_mbar_obj.xml | 2 +-
assets/xml/objects/object_mm.xml | 3 +-
assets/xml/objects/object_niw.xml | 4 +-
assets/xml/objects/object_obj_milk_bin.xml | 2 +-
assets/xml/objects/object_owl.xml | 4 +-
assets/xml/objects/object_oyu.xml | 2 +-
assets/xml/objects/object_pamera.xml | 20 +-
assets/xml/objects/object_sek.xml | 4 +-
assets/xml/objects/object_shn.xml | 7 +-
assets/xml/objects/object_st.xml | 4 +-
assets/xml/objects/object_syokudai.xml | 6 +-
assets/xml/objects/object_tite.xml | 8 +-
assets/xml/objects/object_tk.xml | 4 +-
assets/xml/objects/object_uch.xml | 2 +-
assets/xml/objects/object_wf.xml | 10 +-
assets/xml/objects/object_zm.xml | 5 +-
assets/xml/objects/object_zo.xml | 4 +-
include/variables.h | 238 ---
include/z64object.h | 14 +-
src/code/z_eff_blure.c | 5 +-
src/code/z_eff_shield_particle.c | 5 +-
src/code/z_eff_spark.c | 5 +-
src/code/z_eff_tire_mark.c | 3 +-
src/code/z_en_item00.c | 51 +-
src/code/z_lights.c | 5 +-
.../actors/ovl_Arms_Hook/z_arms_hook.c | 8 +-
.../ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c | 19 +-
.../ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c | 20 +-
.../actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c | 8 +-
.../actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c | 14 +-
.../ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c | 8 +-
.../actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c | 8 +-
.../ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c | 21 +-
.../actors/ovl_Bg_Icicle/z_bg_icicle.c | 8 +-
.../actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c | 8 +-
.../ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c | 8 +-
.../ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c | 11 +-
.../actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c | 17 +-
.../ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c | 13 +-
.../ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c | 20 +-
.../ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c | 8 +-
.../actors/ovl_Bg_Ladder/z_bg_ladder.c | 27 +-
.../actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c | 8 +-
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c | 8 +-
.../ovl_Bg_Market_Step/z_bg_market_step.c | 9 +-
.../ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c | 8 +-
.../actors/ovl_Bg_Tobira01/z_bg_tobira01.c | 8 +-
src/overlays/actors/ovl_Boss_02/z_boss_02.c | 75 +-
.../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 18 +-
.../actors/ovl_Dm_Char07/z_dm_char07.c | 73 +-
src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c | 9 +-
src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c | 8 +-
.../actors/ovl_Dm_Statue/z_dm_statue.c | 8 +-
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 221 +--
src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 3 +-
.../actors/ovl_Door_Spiral/z_door_spiral.c | 35 +-
.../actors/ovl_Door_Warp1/z_door_warp1.c | 6 +-
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 5 +-
.../actors/ovl_En_Aob_01/z_en_aob_01.c | 6 +-
.../actors/ovl_En_Baisen/z_en_baisen.c | 11 +-
.../actors/ovl_En_Bigslime/z_en_bigslime.c | 3 +-
.../actors/ovl_En_Bji_01/z_en_bji_01.c | 24 +-
.../actors/ovl_En_Bomjima/z_en_bomjima.c | 9 +-
.../actors/ovl_En_Bomjimb/z_en_bomjimb.c | 9 +-
src/overlays/actors/ovl_En_Cha/z_en_cha.c | 8 +-
.../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 19 +-
.../actors/ovl_En_Col_Man/z_en_col_man.c | 4 +-
src/overlays/actors/ovl_En_Cow/z_en_cow.c | 44 +-
src/overlays/actors/ovl_En_Dai/z_en_dai.c | 51 +-
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 43 +-
.../actors/ovl_En_Daiku2/z_en_daiku2.c | 36 +-
.../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 51 +-
src/overlays/actors/ovl_En_Dg/z_en_dg.c | 29 +-
.../actors/ovl_En_Dinofos/z_en_dinofos.c | 81 +-
src/overlays/actors/ovl_En_Dnb/z_en_dnb.c | 22 +-
src/overlays/actors/ovl_En_Dnk/z_en_dnk.c | 85 +-
src/overlays/actors/ovl_En_Dno/z_en_dno.c | 43 +-
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c | 65 +-
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c | 39 +-
src/overlays/actors/ovl_En_Dns/z_en_dns.c | 31 +-
.../actors/ovl_En_Dodongo/z_en_dodongo.c | 32 +-
.../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 17 +-
src/overlays/actors/ovl_En_Elf/z_en_elf.c | 6 +-
.../actors/ovl_En_Elfbub/z_en_elfbub.c | 5 +-
.../actors/ovl_En_Encount2/z_en_encount2.c | 18 +-
.../ovl_En_Ending_Hero/z_en_ending_hero.c | 25 +-
.../ovl_En_Ending_Hero2/z_en_ending_hero2.c | 7 +-
.../ovl_En_Ending_Hero3/z_en_ending_hero3.c | 7 +-
.../ovl_En_Ending_Hero4/z_en_ending_hero4.c | 7 +-
.../ovl_En_Ending_Hero5/z_en_ending_hero5.c | 16 +-
.../ovl_En_Ending_Hero6/z_en_ending_hero6.c | 57 +-
src/overlays/actors/ovl_En_Fall/z_en_fall.c | 6 +-
src/overlays/actors/ovl_En_Fg/z_en_fg.c | 31 +-
.../actors/ovl_En_Firefly/z_en_firefly.c | 12 +-
src/overlays/actors/ovl_En_Fish2/z_en_fish2.c | 24 +-
.../actors/ovl_En_Floormas/z_en_floormas.c | 63 +-
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 50 +-
src/overlays/actors/ovl_En_Fu/z_en_fu.c | 30 +-
src/overlays/actors/ovl_En_Geg/z_en_geg.c | 8 +-
.../actors/ovl_En_Ginko_Man/z_en_ginko_man.c | 33 +-
src/overlays/actors/ovl_En_Gm/z_en_gm.c | 40 +-
src/overlays/actors/ovl_En_Go/z_en_go.c | 7 +-
.../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 35 +-
src/overlays/actors/ovl_En_Gs/z_en_gs.c | 11 +-
.../actors/ovl_En_Guruguru/z_en_guruguru.c | 18 +-
.../actors/ovl_En_Hakurock/z_en_hakurock.c | 11 +-
src/overlays/actors/ovl_En_Hg/z_en_hg.c | 30 +-
src/overlays/actors/ovl_En_Ig/z_en_ig.c | 4 +-
src/overlays/actors/ovl_En_In/z_en_in.c | 118 +-
.../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 222 +--
.../actors/ovl_En_Jc_Mato/z_en_jc_mato.c | 5 +-
.../actors/ovl_En_Kakasi/z_en_kakasi.c | 19 +-
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c | 40 +-
src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 14 +-
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 88 +-
.../actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 86 +-
.../actors/ovl_En_Ma_Yts/z_en_ma_yts.c | 91 +-
.../actors/ovl_En_Minifrog/z_en_minifrog.c | 27 +-
src/overlays/actors/ovl_En_Mm/z_en_mm.c | 3 +-
src/overlays/actors/ovl_En_Ms/z_en_ms.c | 7 +-
.../actors/ovl_En_Mushi2/z_en_mushi2.c | 8 +-
src/overlays/actors/ovl_En_Muto/z_en_muto.c | 9 +-
src/overlays/actors/ovl_En_Niw/z_en_niw.c | 20 +-
src/overlays/actors/ovl_En_Nnh/z_en_nnh.c | 5 +-
.../actors/ovl_En_Nutsball/z_en_nutsball.c | 3 +-
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 66 +-
src/overlays/actors/ovl_En_Ot/z_en_ot.c | 34 +-
src/overlays/actors/ovl_En_Owl/z_en_owl.c | 68 +-
.../actors/ovl_En_Pamera/z_en_pamera.c | 52 +-
src/overlays/actors/ovl_En_Pm/z_en_pm.c | 47 +-
.../actors/ovl_En_Po_Fusen/z_en_po_fusen.c | 7 +-
.../ovl_En_Po_Sisters/z_en_po_sisters.c | 76 +-
src/overlays/actors/ovl_En_Poh/z_en_poh.c | 44 +-
.../actors/ovl_En_Railgibud/z_en_railgibud.c | 55 +-
src/overlays/actors/ovl_En_Rd/z_en_rd.c | 86 +-
.../actors/ovl_En_Recepgirl/z_en_recepgirl.c | 50 +-
src/overlays/actors/ovl_En_Rr/z_en_rr.c | 5 +-
src/overlays/actors/ovl_En_Rsn/z_en_rsn.c | 12 +-
src/overlays/actors/ovl_En_Sb/z_en_sb.c | 35 +-
.../actors/ovl_En_Scopecoin/z_en_scopecoin.c | 9 +-
.../actors/ovl_En_Sellnuts/z_en_sellnuts.c | 50 +-
src/overlays/actors/ovl_En_Skb/z_en_skb.c | 44 +-
src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 73 +-
.../actors/ovl_En_Suttari/z_en_suttari.c | 29 +-
src/overlays/actors/ovl_En_Sw/z_en_sw.c | 47 +-
.../ovl_En_Syateki_Man/z_en_syateki_man.c | 49 +-
.../actors/ovl_En_Tanron3/z_en_tanron3.c | 9 +-
.../actors/ovl_En_Thiefbird/z_en_thiefbird.c | 51 +-
src/overlays/actors/ovl_En_Tite/z_en_tite.c | 42 +-
src/overlays/actors/ovl_En_Tk/z_en_tk.c | 37 +-
.../actors/ovl_En_Torch2/z_en_torch2.c | 12 +-
src/overlays/actors/ovl_En_Toto/z_en_toto.c | 49 +-
src/overlays/actors/ovl_En_Trt/z_en_trt.c | 43 +-
src/overlays/actors/ovl_En_Tru/z_en_tru.c | 13 +-
.../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 6 +-
.../actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c | 5 +-
.../ovl_En_Water_Effect/z_en_water_effect.c | 14 +-
src/overlays/actors/ovl_En_Wf/z_en_wf.c | 84 +-
src/overlays/actors/ovl_En_Zog/z_en_zog.c | 4 +-
src/overlays/actors/ovl_En_Zot/z_en_zot.c | 34 +-
.../actors/ovl_Item_B_Heart/z_item_b_heart.c | 12 +-
src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c | 23 +-
src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c | 8 +-
src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c | 2 +-
.../ovl_Obj_Danpeilift/z_obj_danpeilift.c | 2 +-
.../actors/ovl_Obj_Dinner/z_obj_dinner.c | 7 +-
.../actors/ovl_Obj_Ending/z_obj_ending.c | 10 +-
.../actors/ovl_Obj_Etcetera/z_obj_etcetera.c | 2 -
.../actors/ovl_Obj_Funen/z_obj_funen.c | 5 +-
.../actors/ovl_Obj_Ghaka/z_obj_ghaka.c | 11 +-
src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 5 +-
.../actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c | 20 +-
.../actors/ovl_Obj_HsStump/z_obj_hsstump.c | 8 +-
.../actors/ovl_Obj_Iceblock/z_obj_iceblock.c | 6 +-
.../actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c | 12 +-
.../ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c | 8 +-
.../ovl_Obj_Lightblock/z_obj_lightblock.c | 9 +-
.../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 28 +-
.../actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c | 6 +-
.../ovl_Obj_Moon_Stone/z_obj_moon_stone.c | 11 +-
.../actors/ovl_Obj_Raillift/z_obj_raillift.c | 15 +-
.../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 11 +-
.../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 2 +-
src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c | 11 +-
.../actors/ovl_Obj_Usiyane/z_obj_usiyane.c | 2 +-
.../ovl_Obj_Visiblock/z_obj_visiblock.c | 8 +-
.../ovl_Obj_Warpstone/z_obj_warpstone.c | 12 +-
src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c | 11 +-
src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c | 2 +-
.../ovl_Object_Kankyo/z_object_kankyo.c | 4 +-
tools/ZAPDConfigs/MM/ObjectList_MM.txt | 16 +-
undefined_syms.txt | 1694 +----------------
216 files changed, 1960 insertions(+), 4802 deletions(-)
diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml
index 8237f63804..70f9d606b1 100644
--- a/assets/xml/objects/gameplay_dangeon_keep.xml
+++ b/assets/xml/objects/gameplay_dangeon_keep.xml
@@ -50,8 +50,8 @@
-
-
+
+
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 5e5b9b4f5c..21fe1f39b2 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -898,7 +898,7 @@
-
+
@@ -996,7 +996,7 @@
-
+
@@ -1038,15 +1038,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1319,7 +1319,7 @@
-
+
@@ -1399,14 +1399,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index 85fd13cecd..f9915c8800 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -42,13 +42,14 @@
-
-
+
+
-
+
+
diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml
index d623f9455a..554047b443 100644
--- a/assets/xml/objects/object_bg.xml
+++ b/assets/xml/objects/object_bg.xml
@@ -74,7 +74,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml
index e8c7fe9496..cd953541c1 100644
--- a/assets/xml/objects/object_bji.xml
+++ b/assets/xml/objects/object_bji.xml
@@ -31,10 +31,11 @@
-
+
-
+
+
diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml
index d948ff5464..f0272cdc0a 100644
--- a/assets/xml/objects/object_boj.xml
+++ b/assets/xml/objects/object_boj.xml
@@ -3,16 +3,16 @@
-
-
+
+
-
-
-
+
+
+
@@ -49,7 +49,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/assets/xml/objects/object_boss02.xml b/assets/xml/objects/object_boss02.xml
index f944de2421..fee15d4a06 100644
--- a/assets/xml/objects/object_boss02.xml
+++ b/assets/xml/objects/object_boss02.xml
@@ -8,7 +8,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/assets/xml/objects/object_boss_hakugin.xml b/assets/xml/objects/object_boss_hakugin.xml
index 05302db78d..52a124fec1 100644
--- a/assets/xml/objects/object_boss_hakugin.xml
+++ b/assets/xml/objects/object_boss_hakugin.xml
@@ -33,7 +33,7 @@
-
+
diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml
index b440573447..390c54b368 100644
--- a/assets/xml/objects/object_cow.xml
+++ b/assets/xml/objects/object_cow.xml
@@ -1,6 +1,6 @@
-
+
@@ -19,9 +19,9 @@
-
-
-
+
+
+
@@ -32,7 +32,7 @@
-
-
+
+
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index 209742fe18..0d290f19de 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -9,7 +9,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_dnp.xml b/assets/xml/objects/object_dnp.xml
index 0f5655e9b6..575ae3d698 100644
--- a/assets/xml/objects/object_dnp.xml
+++ b/assets/xml/objects/object_dnp.xml
@@ -52,7 +52,10 @@
-
+
+
+
+
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index 64939670e3..135dc6ab63 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -21,7 +21,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index dc2ab5ed41..7de69f2ff3 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -15,6 +15,9 @@
+
+
+
diff --git a/assets/xml/objects/object_f52_obj.xml b/assets/xml/objects/object_f52_obj.xml
index 7f35d8b1bb..f80b676964 100644
--- a/assets/xml/objects/object_f52_obj.xml
+++ b/assets/xml/objects/object_f52_obj.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml
index b1d284de9f..cf65cc0ac2 100644
--- a/assets/xml/objects/object_fr.xml
+++ b/assets/xml/objects/object_fr.xml
@@ -11,7 +11,8 @@
-
+
+
diff --git a/assets/xml/objects/object_fsn.xml b/assets/xml/objects/object_fsn.xml
index f2d4b36485..7c3d0beb2a 100644
--- a/assets/xml/objects/object_fsn.xml
+++ b/assets/xml/objects/object_fsn.xml
@@ -31,13 +31,15 @@
-
+
-
+
+
+
@@ -53,7 +55,8 @@
-
+
+
diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml
index 83d2f9eff9..fe847642e7 100644
--- a/assets/xml/objects/object_fu.xml
+++ b/assets/xml/objects/object_fu.xml
@@ -27,7 +27,10 @@
-
+
+
+
+
diff --git a/assets/xml/objects/object_hanareyama_obj.xml b/assets/xml/objects/object_hanareyama_obj.xml
index ba213a5856..62cf675402 100644
--- a/assets/xml/objects/object_hanareyama_obj.xml
+++ b/assets/xml/objects/object_hanareyama_obj.xml
@@ -1,7 +1,6 @@
-
-
+
@@ -59,7 +58,12 @@
-
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 07969fe80f..42bace14f8 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -6,8 +6,8 @@
-
-
+
+
@@ -17,9 +17,10 @@
-
+
-
+
+
diff --git a/assets/xml/objects/object_in2.xml b/assets/xml/objects/object_in2.xml
index 34a942882a..a47c7613ea 100644
--- a/assets/xml/objects/object_in2.xml
+++ b/assets/xml/objects/object_in2.xml
@@ -21,15 +21,15 @@
-
+
-
+
-
+
@@ -37,9 +37,9 @@
-
+
-
+
diff --git a/assets/xml/objects/object_jg.xml b/assets/xml/objects/object_jg.xml
index 10253e155d..03d7c3ce59 100644
--- a/assets/xml/objects/object_jg.xml
+++ b/assets/xml/objects/object_jg.xml
@@ -94,7 +94,7 @@
-
-
+
+
diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml
index 3d5c3aee2b..0a374033b6 100644
--- a/assets/xml/objects/object_lightswitch.xml
+++ b/assets/xml/objects/object_lightswitch.xml
@@ -3,7 +3,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml
index 98444a884c..7001eb84ac 100644
--- a/assets/xml/objects/object_ma1.xml
+++ b/assets/xml/objects/object_ma1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
@@ -54,7 +54,15 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml
index 523dfe212c..a6554d3875 100644
--- a/assets/xml/objects/object_ma2.xml
+++ b/assets/xml/objects/object_ma2.xml
@@ -6,7 +6,7 @@
-
+
@@ -48,7 +48,16 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_mbar_obj.xml b/assets/xml/objects/object_mbar_obj.xml
index d69d7ce3b1..b1a816f47b 100644
--- a/assets/xml/objects/object_mbar_obj.xml
+++ b/assets/xml/objects/object_mbar_obj.xml
@@ -5,6 +5,6 @@
-
+
diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml
index 3ce9c1925c..43c0e9b194 100644
--- a/assets/xml/objects/object_mm.xml
+++ b/assets/xml/objects/object_mm.xml
@@ -12,7 +12,8 @@
-
+
+
diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml
index f97b5d7261..b055a27409 100644
--- a/assets/xml/objects/object_niw.xml
+++ b/assets/xml/objects/object_niw.xml
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/assets/xml/objects/object_obj_milk_bin.xml b/assets/xml/objects/object_obj_milk_bin.xml
index 4a0ca700bb..70daa61722 100644
--- a/assets/xml/objects/object_obj_milk_bin.xml
+++ b/assets/xml/objects/object_obj_milk_bin.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index b35f38b0f9..381c0bfd0e 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -29,7 +29,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_oyu.xml b/assets/xml/objects/object_oyu.xml
index aa762ce592..78cc8b34d9 100644
--- a/assets/xml/objects/object_oyu.xml
+++ b/assets/xml/objects/object_oyu.xml
@@ -4,6 +4,6 @@
-
+
diff --git a/assets/xml/objects/object_pamera.xml b/assets/xml/objects/object_pamera.xml
index 901a7523bc..6ce4c5219c 100644
--- a/assets/xml/objects/object_pamera.xml
+++ b/assets/xml/objects/object_pamera.xml
@@ -26,7 +26,13 @@
-
+
+
+
+
+
+
+
@@ -55,17 +61,17 @@
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/assets/xml/objects/object_sek.xml b/assets/xml/objects/object_sek.xml
index e37af43802..3529620aa7 100644
--- a/assets/xml/objects/object_sek.xml
+++ b/assets/xml/objects/object_sek.xml
@@ -1,6 +1,6 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/assets/xml/objects/object_shn.xml b/assets/xml/objects/object_shn.xml
index 78cc77ca71..b322641a9e 100644
--- a/assets/xml/objects/object_shn.xml
+++ b/assets/xml/objects/object_shn.xml
@@ -18,7 +18,9 @@
-
+
+
+
@@ -83,7 +85,8 @@
-
+
+
diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml
index a7ce1418df..011d76449c 100644
--- a/assets/xml/objects/object_st.xml
+++ b/assets/xml/objects/object_st.xml
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml
index 83e4c34f33..01ab0ef908 100644
--- a/assets/xml/objects/object_syokudai.xml
+++ b/assets/xml/objects/object_syokudai.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml
index 2d57d1b47d..eec5b05d0d 100644
--- a/assets/xml/objects/object_tite.xml
+++ b/assets/xml/objects/object_tite.xml
@@ -8,10 +8,14 @@
-
+
+
+
-
+
+
+
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 506f9b00af..813b0fb24e 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -12,7 +12,9 @@
-
+
+
+
diff --git a/assets/xml/objects/object_uch.xml b/assets/xml/objects/object_uch.xml
index de16b0d7b8..86f2a4646e 100644
--- a/assets/xml/objects/object_uch.xml
+++ b/assets/xml/objects/object_uch.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml
index 98dd21ed58..56c9e1621a 100644
--- a/assets/xml/objects/object_wf.xml
+++ b/assets/xml/objects/object_wf.xml
@@ -5,7 +5,7 @@
-
+
@@ -20,7 +20,8 @@
-
+
+
@@ -67,13 +68,14 @@
-
+
-
+
+
diff --git a/assets/xml/objects/object_zm.xml b/assets/xml/objects/object_zm.xml
index c5511f6b2e..022efcf279 100644
--- a/assets/xml/objects/object_zm.xml
+++ b/assets/xml/objects/object_zm.xml
@@ -28,7 +28,7 @@
-
+
@@ -36,7 +36,8 @@
-
+
+
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 4462024438..ce520c475b 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -17,7 +17,9 @@
-
+
+
+
diff --git a/include/variables.h b/include/variables.h
index 6ddbdd08b3..0db9a85f0a 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -3635,244 +3635,6 @@ extern u8 D_80780000[0x4600];
extern u8 D_80784600[0x56200];
extern u16 gFramebuffer0[SCREEN_HEIGHT][SCREEN_WIDTH];
-// keep objects
-
-extern Gfx D_040008D0[];
-extern Gfx D_040032B0[];
-extern UNK_TYPE D_0400CF58;
-extern UNK_TYPE D_0400CF88;
-extern UNK_TYPE D_0400CF98;
-extern UNK_TYPE D_0400D0A8;
-extern UNK_TYPE D_0400D0B0;
-extern UNK_TYPE D_0400D0C8;
-extern UNK_TYPE D_0400D100;
-extern UNK_TYPE D_0400D218;
-extern UNK_TYPE D_0400D220;
-extern UNK_TYPE D_0400D228;
-extern UNK_TYPE D_0400D2D0;
-extern UNK_TYPE D_0400D3E8;
-extern UNK_TYPE D_0400D3F8;
-extern UNK_TYPE D_0400D488;
-extern UNK_TYPE D_0400D490;
-extern UNK_TYPE D_0400D500;
-extern UNK_TYPE D_0400D520;
-extern UNK_TYPE D_0400D568;
-extern UNK_TYPE D_0400D638;
-extern UNK_TYPE D_0400D660;
-extern UNK_TYPE D_0400D698;
-extern UNK_TYPE D_0400D728;
-extern UNK_TYPE D_0400D9C8;
-extern UNK_TYPE D_0400D9D0;
-extern UNK_TYPE D_0400DA70;
-extern UNK_TYPE D_0400DA88;
-extern UNK_TYPE D_0400DAA8;
-extern UNK_TYPE D_0400DAC0;
-extern UNK_TYPE D_0400DAC8;
-extern UNK_TYPE D_0400DAD8;
-extern UNK_TYPE D_0400DAE0;
-extern UNK_TYPE D_0400DAF0;
-extern UNK_TYPE D_0400DB10;
-extern UNK_TYPE D_0400DB18;
-extern UNK_TYPE D_0400DB30;
-extern UNK_TYPE D_0400DBB0;
-extern UNK_TYPE D_0400DBE8;
-extern UNK_TYPE D_0400DC48;
-extern UNK_TYPE D_0400DC50;
-extern UNK_TYPE D_0400DCA8;
-extern UNK_TYPE D_0400DCD0;
-extern UNK_TYPE D_0400DCD8;
-extern UNK_TYPE D_0400DCF8;
-extern UNK_TYPE D_0400DD30;
-extern UNK_TYPE D_0400DD38;
-extern UNK_TYPE D_0400DD40;
-extern UNK_TYPE D_0400DD50;
-extern UNK_TYPE D_0400DD58;
-extern UNK_TYPE D_0400DD80;
-extern UNK_TYPE D_0400DDB0;
-extern UNK_TYPE D_0400DDF8;
-extern UNK_TYPE D_0400DE00;
-extern UNK_TYPE D_0400DE08;
-extern UNK_TYPE D_0400DE10;
-extern UNK_TYPE D_0400DE28;
-extern UNK_TYPE D_0400DE30;
-extern UNK_TYPE D_0400DE58;
-extern UNK_TYPE D_0400DE60;
-extern UNK_TYPE D_0400DEA0;
-extern UNK_TYPE D_0400DEA8;
-extern UNK_TYPE D_0400DF78;
-extern UNK_TYPE D_0400DF90;
-extern UNK_TYPE D_0400DFA0;
-extern UNK_TYPE D_0400DFD0;
-extern UNK_TYPE D_0400DFE0;
-extern UNK_TYPE D_0400DFE8;
-extern UNK_TYPE D_0400DFF8;
-extern UNK_TYPE D_0400E000;
-extern UNK_TYPE D_0400E070;
-extern UNK_TYPE D_0400E088;
-extern UNK_TYPE D_0400E120;
-extern UNK_TYPE D_0400E150;
-extern UNK_TYPE D_0400E1F0;
-extern UNK_TYPE D_0400E200;
-extern UNK_TYPE D_0400E208;
-extern UNK_TYPE D_0400E270;
-extern UNK_TYPE D_0400E290;
-extern UNK_TYPE D_0400E2A8;
-extern UNK_TYPE D_0400E2B8;
-extern UNK_TYPE D_0400E2C0;
-extern UNK_TYPE D_0400E2D0;
-extern UNK_TYPE D_0400E2D8;
-extern UNK_TYPE D_0400E2E8;
-extern UNK_TYPE D_0400E318;
-extern UNK_TYPE D_0400E398;
-extern UNK_TYPE D_0400E3A0;
-extern UNK_TYPE D_0400E3A8;
-extern UNK_TYPE D_0400E3C0;
-extern UNK_TYPE D_0400E3D8;
-extern UNK_TYPE D_0400E408;
-extern UNK_TYPE D_0400E410;
-extern UNK_TYPE D_0400E418;
-extern UNK_TYPE D_04012860;
-extern UNK_TYPE D_040128BC;
-extern u64 D_04014570[];
-extern UNK_TYPE D_04015FA0;
-extern UNK_TYPE D_04016360;
-extern UNK_TYPE D_0401A4D0;
-extern UNK_TYPE D_0401A538;
-extern Gfx D_0401A620[];
-extern Gfx D_0401C430[];
-extern UNK_TYPE D_0401F740;
-extern UNK_TYPE D_0401F7C0;
-extern UNK_TYPE D_0401F8C0;
-extern UNK_TYPE D_0401FA40;
-extern UNK_TYPE D_04020BB8;
-extern UNK_TYPE D_040221B8;
-extern UNK_TYPE D_04023100;
-extern UNK_TYPE D_04023130;
-extern Gfx D_04023210[];
-extern UNK_TYPE D_04023288;
-extern Gfx D_04023348[];
-extern Gfx D_04023428[];
-extern UNK_TYPE D_04025DD0;
-extern UNK_TYPE D_040281DC;
-extern UNK_TYPE D_04028FEC;
-extern AnimationHeader D_04029140;
-extern Gfx D_04029CB0[];
-extern Gfx D_04029CF0[];
-extern UNK_TYPE D_04029D20;
-extern Gfx D_0402E510[];
-extern AnimationHeader D_0402E65C;
-extern AnimationHeader D_0402F0EC;
-extern Gfx D_04030100[]; // Floor shockwave ring
-extern Gfx D_040301B0[];
-extern UNK_TYPE D_04032270;
-extern UNK_TYPE D_04035710;
-extern UNK_TYPE D_040367B0;
-extern UNK_TYPE D_040377B0;
-extern UNK_TYPE D_04037850;
-extern Gfx D_040378F0[]; // gExplosionSplashTex1
-extern Gfx D_04037DF0[]; // gExplosionSplashTex2
-extern Gfx D_040382F0[]; // gExplosionSplashTex3
-extern Gfx D_040387F0[]; // gExplosionSplashTex4
-extern Gfx D_04038CF0[]; // gExplosionSplashTex5
-extern Gfx D_040391F0[]; // gExplosionSplashTex6
-extern Gfx D_040396F0[]; // gExplosionSplashTex7
-extern Gfx D_04039BF0[]; // gExplosionSplashTex8
-extern Gfx D_0403A0F0[]; // gExplosionSplashDL
-extern UNK_TYPE D_0403C190;
-extern UNK_TYPE D_0403F230;
-extern UNK_TYPE D_04044300;
-extern Gfx D_04048DF0[];
-extern UNK_TYPE D_04050D10;
-extern Gfx D_04051180[];
-extern Gfx D_04051238[];
-extern AnimationHeader D_0405140C;
-extern Gfx D_040527F0[];
-extern Gfx D_040528B0[];
-extern Gfx D_04054A90[];
-extern u64 D_04054F20[];
-extern UNK_TYPE D_04055628;
-extern Gfx D_04057B10[];
-extern Gfx D_04058BA0[];
-extern Gfx D_04089070[];
-extern TexturePtr D_0408DBE0[]; // gDust1Tex
-extern TexturePtr D_0408DFE0[]; // gDust2Tex
-extern TexturePtr D_0408E3E0[]; // gDust3Tex
-extern TexturePtr D_0408E7E0[]; // gDust4Tex
-extern TexturePtr D_0408EBE0[]; // gDust5Tex
-extern TexturePtr D_0408EFE0[]; // gDust6Tex
-extern TexturePtr D_0408F3E0[]; // gDust7Tex
-extern TexturePtr D_0408F7E0[]; // gDust8Tex
-extern UNK_TYPE D_04050550;
-extern Gfx D_04050648[];
-extern Gfx D_040506E0[];
-extern UNK_TYPE D_040510B0;
-extern UNK_TYPE D_04054940;
-extern Gfx D_0405AAB0[];
-extern UNK_TYPE D_0405B6F0;
-extern UNK_TYPE D_0405BEF0;
-extern UNK_TYPE D_0405C6F0;
-extern UNK_TYPE D_0405CEF0;
-extern UNK_TYPE D_0405E6F0;
-extern Gfx D_0405F6F0[];
-extern UNK_TYPE D_0405F7C0;
-extern UNK_TYPE D_0405FFC0;
-extern UNK_TYPE D_040607C0;
-extern UNK_TYPE D_04060FC0;
-extern UNK_TYPE D_040617C0;
-extern UNK_TYPE D_04061FC0;
-extern UNK_TYPE D_04061FE0;
-extern UNK_TYPE D_04062000;
-extern UNK_TYPE D_04062020;
-extern UNK_TYPE D_04062040;
-extern UNK_TYPE D_04062060;
-extern Gfx D_040622C0[];
-extern Gfx D_0406AB30[];
-extern UNK_TYPE D_0406B730;
-extern UNK_TYPE D_0406BB0C;
-extern UNK_TYPE D_0406F380;
-extern Gfx D_040706E0[];
-extern UNK_TYPE D_04073F00;
-extern UNK_TYPE D_04075400;
-extern Gfx D_04076BC0[];
-extern UNK_TYPE D_04079B10;
-extern Gfx D_0407AB10[]; // sun (sparkles when small) displaylist
-extern Gfx D_0407AB58[];
-extern UNK_TYPE D_0407AFB0;
-extern UNK_TYPE D_0407D650;
-extern UNK_TYPE D_0407F218;
-extern UNK_TYPE D_040815D0;
-extern UNK_TYPE D_04081628;
-extern UNK_TYPE D_04083534;
-extern UNK_TYPE D_04091BE0;
-extern UNK_TYPE D_04091CE0;
-extern TexturePtr D_04091DE0[];
-extern TexturePtr D_04091FE0[];
-extern TexturePtr D_040921E0[];
-extern TexturePtr D_040923E0[];
-
-extern Gfx D_05000C40[];
-extern UNK_TYPE D_05001D20;
-extern Gfx D_050061E8[];
-extern Gfx D_05006420[];
-extern Gfx D_050066B0[];
-extern UNK_TYPE D_05007498;
-extern Gfx D_05007890[];
-extern Gfx D_050078A0[];
-extern Gfx D_05007938[];
-extern Gfx D_05007980[];
-extern UNK_TYPE D_05007E00;
-extern UNK_TYPE D_05008018;
-extern UNK_TYPE D_050085F0;
-extern Gfx D_05017EA0[]; // pot displaylist
-extern Gfx D_05018090[]; // pot break shard displaylist
-extern UNK_TYPE D_050182A8;
-extern UNK_TYPE D_0501B508;
-extern UNK_TYPE D_0501C058;
-extern Gfx D_0501D980[];
-extern Gfx D_050219E0[];
-extern UNK_TYPE D_05023008;
-extern UNK_TYPE D_0502324C;
-
// other segments
extern GfxMasterList D_0E000000;
extern Mtx D_01000000;
diff --git a/include/z64object.h b/include/z64object.h
index 08423ab6c7..34035306b4 100644
--- a/include/z64object.h
+++ b/include/z64object.h
@@ -405,7 +405,7 @@ typedef enum {
/* 0x189 */ OBJECT_HANAREYAMA_OBJ,
/* 0x18A */ OBJECT_CRACE_OBJECT,
/* 0x18B */ OBJECT_DNQ,
- /* 0x18C */ OBJECT_OBJECT_UNSET_TOKEIDAI,
+ /* 0x18C */ OBJECT_OBJ_TOKEIDAI,
/* 0x18D */ OBJECT_EG,
/* 0x18E */ OBJECT_TRU,
/* 0x18F */ OBJECT_TRT,
@@ -545,13 +545,13 @@ typedef enum {
/* 0x215 */ OBJECT_GI_RESERVE_C_01,
/* 0x216 */ OBJECT_ZOD,
/* 0x217 */ OBJECT_KUMO30,
- /* 0x218 */ OBJECT_OBJECT_UNSET_YASI,
+ /* 0x218 */ OBJECT_OBJ_YASI,
/* 0x219 */ OBJECT_MASK_ROMERNY,
/* 0x21A */ OBJECT_TANRON1,
/* 0x21B */ OBJECT_TANRON2,
/* 0x21C */ OBJECT_TANRON3,
/* 0x21D */ OBJECT_GI_MAGICMUSHROOM,
- /* 0x21E */ OBJECT_OBJECT_UNSET_CHAN,
+ /* 0x21E */ OBJECT_OBJ_CHAN,
/* 0x21F */ OBJECT_GI_MASK10,
/* 0x220 */ OBJECT_ZOS,
/* 0x221 */ OBJECT_MASK_POSTHAT,
@@ -589,7 +589,7 @@ typedef enum {
/* 0x241 */ OBJECT_DT,
/* 0x242 */ OBJECT_GI_MASK03,
/* 0x243 */ OBJECT_CHA,
- /* 0x244 */ OBJECT_OBJECT_UNSET_DINNER,
+ /* 0x244 */ OBJECT_OBJ_DINNER,
/* 0x245 */ OBJECT_GI_RESERVE_B_01,
/* 0x246 */ OBJECT_LASTDAY,
/* 0x247 */ OBJECT_BAI,
@@ -608,7 +608,7 @@ typedef enum {
/* 0x254 */ OBJECT_GI_STONEMASK,
/* 0x255 */ OBJECT_ZORABAND,
/* 0x256 */ OBJECT_KEPN_KOYA,
- /* 0x257 */ OBJECT_OBJECT_UNSET_USIYANE,
+ /* 0x257 */ OBJECT_OBJ_USIYANE,
/* 0x258 */ OBJECT_GI_MASK05,
/* 0x259 */ OBJECT_GI_MASK11,
/* 0x25A */ OBJECT_GI_MASK20,
@@ -618,7 +618,7 @@ typedef enum {
/* 0x25E */ OBJECT_MASK_MEOTO,
/* 0x25F */ OBJECT_MASK_DANCER,
/* 0x260 */ OBJECT_KZSAKU,
- /* 0x261 */ OBJECT_OBJECT_UNSET_MILK_BIN,
+ /* 0x261 */ OBJECT_OBJ_MILK_BIN,
/* 0x262 */ OBJECT_RANDOM_OBJ,
/* 0x263 */ OBJECT_KUJIYA,
/* 0x264 */ OBJECT_KITAN,
@@ -636,7 +636,7 @@ typedef enum {
/* 0x270 */ OBJECT_MOONEND,
/* 0x271 */ OBJECT_OB,
/* 0x272 */ OBJECT_GI_BOTTLE_04,
- /* 0x273 */ OBJECT_OBJECT_UNSET_DANPEILIFT,
+ /* 0x273 */ OBJECT_OBJ_DANPEILIFT,
/* 0x274 */ OBJECT_WDOR01,
/* 0x275 */ OBJECT_WDOR02,
/* 0x276 */ OBJECT_WDOR03,
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 8875343662..b17799aff5 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
EffectBlureElement* elem;
@@ -720,8 +721,8 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx*
gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
- gDPLoadTextureBlock(POLY_XLU_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP,
- G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
+ G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED);
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index 05669d63ad..112f7fe73a 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -2,6 +2,7 @@
#include "vt.h"
#include "assets/code/eff_shield_particle/eff_shield_particle.c"
+#include "objects/gameplay_keep/gameplay_keep.h"
void EffectShieldParticle_Init(void* thisx, void* initParamsx) {
EffectShieldParticle* this = (EffectShieldParticle*)thisx;
@@ -154,8 +155,8 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
- gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
- G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+ G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0,
0, COMBINED, 0, 0, 0, COMBINED);
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index 27ed1443db..697c553987 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
void EffectSpark_Init(void* thisx, void* initParamsx) {
EffectSpark* this = (EffectSpark*)thisx;
@@ -152,8 +153,8 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
- gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
- G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+ G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineMode(POLY_XLU_DISP++, G_CC_SHADEDECALA, G_CC_PASS2);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
diff --git a/src/code/z_eff_tire_mark.c b/src/code/z_eff_tire_mark.c
index e893de8a0a..532e8e2fb0 100644
--- a/src/code/z_eff_tire_mark.c
+++ b/src/code/z_eff_tire_mark.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 arg4,
CollisionPoly* colPoly, s32 arg6) {
@@ -233,7 +234,7 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) {
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP++, 0x2C);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
- gDPLoadTextureBlock(POLY_OPA_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
+ gDPLoadTextureBlock(POLY_OPA_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0,
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 2f0668c668..970a704582 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -1,4 +1,6 @@
#include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_gi_hearts/object_gi_hearts.h"
#define FLAGS 0x00000000
@@ -693,12 +695,12 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
-UNK_PTR D_801ADF30[5] = {
- &D_04061FC0, // Green rupee
- &D_04061FE0, // Blue rupee
- &D_04062000, // Red rupee
- &D_04062040, // Orange rupee
- &D_04062020 // Purple rupee
+TexturePtr D_801ADF30[] = {
+ gameplay_keep_Tex_061FC0, // Green rupee
+ gameplay_keep_Tex_061FE0, // Blue rupee
+ gameplay_keep_Tex_062000, // Red rupee
+ gameplay_keep_Tex_062040, // Orange rupee
+ gameplay_keep_Tex_062020 // Purple rupee
};
void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
@@ -720,24 +722,24 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_801ADF30[iconNb]));
- gSPDisplayList(POLY_OPA_DISP++, &D_040622C0); // TODO symbol
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0); // TODO symbol
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
-UNK_PTR D_801ADF44[12] = {
- &D_0405E6F0, // Heart (Not used)
- &D_0405CEF0, // Bombs (A), Bombs (0)
- &D_0405BEF0, // Arrows (10)
- &D_0405B6F0, // Arrows (30)
- &D_0405C6F0, // Arrows (40), Arrows (50)
- &D_0405CEF0, // Bombs (B)
- &D_040607C0, // Nuts (1), Nuts (10)
- &D_04060FC0, // Sticks (1)
- &D_040617C0, // Magic (Large)
- &D_0405FFC0, // Magic (Small)
+TexturePtr D_801ADF44[12] = {
+ gameplay_keep_Tex_05E6F0, // Heart (Not used)
+ gameplay_keep_Tex_05CEF0, // Bombs (A), Bombs (0)
+ gameplay_keep_Tex_05BEF0, // Arrows (10)
+ gameplay_keep_Tex_05B6F0, // Arrows (30)
+ gameplay_keep_Tex_05C6F0, // Arrows (40), Arrows (50)
+ gameplay_keep_Tex_05CEF0, // Bombs (B)
+ gameplay_keep_Tex_0607C0, // Nuts (1), Nuts (10)
+ gameplay_keep_Tex_060FC0, // Sticks (1)
+ gameplay_keep_Tex_0617C0, // Magic (Large)
+ gameplay_keep_Tex_05FFC0, // Magic (Small)
NULL,
- &D_0405F7C0 // Small Key
+ gameplay_keep_Tex_05F7C0 // Small Key
};
void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
@@ -764,14 +766,11 @@ void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
- gSPDisplayList(POLY_OPA_DISP++, D_0405F6F0);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
-extern Gfx D_06001290[];
-extern Gfx D_06001470[];
-
void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
s32 pad;
s32 pad2;
@@ -784,8 +783,8 @@ void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
- gSPDisplayList(POLY_XLU_DISP++, D_06001290);
- gSPDisplayList(POLY_XLU_DISP++, D_06001470);
+ gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001290);
+ gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001470);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -801,7 +800,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
- gSPDisplayList(POLY_XLU_DISP++, D_0405AAB0);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_05AAB0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index fae6af51e1..858a7186e4 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type) {
info->type = type;
@@ -418,7 +419,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gDPSetCombineLERP(dl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
0);
- gSPDisplayList(dl++, D_04029CB0);
+ gSPDisplayList(dl++, gameplay_keep_DL_029CB0);
do {
if (light->info->type == LIGHT_POINT_GLOW) {
@@ -434,7 +435,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gSPMatrix(dl++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(dl++, D_04029CF0);
+ gSPDisplayList(dl++, gameplay_keep_DL_029CF0);
}
}
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
index 1045976983..1b60a41470 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@@ -5,6 +5,8 @@
*/
#include "z_arms_hook.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_link_child/object_link_child.h"
#define FLAGS 0x00000030
@@ -50,8 +52,6 @@ static ColliderQuadInit D_808C1BC0 = {
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
};
-extern Gfx D_0601D960[];
-
void ArmsHook_SetupAction(ArmsHook* this, ArmsHookActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@@ -323,7 +323,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80122868(globalCtx, player);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_0601D960);
+ gSPDisplayList(POLY_OPA_DISP++, object_link_child_DL_01D960);
Matrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
MTXMODE_NEW);
Math_Vec3f_Diff(&player->rightHandWorld.pos, &this->actor.world.pos, &sp68);
@@ -334,7 +334,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
f0 = sqrtf(SQ(sp68.y) + sp48);
Matrix_Scale(0.015f, 0.015f, f0 * 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_040008D0);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0008D0);
func_801229A0(globalCtx, player);
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
index 5ce8f18e96..752447df35 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_gear.h"
+#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000010
@@ -39,14 +40,6 @@ const ActorInit Bg_Ctower_Gear_InitVars = {
(ActorFunc)BgCtowerGear_Draw,
};
-extern Gfx D_06010828[];
-extern Gfx D_06015F30[];
-extern Gfx D_060160A0[];
-extern CollisionHeader D_06016E70;
-extern Gfx D_06017018[];
-extern Gfx D_06018118[];
-extern CollisionHeader D_06018588;
-
static Vec3f D_80AD3270[] = {
{ -70.0f, -60.0f, 8.0f }, { -60.0f, -60.0f, -9.1f }, { -75.0f, -60.0f, -9.1f }, { -70.0f, -60.0f, -26.2f }
};
@@ -75,7 +68,7 @@ static InitChainEntry sInitChainOrgan[] = {
ICHAIN_F32(uncullZoneDownward, 570, ICHAIN_STOP),
};
-static Gfx* D_80AD32E8[] = { D_06010828, D_06017018, D_06018118 };
+static Gfx* D_80AD32E8[] = { object_ctower_rot_DL_010828, object_ctower_rot_DL_017018, object_ctower_rot_DL_018118 };
void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
int i;
@@ -144,10 +137,10 @@ void BgCtowerGear_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (type == WATER_WHEEL) {
DynaPolyActor_Init(&this->dyna, 3);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06018588);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_018588);
} else if (type == ORGAN) {
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06016E70);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_016E70);
func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
}
@@ -207,9 +200,9 @@ void BgCtowerGear_DrawOrgan(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060160A0);
+ gSPDisplayList(POLY_OPA_DISP++, object_ctower_rot_DL_0160A0);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06015F30);
+ gSPDisplayList(POLY_XLU_DISP++, object_ctower_rot_DL_015F30);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
index 1686906238..bd5a5e870f 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
+++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_rot.h"
+#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000030
@@ -32,19 +33,12 @@ const ActorInit Bg_Ctower_Rot_InitVars = {
(ActorFunc)BgCtowerRot_Draw,
};
-extern Gfx D_060129D0[];
-extern Gfx D_06012DA0[];
-extern CollisionHeader D_060142E8;
-extern Gfx D_06017220[];
-extern CollisionHeader D_06017410;
-extern Gfx D_060174E0[];
-extern CollisionHeader D_06017650;
-
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-static Gfx* bgCtowerRotDlists[] = { D_06012DA0, D_06017220, D_060174E0 };
+static Gfx* bgCtowerRotDlists[] = { object_ctower_rot_DL_012DA0, object_ctower_rot_DL_017220,
+ object_ctower_rot_DL_0174E0 };
void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgCtowerRot* this = THIS;
@@ -55,16 +49,16 @@ void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
if (this->dyna.actor.params == CORRIDOR) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060142E8);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_0142E8);
this->actionFunc = BgCtowerRot_CorridorRotate;
return;
}
player = GET_PLAYER(globalCtx);
if (this->dyna.actor.params == MAIN_DOOR) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017410);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017410);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y + 0x4000;
} else {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017650);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017650);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y - 0x4000;
}
Actor_OffsetOfPointInActorCoords(&this->dyna.actor, &offset, &player->actor.world.pos);
@@ -161,6 +155,6 @@ void BgCtowerRot_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, bgCtowerRotDlists[this->dyna.actor.params]);
if (this->dyna.actor.params == CORRIDOR) {
- Gfx_DrawDListXlu(globalCtx, D_060129D0);
+ Gfx_DrawDListXlu(globalCtx, object_ctower_rot_DL_0129D0);
}
}
diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
index ba5405cf6e..8bfdc7a2f3 100644
--- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
+++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_fu_kaiten.h"
+#include "objects/object_fu_kaiten/object_fu_kaiten.h"
#define FLAGS 0x00000030
@@ -27,9 +28,6 @@ const ActorInit Bg_Fu_Kaiten_InitVars = {
(ActorFunc)BgFuKaiten_Draw,
};
-extern Gfx D_060005D0[];
-extern CollisionHeader D_06002D30;
-
void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgFuKaiten* this = THIS;
@@ -37,7 +35,7 @@ void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(thisx, 1.0);
DynaPolyActor_Init(&this->dyna, 3);
- CollisionHeader_GetVirtual(&D_06002D30, &header);
+ CollisionHeader_GetVirtual(&object_fu_kaiten_Colheader_002D30, &header);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, header);
this->bounceHeight = 0.0;
@@ -82,6 +80,6 @@ void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060005D0);
+ gSPDisplayList(POLY_OPA_DISP++, object_fu_kaiten_DL_0005D0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
index e75367f602..dee3117426 100644
--- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_goron_oyu.h"
+#include "objects/object_oyu/object_oyu.h"
#define FLAGS 0x00000030
@@ -34,11 +35,6 @@ const ActorInit Bg_Goron_Oyu_InitVars = {
(ActorFunc)BgGoronOyu_Draw,
};
-extern Gfx D_06000080;
-extern Gfx D_06000158;
-extern AnimatedMaterial D_06000968;
-extern CollisionHeader D_06000988;
-
void func_80B40080(BgGoronOyu* this) {
this->unk_17E = 1;
this->actionFunc = func_80B400C8;
@@ -157,7 +153,7 @@ void BgGoronOyu_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
- CollisionHeader_GetVirtual(&D_06000988, &colHeader);
+ CollisionHeader_GetVirtual(&object_oyu_Colheader_000988, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
@@ -188,9 +184,9 @@ void BgGoronOyu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06000968));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_oyu_Matanimheader_000968));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, &D_06000158);
- gSPDisplayList(POLY_XLU_DISP++, &D_06000080);
+ gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000158);
+ gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000080);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
index 87686f4c8e..1f39ce6ba0 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_haka_curtain.h"
+#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000010
@@ -44,15 +45,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_06001588;
-extern Gfx D_06001410[];
-
void BgHakaCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaCurtain* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06001588);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_001588);
if (Flags_GetClear(globalCtx, this->dyna.actor.room)) {
func_80B6DE80(this);
return;
@@ -137,5 +135,5 @@ void BgHakaCurtain_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06001410);
+ Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_001410);
}
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
index a36055a3dc..862cf1611c 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_haka_tomb.h"
+#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000000
@@ -22,9 +23,6 @@ void func_80BD6768(BgHakaTomb* this, GlobalContext* globalCtx);
void BgHakaTomb_SetupDoNothing(BgHakaTomb* this);
void BgHakaTomb_DoNothing(BgHakaTomb* this, GlobalContext* globalCtx);
-extern CollisionHeader D_06000EE8[];
-extern Gfx D_060007B0[];
-
const ActorInit Bg_Haka_Tomb_InitVars = {
ACTOR_BG_HAKA_TOMB,
ACTORCAT_BG,
@@ -48,7 +46,7 @@ void BgHakaTomb_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, D_06000EE8);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_000EE8);
func_8013E3B8(&this->dyna.actor, this->cutscenes, ARRAY_COUNT(this->cutscenes));
func_80BD6624(this);
}
@@ -128,5 +126,5 @@ void BgHakaTomb_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaTomb_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_060007B0);
+ Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_0007B0);
}
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
index 0a3ef22ebc..77e2aa6602 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_hakugin_post.h"
+#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS 0x00000030
@@ -32,13 +33,6 @@ void func_80A9D3E4(BgHakuginPost* this);
void func_80A9D434(BgHakuginPost* this, GlobalContext* globalCtx);
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx);
-extern Gfx D_0600C1A8[];
-extern Gfx D_0600C568[];
-extern Gfx D_0600CA38[];
-extern Gfx D_0600CEC8[];
-extern Gfx D_0600D098[];
-extern CollisionHeader D_0600D3B0;
-
BgHakuginPostColliders D_80A9DDC0;
BgHakuginPostUnkStruct D_80A9E028;
@@ -705,7 +699,7 @@ void BgHakuginPost_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.shape.rot.x = 0;
this->dyna.actor.shape.rot.z = 0;
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600D3B0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hakugin_obj_Colheader_00D3B0);
func_80A9B3BC(this, globalCtx);
func_80A9CA94(this);
} else {
@@ -996,13 +990,14 @@ void BgHakuginPost_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80A9D900[] = {
- D_0600C1A8, D_0600C568, NULL, NULL, D_0600CA38, D_0600CEC8, NULL,
+ object_hakugin_obj_DL_00C1A8, object_hakugin_obj_DL_00C568, NULL, NULL,
+ object_hakugin_obj_DL_00CA38, object_hakugin_obj_DL_00CEC8, NULL,
};
static Gfx* D_80A9D91C[] = {
- D_0600D098,
- D_0600D098,
- D_0600D098,
- D_0600D098,
+ object_hakugin_obj_DL_00D098,
+ object_hakugin_obj_DL_00D098,
+ object_hakugin_obj_DL_00D098,
+ object_hakugin_obj_DL_00D098,
};
BgHakuginPost* this = THIS;
BgHakuginPostUnkStruct1* unkStruct1;
diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
index d497492f33..bf0851a5b7 100644
--- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
+++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_icicle.h"
+#include "objects/object_icicle/object_icicle.h"
#define FLAGS 0x00000000
@@ -60,9 +61,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern Gfx D_060000D0[];
-extern CollisionHeader D_06000294;
-
void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIcicle* this = THIS;
@@ -71,7 +69,7 @@ void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000294);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_icicle_Colheader_000294);
Collider_InitAndSetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
Collider_UpdateCylinder(thisx, &this->collider);
@@ -245,5 +243,5 @@ void BgIcicle_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIcicle_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_060000D0);
+ Gfx_DrawDListOpa(globalCtx, object_icicle_DL_0000D0);
}
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
index e96c20accb..55c87bafae 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_ray.h"
+#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000000
@@ -59,9 +60,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern Gfx D_06001100[];
-extern AnimatedMaterial D_06001228[];
-
void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
ColliderCylinder* collision = &this->collision;
@@ -71,7 +69,7 @@ void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetCylinder(globalCtx, collision, &this->actor, &sCylinderInit);
Collider_UpdateCylinder(&this->actor, &this->collision);
- this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(D_06001228);
+ this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(object_ikana_obj_Matanimheader_001228);
if (Flags_GetSwitch(globalCtx, this->actor.params & 0x7F)) {
BgIkanaRay_SetActivated(this);
@@ -119,5 +117,5 @@ void BgIkanaRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTextures);
- Gfx_DrawDListXlu(globalCtx, D_06001100);
+ Gfx_DrawDListXlu(globalCtx, object_ikana_obj_DL_001100);
}
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
index 70b58b4828..d37d09abf3 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_shutter.h"
+#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000010
@@ -53,9 +54,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_06000F28;
-extern Gfx D_06000CE8[];
-
s32 BgIkanaShutter_AllSwitchesPressed(BgIkanaShutter* this, GlobalContext* globalCtx) {
return Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x7F) &&
Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x7F) + 1) &&
@@ -68,7 +66,7 @@ void BgIkanaShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000F28);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikana_obj_Colheader_000F28);
if (!((this->dyna.actor.params >> 8) & 1)) {
if (BgIkanaShutter_AllSwitchesPressed(this, globalCtx)) {
func_80BD599C(this);
@@ -213,5 +211,5 @@ void BgIkanaShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIkanaShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000CE8);
+ Gfx_DrawDListOpa(globalCtx, object_ikana_obj_DL_000CE8);
}
diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
index f4dca549b3..2145a3a27e 100644
--- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
+++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_iknin_susceil.h"
+#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS 0x00000030
@@ -26,10 +27,6 @@ void func_80C0AD44(BgIkninSusceil* this);
void func_80C0AD64(BgIkninSusceil* this, GlobalContext* globalCtx);
void func_80C0AE5C(BgIkninSusceil* this, GlobalContext* globalCtx);
-extern CollisionHeader D_0600CBAC;
-extern AnimatedMaterial D_0600C670;
-extern Gfx D_0600C308[];
-
const ActorInit Bg_Iknin_Susceil_InitVars = {
ACTOR_BG_IKNIN_SUSCEIL,
ACTORCAT_BG,
@@ -116,8 +113,8 @@ void BgIkninSusceil_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600CBAC);
- this->animatedTexture = Lib_SegmentedToVirtual(&D_0600C670);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikninside_obj_Colheader_00CBAC);
+ this->animatedTexture = Lib_SegmentedToVirtual(object_ikninside_obj_Matanimheader_00C670);
func_80C0AC74(this);
}
@@ -260,5 +257,5 @@ void BgIkninSusceil_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkninSusceil* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTexture);
- Gfx_DrawDListOpa(globalCtx, D_0600C308);
+ Gfx_DrawDListOpa(globalCtx, object_ikninside_obj_DL_00C308);
}
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
index 53a0b5ea29..515be1029d 100644
--- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_iknv_obj.h"
+#include "objects/object_iknv_obj/object_iknv_obj.h"
#define FLAGS 0x00000010
@@ -20,12 +21,6 @@ void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, GlobalContext* globalCtx);
-extern CollisionHeader D_060119D4;
-extern CollisionHeader D_06012CA4;
-extern Gfx D_06011880[];
-extern Gfx D_060129C8[];
-extern Gfx D_06013058[];
-
const ActorInit Bg_Iknv_Obj_InitVars = {
ACTOR_BG_IKNV_OBJ,
ACTORCAT_BG,
@@ -67,24 +62,24 @@ void BgIknvObj_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc = BgIknvObj_DoNothing;
switch (IKNV_OBJ_TYPE(this)) {
case IKNV_OBJ_WATERWHEEL:
- this->displayListPtr = D_06013058;
+ this->displayListPtr = object_iknv_obj_DL_013058;
this->actionFunc = BgIknvObj_UpdateWaterwheel;
this->dyna.actor.flags |= 0x100000;
this->dyna.actor.flags |= 0x10;
break;
case IKNV_OBJ_RAISED_DOOR:
- this->displayListPtr = D_06011880;
+ this->displayListPtr = object_iknv_obj_DL_011880;
DynaPolyActor_Init(&this->dyna, 0);
- CollisionHeader_GetVirtual(&D_060119D4, &colHeader);
+ CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_0119D4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
this->actionFunc = BgIknvObj_UpdateRaisedDoor;
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 120.0f;
break;
case IKNV_OBJ_SAKON_DOOR:
- this->displayListPtr = D_060129C8;
+ this->displayListPtr = object_iknv_obj_DL_0129C8;
this->actionFunc = BgIknvObj_UpdateSakonDoor;
DynaPolyActor_Init(&this->dyna, 0);
- CollisionHeader_GetVirtual(&D_06012CA4, &colHeader);
+ CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_012CA4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
index 61e6845631..620d55d38a 100644
--- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_inibs_movebg.h"
+#include "objects/object_inibs_object/object_inibs_object.h"
#define FLAGS 0x00000030
@@ -26,15 +27,9 @@ const ActorInit Bg_Inibs_Movebg_InitVars = {
(ActorFunc)BgInibsMovebg_Draw,
};
-extern Gfx D_06001C10[];
-extern Gfx D_06001DC0[];
-extern AnimatedMaterial D_06002598;
-extern Gfx D_06006140[];
-extern Gfx D_060062D8[];
-extern AnimatedMaterial D_06006858;
-Gfx* D_80B96560[] = { D_060062D8, D_06001DC0 };
-Gfx* D_80B96568[] = { D_06006140, D_06001C10 };
-AnimatedMaterial* D_80B96570[] = { &D_06006858, &D_06002598 };
+Gfx* D_80B96560[] = { object_inibs_object_DL_0062D8, object_inibs_object_DL_001DC0 };
+Gfx* D_80B96568[] = { object_inibs_object_DL_006140, object_inibs_object_DL_001C10 };
+AnimatedMaterial* D_80B96570[] = { object_inibs_object_Matanimheader_006858, object_inibs_object_Matanimheader_002598 };
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
index 3d47988b99..28cea492c6 100644
--- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_keikoku_spr.h"
+#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000
@@ -34,13 +35,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP),
};
-extern Gfx D_06000100[];
-extern AnimatedMaterial D_060001F8;
-extern Gfx D_06000300[];
-extern AnimatedMaterial D_060003F8;
-extern Gfx D_06000500[];
-extern AnimatedMaterial D_060005F8;
-
void BgKeikokuSpr_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
}
@@ -56,13 +50,13 @@ void BgKeikokuSpr_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060001F8));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0001F8));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06000100);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060003F8));
- gSPDisplayList(POLY_XLU_DISP++, D_06000300);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060005F8));
- gSPDisplayList(POLY_XLU_DISP++, D_06000500);
+ gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000100);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0003F8));
+ gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000300);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0005F8));
+ gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000500);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
index d526c458ba..4c832a7758 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_kin2_fence.h"
+#include "objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS 0x00000010
@@ -118,9 +119,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern Gfx D_06000828[];
-extern CollisionHeader D_06000908;
-
s32 BgKin2Fence_CheckHitMask(BgKin2Fence* this) {
ColliderJntSphElement* elements = this->collider.elements;
@@ -159,7 +157,7 @@ void BgKin2Fence_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000908);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_kin2_obj_Colheader_000908);
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderElements);
Matrix_SetStateRotationAndTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
@@ -272,5 +270,5 @@ void BgKin2Fence_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgKin2Fence_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000828);
+ Gfx_DrawDListOpa(globalCtx, object_kin2_obj_DL_000828);
}
diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
index 070d8776b2..6fec6820a4 100644
--- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
+++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ladder.h"
+#include "objects/object_ladder/object_ladder.h"
#define FLAGS 0x00000010
@@ -19,16 +20,6 @@ void BgLadder_ActionStartCutscene(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionFadeIn(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionIdle(BgLadder* this, GlobalContext* globalCtx);
-extern Gfx D_060000A0[];
-extern Gfx D_060002D0[];
-extern Gfx D_06000500[];
-extern Gfx D_06000730[];
-
-extern CollisionHeader D_060001D8;
-extern CollisionHeader D_06000408;
-extern CollisionHeader D_06000638;
-extern CollisionHeader D_06000868;
-
const ActorInit Bg_Ladder_InitVars = {
ACTOR_BG_LADDER,
ACTORCAT_PROP,
@@ -46,10 +37,10 @@ static InitChainEntry sInitChain[] = {
};
static Gfx* sLadderDLists[] = {
- D_060000A0, // 12 Rung
- D_060002D0, // 16 Rung
- D_06000500, // 20 Rung
- D_06000730, // 24 Rung
+ object_ladder_DL_0000A0, // 12 Rung
+ object_ladder_DL_0002D0, // 16 Rung
+ object_ladder_DL_000500, // 20 Rung
+ object_ladder_DL_000730, // 24 Rung
};
void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -65,13 +56,13 @@ void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
size = thisx->params;
if (size == LADDER_SIZE_12RUNG) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060001D8);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_0001D8);
} else if (size == LADDER_SIZE_16RUNG) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000408);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000408);
} else if (size == LADDER_SIZE_20RUNG) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000638);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000638);
} else if (size == LADDER_SIZE_24RUNG) {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000868);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000868);
} else {
Actor_MarkForDeath(&this->dyna.actor);
return;
diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
index 11132cf64e..b0ad9d32eb 100644
--- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
+++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_lbfshot.h"
+#include "objects/object_lbfshot/object_lbfshot.h"
#define FLAGS 0x00000000
@@ -30,16 +31,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_060014D8;
-extern Gfx D_06000228[];
-
void BgLbfshot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
this->dyna.actor.uncullZoneForward = 4000.0f;
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060014D8);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lbfshot_Colheader_0014D8);
}
void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
@@ -47,5 +45,5 @@ void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void BgLbfshot_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000228);
+ Gfx_DrawDListOpa(globalCtx, object_lbfshot_DL_000228);
}
diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
index e8a2d0b4cc..7c1a086a26 100644
--- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_lotus.h"
+#include "objects/object_lotus/object_lotus.h"
#define FLAGS 0x00000000
@@ -35,9 +36,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_06000A20; // Lilypad collision
-extern Gfx D_06000040[]; // Lilypad model
-
void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLotus* this = THIS;
s32 pad;
@@ -45,7 +43,7 @@ void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000A20);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lotus_Colheader_000A20);
this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96;
@@ -173,5 +171,5 @@ void BgLotus_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgLotus_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000040);
+ Gfx_DrawDListOpa(globalCtx, object_lotus_DL_000040);
}
diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
index e9a365c91d..db363498c0 100644
--- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
+++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_market_step.h"
+#include "objects/object_market_obj/object_market_obj.h"
#define FLAGS 0x10000020
@@ -26,12 +27,8 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
-extern Gfx D_0601F050[];
-extern Gfx D_06018DA0[];
-extern Gfx D_0601EF10[];
-extern Gfx D_06018C60[];
-Gfx* D_80AF0120[] = { D_0601F050, D_06018DA0 };
-Gfx* D_80AF0128[] = { D_0601EF10, D_06018C60 };
+Gfx* D_80AF0120[] = { object_market_obj_DL_01F050, object_market_obj_DL_018DA0 };
+Gfx* D_80AF0128[] = { object_market_obj_DL_01EF10, object_market_obj_DL_018C60 };
void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMarketStep* this = THIS;
diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
index 8a31c536bc..e5e300757e 100644
--- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
+++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_mbar_chair.h"
+#include "objects/object_mbar_obj/object_mbar_obj.h"
#define FLAGS 0x00000000
@@ -34,15 +35,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_060019B4;
-extern Gfx D_06000288[];
-
void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMbarChair* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060019B4);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_mbar_obj_Colheader_0019B4);
}
void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@@ -55,5 +53,5 @@ void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000288);
+ Gfx_DrawDListOpa(globalCtx, object_mbar_obj_DL_000288);
}
diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
index 38ce543ccf..1e2f021124 100644
--- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
+++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_tobira01.h"
+#include "objects/object_spot11_obj/object_spot11_obj.h"
#define FLAGS 0x00000030
@@ -27,9 +28,6 @@ const ActorInit Bg_Tobira01_InitVars = {
(ActorFunc)BgTobira01_Draw,
};
-extern Gfx D_06000088[];
-extern CollisionHeader D_060011C0;
-
void BgTobira01_Open(BgTobira01* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 cutsceneId = this->dyna.actor.cutscene;
@@ -80,7 +78,7 @@ void BgTobira01_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060011C0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_spot11_obj_Colheader_0011C0);
gSaveContext.weekEventReg[88] &= (u8)~0x40;
Actor_SetScale(&this->dyna.actor, 1.0f);
this->timer2 = gSaveContext.isNight;
@@ -107,7 +105,7 @@ void BgTobira01_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000088);
+ gSPDisplayList(POLY_OPA_DISP++, object_spot11_obj_DL_000088);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
index f60141c5d8..245095bc07 100644
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c
+++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
@@ -7,6 +7,8 @@
#include "z_boss_02.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
+#include "objects/object_boss02/object_boss02.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@@ -29,36 +31,6 @@ void func_809DD2F8(GlobalContext* globalCtx);
void func_809DD934(Boss02* this, GlobalContext* globalCtx);
void func_809DEAC4(Boss02* this, GlobalContext* globalCtx);
-extern Gfx D_06000230[];
-extern Gfx D_060002E0[];
-extern UNK_TYPE D_060003A0;
-extern UNK_TYPE D_060041A0;
-extern UNK_TYPE D_06008650;
-extern SkeletonHeader D_06009B10;
-extern AnimationHeader D_06009C78;
-extern Gfx D_0600ECF0[];
-extern Gfx D_0600EF90[];
-extern Gfx D_0600F310[];
-extern Gfx D_0600F690[];
-extern Gfx D_0600FA10[];
-extern Gfx D_0600FD90[];
-extern Gfx D_06010110[];
-extern Gfx D_06010490[];
-extern Gfx D_06010810[];
-extern Gfx D_06010B90[];
-extern Gfx D_06010F10[];
-extern Gfx D_06011290[];
-extern Gfx D_06011610[];
-extern Gfx D_06011990[];
-extern Gfx D_06011D10[];
-extern Gfx D_06012090[];
-extern Gfx D_06012410[];
-extern Gfx D_06012790[];
-extern Gfx D_06012B10[];
-extern Gfx D_06012E90[];
-extern Gfx D_06013210[];
-extern Gfx D_06013590[];
-
static u8 D_809E0420;
static u8 D_809E0421;
static u8 D_809E0422;
@@ -624,7 +596,8 @@ void Boss02_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_HEAVY;
this->actor.colChkInfo.health = 20;
Actor_SetScale(&this->actor, 0.01f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06009B10, &D_06009C78, this->jointTable, this->morphTable, 13);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_boss02_Skel_009B10, &object_boss02_Anim_009C78,
+ this->jointTable, this->morphTable, 13);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere1, &this->actor, &sJntSphInit1,
this->colliderSphere1Elements);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere2, &this->actor, &sJntSphInit2,
@@ -663,7 +636,7 @@ void func_809DAA98(Boss02* this, GlobalContext* globalCtx) {
void func_809DAAA8(Boss02* this, GlobalContext* globalCtx) {
this->actionFunc = func_809DAB78;
- Animation_MorphToLoop(&this->skelAnime, &D_06009C78, 0.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_boss02_Anim_009C78, 0.0f);
if (D_809E042C->unk_1D20 != 0) {
this->unk_0144 = 10;
} else {
@@ -1351,9 +1324,12 @@ void func_809DC78C(Actor* thisx, GlobalContext* globalCtx) {
// matrix stuff at the start?
void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
static Gfx* D_809DFA9C[] = {
- D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
- D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
- D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
+ object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
+ object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
+ object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
+ object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
+ object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
+ object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
Boss02* this = THIS;
@@ -1378,9 +1354,9 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
func_8012C28C(globalCtx->state.gfxCtx);
if (this->actor.params == 0) {
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060003A0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0003A0));
} else {
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060041A0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0041A0));
}
gSPSegment(POLY_OPA_DISP++, 0x0D, matrix);
@@ -1490,9 +1466,12 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
#else
static Gfx* D_809DFA9C[] = {
- D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
- D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
- D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
+ object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
+ object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
+ object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
+ object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
+ object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
+ object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_02/Boss02_Draw.s")
@@ -1562,7 +1541,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 1) {
if (!flag) {
- gSPDisplayList(POLY_XLU_DISP++, D_06000230);
+ gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 185, 140, 70, 128);
flag++;
}
@@ -1583,7 +1562,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
+ gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@@ -1604,7 +1583,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_0401A620);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_01A620);
}
}
@@ -1612,7 +1591,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 4) {
if (!flag) { //! @bug - dev forgot to set flag to 1, should only apply to first entry?
- gSPDisplayList(POLY_XLU_DISP++, D_04023348);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023348);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
}
@@ -1624,7 +1603,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_04023428);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
@@ -1632,7 +1611,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 2) {
if (!flag) {
- gSPDisplayList(POLY_XLU_DISP++, D_06000230);
+ gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 30, 30, 30, 128);
flag++;
}
@@ -1648,7 +1627,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
+ gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@@ -2178,7 +2157,7 @@ void func_809DEAC4(Boss02* this, GlobalContext* globalCtx) {
if (this->unk_1D1C == (u32)(KREG(92) + 125)) {
TitleCard_InitBossName(&globalCtx->state, &globalCtx->actorCtx.titleCtxt,
- Lib_SegmentedToVirtual(&D_06008650), 160, 180, 128, 40);
+ Lib_SegmentedToVirtual(object_boss02_Tex_008650), 160, 180, 128, 40);
}
if (this->unk_1D1C == (u32)(BREG(27) + 335)) {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 7c84fc13c1..c85a48eb86 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -5,6 +5,8 @@
*/
#include "z_demo_kankyo.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_bubble/object_bubble.h"
#define FLAGS 0x00000030
@@ -17,10 +19,6 @@ void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx);
void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx);
-extern Gfx D_0407AB58[];
-extern Gfx D_06001000[]; // the bubble display list used by shabom in giants type
-extern Gfx D_04023428[];
-
static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at once
static s16 sLostWoodsSkyFishParticleNum = 0;
@@ -525,8 +523,8 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(&D_04079B10));
- gSPDisplayList(POLY_XLU_DISP++, D_0407AB10);
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_079B10));
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
@@ -593,7 +591,7 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0407AB58);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB58);
}
}
@@ -657,7 +655,7 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
break;
}
- gSPDisplayList(POLY_XLU_DISP++, &D_04023348);
+ gSPDisplayList(POLY_XLU_DISP++, &gameplay_keep_DL_023348);
Matrix_InsertMatrix(&globalCtx->billboardMtxF, MTXMODE_APPLY);
@@ -667,9 +665,9 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == DEMO_KANKYO_TYPE_GIANTS) {
- gSPDisplayList(POLY_XLU_DISP++, D_06001000);
+ gSPDisplayList(POLY_XLU_DISP++, object_bubble_DL_001000);
} else {
- gSPDisplayList(POLY_XLU_DISP++, D_04023428);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
}
diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
index efb716667e..290f5a7970 100644
--- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
+++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
@@ -5,6 +5,7 @@
*/
#include "z_dm_char07.h"
+#include "objects/object_milkbar/object_milkbar.h"
#define FLAGS 0x00000030
@@ -29,24 +30,6 @@ const ActorInit Dm_Char07_InitVars = {
(ActorFunc)DmChar07_Draw,
};
-extern Gfx D_06000100[];
-extern Gfx D_06000240[];
-extern Gfx D_06000650[];
-extern Gfx D_06000790[];
-extern Gfx D_06000B80[];
-extern Gfx D_06000CC0[];
-extern Gfx D_060010D0[];
-extern Gfx D_06001210[];
-extern Gfx D_060015E0[];
-extern Gfx D_060016B8[];
-extern Gfx D_06002BA0[];
-extern Gfx D_06002CD0[];
-extern CollisionHeader D_06006688;
-extern Gfx D_060076A0[];
-extern Gfx D_06007918[];
-extern AnimatedMaterial D_060105F8;
-extern Gfx D_06010D68[];
-
void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@@ -62,7 +45,7 @@ void DmChar07_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
this->isStage = 1;
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06006688);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_milkbar_Colheader_006688);
} else {
Actor_SetScale(&this->dyna.actor, 1.0f);
}
@@ -96,36 +79,36 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
- gSPDisplayList(POLY_OPA_DISP++, D_06002CD0);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_002CD0);
break;
case DMCHAR07_CREDITS_STAGE:
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060105F8));
- gSPDisplayList(POLY_OPA_DISP++, D_06007918);
- gSPDisplayList(POLY_OPA_DISP++, D_06000240);
- gSPDisplayList(POLY_OPA_DISP++, D_06000790);
- gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
- gSPDisplayList(POLY_OPA_DISP++, D_06001210);
- gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_milkbar_Matanimheader_0105F8));
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_007918);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000240);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000790);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06001210);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
}
break;
case DMCHAR07_DISHES:
- gSPDisplayList(POLY_OPA_DISP++, D_06010D68);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_010D68);
break;
}
@@ -133,31 +116,31 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
- gSPDisplayList(POLY_XLU_DISP++, D_06002BA0);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_002BA0);
break;
case DMCHAR07_CREDITS_STAGE:
- gSPDisplayList(POLY_XLU_DISP++, D_060076A0);
- gSPDisplayList(POLY_XLU_DISP++, D_06000100);
- gSPDisplayList(POLY_XLU_DISP++, D_06000650);
- gSPDisplayList(POLY_XLU_DISP++, D_06000B80);
- gSPDisplayList(POLY_XLU_DISP++, D_060010D0);
- gSPDisplayList(POLY_XLU_DISP++, D_060015E0);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0076A0);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000100);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000650);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000B80);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0010D0);
+ gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0015E0);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000100);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000100);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000650);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000650);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000B80);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000B80);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_060010D0);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0010D0);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
- gSPDisplayList(POLY_OPA_DISP++, D_060015E0);
+ gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0015E0);
}
break;
case DMCHAR07_DISHES:
diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
index 0e9b87191e..871cc0cf29 100644
--- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
+++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
@@ -5,6 +5,7 @@
*/
#include "z_dm_nb.h"
+#include "objects/object_nb/object_nb.h"
#define FLAGS 0x00000009
@@ -27,10 +28,7 @@ const ActorInit Dm_Nb_InitVars = {
(ActorFunc)DmNb_Draw,
};
-extern AnimationHeader D_06000990;
-extern FlexSkeletonHeader D_06008C40;
-
-static ActorAnimationEntryS D_80C1E200[] = { &D_06000990, 1.0f, 0, -1, 0, 0 };
+static ActorAnimationEntryS D_80C1E200[] = { &object_nb_Anim_000990, 1.0f, 0, -1, 0, 0 };
s32 func_80C1DED0(DmNb* this, s32 arg1) {
s32 ret = 0;
@@ -72,7 +70,8 @@ void DmNb_Init(Actor* thisx, GlobalContext* globalCtx) {
DmNb* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008C40, NULL, this->jointTable, this->morphTable, 8);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_nb_Skel_008C40, NULL, this->jointTable, this->morphTable,
+ 8);
this->unk1F0 = -1;
func_80C1DED0(this, 0);
this->actor.flags &= ~1;
diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
index 16c5599836..53e0fec63b 100644
--- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
+++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
@@ -5,6 +5,7 @@
*/
#include "z_dm_sa.h"
+#include "objects/object_stk/object_stk.h"
#define FLAGS 0x00000030
@@ -29,10 +30,7 @@ const ActorInit Dm_Sa_InitVars = {
(ActorFunc)DmSa_Draw,
};
-extern FlexSkeletonHeader D_06013328;
-extern AnimationHeader D_0600CC94;
-
-static ActorAnimationEntry D_80A2ED00[] = { { &D_0600CC94, 1.0f, 0, -1.0f, 0, 0 } };
+static ActorAnimationEntry D_80A2ED00[] = { { &object_stk_Anim_00CC94, 1.0f, 0, -1.0f, 0, 0 } };
void func_80A2E960(SkelAnime* arg0, ActorAnimationEntry* animations, u16 index) {
f32 frameCount;
@@ -54,7 +52,7 @@ void DmSa_Init(Actor* thisx, GlobalContext* globalCtx) {
this->alpha = 0xFF;
this->actor.targetArrowOffset = 3000.0f;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A2E960(&this->skelAnime, D_80A2ED00, 0);
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = DmSa_DoNothing;
diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
index edfa0567da..d4ca48e11d 100644
--- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
+++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
@@ -5,6 +5,7 @@
*/
#include "z_dm_statue.h"
+#include "objects/object_smtower/object_smtower.h"
#define FLAGS 0x04000030
@@ -27,9 +28,6 @@ const ActorInit Dm_Statue_InitVars = {
(ActorFunc)DmStatue_Draw,
};
-extern AnimatedMaterial D_06001788;
-extern Gfx D_06000520[];
-
void DmStatue_Init(Actor* thisx, GlobalContext* globalCtx) {
DmStatue* this = THIS;
@@ -43,6 +41,6 @@ void DmStatue_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DmStatue_Draw(Actor* thisx, GlobalContext* globalCtx) {
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06001788));
- Gfx_DrawDListXlu(globalCtx, D_06000520);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_smtower_Matanimheader_001788));
+ Gfx_DrawDListXlu(globalCtx, object_smtower_DL_000520);
}
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
index 99a46c1e25..88a2c4b3e4 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
@@ -5,6 +5,9 @@
*/
#include "z_dm_stk.h"
+#include "objects/object_stk/object_stk.h"
+#include "objects/object_stk2/object_stk2.h"
+#include "objects/object_stk3/object_stk3.h"
#define FLAGS 0x02000030
@@ -30,96 +33,6 @@ void func_80AA1C64(DmStk* this, GlobalContext* globalCtx);
void func_80AA2720(DmStk* this, GlobalContext* globalCtx);
void func_80AA27EC(DmStk* this, GlobalContext* globalCtx);
-extern AnimationHeader D_0600055C;
-extern AnimationHeader D_06001030;
-extern AnimationHeader D_0600130C;
-extern AnimationHeader D_06001374;
-extern AnimationHeader D_06001EDC;
-extern AnimationHeader D_06002774;
-extern AnimationHeader D_06002CD8;
-extern AnimationHeader D_06003068;
-extern AnimationHeader D_060035C8;
-extern AnimationHeader D_060039F0;
-extern AnimationHeader D_06004554;
-extern AnimationHeader D_06004580;
-extern Gfx D_060046B0[];
-extern AnimationHeader D_060049C8;
-extern AnimationHeader D_060051C0;
-extern Gfx D_060053C0[];
-extern Gfx D_06005870[];
-extern AnimationHeader D_06005F44;
-extern Gfx D_06006BB0[];
-extern AnimationHeader D_060070DC;
-extern Gfx D_06007840[];
-extern Gfx D_060079F0[];
-extern Gfx D_060084C0[];
-extern UNK_TYPE D_06008658;
-extern Gfx D_060087B0[];
-extern Gfx D_06008A80[];
-extern Gfx D_060090C0[];
-extern Gfx D_06009710[];
-extern Gfx D_06009AC0[];
-extern Gfx D_06009DA0[];
-extern Gfx D_0600A530[];
-extern Gfx D_0600A5C0[];
-extern Gfx D_0600AE30[];
-extern Gfx D_0600AEC0[];
-extern AnimationHeader D_0600BB2C;
-extern AnimationHeader D_0600C270;
-extern AnimationHeader D_0600C964;
-extern Gfx D_0600CAD0[];
-extern AnimationHeader D_0600CBB8;
-extern AnimationHeader D_0600D830;
-extern AnimationHeader D_0600E6EC;
-extern AnimationHeader D_0600EEC0;
-extern AnimationHeader D_060101A4;
-extern AnimationHeader D_06010B60;
-extern AnimationHeader D_060110B4;
-extern AnimationHeader D_06011FB0;
-extern AnimationHeader D_06012A58;
-extern FlexSkeletonHeader D_06013328;
-extern AnimationHeader D_060141E4;
-extern AnimationHeader D_06014920;
-extern AnimationHeader D_06015028;
-extern AnimationHeader D_06015C14;
-extern AnimationHeader D_06016508;
-extern Gfx D_06016620[];
-extern AnimationHeader D_06016910;
-extern AnimationHeader D_06018ED0;
-extern AnimationHeader D_0601AA80;
-extern AnimationHeader D_0601C114;
-extern AnimationHeader D_0601C21C;
-extern AnimationHeader D_0601D008;
-extern AnimationHeader D_0601D07C;
-extern AnimationHeader D_0601D3D0;
-extern AnimationHeader D_0601DDE0;
-extern AnimationHeader D_0601EF50;
-extern AnimationHeader D_0601F9E4;
-extern AnimationHeader D_06020CAC;
-extern AnimationHeader D_0602200C;
-extern AnimationHeader D_0602336C;
-extern AnimationHeader D_060259F4;
-extern AnimationHeader D_060266C8;
-extern AnimationHeader D_06026CF4;
-extern AnimationHeader D_06027CF4;
-extern AnimationHeader D_06028F28;
-extern AnimationHeader D_06029A04;
-extern AnimationHeader D_0602A2D8;
-extern AnimationHeader D_0602AD54;
-extern AnimationHeader D_0602DC64;
-extern AnimationHeader D_0602E9A0;
-extern AnimationHeader D_0602FA70;
-extern AnimationHeader D_0603021C;
-extern AnimationHeader D_06031210;
-extern AnimationHeader D_060322FC;
-extern AnimationHeader D_06032AE0;
-extern AnimationHeader D_0603323C;
-extern AnimationHeader D_06034FD8;
-extern AnimationHeader D_06036964;
-extern AnimationHeader D_06037B94;
-extern AnimationHeader D_0603967C;
-extern AnimationHeader D_0603A8F8;
-
const ActorInit Dm_Stk_InitVars = {
ACTOR_DM_STK,
ACTORCAT_ITEMACTION,
@@ -190,42 +103,42 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_0601C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0601D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0600D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0600055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0600C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0601AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0601DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
- { &D_06004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0602200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0602A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
- { &D_06029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0602AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
- { &D_0600BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0600E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0603323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_060322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_0603021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
- { &D_06016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
- { &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
- { &D_06001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk_Anim_01C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_01D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk_Anim_001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_00D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_00055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_00C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_01AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_01DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
+ { &object_stk2_Anim_004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_02200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk_Anim_002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_02A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
+ { &object_stk2_Anim_029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_02AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
+ { &object_stk_Anim_00BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_00C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_00E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_03323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_0322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_03021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
+ { &object_stk_Anim_016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk_Anim_014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
+ { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk2_Anim_034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk3_Anim_002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk3_Anim_004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
+ { &object_stk3_Anim_001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
};
void func_80A9FDB0(DmStk* this, GlobalContext* globalCtx) {
@@ -965,7 +878,7 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.targetArrowOffset = 1100.0f;
this->unk_334 = 99;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
}
@@ -1680,11 +1593,11 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((this->unk_2E0 == 69) || (this->unk_2E0 == 11) || (this->unk_2E0 == 71)) {
- gSPDisplayList(POLY_OPA_DISP++, D_0600AEC0);
- gSPDisplayList(POLY_OPA_DISP++, D_0600AE30);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AEC0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AE30);
} else {
- gSPDisplayList(POLY_OPA_DISP++, D_0600A5C0);
- gSPDisplayList(POLY_OPA_DISP++, D_0600A530);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A5C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A530);
}
switch (this->unk_32C) {
@@ -1699,16 +1612,16 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}
POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, this->unk_2E8, this->unk_2EC, this->unk_2F0,
this->unk_2F4, this->unk_2F8, this->unk_2FC);
- gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
} else {
- gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
}
break;
case 2:
- gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
- gSPDisplayList(POLY_OPA_DISP++, D_06005870);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_005870);
if (func_800EE29C(globalCtx, 0x201) &&
(globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x201)]->unk0 == 2) && (this->unk_337 >= 0)) {
@@ -1718,8 +1631,8 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_337].segment);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06008658));
- Gfx_DrawDListOpa(globalCtx, D_06007840);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_stk2_Matanimheader_008658));
+ Gfx_DrawDListOpa(globalCtx, object_stk2_DL_007840);
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_336].segment);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_336].segment);
@@ -1742,20 +1655,20 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
switch (this->unk_32D) {
case 0:
- gSPDisplayList(POLY_OPA_DISP++, D_06009AC0);
- gSPDisplayList(POLY_OPA_DISP++, D_060046B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009AC0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0046B0);
break;
case 1:
- gSPDisplayList(POLY_OPA_DISP++, D_06009710);
- gSPDisplayList(POLY_OPA_DISP++, D_060053C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009710);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0053C0);
break;
case 3:
- gSPDisplayList(POLY_OPA_DISP++, D_06009DA0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009DA0);
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1)) {
- gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
break;
@@ -1766,7 +1679,7 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
break;
}
@@ -1783,33 +1696,33 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
break;
case 1:
- gSPDisplayList(POLY_OPA_DISP++, D_060084C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0084C0);
break;
case 2:
- gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
- gSPDisplayList(POLY_OPA_DISP++, D_060079F0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0079F0);
break;
case 3:
if ((globalCtx->sceneNum != SCENE_LOST_WOODS) || (gSaveContext.sceneSetupIndex != 1)) {
- gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
- gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 4:
- gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 6:
- gSPDisplayList(POLY_OPA_DISP++, D_06008A80);
- gSPDisplayList(POLY_OPA_DISP++, D_06016620);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_008A80);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_016620);
break;
case 9:
if (this->unk_2E4 == 255) {
- gSPDisplayList(POLY_OPA_DISP++, D_060087B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0087B0);
}
break;
}
@@ -1829,7 +1742,7 @@ void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->unk_33B != 0) {
if (this->actor.params == 1) {
- Gfx_DrawDListOpa(globalCtx, D_06006BB0);
+ Gfx_DrawDListOpa(globalCtx, object_stk_DL_006BB0);
return;
}
diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
index 167dbfe69d..05b79fb63f 100644
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
@@ -5,6 +5,7 @@
*/
#include "z_door_ana.h"
+#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#define FLAGS 0x02000000
@@ -208,5 +209,5 @@ void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListXlu(globalCtx, D_05000C40);
+ Gfx_DrawDListXlu(globalCtx, gameplay_field_keep_DL_000C40);
}
diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
index dc121bfc9d..27d8bd2118 100644
--- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
+++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
@@ -5,6 +5,12 @@
*/
#include "z_door_spiral.h"
+#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
+#include "objects/object_numa_obj/object_numa_obj.h"
+#include "objects/object_hakugin_obj/object_hakugin_obj.h"
+#include "objects/object_ikana_obj/object_ikana_obj.h"
+#include "objects/object_ikninside_obj/object_ikninside_obj.h"
+#include "objects/object_danpei_object/object_danpei_object.h"
#define FLAGS 0x00000010
@@ -77,29 +83,16 @@ const ActorInit Door_Spiral_InitVars = {
(ActorFunc)DoorSpiral_Draw,
};
-extern Gfx D_06000590[];
-extern Gfx D_060007A8[];
-extern Gfx D_06000EA0[];
-extern Gfx D_060012C0[];
-extern Gfx D_060014C8[];
-extern Gfx D_06002110[];
-extern Gfx D_06004448[];
-extern Gfx D_060051B8[];
-extern Gfx D_06006128[];
-extern Gfx D_06009278[];
-extern Gfx D_06012B70[];
-extern Gfx D_06013EA8[];
-
// Parameters for each staircase, indexed with SpiralType
static SpiralInfo sSpiralInfo[] = {
- { { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
- { { D_050219E0, D_0501D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
- { { D_06004448, D_060007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
- { { D_060051B8, D_060014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
- { { D_06009278, D_06006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
- { { D_06013EA8, D_06012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
- { { D_06000EA0, D_06000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
- { { D_06002110, D_060012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
+ { { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
+ { { gameplay_dangeon_keep_DL_0219E0, gameplay_dangeon_keep_DL_01D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
+ { { object_numa_obj_DL_004448, object_numa_obj_DL_0007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
+ { { object_numa_obj_DL_0051B8, object_numa_obj_DL_0014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
+ { { object_hakugin_obj_DL_009278, object_hakugin_obj_DL_006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
+ { { object_ikana_obj_DL_013EA8, object_ikana_obj_DL_012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
+ { { object_ikninside_obj_DL_000EA0, object_ikninside_obj_DL_000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
+ { { object_danpei_object_DL_002110, object_danpei_object_DL_0012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
};
// Defines which object bank a staircase should use, and its index to `sSpiralInfo`
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 6d933ecd95..8444d3d083 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -1035,7 +1035,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + this->unk_1A4,
this->dyna.actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(4.0f, this->unk_1AC, 4.0f, MTXMODE_APPLY);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0044D8));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0044D8));
Gfx_DrawDListXlu(globalCtx, object_warp1_DL_003230);
return;
}
@@ -1054,7 +1054,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
Matrix_Scale(1.0f, this->unk_1A8, 1.0f, MTXMODE_APPLY);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0057D8));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0057D8));
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -1066,7 +1066,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, object_warp1_DL_004690);
gfxCtx = globalCtx->state.gfxCtx;
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_007238));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_007238));
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index 697ea58e8f..7582a378ac 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -5,6 +5,7 @@
*/
#include "z_eff_dust.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#include "system_malloc.h"
#define FLAGS 0x00000030
@@ -295,7 +296,7 @@ void func_80919768(Actor* thisx, GlobalContext* globalCtx2) {
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
- gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}
@@ -351,7 +352,7 @@ void func_809199FC(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
- gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}
diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
index 2a67ff703a..f99c9afb09 100644
--- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
@@ -980,9 +980,9 @@ s32 EnAob01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx) {
EnAob01* this = THIS;
TexturePtr sp38[] = {
- &object_aob_Tex_000658,
- &object_aob_Tex_000E58,
- &object_aob_Tex_001658,
+ object_aob_Tex_000658,
+ object_aob_Tex_000E58,
+ object_aob_Tex_001658,
};
if (limbIndex == 15) {
diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
index fcbd60ed0a..b9ae56f28b 100644
--- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
+++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
@@ -5,6 +5,7 @@
*/
#include "z_en_baisen.h"
+#include "objects/object_bai/object_bai.h"
#define FLAGS 0x00000009
@@ -22,11 +23,6 @@ void func_80BE895C(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE8AAC(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE89D8(EnBaisen* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_06007908;
-extern AnimationHeader D_060011C0;
-extern AnimationHeader D_060008B4;
-extern AnimationHeader D_06008198;
-
const ActorInit En_Baisen_InitVars = {
ACTOR_EN_BAISEN,
ACTORCAT_NPC,
@@ -61,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = {
static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x2AD5, 0x2AD6, 0x2AD7, 0x2AD8, 0x2AC6 };
-static AnimationHeader* D_80BE8E4C[] = { &D_060011C0, &D_060008B4, &D_06008198 };
+static AnimationHeader* D_80BE8E4C[] = { &object_bai_Anim_0011C0, &object_bai_Anim_0008B4, &object_bai_Anim_008198 };
static u8 animModes[] = { 0, 0 };
@@ -69,7 +65,8 @@ void EnBaisen_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBaisen* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->jointTable, this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bai_Skel_007908, &object_bai_Anim_0011C0, this->jointTable,
+ this->morphTable, 20);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->paramCopy = this->actor.params;
if (this->actor.params == 0) {
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
index 56370af5de..06dc70bebc 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
@@ -7,6 +7,7 @@
#include "z_en_bigslime.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_bigslime/object_bigslime.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000235
@@ -3099,7 +3100,7 @@ void EnBigslime_DrawGekko(Actor* thisx, GlobalContext* globalCtx) {
func_800AE5A0(globalCtx);
}
- EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, D_04076BC0, this->gekkoScale * (550.0f / 7.0f),
+ EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, gCircleShadowDL, this->gekkoScale * (550.0f / 7.0f),
this->gekkoScale * (550.0f / 7.0f), 0.0f, 0, 255.0f);
if (this->minislimeState != MINISLIME_INACTIVE_STATE) {
diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
index a337f9df0e..4ebe8cc8f6 100644
--- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
+++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
@@ -5,6 +5,7 @@
*/
#include "z_en_bji_01.h"
+#include "objects/object_bji/object_bji.h"
#define FLAGS 0x00000019
@@ -30,15 +31,6 @@ s32 EnBji01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx);
void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
-extern AnimationHeader D_06000FDC;
-extern AnimationHeader D_06005B58;
-extern AnimationHeader D_06000AB0;
-extern AnimationHeader D_0600066C;
-extern void* D_060049F0[];
-extern void* D_06004E70[];
-extern void* D_06005270[];
-extern FlexSkeletonHeader D_0600578C;
-
const ActorInit En_Bji_01_InitVars = {
ACTOR_EN_BJI_01,
ACTORCAT_NPC,
@@ -73,10 +65,10 @@ static ColliderCylinderInit sCylinderInit = {
/* Animations struct */
static struct_80B8E1A8 D_809CDC7C[] = {
- { &D_06000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
- { &D_06005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
- { &D_06000AB0, 1.0f, 0, 0.0f }, /* Talking */
- { &D_0600066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
+ { &object_bji_Anim_000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
+ { &object_bji_Anim_005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
+ { &object_bji_Anim_000AB0, 1.0f, 0, 0.0f }, /* Talking */
+ { &object_bji_Anim_00066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
};
void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx) {
@@ -339,8 +331,8 @@ void EnBji01_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBji01* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600578C, &D_06000FDC, this->jointTable, this->morphTable,
- BJI_LIMB_MAX);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bji_Skel_00578C, &object_bji_Anim_000FDC, this->jointTable,
+ this->morphTable, BJI_LIMB_MAX);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -442,7 +434,7 @@ void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sEyeTextures[] = { D_060049F0, D_06004E70, D_06005270 };
+ static TexturePtr sEyeTextures[] = { object_bji_Tex_0049F0, object_bji_Tex_004E70, object_bji_Tex_005270 };
EnBji01* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
index 4664f2b9f8..5c0a2bad61 100644
--- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
@@ -1101,13 +1101,12 @@ void EnBomjima_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjima_D_80C00B18, gEnBomjima_D_80C00B18,
};
static TexturePtr D_80C00B3C[] = {
- &object_cs_Tex_00C520,
- &object_cs_Tex_00CD20,
- &object_cs_Tex_00D520,
+ object_cs_Tex_00C520,
+ object_cs_Tex_00CD20,
+ object_cs_Tex_00D520,
};
static TexturePtr D_80C00B48[] = {
- &object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
- &object_cs_Tex_00DD20, &object_cs_Tex_00F220,
+ object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjima* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
index dc776fa59a..a33b555778 100644
--- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
+++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
@@ -897,13 +897,12 @@ void EnBomjimb_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjimb_D_80C03250, gEnBomjimb_D_80C03250,
};
static TexturePtr D_80C03274[] = {
- &object_cs_Tex_00C520,
- &object_cs_Tex_00CD20,
- &object_cs_Tex_00D520,
+ object_cs_Tex_00C520,
+ object_cs_Tex_00CD20,
+ object_cs_Tex_00D520,
};
static TexturePtr D_80C03280[] = {
- &object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
- &object_cs_Tex_00DD20, &object_cs_Tex_00F220,
+ object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjimb* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c
index 92d91f6443..7373fde757 100644
--- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c
+++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c
@@ -5,6 +5,7 @@
*/
#include "z_en_cha.h"
+#include "objects/object_cha/object_cha.h"
#define FLAGS 0x00000000
@@ -49,9 +50,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 10, 40, 0, { 0, 0, 0 } },
};
-extern Gfx D_06000710[];
-extern Gfx D_06000958[];
-
void EnCha_Init(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
s32 pad;
@@ -117,8 +115,8 @@ void EnCha_Update(Actor* thisx, GlobalContext* globalCtx2) {
void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
- Gfx_DrawDListOpa(globalCtx, D_06000710);
+ Gfx_DrawDListOpa(globalCtx, object_cha_DL_000710);
Matrix_InsertTranslation(-1094.0f, 4950.0f, 9.0f, MTXMODE_APPLY);
Matrix_InsertXRotation_s(this->actor.home.rot.x, MTXMODE_APPLY);
- Gfx_DrawDListOpa(globalCtx, D_06000958);
+ Gfx_DrawDListOpa(globalCtx, object_cha_DL_000958);
}
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index d323c98d27..4b7156ad4d 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -5,6 +5,7 @@
*/
#include "z_en_clear_tag.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@@ -81,8 +82,18 @@ static f32 sLightRayMaxScale[] = {
25.0f, 100.0f, 48.0f, 20.0f, 32.0f,
};
-static Gfx* sSplashTex[] = {
- D_040378F0, D_04037DF0, D_040382F0, D_040387F0, D_04038CF0, D_040391F0, D_040396F0, D_04039BF0, NULL, NULL, NULL,
+static TexturePtr sSplashTex[] = {
+ gExplosionSplashTex1,
+ gExplosionSplashTex2,
+ gExplosionSplashTex3,
+ gExplosionSplashTex4,
+ gExplosionSplashTex5,
+ gExplosionSplashTex6,
+ gExplosionSplashTex7,
+ gExplosionSplashTex8,
+ NULL,
+ NULL,
+ NULL,
};
#include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c"
@@ -820,7 +831,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&mtxF);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_04030100);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_030100);
}
}
}
@@ -986,7 +997,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateStateAroundXAxis(effect->rotationX);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0403A0F0);
+ gSPDisplayList(POLY_XLU_DISP++, gExplosionSplashDL);
}
}
}
diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
index 531e0b1229..017c8ae2b0 100644
--- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
+++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
@@ -246,7 +246,7 @@ void func_80AFE4AC(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05E6F0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -268,7 +268,7 @@ void func_80AFE650(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05CEF0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05CEF0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
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 9f997cc1eb..26d1f040d4 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
@@ -61,13 +62,6 @@ static ColliderCylinderInit sCylinderInit = {
Vec3f D_8099D63C = { 0.0f, -1300.0f, 1100.0f };
-extern AnimationHeader D_060001CC; // gCowBodyChewAnim
-extern FlexSkeletonHeader D_06004010; // gCowBodySkel
-extern AnimationHeader D_06004264; // gCowBodyMoveHeadAnim
-extern AnimationHeader D_06004348; // gCowTailIdleAnim
-extern FlexSkeletonHeader D_06004C30; // gCowTailSkel
-extern AnimationHeader D_06004E98; // gCowTailSwishAnim
-
void EnCow_RotatePoint(Vec3f* vec, s16 angle) {
f32 x = (Math_CosS(angle) * vec->x) + (Math_SinS(angle) * vec->z);
@@ -113,9 +107,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (EN_COW_TYPE(thisx)) {
case EN_COW_TYPE_DEFAULT:
case EN_COW_TYPE_ABDUCTED:
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable,
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
- Animation_PlayLoop(&this->skelAnime, &D_060001CC);
+ Animation_PlayLoop(&this->skelAnime, &gCowBodyChewAnim);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[0], &this->actor, &sCylinderInit);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[1], &this->actor, &sCylinderInit);
@@ -141,9 +135,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
func_801A5080(4);
break;
case EN_COW_TYPE_TAIL:
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable,
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
- Animation_PlayLoop(&this->skelAnime, &D_06004348);
+ Animation_PlayLoop(&this->skelAnime, &gCowTailIdleAnim);
this->actor.update = EnCow_UpdateTail;
this->actor.draw = EnCow_DrawTail;
@@ -177,13 +171,13 @@ void EnCow_UpdateAnimation(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = 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) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
- if (this->skelAnime.animation == &D_060001CC) {
+ if (this->skelAnime.animation == &gCowBodyChewAnim) {
this->animationTimer = 0;
}
}
@@ -320,15 +314,15 @@ void EnCow_DoTail(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = 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_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 25000) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
- if (this->skelAnime.animation == &D_06004348) {
+ if (this->skelAnime.animation == &gCowTailIdleAnim) {
this->animationTimer = 0;
}
}
@@ -350,12 +344,12 @@ void EnCow_Update(Actor* thisx, GlobalContext* globalCtx2) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
if (SkelAnime_Update(&this->skelAnime)) {
- if (this->skelAnime.animation == &D_060001CC) {
+ if (this->skelAnime.animation == &gCowBodyChewAnim) {
Actor_PlaySfxAtPos(&this->actor, 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);
}
}
@@ -391,11 +385,11 @@ void EnCow_UpdateTail(Actor* thisx, GlobalContext* globalCtx) {
EnCow* this = THIS;
if (SkelAnime_Update(&this->skelAnime)) {
- 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_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c
index 12266ab411..232f85537f 100644
--- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c
+++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c
@@ -5,6 +5,7 @@
*/
#include "z_en_dai.h"
+#include "objects/object_dai/object_dai.h"
#define FLAGS 0x02000039
@@ -18,24 +19,6 @@ void EnDai_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B3F00C(EnDai* this, GlobalContext* globalCtx);
void func_80B3EF90(EnDai* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060107B0;
-extern AnimationHeader D_06010FB0;
-extern AnimationHeader D_060117B0;
-extern AnimationHeader D_06010FB0;
-extern AnimationHeader D_06011FB0;
-extern AnimationHeader D_060127B0;
-extern AnimationHeader D_060079E4;
-extern AnimationHeader D_06007354;
-extern AnimationHeader D_06000CEC;
-extern AnimationHeader D_060069DC;
-extern AnimationHeader D_0600563C;
-extern AnimationHeader D_06002E58;
-extern AnimationHeader D_06006590;
-extern FlexSkeletonHeader D_060130D0;
-extern Gfx D_06000230[];
-extern Gfx D_060002E8[];
-extern Gfx D_0600C538[];
-
const ActorInit En_Dai_InitVars = {
ACTOR_EN_DAI,
ACTORCAT_NPC,
@@ -87,7 +70,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gDPPipeSync(POLY_XLU_DISP++);
if (!isDisplayListSet) {
- gSPDisplayList(POLY_XLU_DISP++, D_06000230);
+ gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_000230);
isDisplayListSet = true;
}
@@ -108,7 +91,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_060002E8);
+ gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_0002E8);
Matrix_StatePop();
}
@@ -148,9 +131,11 @@ s32 func_80B3E5B4(EnDai* this, GlobalContext* globalCtx) {
s32 func_80B3E5DC(EnDai* this, s32 arg1) {
static ActorAnimationEntryS D_80B3FBFC[] = {
- { &D_060079E4, 1.0f, 0, -1, 0, 0 }, { &D_060079E4, 1.0f, 0, -1, 0, -4 }, { &D_06007354, 1.0f, 0, -1, 2, -4 },
- { &D_06000CEC, 1.0f, 0, -1, 2, -4 }, { &D_060069DC, 1.0f, 0, -1, 2, -4 }, { &D_0600563C, 1.0f, 0, -1, 2, 0 },
- { &D_0600563C, 1.0f, 0, -1, 2, -4 }, { &D_06002E58, 1.0f, 0, -1, 0, -4 }, { &D_06006590, 1.0f, 0, -1, 2, -4 },
+ { &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, 0 }, { &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, -4 },
+ { &object_dai_Anim_007354, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_000CEC, 1.0f, 0, -1, 2, -4 },
+ { &object_dai_Anim_0069DC, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_00563C, 1.0f, 0, -1, 2, 0 },
+ { &object_dai_Anim_00563C, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_002E58, 1.0f, 0, -1, 0, -4 },
+ { &object_dai_Anim_006590, 1.0f, 0, -1, 2, -4 },
};
s32 phi_v1 = false;
@@ -526,7 +511,8 @@ void EnDai_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDai* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060130D0, NULL, this->jointTable, this->morphTable, 19);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dai_Skel_0130D0, NULL, this->jointTable, this->morphTable,
+ 19);
this->unk_A70 = -1;
func_80B3E5DC(this, 0);
Actor_SetScale(&this->actor, 0.2f);
@@ -647,10 +633,10 @@ void EnDai_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
- static AnimationHeader* D_80B3FE58[] = {
- &D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
+ static TexturePtr D_80B3FE58[] = {
+ object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
+ object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
-
s32 pad;
if (globalCtx->actorCtx.unkB != 0) {
@@ -676,7 +662,7 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
+ gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
}
func_80B3E5B4(this, globalCtx);
@@ -685,8 +671,9 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
}
void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
- static AnimationHeader* D_80B3FE70[] = {
- &D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
+ static TexturePtr D_80B3FE70[] = {
+ object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
+ object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
@@ -707,7 +694,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_0600C538);
+ gSPDisplayList(POLY_OPA_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else {
@@ -726,7 +713,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
+ gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 52777aee08..40ea3c72cc 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@@ -5,6 +5,7 @@
*/
#include "z_en_daiku.h"
+#include "objects/object_daiku/object_daiku.h"
#define FLAGS 0x00000009
@@ -20,22 +21,6 @@ void func_80943BC0(EnDaiku* this);
void func_80943BDC(EnDaiku* this, GlobalContext* globalCtx);
void func_809438F8(EnDaiku* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000600;
-extern AnimationHeader D_06000C44;
-extern AnimationHeader D_06001114;
-extern AnimationHeader D_06002FA0;
-extern FlexSkeletonHeader D_0600A850;
-extern AnimationHeader D_0600ACD0;
-extern AnimationHeader D_0600B690;
-extern AnimationHeader D_0600BEAC;
-extern AnimationHeader D_0600C234;
-extern AnimationHeader D_0600C92C;
-extern Gfx D_06006D70[];
-extern Gfx D_06006E80[];
-extern Gfx D_06006FB0[];
-extern Gfx D_060070C0[];
-extern Gfx D_06008EC8[];
-
const ActorInit En_Daiku_InitVars = {
ACTOR_EN_DAIKU,
ACTORCAT_NPC,
@@ -108,18 +93,18 @@ void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_27E = this->unk_278 * 4 + 4;
case ENDAIKU_PARAMS_FF_1:
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable,
- this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
+ this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_2:
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_0600B690, this->jointTable,
- this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_00B690,
+ this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_3:
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06001114, this->jointTable,
- this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_001114,
+ this->jointTable, this->morphTable, 17);
break;
}
@@ -134,8 +119,9 @@ void EnDaiku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_8094373C(EnDaiku* this, s32 arg1) {
static AnimationHeader* D_809440A4[] = {
- &D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234,
- &D_06000600, &D_06001114, &D_0600B690, &D_0600BEAC,
+ &object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C,
+ &object_daiku_Anim_000C44, &object_daiku_Anim_00C234, &object_daiku_Anim_000600,
+ &object_daiku_Anim_001114, &object_daiku_Anim_00B690, &object_daiku_Anim_00BEAC,
};
static u8 D_809440C8[] = {
0, 0, 0, 0, 2, 0, 0, 2, 2,
@@ -309,7 +295,12 @@ s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
}
void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
- static Gfx* D_809440D4[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70 };
+ static Gfx* D_809440D4[] = {
+ object_daiku_DL_0070C0,
+ object_daiku_DL_006FB0,
+ object_daiku_DL_006E80,
+ object_daiku_DL_006D70,
+ };
EnDaiku* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -319,7 +310,7 @@ void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
if ((this->unk_278 == ENDAIKU_PARAMS_FF_3) && (limbIndex == 8)) {
- gSPDisplayList(POLY_OPA_DISP++, D_06008EC8);
+ gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_008EC8);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
index 478ab95f4b..1719951d81 100644
--- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
+++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
@@ -6,6 +6,8 @@
#include "z_en_daiku2.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+#include "objects/object_daiku/object_daiku.h"
+#include "objects/object_bombiwa/object_bombiwa.h"
#define FLAGS 0x00000009
@@ -30,22 +32,6 @@ void func_80BE71D8(EnDaiku2* this, GlobalContext* globalCtx);
void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5);
void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06002134;
-extern AnimationHeader D_06002FA0;
-extern AnimationHeader D_0600ACD0;
-extern AnimationHeader D_0600C92C;
-extern AnimationHeader D_06000C44;
-extern AnimationHeader D_0600C234;
-extern AnimationHeader D_06000600;
-extern AnimationHeader D_06001114;
-extern AnimationHeader D_0600B690;
-extern AnimationHeader D_06001A24;
-extern AnimationHeader D_0600D328;
-extern FlexSkeletonHeader D_0600A850;
-extern Gfx D_06009638[];
-extern Gfx D_0600A390[];
-extern Gfx D_060009E0[];
-
const ActorInit En_Daiku2_InitVars = {
ACTOR_EN_DAIKU2,
ACTORCAT_NPC,
@@ -96,7 +82,8 @@ void EnDaiku2_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
+ this->jointTable, this->morphTable, 17);
this->actor.targetMode = 0;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->unk_278 = ENDAIKU2_GET_7F(&this->actor);
@@ -135,8 +122,9 @@ void EnDaiku2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80BE6408(EnDaiku2* this, s32 arg1) {
static AnimationHeader* sAnimations[] = {
- &D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234, &D_06000600,
- &D_06001114, &D_0600B690, &D_06001A24, &D_06002134, &D_0600D328,
+ &object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C, &object_daiku_Anim_000C44,
+ &object_daiku_Anim_00C234, &object_daiku_Anim_000600, &object_daiku_Anim_001114, &object_daiku_Anim_00B690,
+ &object_daiku_Anim_001A24, &object_daiku_Anim_002134, &object_daiku_Anim_00D328,
};
static u8 D_80BE7958[] = {
0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0,
@@ -274,8 +262,8 @@ void func_80BE66E4(EnDaiku2* this, GlobalContext* globalCtx) {
if ((this->unk_276 == 5) || (this->unk_276 == 9)) {
func_80BE6408(this, 10);
} else if ((this->unk_276 == 10) && (this->unk_284 <= sp9C)) {
- this->unk_284 = Animation_GetLastFrame(&D_06002134);
- Animation_Change(&this->skelAnime, &D_06002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
+ this->unk_284 = Animation_GetLastFrame(&object_daiku_Anim_002134);
+ Animation_Change(&this->skelAnime, &object_daiku_Anim_002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
this->unk_276 = 11;
} else if ((this->unk_276 == 11) && (sp9C <= 0.0f)) {
func_80BE6408(this, 8);
@@ -479,11 +467,11 @@ void EnDaiku2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (limbIndex == 14) {
Matrix_Scale(this->unk_260, this->unk_260, this->unk_260, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06009638);
+ gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_009638);
}
if (limbIndex == 15) {
- gSPDisplayList(POLY_OPA_DISP++, D_0600A390);
+ gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_00A390);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -569,7 +557,7 @@ void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx) {
Matrix_Scale(particle->unk_30, particle->unk_30, particle->unk_30, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060009E0);
+ gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_0009E0);
Matrix_StatePop();
}
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
index d6308cb1aa..1d68634001 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
@@ -6,6 +6,7 @@
#include "z_en_dekunuts.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
+#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000005
@@ -38,20 +39,6 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx);
void func_808BE680(EnDekunuts* this);
void func_808BE6C4(EnDekunuts* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000168;
-extern Gfx D_06001E50[];
-extern Gfx D_06001F50[];
-extern SkeletonHeader D_06002468;
-extern AnimationHeader D_0600259C;
-extern AnimationHeader D_06002A5C;
-extern AnimationHeader D_06002BD4;
-extern AnimationHeader D_06002DD4;
-extern AnimationHeader D_06002FA4;
-extern AnimationHeader D_06003180;
-extern AnimationHeader D_0600326C;
-extern AnimationHeader D_060033E4;
-extern AnimationHeader D_06003780;
-
const ActorInit En_Dekunuts_InitVars = {
ACTOR_EN_DEKUNUTS,
ACTORCAT_ENEMY,
@@ -132,7 +119,8 @@ void EnDekunuts_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, &D_0600326C, this->jointTable, this->morphTable, 10);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, &object_dekunuts_Anim_00326C,
+ this->jointTable, this->morphTable, 10);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
this->unk_194 = ENDEKUNUTS_GET_FF00(&this->actor);
@@ -178,7 +166,7 @@ void func_808BD3B4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD428(EnDekunuts* this) {
- Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06003180, 0.0f);
+ Animation_PlayOnceSetSpeed(&this->skelAnime, &object_dekunuts_Anim_003180, 0.0f);
this->unk_190 = Rand_S16Offset(100, 50);
this->collider.dim.height = 5;
Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos);
@@ -233,7 +221,7 @@ void func_808BD49C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD78C(EnDekunuts* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06002FA4);
+ Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_002FA4);
this->unk_190 = 2;
this->actionFunc = func_808BD7D4;
}
@@ -253,7 +241,7 @@ void func_808BD7D4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD870(EnDekunuts* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
if (this->actionFunc == func_808BDA4C) {
this->unk_190 = 4098;
} else {
@@ -292,7 +280,7 @@ void func_808BD8D8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDA08(EnDekunuts* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06000168);
+ Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168);
this->unk_190 = this->unk_194;
this->actionFunc = func_808BDA4C;
}
@@ -336,7 +324,7 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_THROW);
}
} else if ((this->unk_190 >= 2) && Animation_OnFrame(&this->skelAnime, 12.0f)) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000168, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168, -3.0f);
if (this->unk_190 != 0) {
this->unk_190--;
}
@@ -344,14 +332,14 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDC9C(EnDekunuts* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->unk_190 = 0;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
this->actionFunc = func_808BDD54;
}
void func_808BDCF0(EnDekunuts* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->collider.base.acFlags &= ~AC_ON;
this->unk_190 = 80;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
@@ -379,7 +367,7 @@ void func_808BDD54(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDE7C(EnDekunuts* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06002DD4, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002DD4, -3.0f);
this->collider.dim.height = 37;
this->actor.colChkInfo.mass = 50;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
@@ -399,7 +387,7 @@ void func_808BDEF8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDF60(EnDekunuts* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06003780);
+ Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_003780);
this->unk_190 = 2;
this->unk_18C = 0;
this->collider.base.acFlags |= AC_ON;
@@ -456,7 +444,7 @@ void func_808BDFB8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE1CC(EnDekunuts* this) {
- Animation_PlayLoop(&this->skelAnime, &D_060033E4);
+ Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_0033E4);
this->unk_190 = 3;
this->actor.speedXZ = 0.0f;
if (this->unk_18D != 0) {
@@ -479,7 +467,7 @@ void func_808BE22C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE294(EnDekunuts* this, s32 arg1) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600259C, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_00259C, -3.0f);
if (this->actor.params == ENDEKUNUTS_GET_FF00_0) {
this->actor.speedXZ = 10.0f;
if (arg1 != 0) {
@@ -492,7 +480,7 @@ void func_808BE294(EnDekunuts* this, s32 arg1) {
this->actionFunc = func_808BE358;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CUTBODY);
- Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&D_0600259C));
+ Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&object_dekunuts_Anim_00259C));
}
void func_808BE358(EnDekunuts* this, GlobalContext* globalCtx) {
@@ -531,7 +519,7 @@ void func_808BE3FC(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE484(EnDekunuts* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06002BD4);
+ Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_002BD4);
this->actionFunc = func_808BE4D4;
this->actor.speedXZ = 0.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD);
@@ -554,13 +542,14 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx) {
Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xE0);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OBJ_ETCETERA, this->actor.home.pos.x, this->actor.home.pos.y,
this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, 0x80);
- EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10, D_06001F50);
+ EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10,
+ object_dekunuts_DL_001F50);
Actor_MarkForDeath(&this->actor);
}
}
void func_808BE680(EnDekunuts* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
this->actionFunc = func_808BE6C4;
}
@@ -748,7 +737,7 @@ void EnDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.colorFilterTimer != 0) {
func_800AE5A0(globalCtx);
}
- Gfx_DrawDListOpa(globalCtx, D_06001E50);
+ Gfx_DrawDListOpa(globalCtx, object_dekunuts_DL_001E50);
func_800BE680(globalCtx, &this->actor, this->unk_21C, 8, this->unk_214, this->unk_218, this->unk_210,
this->unk_18E);
}
diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c
index 2b34268438..040dd4c57b 100644
--- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c
+++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c
@@ -5,6 +5,7 @@
*/
#include "z_en_dg.h"
+#include "objects/object_dog/object_dog.h"
#define FLAGS 0x00800019
@@ -36,17 +37,6 @@ void func_8098BB10(EnDg* this, GlobalContext* globalCtx);
void func_8098BBEC(EnDg* this, GlobalContext* globalCtx);
void func_8098BC54(EnDg* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000998;
-extern AnimationHeader D_06001048;
-extern AnimationHeader D_06001348;
-extern AnimationHeader D_06001560;
-extern AnimationHeader D_060017C0;
-extern AnimationHeader D_06001A84;
-extern AnimationHeader D_06001BD8;
-extern AnimationHeader D_06001FB0;
-extern AnimationHeader D_060021C8;
-extern FlexSkeletonHeader D_060080F0;
-
const ActorInit En_Dg_InitVars = {
ACTOR_EN_DG,
ACTORCAT_ENEMY,
@@ -140,12 +130,14 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_060021C8, 1.0f, 0, -1, 0, 0 }, { &D_060021C8, 1.0f, 0, -1, 0, -6 }, { &D_06001BD8, 1.0f, 0, -1, 0, 0 },
- { &D_06000998, 1.0f, 0, -1, 0, -6 }, { &D_06001FB0, 1.0f, 0, -1, 2, -6 }, { &D_06001FB0, 1.0f, 0, -1, 4, -6 },
- { &D_06001048, 1.0f, 0, -1, 2, -6 }, { &D_06001348, 1.0f, 0, -1, 0, -6 }, { &D_06001048, 1.0f, 0, 27, 2, -6 },
- { &D_06001048, 1.0f, 28, -1, 2, -6 }, { &D_06001048, 1.0f, 54, 54, 2, -6 }, { &D_060021C8, -1.5f, -1, 0, 0, -6 },
- { &D_06001560, 1.0f, 0, -1, 2, 0 }, { &D_06001A84, 1.2f, 0, -1, 2, 0 }, { &D_060017C0, 1.2f, 0, -1, 2, 0 },
- { &D_060021C8, 0.5f, 0, -1, 0, 0 },
+ { &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, -6 },
+ { &object_dog_Anim_001BD8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_000998, 1.0f, 0, -1, 0, -6 },
+ { &object_dog_Anim_001FB0, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001FB0, 1.0f, 0, -1, 4, -6 },
+ { &object_dog_Anim_001048, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001348, 1.0f, 0, -1, 0, -6 },
+ { &object_dog_Anim_001048, 1.0f, 0, 27, 2, -6 }, { &object_dog_Anim_001048, 1.0f, 28, -1, 2, -6 },
+ { &object_dog_Anim_001048, 1.0f, 54, 54, 2, -6 }, { &object_dog_Anim_0021C8, -1.5f, -1, 0, 0, -6 },
+ { &object_dog_Anim_001560, 1.0f, 0, -1, 2, 0 }, { &object_dog_Anim_001A84, 1.2f, 0, -1, 2, 0 },
+ { &object_dog_Anim_0017C0, 1.2f, 0, -1, 2, 0 }, { &object_dog_Anim_0021C8, 0.5f, 0, -1, 0, 0 },
};
static InitChainEntry sInitChain[] = {
@@ -1116,7 +1108,8 @@ void EnDg_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060080F0, NULL, this->jointTable, this->morphTable, 13);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_0080F0, NULL, this->jointTable, this->morphTable,
+ 13);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
index c1dad5416b..33a65bb9ce 100644
--- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
@@ -5,6 +5,7 @@
*/
#include "z_en_dinofos.h"
+#include "objects/object_dinofos/object_dinofos.h"
#define FLAGS 0x00000435
@@ -56,25 +57,6 @@ void func_8089C398(EnDinofos* this);
void func_8089C164(EnDinofos* this);
void func_8089C244(EnDinofos* this);
-extern FlexSkeletonHeader D_06009570;
-extern AnimationHeader D_06002E40;
-extern AnimationHeader D_060025B4;
-extern AnimationHeader D_06000580;
-extern AnimationHeader D_06001CCC;
-extern AnimationHeader D_0600ABD0;
-extern AnimationHeader D_0600D62C;
-extern AnimationHeader D_06001040;
-extern AnimationHeader D_060013C0;
-extern AnimationHeader D_060017B8;
-extern AnimationHeader D_0600C974;
-extern AnimationHeader D_06009B70;
-extern AnimationHeader D_06000AF0;
-extern AnimationHeader D_0600D21C;
-extern Gfx D_06008E30[];
-extern Gfx D_06009030[];
-extern Gfx D_06009230[];
-extern Gfx D_06009030[];
-
const ActorInit En_Dinofos_InitVars = {
ACTOR_EN_DINOFOS,
ACTORCAT_ENEMY,
@@ -259,11 +241,11 @@ static DamageTable sDamageTable = {
static CollisionCheckInfoInit sColChkInfoInit = { 4, 40, 100, 80 };
-static Gfx* D_8089E33C[] = {
- D_06008E30,
- D_06009030,
- D_06009230,
- D_06009030,
+static TexturePtr D_8089E33C[] = {
+ object_dinofos_Tex_008E30,
+ object_dinofos_Tex_009030,
+ object_dinofos_Tex_009230,
+ object_dinofos_Tex_009030,
};
static s16 D_8089E34C = -1;
@@ -293,7 +275,8 @@ void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
this->colliderJntSphElement);
Collider_InitAndSetQuad(globalCtx, &this->colliderQuad, &this->actor, &sQuadInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009570, &D_06002E40, this->jointTable, this->morphTable, 21);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dinofos_Skel_009570, &object_dinofos_Anim_002E40,
+ this->jointTable, this->morphTable, 21);
if (D_8089E364 == 0) {
for (i = 0; i < ARRAY_COUNT(D_8089E33C); i++) {
@@ -483,8 +466,9 @@ void func_8089B100(EnDinofos* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Vec3f sp3C;
- Animation_Change(&this->skelAnime, &D_06001CCC, 1.0f, Animation_GetLastFrame(&D_06001CCC),
- Animation_GetLastFrame(&D_06001CCC), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_dinofos_Anim_001CCC, 1.0f,
+ Animation_GetLastFrame(&object_dinofos_Anim_001CCC),
+ Animation_GetLastFrame(&object_dinofos_Anim_001CCC), 2, 0.0f);
func_800BE33C(&camera->eye, &camera->at, &this->unk_29A, true);
Math_Vec3f_Diff(&this->actor.world.pos, &player->actor.world.pos, &sp3C);
this->unk_2BC.x = player->actor.world.pos.x + (0.4f * sp3C.x);
@@ -549,7 +533,7 @@ void func_8089B4A4(EnDinofos* this) {
if (this->unk_290 < 10) {
func_801A2E54(NA_BGM_MINI_BOSS);
}
- Animation_PlayOnce(&this->skelAnime, &D_0600C974);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00C974);
this->unk_2BC.x = (Math_SinS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.x;
this->unk_2BC.y = this->actor.floorHeight + 11.0f;
this->unk_2BC.z = (Math_CosS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.z;
@@ -589,7 +573,7 @@ void func_8089B580(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B6E8(EnDinofos* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009B70, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_009B70, -3.0f);
this->actionFunc = func_8089B72C;
}
@@ -607,7 +591,7 @@ void func_8089B72C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B7B0(EnDinofos* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06002E40, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_002E40, -4.0f);
this->unk_290 = (s32)Rand_ZeroFloat(20.0f) + 40;
this->unk_292 = 30;
this->actor.speedXZ = 0.0f;
@@ -635,7 +619,7 @@ void func_8089B8B0(EnDinofos* this, GlobalContext* globalCtx) {
f32 phi_f0;
if (this->actionFunc != func_8089B98C) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
if (Actor_OtherIsTargeted(globalCtx, &this->actor)) {
phi_f0 = 170.0f;
} else {
@@ -690,7 +674,7 @@ void func_8089B98C(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089BAC0(EnDinofos* this) {
if (this->actionFunc != func_8089BB60) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
this->actor.speedXZ = 0.0f;
}
if (BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y) > 0) {
@@ -731,8 +715,8 @@ void func_8089BBB4(EnDinofos* this, GlobalContext* globalCtx) {
if (this->actionFunc == func_8089D1E0) {
this->skelAnime.playSpeed = this->actor.speedXZ * 0.166666671634f;
} else {
- Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * 0.166666671634f, 0.0f, 0.0f, 0,
- -4.0f);
+ Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * 0.166666671634f, 0.0f,
+ 0.0f, 0, -4.0f);
}
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
@@ -811,10 +795,10 @@ void func_8089BD28(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C024(EnDinofos* this, s32 arg1) {
if (arg1 == 0) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, 2.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, 2.0f);
func_8089AD70(this);
} else {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, -1.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, -1.0f);
if ((arg1 == 2) || (arg1 == 3)) {
this->colliderJntSph.base.acFlags &= ~AC_ON;
func_8089AD70(this);
@@ -878,10 +862,10 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
this->unk_290++;
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x1800);
- if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &D_06001CCC)) {
+ if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &object_dinofos_Anim_001CCC)) {
this->colliderQuad.base.atFlags |= AT_ON;
this->colliderJntSph.base.acFlags |= AC_ON;
- Animation_Change(&this->skelAnime, &D_060025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
+ Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
}
if (this->actor.bgCheckFlags & 1) {
@@ -892,9 +876,9 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C398(EnDinofos* this) {
if (this->actionFunc != func_8089C2A8) {
- Animation_PlayOnce(&this->skelAnime, &D_06000AF0);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_000AF0);
} else {
- this->skelAnime.endFrame = Animation_GetLastFrame(&D_060025B4);
+ this->skelAnime.endFrame = Animation_GetLastFrame(&object_dinofos_Anim_0025B4);
}
if (this->actor.speedXZ < 0.0f) {
@@ -921,7 +905,7 @@ void func_8089C44C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C4F8(EnDinofos* this) {
- Animation_PlayOnce(&this->skelAnime, &D_060025B4);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0025B4);
this->colliderQuad.base.atFlags &= ~AT_BOUNCED;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_CRY);
this->unk_290 = 0;
@@ -952,7 +936,7 @@ void func_8089C56C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C690(EnDinofos* this) {
- Animation_Change(&this->skelAnime, &D_060025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
this->colliderQuad.base.atFlags &= ~(AT_ON | AT_BOUNCED);
if (this->actionFunc != func_8089C2A8) {
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1002,7 +986,7 @@ void func_8089C7B8(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C87C(EnDinofos* this, s32 arg1) {
- Animation_PlayOnce(&this->skelAnime, &D_0600D21C);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00D21C);
func_800BE5CC(&this->actor, &this->colliderJntSph, arg1);
this->actor.shape.rot.y = BINANG_ROT180(this->actor.world.rot.y);
this->actor.speedXZ = 10.0f;
@@ -1035,7 +1019,7 @@ void func_8089C938(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CA14(EnDinofos* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001040, -5.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001040, -5.0f);
this->colliderJntSph.base.acFlags |= AC_ON;
this->actor.speedXZ = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1056,7 +1040,7 @@ void func_8089CB10(EnDinofos* this, GlobalContext* globalCtx) {
s32 i;
Sphere16* worldSphere;
- Animation_PlayLoop(&this->skelAnime, &D_060013C0);
+ Animation_PlayLoop(&this->skelAnime, &object_dinofos_Anim_0013C0);
this->unk_290 = 20;
this->actor.speedXZ = 0.0f;
this->colliderJntSph.base.atFlags |= AT_ON;
@@ -1128,7 +1112,7 @@ void func_8089CBEC(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CF00(EnDinofos* this, GlobalContext* globalCtx) {
- Animation_PlayOnce(&this->skelAnime, &D_060017B8);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0017B8);
this->colliderJntSph.base.atFlags &= ~AT_ON;
if (globalCtx->sceneNum == SCENE_MITURIN) {
globalCtx->envCtx.unk_C3 = 255;
@@ -1143,7 +1127,7 @@ void func_8089CF70(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CFAC(EnDinofos* this) {
- Animation_PlayOnce(&this->skelAnime, &D_0600ABD0);
+ Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00ABD0);
this->actor.flags &= ~1;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_DEAD);
this->actor.speedXZ = 0.0f;
@@ -1183,7 +1167,8 @@ void func_8089D11C(EnDinofos* this, s16 arg1) {
} else {
this->actor.speedXZ = 15.0f;
}
- Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0, -4.0f);
+ Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0,
+ -4.0f);
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
this->unk_292 = 10;
this->unk_2A4 = 0.0f;
diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
index 7e4b67b7c3..05da2a9b48 100644
--- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
+++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
@@ -5,6 +5,8 @@
*/
#include "z_en_dnb.h"
+#include "objects/object_hanareyama_obj/object_hanareyama_obj.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x000000B0
@@ -19,12 +21,6 @@ s32 func_80A507C0(EnDnbUnkStruct* arg0, Vec3f arg1, Vec3f arg2, u8 arg3, f32 arg
s32 func_80A5086C(EnDnbUnkStruct* arg0);
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx);
-extern Gfx D_06000000[];
-extern Gfx D_06000020[];
-extern Gfx D_06004638[];
-extern Vec3s D_06004710[];
-extern CollisionHeader D_06004D8C;
-
const ActorInit En_Dnb_InitVars = {
ACTOR_EN_DNB,
ACTORCAT_BG,
@@ -109,9 +105,9 @@ void EnDnb_Init(Actor* thisx, GlobalContext* globalCtx) {
s16* alloc;
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06004D8C);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hanareyama_obj_Colheader_004D8C);
- alloc = (s16*)Lib_SegmentedToVirtual(D_06004710);
+ alloc = (s16*)Lib_SegmentedToVirtual(object_hanareyama_obj_Vec_004710);
for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
func_80A4FDD0(&this->particles[i], this, alloc, i);
}
@@ -156,7 +152,7 @@ void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
- Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
+ Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -181,7 +177,7 @@ void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
void func_80A5063C(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
- Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
+ Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -259,7 +255,7 @@ s32 func_80A5086C(EnDnbUnkStruct* arg0) {
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
static TexturePtr D_80A50CBC[] = {
- D_0408F7E0, D_0408F3E0, D_0408EFE0, D_0408EBE0, D_0408E7E0, D_0408E3E0, D_0408DFE0, D_0408DBE0,
+ gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
GlobalContext* globalCtx = globalCtx2;
s32 isGfxSetup = false;
@@ -275,7 +271,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
if (arg0->isEnabled == 1) {
if (!isGfxSetup) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
- gSPDisplayList(POLY_XLU_DISP++, D_06000000);
+ gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000000);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 0);
isGfxSetup = true;
}
@@ -294,7 +290,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
idx = (arg0->unk_01 / (f32)arg0->unk_02) * 8.0f;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80A50CBC[idx]));
- gSPDisplayList(POLY_XLU_DISP++, D_06000020);
+ gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000020);
Matrix_StatePop();
sp5C += 1;
diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
index 2dcf85e3d0..9333810346 100644
--- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
+++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
@@ -5,6 +5,9 @@
*/
#include "z_en_dnk.h"
+#include "objects/object_dnk/object_dnk.h"
+#include "objects/object_hintnuts/object_hintnuts.h"
+#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000009
@@ -19,39 +22,6 @@ void EnDnk_DoNothing(EnDnk* this, GlobalContext* globalCtx);
void func_80A52018(Actor* thisx, GlobalContext* globalCtx);
void func_80A52134(EnDnk* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000168;
-extern AnimationHeader D_0600031C;
-extern AnimationHeader D_06000430;
-extern AnimationHeader D_060006CC;
-extern AnimationHeader D_06000894;
-extern AnimationHeader D_06000B70;
-extern UNK_PTR D_06001680[];
-extern UNK_PTR D_06001700[];
-extern UNK_PTR D_06001780[];
-extern SkeletonHeader D_060023B8;
-extern SkeletonHeader D_06002468;
-extern AnimationHeader D_060024CC;
-extern AnimationHeader D_0600259C;
-extern AnimationHeader D_060026C4;
-extern SkeletonHeader D_06002848;
-extern AnimationHeader D_06002894;
-extern AnimationHeader D_06002950;
-extern AnimationHeader D_060029BC;
-extern AnimationHeader D_06002A08;
-extern AnimationHeader D_06002A5C;
-extern AnimationHeader D_06002B6C;
-extern AnimationHeader D_06002B90;
-extern AnimationHeader D_06002BD4;
-extern AnimationHeader D_06002DD4;
-extern AnimationHeader D_06002E84;
-extern AnimationHeader D_06002F7C;
-extern AnimationHeader D_06002FA4;
-extern AnimationHeader D_06003128;
-extern AnimationHeader D_06003180;
-extern AnimationHeader D_0600326C;
-extern AnimationHeader D_060033E4;
-extern AnimationHeader D_06003780;
-
static s16 D_80A521A0 = 0;
const ActorInit En_Dnk_InitVars = {
@@ -124,18 +94,24 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_06000B70, 1.0f, 0, -1, 2, 0 }, { &D_06000B70, 1.0f, 0, -1, 2, -4 }, { &D_06002A08, 1.0f, 0, -1, 0, -4 },
- { &D_0600031C, 1.0f, 0, -1, 0, -4 }, { &D_06000430, 1.0f, -1, -1, 2, 0 }, { &D_06000430, 1.0f, 0, -1, 2, -4 },
- { &D_06000894, 1.0f, 0, -1, 2, -4 }, { &D_06002B6C, 1.0f, 0, -1, 0, 0 }, { &D_06002B6C, 1.0f, 0, -1, 0, -4 },
- { &D_060006CC, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 2, -4 }, { &D_060024CC, 1.0f, -1, -1, 2, 0 },
- { &D_060024CC, 1.0f, 0, -1, 2, -4 }, { &D_060026C4, 1.0f, 0, -1, 2, -4 }, { &D_06002894, 1.0f, 0, -1, 2, -4 },
- { &D_06002B90, 1.0f, 0, -1, 2, -4 }, { &D_06002F7C, 1.0f, 0, -1, 0, 0 }, { &D_06002F7C, 1.0f, 0, -1, 0, -4 },
- { &D_06003128, 1.0f, 0, -1, 0, 0 }, { &D_06003128, 1.0f, 0, -1, 0, -4 }, { &D_060029BC, 1.0f, 0, -1, 0, -4 },
- { &D_06002E84, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 0, -4 }, { &D_0600259C, 1.0f, 0, -1, 2, -4 },
- { &D_06002A5C, 1.0f, 0, -1, 2, 0 }, { &D_06002A5C, 1.0f, 0, -1, 2, -4 }, { &D_06002BD4, 1.0f, 0, -1, 2, -4 },
- { &D_06002DD4, 1.0f, 0, -1, 2, -4 }, { &D_06002FA4, 1.0f, 0, -1, 0, -4 }, { &D_06003180, 1.0f, 0, -1, 2, -4 },
- { &D_0600326C, 1.0f, 0, -1, 0, 0 }, { &D_0600326C, 1.0f, 0, -1, 0, -4 }, { &D_060033E4, 1.0f, 0, -1, 0, -4 },
- { &D_06003780, 1.0f, 0, -1, 0, 0 }, { &D_06003780, 1.0f, 0, -1, 0, -4 }, { &D_06002950, 1.0f, 0, -1, 0, 0 },
+ { &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, 0 }, { &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, -4 },
+ { &object_dnk_Anim_002A08, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_00031C, 1.0f, 0, -1, 0, -4 },
+ { &object_dnk_Anim_000430, 1.0f, -1, -1, 2, 0 }, { &object_dnk_Anim_000430, 1.0f, 0, -1, 2, -4 },
+ { &object_dnk_Anim_000894, 1.0f, 0, -1, 2, -4 }, { &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, 0 },
+ { &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_0006CC, 1.0f, 0, -1, 0, -4 },
+ { &object_hintnuts_Anim_000168, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0024CC, 1.0f, -1, -1, 2, 0 },
+ { &object_hintnuts_Anim_0024CC, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0026C4, 1.0f, 0, -1, 2, -4 },
+ { &object_hintnuts_Anim_002894, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_002B90, 1.0f, 0, -1, 2, -4 },
+ { &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, -4 },
+ { &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, -4 },
+ { &object_hintnuts_Anim_0029BC, 1.0f, 0, -1, 0, -4 }, { &object_hintnuts_Anim_002E84, 1.0f, 0, -1, 0, -4 },
+ { &object_dekunuts_Anim_000168, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_00259C, 1.0f, 0, -1, 2, -4 },
+ { &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, 0 }, { &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, -4 },
+ { &object_dekunuts_Anim_002BD4, 1.0f, 0, -1, 2, -4 }, { &object_dekunuts_Anim_002DD4, 1.0f, 0, -1, 2, -4 },
+ { &object_dekunuts_Anim_002FA4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003180, 1.0f, 0, -1, 2, -4 },
+ { &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, 0 }, { &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, -4 },
+ { &object_dekunuts_Anim_0033E4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, 0 },
+ { &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_002950, 1.0f, 0, -1, 0, 0 },
};
s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
@@ -144,7 +120,7 @@ s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
s32 sp30 = false;
if (animIndex >= 0) {
- if (animIndex < 36) {
+ if (animIndex < ARRAY_COUNT(sAnimations)) {
sp30 = true;
frameCount = sAnimations[animIndex].frameCount;
if (frameCount < 0) {
@@ -184,17 +160,20 @@ void func_80A51648(EnDnk* this, GlobalContext* globalCtx) {
switch (ENDNK_GET_3(&this->actor)) {
case ENDNK_GET_3_0:
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002848, NULL, this->jointTable, this->morphTable, 11);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_dnk_Skel_002848, NULL, this->jointTable,
+ this->morphTable, 11);
func_80A514F0(&this->skelAnime, 7);
break;
case ENDNK_GET_3_1:
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, NULL, this->jointTable, this->morphTable, 10);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_hintnuts_Skel_0023B8.sh, NULL, this->jointTable,
+ this->morphTable, 10);
func_80A514F0(&this->skelAnime, 18);
break;
case ENDNK_GET_3_2:
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, NULL, this->jointTable, this->morphTable, 10);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, NULL, this->jointTable,
+ this->morphTable, 10);
func_80A514F0(&this->skelAnime, 35);
break;
}
@@ -328,10 +307,10 @@ void func_80A51AA4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
}
void func_80A51CB8(EnDnk* this, GlobalContext* globalCtx) {
- static UNK_PTR D_80A5245C[] = {
- D_06001680,
- D_06001700,
- D_06001780,
+ static TexturePtr D_80A5245C[] = {
+ object_dnk_Tex_001680,
+ object_dnk_Tex_001700,
+ object_dnk_Tex_001780,
};
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c
index 2a352380cf..f9fae8ec5a 100644
--- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c
+++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c
@@ -7,6 +7,7 @@
#include "z_en_dno.h"
#include "overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h"
#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_dno/object_dno.h"
#define FLAGS 0x00000039
@@ -39,37 +40,19 @@ void func_80A732C8(EnDno* this, GlobalContext* globalCtx);
s32 EnDno_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
void EnDno_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
-extern AnimationHeader D_06000470;
-extern AnimationHeader D_060008F0;
-extern AnimationHeader D_06000F6C;
-extern AnimationHeader D_06001A50;
-extern AnimationHeader D_06002530;
-extern AnimationHeader D_06003320;
-extern AnimationHeader D_060036D0;
-extern AnimationHeader D_060041CC;
-extern AnimationHeader D_06004DD8;
-extern AnimationHeader D_060051E4;
-extern AnimationHeader D_06005E20;
-extern AnimationHeader D_06005F98;
-extern AnimationHeader D_06006488;
-extern AnimationHeader D_06006F84;
-extern AnimationHeader D_060073E4;
-extern AnimationHeader D_060077A8;
-extern AnimationHeader D_06007CA4;
-extern AnimationHeader D_06008324;
-extern AnimationHeader D_06008AE4;
-extern AnimationHeader D_06009100;
-extern FlexSkeletonHeader D_0600E1F8;
extern u8 D_801C20C0;
static struct_80B8E1A8 sAnimations[] = {
- { &D_06000470, 1.0f, 2, 0.0f }, { &D_060008F0, 1.0f, 2, 0.0f }, { &D_06000F6C, 1.0f, 0, 0.0f },
- { &D_06001A50, 1.0f, 2, 0.0f }, { &D_06002530, 1.0f, 2, 0.0f }, { &D_06003320, 1.0f, 2, 0.0f },
- { &D_060036D0, 1.0f, 0, 0.0f }, { &D_060041CC, 1.0f, 2, 0.0f }, { &D_06004DD8, 1.0f, 2, 0.0f },
- { &D_06005F98, 1.0f, 0, 0.0f }, { &D_06006488, 1.0f, 2, 0.0f }, { &D_060073E4, 1.0f, 0, 0.0f },
- { &D_060077A8, 1.0f, 0, 0.0f }, { &D_06007CA4, 1.0f, 0, 0.0f }, { &D_06008324, 1.0f, 0, 0.0f },
- { &D_06008AE4, 1.0f, 2, 0.0f }, { &D_06009100, 1.0f, 2, 0.0f }, { &D_060051E4, 1.0f, 2, 0.0f },
- { &D_06005E20, 1.0f, 0, 0.0f }, { &D_06006F84, 1.0f, 0, 0.0f },
+ { &object_dno_Anim_000470, 1.0f, 2, 0.0f }, { &object_dno_Anim_0008F0, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_000F6C, 1.0f, 0, 0.0f }, { &object_dno_Anim_001A50, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_002530, 1.0f, 2, 0.0f }, { &object_dno_Anim_003320, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_0036D0, 1.0f, 0, 0.0f }, { &object_dno_Anim_0041CC, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_004DD8, 1.0f, 2, 0.0f }, { &object_dno_Anim_005F98, 1.0f, 0, 0.0f },
+ { &object_dno_Anim_006488, 1.0f, 2, 0.0f }, { &object_dno_Anim_0073E4, 1.0f, 0, 0.0f },
+ { &object_dno_Anim_0077A8, 1.0f, 0, 0.0f }, { &object_dno_Anim_007CA4, 1.0f, 0, 0.0f },
+ { &object_dno_Anim_008324, 1.0f, 0, 0.0f }, { &object_dno_Anim_008AE4, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_009100, 1.0f, 2, 0.0f }, { &object_dno_Anim_0051E4, 1.0f, 2, 0.0f },
+ { &object_dno_Anim_005E20, 1.0f, 0, 0.0f }, { &object_dno_Anim_006F84, 1.0f, 0, 0.0f },
};
const ActorInit En_Dno_InitVars = {
@@ -213,8 +196,8 @@ void EnDno_Init(Actor* thisx, GlobalContext* globalCtx) {
if (actor == NULL) {
Actor_ProcessInitChain(thisx, sInitChain);
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 21.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E1F8, &D_06007CA4, this->jointTable,
- this->morphTable, 28);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dno_Skel_00E1F8, &object_dno_Anim_007CA4,
+ this->jointTable, this->morphTable, 28);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
Actor_UpdateBgCheckInfo(globalCtx, thisx, 0.0f, 0.0f, 0.0f, 4);
diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
index f578b64456..6d9728c978 100644
--- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
@@ -5,6 +5,7 @@
*/
#include "z_en_dnp.h"
+#include "objects/object_dnp/object_dnp.h"
#define FLAGS 0x00000019
@@ -21,35 +22,6 @@ void func_80B3D338(EnDnp* this, GlobalContext* globalCtx);
void func_80B3D3F8(EnDnp* this, GlobalContext* globalCtx);
void func_80B3D558(EnDnp* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060007D8;
-extern AnimationHeader D_0600125C;
-extern AnimationHeader D_060017F8;
-extern AnimationHeader D_06001C1C;
-extern AnimationHeader D_060021DC;
-extern AnimationHeader D_060026B8;
-extern AnimationHeader D_06004D08;
-extern AnimationHeader D_060057AC;
-extern AnimationHeader D_0600625C;
-extern AnimationHeader D_0600674C;
-extern AnimationHeader D_06006B74;
-extern AnimationHeader D_060071F4;
-extern AnimationHeader D_06007960;
-extern AnimationHeader D_06008588;
-extern AnimationHeader D_0600923C;
-extern AnimationHeader D_06009AA0;
-extern AnimationHeader D_0600A900;
-extern AnimationHeader D_0600AEB8;
-extern AnimationHeader D_0600B324;
-extern AnimationHeader D_0600B754;
-extern AnimationHeader D_0600BAD8;
-extern Gfx D_060103D0[];
-extern Gfx D_060105D0[];
-extern Gfx D_060107D0[];
-extern Gfx D_060109D0[];
-extern FlexSkeletonHeader D_06010D60;
-extern AnimationHeader D_060115B8;
-extern AnimationHeader D_06012428;
-
const ActorInit En_Dnp_InitVars = {
ACTOR_EN_DNP,
ACTORCAT_NPC,
@@ -85,15 +57,19 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS sAnimations[] = {
- { &D_060007D8, 1.0f, 0, -1, 2, -4 }, { &D_060021DC, 1.0f, 0, -1, 0, 0 }, { &D_060021DC, 1.0f, 0, -1, 0, -4 },
- { &D_060026B8, 1.0f, 0, -1, 2, -4 }, { &D_06004D08, 1.0f, 0, -1, 2, -4 }, { &D_060071F4, 1.0f, 0, -1, 2, -4 },
- { &D_06007960, 1.0f, 0, -1, 0, -4 }, { &D_06008588, 1.0f, 0, -1, 2, 0 }, { &D_0600A900, 1.0f, 0, -1, 0, -4 },
- { &D_0600AEB8, 1.0f, 0, -1, 0, -4 }, { &D_0600B754, 1.0f, 0, -1, 2, -4 }, { &D_0600674C, 1.0f, 0, -1, 0, -4 },
- { &D_0600BAD8, 1.0f, 0, -1, 2, -4 }, { &D_06006B74, 1.0f, 0, -1, 0, -4 }, { &D_06012428, 1.0f, 0, -1, 0, -4 },
- { &D_0600B324, 1.0f, 0, -1, 0, 0 }, { &D_0600B324, 1.0f, 0, -1, 0, -4 }, { &D_060115B8, 1.0f, 0, -1, 0, -4 },
- { &D_060115B8, 1.0f, 0, -1, 0, 0 }, { &D_0600923C, 1.0f, 0, -1, 2, -4 }, { &D_06009AA0, 1.0f, 0, -1, 0, -4 },
- { &D_0600125C, 1.0f, 0, -1, 2, -4 }, { &D_060017F8, 1.0f, 0, -1, 2, 0 }, { &D_06001C1C, 1.0f, 0, -1, 0, -4 },
- { &D_060057AC, 1.0f, 0, -1, 2, 0 }, { &D_0600625C, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_0007D8, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_0021DC, 1.0f, 0, -1, 0, 0 },
+ { &object_dnp_Anim_0021DC, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_0026B8, 1.0f, 0, -1, 2, -4 },
+ { &object_dnp_Anim_004D08, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_0071F4, 1.0f, 0, -1, 2, -4 },
+ { &object_dnp_Anim_007960, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_008588, 1.0f, 0, -1, 2, 0 },
+ { &object_dnp_Anim_00A900, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00AEB8, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_00B754, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_00674C, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_00BAD8, 1.0f, 0, -1, 2, -4 }, { &object_dnp_Anim_006B74, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_012428, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00B324, 1.0f, 0, -1, 0, 0 },
+ { &object_dnp_Anim_00B324, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_0115B8, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_0115B8, 1.0f, 0, -1, 0, 0 }, { &object_dnp_Anim_00923C, 1.0f, 0, -1, 2, -4 },
+ { &object_dnp_Anim_009AA0, 1.0f, 0, -1, 0, -4 }, { &object_dnp_Anim_00125C, 1.0f, 0, -1, 2, -4 },
+ { &object_dnp_Anim_0017F8, 1.0f, 0, -1, 2, 0 }, { &object_dnp_Anim_001C1C, 1.0f, 0, -1, 0, -4 },
+ { &object_dnp_Anim_0057AC, 1.0f, 0, -1, 2, 0 }, { &object_dnp_Anim_00625C, 1.0f, 0, -1, 0, -4 },
};
static s32 D_80B3DE58[] = {
@@ -358,7 +334,8 @@ void EnDnp_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDnp* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 16.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06010D60, NULL, this->jointTable, this->morphTable, 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dnp_Skel_010D60, NULL, this->jointTable, this->morphTable,
+ 26);
this->unk_340 = -1;
func_80B3CC38(this, 15);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -489,11 +466,11 @@ void EnDnp_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void EnDnp_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static Gfx* D_80B3DEAC[] = {
- D_060103D0,
- D_060105D0,
- D_060107D0,
- D_060109D0,
+ static TexturePtr D_80B3DEAC[] = {
+ object_dnp_Tex_0103D0,
+ object_dnp_Tex_0105D0,
+ object_dnp_Tex_0107D0,
+ object_dnp_Tex_0109D0,
};
EnDnp* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
index f1e500e0fb..a3df353dc4 100644
--- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
@@ -5,6 +5,7 @@
*/
#include "z_en_dnq.h"
+#include "objects/object_dnq/object_dnq.h"
#define FLAGS 0x00000009
@@ -17,24 +18,6 @@ void EnDnq_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80A52FB8(EnDnq* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060006F0;
-extern AnimationHeader D_06000BF8;
-extern AnimationHeader D_06001100;
-extern AnimationHeader D_06001AEC;
-extern AnimationHeader D_06002690;
-extern AnimationHeader D_06003408;
-extern AnimationHeader D_06003DBC;
-extern AnimationHeader D_060047B8;
-extern AnimationHeader D_06004EA0;
-extern AnimationHeader D_06005284;
-extern AnimationHeader D_06005A14;
-extern AnimationHeader D_06005E18;
-extern AnimationHeader D_06006984;
-extern AnimationHeader D_06007528;
-extern AnimationHeader D_06008328;
-extern FlexSkeletonHeader D_0600EB48;
-extern AnimationHeader D_0600F504;
-
static s32 D_80A53400[] = {
0x00120100, 0x150E0899, 0x0C120F08, 0x9A0C0F08, 0x9B0C0F08, 0x9C0C1112, 0x01100E08, 0x980C1000, 0x00120200,
0x0C0E089D, 0x0C0F089E, 0x0C111202, 0x100E089F, 0x0C100000, 0x0E08A10C, 0x0F08A20C, 0x10000000,
@@ -75,13 +58,16 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS D_80A5349C[] = {
- { &D_06008328, 1.0f, 0, -1, 0, 0 }, { &D_06008328, 1.0f, 0, -1, 0, -4 }, { &D_06007528, 1.0f, 0, -1, 2, -4 },
- { &D_060006F0, 1.0f, 0, -1, 2, 0 }, { &D_06000BF8, 1.0f, 0, -1, 0, -4 }, { &D_06002690, 0.0f, 0, -1, 2, 0 },
- { &D_06002690, 1.0f, 0, -1, 2, -4 }, { &D_06003408, 1.0f, 0, -1, 0, -4 }, { &D_06006984, 1.0f, 0, -1, 2, -4 },
- { &D_06005E18, 1.0f, 0, -1, 2, -4 }, { &D_06005A14, 1.0f, 0, -1, 2, -4 }, { &D_06005284, 1.0f, 0, -1, 2, -4 },
- { &D_06001AEC, 1.0f, 0, -1, 2, 0 }, { &D_06001100, 1.0f, 0, -1, 2, 0 }, { &D_06004EA0, 1.0f, 0, -1, 0, -4 },
- { &D_0600F504, 1.0f, 0, -1, 0, -4 }, { &D_060047B8, 1.0f, 0, -1, 0, -4 }, { &D_06003DBC, 1.0f, 0, -1, 2, -4 },
- { &D_06005A14, 1.0f, 0, -1, 0, -4 }, { &D_06003DBC, 1.0f, 0, -1, 0, -4 },
+ { &object_dnq_Anim_008328, 1.0f, 0, -1, 0, 0 }, { &object_dnq_Anim_008328, 1.0f, 0, -1, 0, -4 },
+ { &object_dnq_Anim_007528, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_0006F0, 1.0f, 0, -1, 2, 0 },
+ { &object_dnq_Anim_000BF8, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_002690, 0.0f, 0, -1, 2, 0 },
+ { &object_dnq_Anim_002690, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_003408, 1.0f, 0, -1, 0, -4 },
+ { &object_dnq_Anim_006984, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_005E18, 1.0f, 0, -1, 2, -4 },
+ { &object_dnq_Anim_005A14, 1.0f, 0, -1, 2, -4 }, { &object_dnq_Anim_005284, 1.0f, 0, -1, 2, -4 },
+ { &object_dnq_Anim_001AEC, 1.0f, 0, -1, 2, 0 }, { &object_dnq_Anim_001100, 1.0f, 0, -1, 2, 0 },
+ { &object_dnq_Anim_004EA0, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_00F504, 1.0f, 0, -1, 0, -4 },
+ { &object_dnq_Anim_0047B8, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_003DBC, 1.0f, 0, -1, 2, -4 },
+ { &object_dnq_Anim_005A14, 1.0f, 0, -1, 0, -4 }, { &object_dnq_Anim_003DBC, 1.0f, 0, -1, 0, -4 },
};
void func_80A52530(GlobalContext* globalCtx, EnDnq* this) {
@@ -420,7 +406,8 @@ void EnDnq_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDnq* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 14.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600EB48, NULL, this->jointTable, this->morphTable, 33);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dnq_Skel_00EB48, NULL, this->jointTable, this->morphTable,
+ 33);
this->unk_398 = -1;
func_80A5257C(this, 0);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
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 b6e75ef3ce..f9b3bdcebc 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_dns/object_dns.h"
#define FLAGS 0x00000019
@@ -19,20 +20,6 @@ void func_8092D330(EnDns* this, GlobalContext* globalCtx);
void EnDns_DoNothing(EnDns* this, GlobalContext* globalCtx);
void func_8092D4D8(EnDns* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060002A8;
-extern AnimationHeader D_06000734;
-extern AnimationHeader D_060008F4;
-extern AnimationHeader D_06000BD8;
-extern AnimationHeader D_06000D58;
-extern AnimationHeader D_06000FEC;
-extern TexturePtr D_060028E8;
-extern TexturePtr D_06002968;
-extern TexturePtr D_060029E8;
-extern Gfx D_06002C48[];
-extern SkeletonHeader D_06002DD8;
-extern AnimationHeader D_06003310;
-extern AnimationHeader D_060034EC;
-
static s32 D_8092DCB0[] = {
0x00172000, 0x050E082F, 0x0C100E08, 0x200C1000, 0x00172000, 0x050E0830, 0x0C100E08, 0x210C1000,
0x00172000, 0x050E0831, 0x0C100E08, 0x220C1000, 0x00172000, 0x050E0832, 0x0C100E08, 0x230C1000,
@@ -74,10 +61,11 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS sAnimations[] = {
- { &D_06003310, 1.0f, 0, -1, 0, 0 }, { &D_06003310, 1.0f, 0, -1, 0, -4 }, { &D_060034EC, 1.0f, 0, -1, 0, 0 },
- { &D_060034EC, 1.0f, 0, -1, 0, -4 }, { &D_060008F4, 1.0f, 0, -1, 2, 0 }, { &D_06000BD8, 1.0f, 0, -1, 0, 0 },
- { &D_06000D58, 1.0f, 0, -1, 2, 0 }, { &D_06000FEC, 1.0f, 0, -1, 0, 0 }, { &D_060002A8, 1.0f, 0, -1, 2, 0 },
- { &D_06000734, 1.0f, 0, -1, 2, 0 },
+ { &object_dns_Anim_003310, 1.0f, 0, -1, 0, 0 }, { &object_dns_Anim_003310, 1.0f, 0, -1, 0, -4 },
+ { &object_dns_Anim_0034EC, 1.0f, 0, -1, 0, 0 }, { &object_dns_Anim_0034EC, 1.0f, 0, -1, 0, -4 },
+ { &object_dns_Anim_0008F4, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000BD8, 1.0f, 0, -1, 0, 0 },
+ { &object_dns_Anim_000D58, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000FEC, 1.0f, 0, -1, 0, 0 },
+ { &object_dns_Anim_0002A8, 1.0f, 0, -1, 2, 0 }, { &object_dns_Anim_000734, 1.0f, 0, -1, 2, 0 },
};
void func_8092C5C0(EnDns* this) {
@@ -376,7 +364,7 @@ void func_8092D108(EnDns* this, GlobalContext* globalCtx) {
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06002C48);
+ gSPDisplayList(POLY_OPA_DISP++, object_dns_DL_002C48);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -495,7 +483,7 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 18.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002DD8, NULL, this->jointTable, this->morphTable, 13);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_dns_Skel_002DD8, NULL, this->jointTable, this->morphTable, 13);
this->unk_2F8 = -1;
func_8092C63C(this, 2);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -616,7 +604,8 @@ void EnDns_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr D_8092DE1C[] = { &D_060028E8, &D_06002968, &D_060029E8, &D_06002968 };
+ static TexturePtr D_8092DE1C[] = { object_dns_Tex_0028E8, object_dns_Tex_002968, object_dns_Tex_0029E8,
+ object_dns_Tex_002968 };
EnDns* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index a77826cd1f..6b198106bd 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -7,6 +7,7 @@
#include "z_en_dodongo.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
+#include "objects/object_dodongo/object_dodongo.h"
#define FLAGS 0x00000405
@@ -34,16 +35,6 @@ void func_808786C8(EnDodongo* this, GlobalContext* globalCtx);
void func_80878724(EnDodongo* this);
void func_808787B0(EnDodongo* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060013C4;
-extern AnimationHeader D_06001A44;
-extern AnimationHeader D_060028F0;
-extern AnimationHeader D_06003088;
-extern AnimationHeader D_06003B14;
-extern AnimationHeader D_060042C4;
-extern AnimationHeader D_06004C20;
-extern SkeletonHeader D_06008318;
-extern AnimationHeader D_06008B1C;
-
const ActorInit En_Dodongo_InitVars = {
ACTOR_EN_DODONGO,
ACTORCAT_ENEMY,
@@ -304,7 +295,8 @@ void EnDodongo_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_330.a = 200;
Math_Vec3f_Copy(&this->unk_314, &D_801C5DB0);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 48.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06008318, &D_06004C20, this->jointTable, this->morphTable, 31);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_dodongo_Skel_008318, &object_dodongo_Anim_004C20,
+ this->jointTable, this->morphTable, 31);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
Collider_InitAndSetJntSph(globalCtx, &this->collider2, &this->actor, &sJntSphInit2, this->collider2Elements);
Collider_InitAndSetJntSph(globalCtx, &this->collider1, &this->actor, &sJntSphInit1, this->collider1Elements);
@@ -545,7 +537,7 @@ s32 func_80877278(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_808773C4(EnDodongo* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06004C20, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dodongo_Anim_004C20, -4.0f);
this->actor.speedXZ = 0.0f;
this->timer = Rand_S16Offset(30, 50);
this->actionFunc = func_80877424;
@@ -565,7 +557,7 @@ void func_80877424(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877494(EnDodongo* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06008B1C, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dodongo_Anim_008B1C, -4.0f);
this->actor.speedXZ = this->unk_334 * 1.5f;
this->timer = Rand_S16Offset(50, 70);
this->actionFunc = func_80877500;
@@ -624,7 +616,7 @@ void func_808777A8(EnDodongo* this) {
s32 i;
Sphere16* sph;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060028F0, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_0028F0, -4.0f);
this->actor.speedXZ = 0.0f;
for (i = 0; i < ARRAY_COUNT(this->collider3Elements); i++) {
@@ -689,7 +681,7 @@ void func_8087784C(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877D50(EnDodongo* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06003088);
+ Animation_PlayOnce(&this->skelAnime, &object_dodongo_Anim_003088);
this->actionFunc = func_80877D90;
}
@@ -701,7 +693,7 @@ void func_80877D90(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80877DE0(EnDodongo* this) {
- Animation_Change(&this->skelAnime, &D_060028F0, -1.0f, 35.0f, 0.0f, 2, -4.0f);
+ Animation_Change(&this->skelAnime, &object_dodongo_Anim_0028F0, -1.0f, 35.0f, 0.0f, 2, -4.0f);
this->actor.flags |= 0x10;
this->timer = 25;
this->actionFunc = func_80877E60;
@@ -813,10 +805,10 @@ void func_80878354(EnDodongo* this) {
this->unk_306 = (0xFFFF - ABS_ALT(yDiff)) / 15;
if (yDiff >= 0) {
- sp18 = &D_060042C4;
+ sp18 = &object_dodongo_Anim_0042C4;
this->unk_306 = -this->unk_306;
} else {
- sp18 = &D_06003B14;
+ sp18 = &object_dodongo_Anim_003B14;
}
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_TAIL);
@@ -879,7 +871,7 @@ void func_808785B0(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_8087864C(EnDodongo* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001A44, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_001A44, -4.0f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DAMAGE);
this->timer = 0;
this->unk_304 = 0;
@@ -899,7 +891,7 @@ void func_808786C8(EnDodongo* this, GlobalContext* globalCtx) {
}
void func_80878724(EnDodongo* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060013C4, -8.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dodongo_Anim_0013C4, -8.0f);
this->timer = 0;
this->unk_304 = 0;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DODO_J_DEAD);
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 564b52fcb1..69eb19f58a 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"
#define FLAGS 0x00000030
@@ -30,9 +31,6 @@ const ActorInit En_Dy_Extra_InitVars = {
(ActorFunc)EnDyExtra_Draw,
};
-extern Vtx D_0600DD40[];
-extern Gfx D_0600DEF0[];
-
void EnDyExtra_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
@@ -88,11 +86,10 @@ void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static Color_RGBA8 D_80A61740[] = { { 255, 255, 170, 255 },
- { 255, 170, 255, 255 },
- { 255, 255, 170, 255 },
- { 170, 255, 255, 255 },
- { 255, 255, 170, 255 } };
+ static Color_RGBA8 D_80A61740[] = {
+ { 255, 255, 170, 255 }, { 255, 170, 255, 255 }, { 255, 255, 170, 255 },
+ { 170, 255, 255, 255 }, { 255, 255, 170, 255 },
+ };
static Color_RGBA8 D_80A61754[] = {
{ 255, 100, 0, 255 }, { 255, 0, 100, 255 }, { 100, 255, 0, 255 }, { 0, 100, 255, 255 }, { 255, 230, 0, 255 }
};
@@ -101,7 +98,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDyExtra* this = THIS;
s32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
- Vtx* vertices = Lib_SegmentedToVirtual(D_0600DD40);
+ Vtx* vertices = Lib_SegmentedToVirtual(object_dy_obj_Vtx_00DD40);
s32 i;
u8 unk[3];
@@ -126,7 +123,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, D_80A61740[this->type].r, D_80A61740[this->type].g,
D_80A61740[this->type].b, 255);
gDPSetEnvColor(POLY_XLU_DISP++, D_80A61754[this->type].r, D_80A61754[this->type].g, D_80A61754[this->type].b, 128);
- gSPDisplayList(POLY_XLU_DISP++, D_0600DEF0);
+ gSPDisplayList(POLY_XLU_DISP++, object_dy_obj_DL_00DEF0);
CLOSE_DISPS(gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index d614223e76..136cecf4bc 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -5,6 +5,7 @@
*/
#include "z_en_elf.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x02000030
@@ -32,8 +33,6 @@ void func_8088F5F4(EnElf* this, GlobalContext* globalCtx, s32 arg2);
void func_8089010C(Actor* thisx, GlobalContext* globalCtx);
void func_808908D0(Vec3f* arg0, GlobalContext* globalCtx, u32 arg2);
-extern SkeletonHeader D_0402AF58;
-
const ActorInit En_Elf_InitVars = {
ACTOR_EN_ELF,
ACTORCAT_ITEMACTION,
@@ -322,7 +321,8 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx2) {
s32 params;
Actor_ProcessInitChain(thisx, sInitChain);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_0402AF58, &D_04029140, this->jointTable, this->morphTable, 7);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &gameplay_keep_Skel_02AF58.sh, &gameplay_keep_Anim_029140,
+ this->jointTable, this->morphTable, 7);
ActorShape_Init(&thisx->shape, 0.0f, NULL, 15.0f);
thisx->shape.shadowAlpha = 255;
diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c
index e0eed3f3c0..264efc2b2c 100644
--- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c
+++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c
@@ -6,6 +6,7 @@
#include "z_en_elfbub.h"
#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
+#include "objects/object_bubble/object_bubble.h"
#define FLAGS 0x00000001
@@ -51,8 +52,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 16, 32, 0, { 0, 0, 0 } },
};
-extern Gfx D_06001000[];
-
void EnElfbub_Init(Actor* thisx, GlobalContext* globalCtx) {
EnElfbub* this = THIS;
Actor* childActor;
@@ -162,7 +161,7 @@ void EnElfbub_Draw(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_InsertZRotation_s(this->zRot * -1, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06001000);
+ gSPDisplayList(POLY_XLU_DISP++, object_bubble_DL_001000);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
index 58bf7e1fe7..07187d90da 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
@@ -5,6 +5,8 @@
*/
#include "z_en_encount2.h"
+#include "objects/object_fusen/object_fusen.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -97,17 +99,13 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(0, 0xF),
};
-extern Gfx D_06000A00[];
-extern Gfx D_06000D78[];
-extern CollisionHeader D_06002420;
-
void EnEncount2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEncount2* this = THIS;
s32 pad;
CollisionHeader* colHeader = NULL;
DynaPolyActor_Init(&this->dyna, 0);
- CollisionHeader_GetVirtual(&D_06002420, &colHeader);
+ CollisionHeader_GetVirtual(&object_fusen_Colheader_002420, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -209,8 +207,8 @@ void EnEncount2_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnEncount2* this = THIS;
if (this->isPopped != true) {
- Gfx_DrawDListOpa(globalCtx, D_06000A00);
- Gfx_DrawDListOpa(globalCtx, D_06000D78);
+ Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000A00);
+ Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000D78);
}
EnEncount2_DrawParticles(this, globalCtx);
}
@@ -279,8 +277,8 @@ void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx) {
Matrix_InsertTranslation(sPtr->pos.x, sPtr->pos.y, sPtr->pos.z, MTXMODE_NEW);
Matrix_Scale(sPtr->scale, sPtr->scale, sPtr->scale, MTXMODE_APPLY);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(&D_04079B10));
- gSPDisplayList(POLY_XLU_DISP++, D_0407AB10);
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_079B10));
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 250, 180, 255, sPtr->alpha);
@@ -288,7 +286,7 @@ void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx) {
Matrix_InsertZRotation_f(DEGTORAD(globalCtx->state.frames * 20.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0407AB58);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB58);
}
}
CLOSE_DISPS(gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
index 93d4ce1bda..34fa659a8b 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero.h"
+#include "objects/object_dt/object_dt.h"
#define FLAGS 0x00000009
@@ -30,17 +31,6 @@ const ActorInit En_Ending_Hero_InitVars = {
(ActorFunc)EnEndingHero_Draw,
};
-extern FlexSkeletonHeader D_0600B0CC;
-extern AnimationHeader D_06000BE0;
-extern UNK_PTR D_06007350[];
-extern UNK_PTR D_06009590[];
-extern UNK_PTR D_06009F90[];
-extern UNK_PTR D_0600A790[];
-extern UNK_PTR D_0600AB90[];
-extern UNK_PTR D_06007750[];
-extern UNK_PTR D_0600A390[];
-extern UNK_PTR D_0600A490[];
-
void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero* this = THIS;
@@ -48,7 +38,8 @@ void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B0CC, &D_06000BE0, this->jointTable, this->morphTable, 15);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dt_Skel_00B0CC, &object_dt_Anim_000BE0, this->jointTable,
+ this->morphTable, 15);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C1E748(this);
}
@@ -80,8 +71,14 @@ void EnEndingHero_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1D);
}
-static UNK_PTR D_80C1E970[] = { D_06007350, D_06009590, D_06009F90, D_0600A790, D_0600AB90 };
-static UNK_PTR D_80C1E984[] = { D_06007750, D_0600A390, D_0600A490 };
+static TexturePtr D_80C1E970[] = {
+ object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90, object_dt_Tex_00A790, object_dt_Tex_00AB90,
+};
+static TexturePtr D_80C1E984[] = {
+ object_dt_Tex_007750,
+ object_dt_Tex_00A390,
+ object_dt_Tex_00A490,
+};
void EnEndingHero_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c
index 09c1a950fc..ddb5535a7b 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero2.h"
+#include "objects/object_bai/object_bai.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero2_InitVars = {
(ActorFunc)EnEndingHero2_Draw,
};
-extern FlexSkeletonHeader D_06007908;
-extern AnimationHeader D_060011C0;
-
void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero2* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->jointTable, this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bai_Skel_007908, &object_bai_Anim_0011C0, this->jointTable,
+ this->morphTable, 20);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C232E8(this);
}
diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c
index c314b7b624..9cb297c5c2 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero3.h"
+#include "objects/object_toryo/object_toryo.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero3_InitVars = {
(ActorFunc)EnEndingHero3_Draw,
};
-extern FlexSkeletonHeader D_06007150;
-extern AnimationHeader D_06000E50;
-
void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero3* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007150, &D_06000E50, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_toryo_Skel_007150, &object_toryo_Anim_000E50,
+ this->jointTable, this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C23518(this);
}
diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c
index 1b8e7e7a14..59e1fd836c 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero4.h"
+#include "objects/object_sdn/object_sdn.h"
#define FLAGS 0x00000009
@@ -30,9 +31,6 @@ const ActorInit En_Ending_Hero4_InitVars = {
(ActorFunc)EnEndingHero4_Draw,
};
-extern FlexSkeletonHeader D_0600D640;
-extern AnimationHeader D_06002A84;
-
void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero4* this = THIS;
@@ -40,7 +38,8 @@ void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600D640, &D_06002A84, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_sdn_Skel_00D640, &object_sdn_Anim_002A84, this->jointTable,
+ this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
func_80C23748(this);
}
diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c
index 8daf7616e4..ba77613bde 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ending_hero5.h"
+#include "objects/object_daiku/object_daiku.h"
#define FLAGS 0x00000009
@@ -30,15 +31,6 @@ const ActorInit En_Ending_Hero5_InitVars = {
(ActorFunc)EnEndingHero5_Draw,
};
-extern FlexSkeletonHeader D_0600A850;
-extern AnimationHeader D_06002FA0;
-
-extern Gfx D_060070C0[];
-extern Gfx D_06006FB0[];
-extern Gfx D_06006E80[];
-extern Gfx D_06006D70[];
-extern Gfx D_0600A390[];
-
void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx) {
EnEndingHero5* this = THIS;
@@ -46,7 +38,8 @@ void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
this->actor.gravity = -3.0f;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
+ this->jointTable, this->morphTable, 17);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
this->unk25C = this->actor.params;
func_80C23980(this);
@@ -72,7 +65,8 @@ void EnEndingHero5_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1D);
}
-Gfx* D_80C23BF0[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70, D_0600A390 };
+Gfx* D_80C23BF0[] = { object_daiku_DL_0070C0, object_daiku_DL_006FB0, object_daiku_DL_006E80, object_daiku_DL_006D70,
+ object_daiku_DL_00A390 };
void EnEndingHero5_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnEndingHero5* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
index 7af0874336..1b296098fa 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
@@ -5,6 +5,11 @@
*/
#include "z_en_ending_hero6.h"
+#include "objects/object_dt/object_dt.h"
+#include "objects/object_daiku/object_daiku.h"
+#include "objects/object_bai/object_bai.h"
+#include "objects/object_toryo/object_toryo.h"
+#include "objects/object_sdn/object_sdn.h"
#define FLAGS 0x00000009
@@ -19,36 +24,6 @@ void EnEndingHero6_InitSkelAnime(EnEndingHero6* this, s32 npcIndex);
void EnEndingHero6_SetupIdle(EnEndingHero6* this);
void EnEndingHero6_Idle(EnEndingHero6* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_0600B0CC; // object_dt
-extern FlexSkeletonHeader D_06007908; // object_bai
-extern FlexSkeletonHeader D_06007150; // object_toryo
-extern FlexSkeletonHeader D_0600D640; // object_sdn
-extern FlexSkeletonHeader D_0600A850; // object_daiku
-
-extern AnimationHeader D_06000BE0; // object_dt
-extern AnimationHeader D_060011C0; // object_bai
-extern AnimationHeader D_06000E50; // object_toryo
-extern AnimationHeader D_06002A84; // object_sdn
-extern AnimationHeader D_06002FA0; // object_daiku
-
-// object_daiku
-extern Gfx D_060070C0[];
-extern Gfx D_06006FB0[];
-extern Gfx D_06006E80[];
-extern Gfx D_06006D70[];
-extern Gfx D_0600A390_dl[];
-
-// object_dt
-extern TexturePtr D_06007350;
-extern TexturePtr D_06009590;
-extern TexturePtr D_06009F90;
-extern TexturePtr D_0600A790;
-extern TexturePtr D_0600AB90;
-
-extern TexturePtr D_06007750;
-extern TexturePtr D_0600A390_tex;
-extern TexturePtr D_0600A490;
-
const ActorInit En_Ending_Hero6_InitVars = {
ACTOR_EN_ENDING_HERO6,
ACTORCAT_NPC,
@@ -61,11 +36,17 @@ const ActorInit En_Ending_Hero6_InitVars = {
(ActorFunc)EnEndingHero6_Draw,
};
-static FlexSkeletonHeader* sSkeletons[] = { &D_0600B0CC, &D_06007908, &D_06007150, &D_0600D640, &D_0600A850,
- &D_0600A850, &D_0600A850, &D_0600A850, &D_0600A850 };
+static FlexSkeletonHeader* sSkeletons[] = {
+ &object_dt_Skel_00B0CC, &object_bai_Skel_007908, &object_toryo_Skel_007150,
+ &object_sdn_Skel_00D640, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
+ &object_daiku_Skel_00A850, &object_daiku_Skel_00A850, &object_daiku_Skel_00A850,
+};
-static AnimationHeader* sAnimations[] = { &D_06000BE0, &D_060011C0, &D_06000E50, &D_06002A84, &D_06002FA0,
- &D_06002FA0, &D_06002FA0, &D_06002FA0, &D_06002FA0 };
+static AnimationHeader* sAnimations[] = {
+ &object_dt_Anim_000BE0, &object_bai_Anim_0011C0, &object_toryo_Anim_000E50,
+ &object_sdn_Anim_002A84, &object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0,
+ &object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0, &object_daiku_Anim_002FA0,
+};
static s32 sLimbCounts[] = { 15, 20, 17, 17, 17, 17, 17, 17, 17 };
@@ -124,7 +105,8 @@ void EnEndingHero6_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnEndingHero6_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
- static Gfx* D_80C2426C[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70, D_0600A390_dl };
+ static Gfx* D_80C2426C[] = { object_daiku_DL_0070C0, object_daiku_DL_006FB0, object_daiku_DL_006E80,
+ object_daiku_DL_006D70, object_daiku_DL_00A390 };
EnEndingHero6* this = THIS;
s32 index;
@@ -139,8 +121,9 @@ void EnEndingHero6_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
}
void EnEndingHero6_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr D_80C24280[] = { &D_06007350, &D_06009590, &D_06009F90, &D_0600A790, &D_0600AB90 };
- static TexturePtr D_80C24294[] = { &D_06007750, &D_0600A390_tex, &D_0600A490 };
+ static TexturePtr D_80C24280[] = { object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90,
+ object_dt_Tex_00A790, object_dt_Tex_00AB90 };
+ static TexturePtr D_80C24294[] = { object_dt_Tex_007750, object_dt_Tex_00A390, object_dt_Tex_00A490 };
s32 pad;
EnEndingHero6* this = THIS;
s32 index = 0;
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
index 0474bc1323..dabda0e1d1 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
@@ -516,7 +516,7 @@ void EnFall_FireBall_SetPerVertexAlpha(f32 fireBallAlpha) {
s32 pad;
u8 perVertexAlphaTable[5];
- Vtx* vertices = Lib_SegmentedToVirtual(&object_fall_Vtx_0004C0);
+ Vtx* vertices = Lib_SegmentedToVirtual(object_fall_Vtx_0004C0);
s32 i;
if (fireBallAlpha > 1.0f) {
@@ -832,7 +832,7 @@ void EnFall_FireRing_Draw(Actor* thisx, GlobalContext* globalCtx) {
this->fireRingAlpha = 1.0f;
}
OPEN_DISPS(globalCtx->state.gfxCtx);
- AnimatedMat_DrawXlu(globalCtx, Lib_SegmentedToVirtual(&object_fall_Matanimheader_004E38));
+ AnimatedMat_DrawXlu(globalCtx, Lib_SegmentedToVirtual(object_fall_Matanimheader_004E38));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_8012C2DC(globalCtx->state.gfxCtx);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE);
@@ -847,7 +847,7 @@ void EnFall_MoonsTear_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_moonston_Matanimheader_001220));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_moonston_Matanimheader_001220));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_8012C28C(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, object_moonston_DL_000400);
diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c
index 189f0e2e02..ea0c820270 100644
--- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c
+++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c
@@ -5,6 +5,8 @@
*/
#include "z_en_fg.h"
+#include "objects/object_fr/object_fr.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00004209
@@ -22,14 +24,6 @@ void EnFg_AddDust(EnFgEffectDust* dustEffect, Vec3f* worldPos);
void EnFg_UpdateDust(EnFgEffectDust* dustEffect);
void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect);
-extern AnimationHeader D_06001534;
-extern AnimationHeader D_060011C0;
-extern AnimationHeader D_060007BC;
-extern Gfx* D_060059A0[];
-extern Gfx* D_0600B328[];
-extern Gfx* D_0600B338[];
-extern FlexSkeletonHeader D_0600B538;
-
const ActorInit En_Fg_InitVars = {
ACTOR_EN_FG,
ACTORCAT_NPC,
@@ -102,10 +96,10 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_06001534, 1.0f, 0, -1, 0, 0 },
- { &D_06001534, 1.0f, 0, -1, 0, -4 },
- { &D_060011C0, 1.0f, 0, -1, 0, -4 },
- { &D_060007BC, 1.0f, 0, -1, 2, -4 },
+ { &object_fr_Anim_001534, 1.0f, 0, -1, 0, 0 },
+ { &object_fr_Anim_001534, 1.0f, 0, -1, 0, -4 },
+ { &object_fr_Anim_0011C0, 1.0f, 0, -1, 0, -4 },
+ { &object_fr_Anim_0007BC, 1.0f, 0, -1, 2, -4 },
};
s32 EnFg_UpdateAnimation(SkelAnime* skelAnime, s16 animIndex) {
@@ -321,7 +315,8 @@ void EnFg_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFg* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 10.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B538, NULL, this->jointTable, this->morphTable, 24);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fr_Skel_00B538, NULL, this->jointTable, this->morphTable,
+ 24);
EnFg_UpdateAnimation(&this->skelAnime, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -412,8 +407,8 @@ void EnFg_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, envColor[this->actor.params].r, envColor[this->actor.params].g,
envColor[this->actor.params].b, envColor[this->actor.params].a);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060059A0));
- gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(&D_060059A0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_fr_Tex_0059A0));
+ gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(object_fr_Tex_0059A0));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnFg_OverrideLimbDraw, EnFg_PostLimbDraw, &this->actor);
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -451,7 +446,7 @@ void EnFg_UpdateDust(EnFgEffectDust* dustEffect) {
}
TexturePtr sDustTex[] = {
- D_0408F7E0, D_0408F3E0, D_0408EFE0, D_0408EBE0, D_0408E7E0, D_0408E3E0, D_0408DFE0, D_0408DBE0,
+ gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
@@ -467,7 +462,7 @@ void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
if (dustEffect->type) {
if (!firstDone) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
- gSPDisplayList(POLY_XLU_DISP++, D_0600B328);
+ gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B328);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0);
firstDone = true;
}
@@ -483,7 +478,7 @@ void EnFg_DrawDust(GlobalContext* globalCtx, EnFgEffectDust* dustEffect) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
index = 0.5f * dustEffect->timer;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sDustTex[index]));
- gSPDisplayList(POLY_XLU_DISP++, D_0600B338);
+ gSPDisplayList(POLY_XLU_DISP++, object_fr_DL_00B338);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
index 20dfe55362..af00d0344c 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
@@ -6,6 +6,7 @@
#include "z_en_firefly.h"
#include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h"
+#include "objects/object_firefly/object_firefly.h"
#define FLAGS 0x00005005
@@ -119,16 +120,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(targetArrowOffset, 4000, ICHAIN_STOP),
};
-extern AnimationHeader D_0600017C;
-extern SkeletonHeader D_060018B8;
-extern Gfx D_06001678[];
-
void EnFirefly_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFirefly* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_060018B8, &D_0600017C, this->jointTable, this->morphTable, 28);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_firefly_Skel_0018B8, &object_firefly_Anim_00017C,
+ this->jointTable, this->morphTable, 28);
Collider_InitAndSetSphere(globalCtx, &this->collider, &this->actor, &sSphereInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -331,7 +329,7 @@ void EnFirefly_FlyIdle(EnFirefly* this, GlobalContext* globalCtx) {
void EnFirefly_SetupFall(EnFirefly* this, GlobalContext* globalCtx) {
this->timer = 40;
this->actor.velocity.y = 0.0f;
- Animation_Change(&this->skelAnime, &D_0600017C, 0.0f, 6.0f, 6.0f, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_firefly_Anim_00017C, 0.0f, 6.0f, 6.0f, 2, 0.0f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_FFLY_DEAD);
this->actor.flags |= 0x10;
@@ -757,7 +755,7 @@ void EnFirefly_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
EnFirefly* this = THIS;
if ((this->currentType != KEESE_FIRE) && (limbIndex == 27)) {
- gSPDisplayList((*gfx)++, D_06001678);
+ gSPDisplayList((*gfx)++, object_firefly_DL_001678);
} else if ((this->unk_2F4 != globalCtx->gameplayFrames) &&
((this->auraType == KEESE_AURA_FIRE) || (this->auraType == KEESE_AURA_ICE)) &&
((limbIndex == 15) || (limbIndex == 21))) {
diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
index e7be940c18..db2cae901a 100644
--- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
+++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
@@ -7,6 +7,8 @@
#include "overlays/actors/ovl_En_Fish/z_en_fish.h"
#include "overlays/actors/ovl_En_Mushi2/z_en_mushi2.h"
#include "z_en_fish2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_fb/object_fb.h"
#define FLAGS 0x00000019
@@ -40,13 +42,6 @@ void func_80B2ADB0(EnFish2* this, Vec3f* vec, s16 arg2);
void func_80B2AF80(EnFish2* this, GlobalContext* globalCtx);
void func_80B2B180(EnFish2* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060006D8;
-extern AnimationHeader D_060007D4;
-extern AnimationHeader D_06000ACC;
-extern AnimationHeader D_06001174;
-extern AnimationHeader D_060013AC;
-extern FlexSkeletonHeader D_06006190;
-
static s32 D_80B2B2E0 = 0;
static s32 D_80B2B2E4 = 0;
static s32 D_80B2B2E8 = 0;
@@ -109,7 +104,8 @@ static f32 D_80B2B380[] = { 0.019f, 0.033f };
void func_80B28370(EnFish2* this, s32 arg0) {
static AnimationHeader* D_80B2B388[] = {
- &D_060013AC, &D_060007D4, &D_060006D8, &D_060006D8, &D_06001174, &D_06000ACC,
+ &object_fb_Anim_0013AC, &object_fb_Anim_0007D4, &object_fb_Anim_0006D8,
+ &object_fb_Anim_0006D8, &object_fb_Anim_001174, &object_fb_Anim_000ACC,
};
static u8 D_80B2B3A0[] = { 0, 0, 2, 2, 2, 2 };
f32 sp34;
@@ -161,8 +157,8 @@ void EnFish2_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.params == 0) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006190, &D_060013AC, this->jointTable, this->morphTable,
- 24);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fb_Skel_006190, &object_fb_Anim_0013AC,
+ this->jointTable, this->morphTable, 24);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
if (this->unk_344 == 0) {
if (gSaveContext.weekEventReg[81] & 0x10) {
@@ -1095,12 +1091,12 @@ void func_80B2ADB0(EnFish2* this, Vec3f* vec, s16 arg2) {
for (i = 0; i < ARRAY_COUNT(this->unk_3F8); i++, ptr++) {
if (!ptr->unk_00) {
- u32 phi_v0;
+ TexturePtr phi_v0;
if (Rand_ZeroOne() < 0.5f) {
- phi_v0 = &D_04091CE0;
+ phi_v0 = gameplay_keep_Tex_091CE0;
} else {
- phi_v0 = &D_04091BE0;
+ phi_v0 = gameplay_keep_Tex_091BE0;
}
ptr->unk_20 = VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(phi_v0));
@@ -1172,7 +1168,7 @@ void func_80B2B180(EnFish2* this, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0);
gSPSegment(POLY_OPA_DISP++, 0x08, ptr->unk_20);
- gSPDisplayList(POLY_OPA_DISP++, D_040301B0);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0301B0);
}
}
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
index 4dff321803..ae6fc99b73 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
@@ -5,6 +5,7 @@
*/
#include "z_en_floormas.h"
+#include "objects/object_wallmaster/object_wallmaster.h"
#define FLAGS 0x00000405
@@ -59,19 +60,6 @@ void func_808D2D30(EnFloormas* this, GlobalContext* globalCtx);
void func_808D2DC0(EnFloormas* this, GlobalContext* globalCtx);
void func_808D3754(Actor* thisx, GlobalContext* globalCtx);
-extern AnimationHeader D_06000590;
-extern AnimationHeader D_06000EA4;
-extern AnimationHeader D_060019CC;
-extern AnimationHeader D_06002158;
-extern AnimationHeader D_060039B0;
-extern AnimationHeader D_060041F4;
-extern Gfx D_06008688[];
-extern FlexSkeletonHeader D_06008FB0;
-extern AnimationHeader D_06009244;
-extern AnimationHeader D_06009520;
-extern AnimationHeader D_06009DB0;
-extern AnimationHeader D_0600A054;
-
const ActorInit En_Floormas_InitVars = {
ACTOR_EN_FLOORMAS,
ACTORCAT_ENEMY,
@@ -166,7 +154,8 @@ void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, this->jointTable, this->morphTable, 25);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_wallmaster_Skel_008FB0, &object_wallmaster_Anim_009DB0,
+ this->jointTable, this->morphTable, 25);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -270,7 +259,7 @@ void func_808D0A48(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0B08(EnFloormas* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D0B50;
}
@@ -289,7 +278,7 @@ void func_808D0B50(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0C14(EnFloormas* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600A054, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_00A054, -3.0f);
this->actionFunc = func_808D0C58;
}
@@ -307,7 +296,7 @@ void func_808D0C58(EnFloormas* this, GlobalContext* globalCtx) {
void func_808D0CE4(EnFloormas* this) {
if (this->actionFunc != func_808D0F80) {
- Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 1.5f);
+ Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 1.5f);
} else {
this->skelAnime.playSpeed = 1.5f;
}
@@ -345,7 +334,7 @@ void func_808D0D70(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D0ECC(EnFloormas* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06009244);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009244);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D0F14;
}
@@ -384,10 +373,10 @@ void func_808D108C(EnFloormas* this) {
this->actor.speedXZ = 0.0f;
if (sp36 > 0) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06002158, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_002158, -3.0f);
} else {
- Animation_Change(&this->skelAnime, &D_06002158, -1.0f, Animation_GetLastFrame(&D_06002158.common), 0.0f, 2,
- -3.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_002158, -1.0f,
+ Animation_GetLastFrame(&object_wallmaster_Anim_002158.common), 0.0f, 2, -3.0f);
}
if (this->actor.scale.x > 0.009f) {
@@ -429,7 +418,8 @@ void func_808D11BC(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1380(EnFloormas* this, GlobalContext* globalCtx) {
- Animation_Change(&this->skelAnime, &D_06009520, 3.0f, 0.0f, Animation_GetLastFrame(&D_06009520.common), 2, -3.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_009520, 3.0f, 0.0f,
+ Animation_GetLastFrame(&object_wallmaster_Anim_009520.common), 2, -3.0f);
this->actor.speedXZ = 0.0f;
this->actor.gravity = 0.0f;
func_808D08D0(this);
@@ -502,7 +492,7 @@ void func_808D1650(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1740(EnFloormas* this) {
- Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, 42.0f, 2, 5.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 41.0f, 42.0f, 2, 5.0f);
if ((this->actor.speedXZ < 0.0f) || (this->actionFunc != func_808D1650)) {
this->unk_18E = 30;
} else {
@@ -548,7 +538,7 @@ void func_808D17EC(EnFloormas* this, GlobalContext* globalCtx) {
if ((this->unk_18E == 0) && (sp24 != 0)) {
if (this->skelAnime.endFrame < 45.0f) {
- this->skelAnime.endFrame = Animation_GetLastFrame(&D_060019CC.common);
+ this->skelAnime.endFrame = Animation_GetLastFrame(&object_wallmaster_Anim_0019CC.common);
} else if (this->actor.params == ENFLOORMAS_GET_7FFF_40) {
func_808D2700(this);
} else {
@@ -579,7 +569,8 @@ void func_808D19D4(EnFloormas* this) {
this->actor.shape.rot.y = parent->shape.rot.y + 0x5555;
this->actor.world.pos = parent->world.pos;
this->actor.params = ENFLOORMAS_GET_7FFF_10;
- Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, Animation_GetLastFrame(&D_060019CC.common), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 41.0f,
+ Animation_GetLastFrame(&object_wallmaster_Anim_0019CC.common), 2, 0.0f);
this->collider.dim.radius = sCylinderInit.dim.radius * 0.6f;
this->collider.dim.height = sCylinderInit.dim.height * 0.6f;
this->actor.flags &= ~0x400;
@@ -605,7 +596,7 @@ void func_808D1B44(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1BCC(EnFloormas* this) {
- Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 4.5f);
+ Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 4.5f);
this->actor.speedXZ = 5.0f;
this->actionFunc = func_808D1C1C;
}
@@ -632,7 +623,7 @@ void func_808D1C1C(EnFloormas* this, GlobalContext* globalCtx) {
void func_808D1D0C(EnFloormas* this) {
if (this->actionFunc != func_808D1C1C) {
- Animation_PlayLoopSetSpeed(&this->skelAnime, &D_060041F4, 4.5f);
+ Animation_PlayLoopSetSpeed(&this->skelAnime, &object_wallmaster_Anim_0041F4, 4.5f);
}
this->actor.speedXZ = 5.0f;
this->actionFunc = func_808D1D6C;
@@ -695,7 +686,7 @@ void func_808D1F7C(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D1FD4(EnFloormas* this) {
- Animation_Change(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D2040;
}
@@ -725,7 +716,7 @@ void func_808D217C(EnFloormas* this, Player* player) {
Vec3f* ptr;
u8 playerForm;
- Animation_Change(&this->skelAnime, &D_060019CC, 1.0f, 36.0f, 45.0f, 2, -3.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 1.0f, 36.0f, 45.0f, 2, -3.0f);
this->actor.flags &= ~1;
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
@@ -781,7 +772,7 @@ void func_808D22C8(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2484(EnFloormas* this) {
- Animation_Change(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_wallmaster_Anim_0019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_808D24F0;
}
@@ -825,7 +816,7 @@ void func_808D24F0(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2700(EnFloormas* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->unk_18E = 0;
this->unk_194 = 1500;
this->actor.params = ENFLOORMAS_GET_7FFF_40;
@@ -890,10 +881,10 @@ void func_808D2764(EnFloormas* this, GlobalContext* globalCtx) {
this->actor.colChkInfo.health = sColChkInfoInit.health;
func_808D0C14(this);
} else if (this->unk_18E == 0) {
- Animation_PlayOnce(&this->skelAnime, &D_060039B0);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_0039B0);
this->unk_18E = 1;
} else {
- Animation_PlayOnce(&this->skelAnime, &D_06009DB0);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_009DB0);
this->unk_18E = 0;
}
}
@@ -933,7 +924,7 @@ void func_808D2AF4(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2B18(EnFloormas* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000590, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wallmaster_Anim_000590, -3.0f);
func_800BE504(&this->actor, &this->collider);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 20);
this->actor.speedXZ = 5.0f;
@@ -976,7 +967,7 @@ void func_808D2C08(EnFloormas* this, GlobalContext* globalCtx) {
}
void func_808D2CDC(EnFloormas* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06000EA4);
+ Animation_PlayOnce(&this->skelAnime, &object_wallmaster_Anim_000EA4);
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -1187,7 +1178,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList((*gfx)++, D_06008688);
+ gSPDisplayList((*gfx)++, object_wallmaster_DL_008688);
Matrix_StatePop();
}
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
index a9b3a95c8c..62d08908af 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
@@ -5,6 +5,8 @@
*/
#include "z_en_fsn.h"
+#include "objects/object_fsn/object_fsn.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -45,25 +47,6 @@ void EnFsn_SelectItem(EnFsn* this, GlobalContext* globalCtx);
void EnFsn_LookToShopkeeperFromShelf(EnFsn* this, GlobalContext* globalCtx);
void EnFsn_PlayerCannotBuy(EnFsn* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06012C34;
-extern AnimationHeader D_060131FC;
-extern AnimationHeader D_0600C58C;
-extern AnimationHeader D_0600E3EC;
-extern AnimationHeader D_0600F00C;
-extern AnimationHeader D_0600CB3C;
-extern AnimationHeader D_0600D354;
-extern AnimationHeader D_060138B0;
-extern AnimationHeader D_0601430C;
-extern AnimationHeader D_0600B9D8;
-extern AnimationHeader D_0600C26C;
-extern AnimationHeader D_0600DE34;
-extern FlexSkeletonHeader D_06013320;
-extern UNK_TYPE D_06005BC0;
-extern UNK_TYPE D_06006D40;
-extern UNK_TYPE D_06007140;
-extern Gfx D_0600F180[];
-extern Gfx D_0600F218[];
-
const ActorInit En_Fsn_InitVars = {
ACTOR_EN_FSN,
ACTORCAT_NPC,
@@ -77,11 +60,13 @@ const ActorInit En_Fsn_InitVars = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_06012C34, 1.0f, 0, -1, 0, 0 }, { &D_060131FC, 1.0f, 0, -1, 0, 0 }, { &D_0600C58C, 1.0f, 0, -1, 2, 0 },
- { &D_0600C58C, -1.0f, 0, -1, 2, 0 }, { &D_0600E3EC, 1.0f, 0, -1, 2, 0 }, { &D_0600F00C, 1.0f, 0, -1, 0, 0 },
- { &D_0600CB3C, 1.0f, 0, -1, 2, 0 }, { &D_0600D354, 1.0f, 0, -1, 0, 0 }, { &D_060138B0, 1.0f, 0, -1, 2, 0 },
- { &D_0601430C, 1.0f, 0, -1, 0, 0 }, { &D_0600B9D8, 1.0f, 0, -1, 2, 0 }, { &D_0600C26C, 1.0f, 0, -1, 0, 0 },
- { &D_0600DE34, 1.0f, 0, -1, 2, 0 },
+ { &object_fsn_Anim_012C34, 1.0f, 0, -1, 0, 0 }, { &object_fsn_Anim_0131FC, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00C58C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C58C, -1.0f, 0, -1, 2, 0 },
+ { &object_fsn_Anim_00E3EC, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00F00C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00CB3C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00D354, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_0138B0, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_01430C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00B9D8, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C26C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00DE34, 1.0f, 0, -1, 2, 0 },
};
static ColliderCylinderInit sCylinderInit = {
@@ -1400,7 +1385,8 @@ void EnFsn_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013320, &D_06012C34, this->jointTable, this->morphTable, 19);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fsn_Skel_013320, &object_fsn_Anim_012C34, this->jointTable,
+ this->morphTable, 19);
if (ENFSN_IS_SHOP(&this->actor)) {
this->actor.shape.rot.y = BINANG_ROT180(this->actor.shape.rot.y);
this->actor.flags &= ~1;
@@ -1460,8 +1446,8 @@ void EnFsn_DrawCursor(EnFsn* this, GlobalContext* globalCtx, f32 x, f32 y, f32 z
func_8012C654(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColor.r, this->cursorColor.g, this->cursorColor.b,
this->cursorColor.a);
- gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_0401F740, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
- G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock_4b(OVERLAY_DISP++, gameplay_keep_Tex_01F740, G_IM_FMT_IA, 16, 16, 0,
+ G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
w = 16.0f * z;
ulx = (x - w) * 4.0f;
uly = (y - w + -12.0f) * 4.0f;
@@ -1508,7 +1494,7 @@ void EnFsn_DrawStickDirectionPrompts(EnFsn* this, GlobalContext* globalCtx) {
if (drawStickRightPrompt || drawStickLeftPrompt) {
func_8012C654(globalCtx->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F8C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F8C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1529,7 +1515,7 @@ void EnFsn_DrawStickDirectionPrompts(EnFsn* this, GlobalContext* globalCtx) {
this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY,
this->stickRightPrompt.texZ, 0, 0, 1.0f, 1.0f);
}
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F7C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F7C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1599,14 +1585,14 @@ void EnFsn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
this->actor.focus.pos.z = this->actor.world.pos.z;
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_0600F180);
- gSPDisplayList(POLY_OPA_DISP++, D_0600F218);
+ gSPDisplayList(POLY_OPA_DISP++, object_fsn_DL_00F180);
+ gSPDisplayList(POLY_OPA_DISP++, object_fsn_DL_00F218);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
void EnFsn_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sEyeTextures[] = { &D_06005BC0, &D_06006D40, &D_06007140 };
+ static TexturePtr sEyeTextures[] = { object_fsn_Tex_005BC0, object_fsn_Tex_006D40, object_fsn_Tex_007140 };
EnFsn* this = THIS;
s32 pad;
s16 i;
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 271dd2678f..3ffd64097b 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -10,6 +10,8 @@
#include "overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "z_en_fu.h"
+#include "objects/object_mu/object_mu.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x0A000019
@@ -54,16 +56,6 @@ void func_80964694(EnFu* this, EnFuUnkStruct* ptr, Vec3f* arg2, s32 len);
void func_809647EC(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len);
void func_80964950(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len);
-extern AnimationHeader D_06001F74;
-extern AnimationHeader D_06002F64;
-extern AnimationHeader D_06004904;
-extern AnimationHeader D_06005304;
-extern AnimationHeader D_060053E0;
-extern Gfx D_0600B0A0[];
-extern Gfx D_0600B0E0[];
-extern FlexSkeletonHeader D_0600B2B0;
-extern AnimationHeader D_0600BAC4;
-
const ActorInit En_Fu_InitVars = {
ACTOR_EN_FU,
ACTORCAT_NPC,
@@ -83,10 +75,10 @@ static Vec3f D_80964B18 = { 0.0f, 55.0f, 12.0f };
static Vec3f D_80964B24 = { 0.0f, 60.0f, 0.0f };
static ActorAnimationEntry sAnimations[] = {
- { &D_060053E0, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06001F74, 1.0f, 0.0f, 0.0f, 0, -4.0f },
- { &D_06002F64, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06004904, 1.0f, 0.0f, 0.0f, 0, 0.0f },
- { &D_06005304, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &D_06005304, 1.0f, 0.0f, 0.0f, 0, 0.0f },
- { &D_0600BAC4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
+ { &object_mu_Anim_0053E0, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &object_mu_Anim_001F74, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_mu_Anim_002F64, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &object_mu_Anim_004904, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_mu_Anim_005304, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &object_mu_Anim_005304, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_mu_Anim_00BAC4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
};
static ColliderCylinderInit sCylinderInit = {
@@ -200,8 +192,8 @@ void EnFu_Init(Actor* thisx, GlobalContext* globalCtx) {
if (fuKaiten != NULL) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B2B0, &D_06001F74, this->jointTable, this->morphTable,
- 21);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mu_Skel_00B2B0, &object_mu_Anim_001F74,
+ this->jointTable, this->morphTable, 21);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -1459,17 +1451,17 @@ void func_80964950(GlobalContext* globalCtx, EnFuUnkStruct* ptr, s32 len) {
for (i = 0; i < len; i++, ptr++) {
if (ptr->unk_36 == 1) {
if (!flag) {
- gSPDisplayList(POLY_OPA_DISP++, D_0600B0A0);
+ gSPDisplayList(POLY_OPA_DISP++, object_mu_DL_00B0A0);
flag = true;
}
Matrix_InsertTranslation(ptr->unk_08.x, ptr->unk_08.y, ptr->unk_08.z, MTXMODE_NEW);
Matrix_NormalizeXYZ(&globalCtx->billboardMtxF);
Matrix_Scale(ptr->unk_00, ptr->unk_00, ptr->unk_00, MTXMODE_APPLY);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_0405E6F0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_0600B0E0);
+ gSPDisplayList(POLY_OPA_DISP++, object_mu_DL_00B0E0);
}
}
diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c
index 21040feb9d..1feb2cca3a 100644
--- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c
+++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c
@@ -1025,10 +1025,10 @@ void EnGeg_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
void func_80BB3BE0(EnGeg* this, GlobalContext* globalCtx) {
static TexturePtr D_80BB4088[] = {
- &object_oF1d_map_Tex_010438,
- &object_oF1d_map_Tex_010C38,
- &object_oF1d_map_Tex_011038,
- &object_oF1d_map_Tex_010838,
+ object_oF1d_map_Tex_010438,
+ object_oF1d_map_Tex_010C38,
+ object_oF1d_map_Tex_011038,
+ object_oF1d_map_Tex_010838,
};
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index b5ce045e64..f679ddb943 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ginko_man.h"
+#include "objects/object_boj/object_boj.h"
#define FLAGS 0x00000009
@@ -29,14 +30,6 @@ void EnGinkoMan_Stamp(EnGinkoMan* this, GlobalContext* globalCtx);
void EnGinkoMan_Dialogue(EnGinkoMan* this, GlobalContext* globalCtx);
void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_0600C240; // object_ginko_skeleton
-extern Gfx D_0600B1D8[]; // object_ginko_limb15_dlist
-extern AnimationHeader D_060008C0; // object_ginko_floorsmacking_anim
-extern AnimationHeader D_060043F0; // object_ginko_sitting_anim
-extern AnimationHeader D_06004A7C; // object_ginko_amazed_anim
-extern AnimationHeader D_06004F40; // object_ginko_stamp_reach_anim
-extern AnimationHeader D_06000AC4; // object_ginko_advertising_anim
-
const ActorInit En_Ginko_Man_InitVars = {
ACTOR_EN_GINKO_MAN,
ACTORCAT_NPC,
@@ -50,11 +43,11 @@ const ActorInit En_Ginko_Man_InitVars = {
};
ActorAnimationEntry animations[] = {
- { &D_060008C0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
- { &D_060043F0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
- { &D_06004F40, 1.0f, 0.0f, 0.0f, 2, -4.0f },
- { &D_06000AC4, 1.0f, 0.0f, 0.0f, 0, -4.0f }, // looking around for customers
- { &D_06004A7C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_boj_Anim_0008C0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_boj_Anim_0043F0, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_boj_Anim_004F40, 1.0f, 0.0f, 0.0f, 2, -4.0f },
+ { &object_boj_Anim_000AC4, 1.0f, 0.0f, 0.0f, 0, -4.0f }, // looking around for customers
+ { &object_boj_Anim_004A7C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
};
void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -69,7 +62,8 @@ void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) {
this->isStampChecked = false;
this->choiceDepositWithdrawl = GINKOMAN_CHOICE_RESET;
this->serviceFee = 0;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C240, &D_060043F0, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_boj_Skel_00C240, &object_boj_Anim_0043F0, this->jointTable,
+ this->morphTable, 16);
EnGinkoMan_SetupIdle(this);
}
@@ -501,7 +495,8 @@ void EnGinkoMan_Dialogue(EnGinkoMan* this, GlobalContext* globalCtx) {
break;
}
- if ((this->skelAnime.animation == &D_060008C0) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+ if ((this->skelAnime.animation == &object_boj_Anim_0008C0) &&
+ Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BANK_MAN_HAND_HIT);
}
}
@@ -601,12 +596,12 @@ void EnGinkoMan_Stamp(EnGinkoMan* this, GlobalContext* globalCtx) {
void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) {
if (this->actor.xzDistToPlayer > 160.0f) {
if (this->animTimer == 0) {
- if (this->skelAnime.animation != &D_06004A7C) {
+ if (this->skelAnime.animation != &object_boj_Anim_004A7C) {
this->animTimer = 40;
Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_ADVERTISING);
}
}
- } else if ((this->animTimer == 0) && (this->skelAnime.animation != &D_06000AC4)) {
+ } else if ((this->animTimer == 0) && (this->skelAnime.animation != &object_boj_Anim_000AC4)) {
this->animTimer = 40;
Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_AMAZED);
}
@@ -616,7 +611,7 @@ void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) {
void EnGinkoMan_FacePlayer(EnGinkoMan* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
- if (this->skelAnime.animation != &D_06004A7C) {
+ if (this->skelAnime.animation != &object_boj_Anim_004A7C) {
func_800E9250(globalCtx, &this->actor, &this->limb15Rot, &this->limb8Rot, this->actor.focus.pos);
} else {
func_800E8F08(&this->limb15Rot, &this->limb8Rot);
@@ -637,7 +632,7 @@ s32 EnGinkoMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
EnGinkoMan* this = THIS;
if (limbIndex == 15) {
- *dList = D_0600B1D8;
+ *dList = object_boj_DL_00B1D8;
}
if (limbIndex == 15) {
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 026d9f51cd..4f7145ceb2 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -6,6 +6,7 @@
#include "z_en_gm.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "objects/object_in2/object_in2.h"
#define FLAGS 0x00000019
@@ -19,25 +20,6 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80950CDC(EnGm* this, GlobalContext* globalCtx);
void func_80950DB8(EnGm* this, GlobalContext* globalCtx);
-extern UNK_PTR D_06005028;
-extern UNK_PTR D_060054A8;
-extern UNK_PTR D_06005CE8;
-extern UNK_PTR D_06006828;
-extern UNK_PTR D_06006C68;
-extern Gfx D_06007528[];
-extern FlexSkeletonHeader D_060078B0;
-extern AnimationHeader D_06008090;
-extern AnimationHeader D_0600898C;
-extern AnimationHeader D_06009450;
-extern AnimationHeader D_06009CDC;
-extern AnimationHeader D_0600A5E0;
-extern AnimationHeader D_0600A70C;
-extern AnimationHeader D_0600AD18;
-extern AnimationHeader D_0600B8B0;
-extern AnimationHeader D_0600B990;
-extern AnimationHeader D_0600BA80;
-extern AnimationHeader D_0600C03C;
-
static u32 D_80951820[] = {
0x0D000101, 0x360A0061, 0x25020600, 0x09001902, 0x0900090A, 0x0D02090A, 0x090F0105, 0x0E090A09, 0x0F0F0E09,
0x00090A18, 0x0E060009, 0x00060A00, 0x6C490209, 0x0A090F3D, 0x02090F0A, 0x0031020A, 0x000A0525, 0x020C0F0C,
@@ -147,11 +129,13 @@ static ColliderSphereInit sSphereInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS D_80951CC0[13] = {
- { &D_06009CDC, 1.0f, 0, -1, 0, 0 }, { &D_06009CDC, 1.0f, 0, -1, 0, -4 }, { &D_0600A5E0, 1.0f, 0, -1, 0, 0 },
- { &D_0600A70C, 1.0f, 0, 1, 0, 0 }, { &D_06008090, 1.0f, 0, -1, 0, 0 }, { &D_0600898C, 1.0f, 0, -1, 2, -4 },
- { &D_06009450, 1.0f, 0, -1, 2, -4 }, { &D_0600AD18, 1.0f, 0, -1, 0, 0 }, { &D_0600AD18, 1.0f, 0, -1, 0, -4 },
- { &D_0600B8B0, 1.0f, 0, -1, 2, 0 }, { &D_0600BA80, 1.0f, 0, -1, 0, -4 }, { &D_0600C03C, 1.0f, 0, -1, 0, -4 },
- { &D_0600B990, 1.0f, 0, -1, 0, -4 },
+ { &object_in2_Anim_009CDC, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_009CDC, 1.0f, 0, -1, 0, -4 },
+ { &object_in2_Anim_00A5E0, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_00A70C, 1.0f, 0, 1, 0, 0 },
+ { &object_in2_Anim_008090, 1.0f, 0, -1, 0, 0 }, { &object_in2_Anim_00898C, 1.0f, 0, -1, 2, -4 },
+ { &object_in2_Anim_009450, 1.0f, 0, -1, 2, -4 }, { &object_in2_Anim_00AD18, 1.0f, 0, -1, 0, 0 },
+ { &object_in2_Anim_00AD18, 1.0f, 0, -1, 0, -4 }, { &object_in2_Anim_00B8B0, 1.0f, 0, -1, 2, 0 },
+ { &object_in2_Anim_00BA80, 1.0f, 0, -1, 0, -4 }, { &object_in2_Anim_00C03C, 1.0f, 0, -1, 0, -4 },
+ { &object_in2_Anim_00B990, 1.0f, 0, -1, 0, -4 },
};
Actor* func_8094DEE0(EnGm* this, GlobalContext* globalCtx, u8 arg2, s16 arg3) {
@@ -1598,7 +1582,8 @@ void EnGm_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 22.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060078B0, NULL, this->jointTable, this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in2_Skel_0078B0, NULL, this->jointTable, this->morphTable,
+ 20);
this->unk_3E8 = -1;
func_8094E054(this, globalCtx, 0);
Collider_InitAndSetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -1699,7 +1684,7 @@ void EnGm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
OPEN_DISPS(globalCtx->state.gfxCtx);
if ((limbIndex == 15) && (this->unk_3A4 & 0x800)) {
- gSPDisplayList(POLY_OPA_DISP++, D_06007528);
+ gSPDisplayList(POLY_OPA_DISP++, object_in2_DL_007528);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -1752,7 +1737,8 @@ void EnGm_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
}
void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static UNK_PTR D_80951E30[] = { &D_060054A8, &D_06005028, &D_06006828, &D_06005028, &D_06005CE8, &D_06006C68 };
+ static TexturePtr D_80951E30[] = { object_in2_Tex_0054A8, object_in2_Tex_005028, object_in2_Tex_006828,
+ object_in2_Tex_005028, object_in2_Tex_005CE8, object_in2_Tex_006C68 };
EnGm* this = THIS;
if ((this->unk_258 != 0) && (this->unk_262 >= 0)) {
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index 3a260a9864..e01bf0218d 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -290,8 +290,7 @@ void func_80A1143C(EnGoStruct ptr[], Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 arg
void func_80A115B4(EnGoStruct ptr[], GlobalContext* globalCtx) {
static TexturePtr D_80A16644[] = {
- &gameplay_keep_Tex_08F7E0, &gameplay_keep_Tex_08F3E0, &gameplay_keep_Tex_08EFE0, &gameplay_keep_Tex_08EBE0,
- &gameplay_keep_Tex_08E7E0, &gameplay_keep_Tex_08E3E0, &gameplay_keep_Tex_08DFE0, &gameplay_keep_Tex_08DBE0,
+ &gDust8Tex, &gDust7Tex, &gDust6Tex, &gDust5Tex, &gDust4Tex, &gDust3Tex, &gDust2Tex, &gDust1Tex,
};
static Color_RGBA8 D_80A16664[] = {
{ 255, 255, 255, 0 },
@@ -2045,8 +2044,8 @@ void EnGo_TransfromLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
void func_80A15FEC(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80A1670C[] = {
- &object_oF1d_map_Tex_010438, &object_oF1d_map_Tex_010C38, &object_oF1d_map_Tex_011038,
- &object_oF1d_map_Tex_010C38, &object_oF1d_map_Tex_010838,
+ object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_011038,
+ object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_010838,
};
EnGo* this = THIS;
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 7fbf4213f6..8905b116c1 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -5,6 +5,8 @@
*/
#include "z_en_goroiwa.h"
+#include "objects/object_goroiwa/object_goroiwa.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x80000010
@@ -30,21 +32,6 @@ void func_80941FA4(EnGoroiwa* this, GlobalContext* globalCtx);
void func_80942084(EnGoroiwa* this);
void func_809420F0(EnGoroiwa* this, GlobalContext* globalCtx);
-extern Gfx D_060032E0[];
-extern Gfx D_060082D0[];
-extern Gfx D_06005C20[];
-extern Gfx D_06003B40[];
-extern Gfx D_06008B90[];
-extern Gfx D_060042B0[];
-extern Gfx D_06004960[];
-extern Gfx D_06004EF0[];
-extern Gfx D_060003B0[];
-extern Gfx D_060028E0[];
-extern Gfx D_06002D70[];
-extern Gfx D_060072F0[];
-extern Gfx D_060077D0[];
-extern Gfx D_06007C60[];
-
const ActorInit En_Goroiwa_InitVars = {
ACTOR_EN_GOROIWA,
ACTORCAT_PROP,
@@ -94,9 +81,9 @@ static f32 D_80942DFC[] = {
};
static Gfx* D_80942E0C[][3] = {
- { D_060042B0, D_06004960, D_06004EF0 },
- { D_060003B0, D_060028E0, D_06002D70 },
- { D_060072F0, D_060077D0, D_06007C60 },
+ { object_goroiwa_DL_0042B0, object_goroiwa_DL_004960, object_goroiwa_DL_004EF0 },
+ { object_goroiwa_DL_0003B0, object_goroiwa_DL_0028E0, object_goroiwa_DL_002D70 },
+ { object_goroiwa_DL_0072F0, object_goroiwa_DL_0077D0, object_goroiwa_DL_007C60 },
};
static Color_RGBA8 D_80942E30[] = {
@@ -1577,9 +1564,9 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
Vec3s sp80;
if (params == ENGOROIWA_C000_1) {
- phi_fp = D_060032E0;
+ phi_fp = object_goroiwa_DL_0032E0;
} else {
- phi_fp = D_060082D0;
+ phi_fp = object_goroiwa_DL_0082D0;
}
for (i = 0; i < ARRAY_COUNT(this->unk_1E8); i++) {
@@ -1609,7 +1596,7 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_04076BC0);
+ gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1619,9 +1606,9 @@ void func_80942B1C(EnGoroiwa* this, GlobalContext* globalCtx) {
void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80942EB4[] = {
- D_06005C20,
- D_06003B40,
- D_06008B90,
+ object_goroiwa_DL_005C20,
+ object_goroiwa_DL_003B40,
+ object_goroiwa_DL_008B90,
};
EnGoroiwa* this = THIS;
s32 params = ENGOROIWA_GET_C000(&this->actor);
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 615d228599..986433988a 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 "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x02000019
@@ -36,10 +37,6 @@ s32 func_809995A4(EnGs* this, GlobalContext* globalCtx);
void func_80999A8C(EnGs* this, GlobalContext* globalCtx);
void func_80999AC0(EnGs* this);
-extern Gfx D_06000950[];
-extern Gfx D_060009D0[];
-extern Gfx D_06000A60[];
-
const ActorInit En_Gs_InitVars = {
ACTOR_EN_GS,
ACTORCAT_PROP,
@@ -1085,10 +1082,10 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000950);
+ gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000950);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->unk_1FA.r, this->unk_1FA.g, this->unk_1FA.b, 255);
- gSPDisplayList(POLY_OPA_DISP++, D_060009D0);
- gSPDisplayList(POLY_OPA_DISP++, D_06000A60);
+ gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_0009D0);
+ gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000A60);
Matrix_StatePop();
diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
index b93a1befee..dd02a3e408 100644
--- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
+++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
@@ -5,6 +5,7 @@
*/
#include "z_en_guruguru.h"
+#include "objects/object_fu/object_fu.h"
#define FLAGS 0x00000019
@@ -24,15 +25,7 @@ void func_80BC73F4(EnGuruguru* this);
void func_80BC7440(EnGuruguru* this, GlobalContext* globalCtx);
void func_80BC7520(EnGuruguru* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_06006C90;
extern ColliderCylinderInit D_80BC79A0;
-extern AnimationHeader D_06000B04;
-extern AnimationHeader D_0600057C;
-
-extern u64 D_06005F20[];
-extern u64 D_06006320[];
-extern u64 D_06006720[];
-extern u64 D_06006920[];
const ActorInit En_Guruguru_InitVars = {
ACTOR_EN_GURUGURU,
@@ -69,18 +62,19 @@ static ColliderCylinderInit sCylinderInit = {
{ 15, 20, 0, { 0, 0, 0 } },
};
-static AnimationHeader* D_80BC79CC[] = { &D_06000B04, &D_0600057C };
+static AnimationHeader* D_80BC79CC[] = { &object_fu_Anim_000B04, &object_fu_Anim_00057C };
static u8 D_80BC79D4[] = { 0 };
static f32 D_80BC79D8[] = { 1.0f, 1.0f };
-static void* sEyeTextures[] = { D_06005F20, D_06006320 };
-static void* sMouthTextures[] = { D_06006720, D_06006920 };
+static TexturePtr sEyeTextures[] = { object_fu_Tex_005F20, object_fu_Tex_006320 };
+static TexturePtr sMouthTextures[] = { object_fu_Tex_006720, object_fu_Tex_006920 };
void EnGuruguru_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGuruguru* this = THIS;
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006C90, &D_06000B04, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fu_Skel_006C90, &object_fu_Anim_000B04, this->jointTable,
+ this->morphTable, 16);
this->actor.targetMode = 0;
if (this->actor.params != 2) {
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
index 416ab1140a..1e4da23ea6 100644
--- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
+++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
@@ -6,6 +6,8 @@
#include "z_en_hakurock.h"
#include "overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_boss_hakugin/object_boss_hakugin.h"
#define FLAGS 0x00000030
@@ -64,10 +66,7 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 0, 60, 60, MASS_IMMOVABLE };
-extern Gfx D_06011100[];
-
// Stalactite
-extern Gfx D_06011178[];
void EnHakurock_Init(Actor* thisx, GlobalContext* globalCtx) {
EnHakurock* this = THIS;
@@ -344,7 +343,7 @@ void func_80B228F4(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 185, 24, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, &D_0406AB30);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_06AB30);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -353,7 +352,7 @@ void EnHakurock_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
Matrix_InsertTranslation(-100.0f, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06011100);
- gSPDisplayList(POLY_OPA_DISP++, D_06011178);
+ gSPDisplayList(POLY_OPA_DISP++, object_boss_hakugin_DL_011100);
+ gSPDisplayList(POLY_OPA_DISP++, object_boss_hakugin_DL_011178);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c
index 1bf3652f0d..34b78c5506 100644
--- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c
+++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c
@@ -5,6 +5,7 @@
*/
#include "z_en_hg.h"
+#include "objects/object_harfgibud/object_harfgibud.h"
#define FLAGS 0x02100019
@@ -30,17 +31,6 @@ void func_80BCF95C(EnHg* this, GlobalContext* globalCtx);
s32 EnHg_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
void EnHg_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
-extern AnimationHeader D_06000370;
-extern AnimationHeader D_06001138;
-extern AnimationHeader D_060015D4;
-extern AnimationHeader D_06001960;
-extern AnimationHeader D_0600260C;
-extern Gfx D_06005E28[];
-extern FlexSkeletonHeader D_06008580;
-extern AnimationHeader D_06009D44;
-extern AnimationHeader D_0600A164;
-extern AnimationHeader D_0600AE1C;
-
const ActorInit En_Hg_InitVars = {
ACTOR_EN_HG,
ACTORCAT_PROP,
@@ -113,10 +103,14 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_0600260C, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06009D44, 1.0f, 0.0f, 0.0f, 0, -4.0f },
- { &D_0600A164, 1.0f, 0.0f, 0.0f, 0, -4.0f }, { &D_06000370, 1.0f, 0.0f, 0.0f, 2, 0.0f },
- { &D_06001138, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_060015D4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
- { &D_06001960, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_0600AE1C, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_harfgibud_Anim_00260C, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_harfgibud_Anim_009D44, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_harfgibud_Anim_00A164, 1.0f, 0.0f, 0.0f, 0, -4.0f },
+ { &object_harfgibud_Anim_000370, 1.0f, 0.0f, 0.0f, 2, 0.0f },
+ { &object_harfgibud_Anim_001138, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_harfgibud_Anim_0015D4, 1.0f, 0.0f, 0.0f, 2, 0.0f },
+ { &object_harfgibud_Anim_001960, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_harfgibud_Anim_00AE1C, 1.0f, 0.0f, 0.0f, 0, 0.0f },
};
static u32 D_80BD00C8 = false;
@@ -127,8 +121,8 @@ void EnHg_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 i;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008580, &D_0600260C, this->jointTable, this->morphTable,
- HG_LIMB_MAX);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_harfgibud_Skel_008580, &object_harfgibud_Anim_00260C,
+ this->jointTable, this->morphTable, HG_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2);
@@ -422,6 +416,6 @@ void EnHg_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnHg_OverrideLimbDraw, EnHg_PostLimbDraw, &this->actor);
Matrix_SetCurrentState(&this->unk1D8);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06005E28);
+ gSPDisplayList(POLY_OPA_DISP++, object_harfgibud_DL_005E28);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
index 811c9cc829..383ef2cd43 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
@@ -992,8 +992,8 @@ void EnIg_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
void EnIg_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80BF3534[] = {
- &object_dai_Tex_0107B0, &object_dai_Tex_010FB0, &object_dai_Tex_0117B0,
- &object_dai_Tex_011FB0, &object_dai_Tex_0127B0,
+ object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
+ object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
EnIg* this = THIS;
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 6c51b2c1a9..da57958827 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -5,6 +5,7 @@
*/
#include "z_en_in.h"
+#include "objects/object_in/object_in.h"
#define FLAGS 0x00000019
@@ -46,54 +47,6 @@ const ActorInit En_In_InitVars = {
(ActorFunc)EnIn_Draw,
};
-extern FlexSkeletonHeader D_06014EA8;
-extern AnimationHeader D_06015E38;
-extern AnimationHeader D_06016484;
-extern AnimationHeader D_06016A60;
-extern AnimationHeader D_060170DC;
-extern AnimationHeader D_060177AC;
-extern AnimationHeader D_06018240;
-extern AnimationHeader D_060187C8;
-extern AnimationHeader D_060198A8;
-extern Gfx D_06007A70[];
-extern Gfx D_06007C48[];
-extern Gfx D_0601C528[];
-extern AnimatedMaterial D_06001C30;
-extern UNK_TYPE D_06003520;
-extern UNK_TYPE D_060035E0;
-extern UNK_TYPE D_06004820;
-extern UNK_TYPE D_06004C20;
-extern UNK_TYPE D_060043E0;
-extern AnimationHeader D_06001D10;
-extern AnimationHeader D_06014F8C;
-extern AnimationHeader D_06000CB0;
-extern AnimationHeader D_060003B4;
-extern AnimationHeader D_06001BE0;
-extern AnimationHeader D_06015918;
-extern AnimationHeader D_0601C0B0;
-extern AnimationHeader D_0601A140;
-extern AnimationHeader D_0601B904;
-extern AnimationHeader D_0601B3C4;
-extern AnimationHeader D_06019EB4;
-extern Gfx D_060137A0[];
-extern Gfx D_06014420[];
-extern Gfx D_06014040[];
-extern Gfx D_06013670[];
-extern Gfx D_06014AE0[];
-extern Gfx D_06012A78[];
-extern Gfx D_06013DE0[];
-extern Gfx D_060138D0[];
-extern Gfx D_06013540[];
-extern Gfx D_06012DF8[];
-extern Gfx D_060145D8[];
-extern Gfx D_06014860[];
-extern Gfx D_06014710[];
-extern Gfx D_06013A00[];
-extern Gfx D_06013F10[];
-extern Gfx D_06014C30[];
-extern Gfx D_060149A8[];
-extern Gfx D_06013440[];
-
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT0,
@@ -179,12 +132,15 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_06001D10, 1.0f, 0, -1, 0, 0 }, { &D_06001D10, 1.0f, 0, -1, 0, -4 }, { &D_06014F8C, 1.0f, 0, -1, 0, 0 },
- { &D_06014F8C, 1.0f, 0, -1, 0, -4 }, { &D_06000CB0, 1.0f, 0, -1, 0, -4 }, { &D_060003B4, 1.0f, 0, -1, 0, -4 },
- { &D_06001BE0, 1.0f, 0, -1, 0, -4 }, { &D_06015918, 1.0f, 0, -1, 0, -4 }, { &D_0601C0B0, 1.0f, 0, -1, 0, 0 },
- { &D_0601C0B0, 1.0f, 0, -1, 0, -4 }, { &D_0601A140, 1.0f, 0, -1, 0, 0 }, { &D_0601A140, 1.0f, 0, -1, 0, -4 },
- { &D_0601B904, 1.0f, 0, -1, 0, 0 }, { &D_0601B904, 1.0f, 0, -1, 0, -4 }, { &D_0601B3C4, 1.0f, 0, -1, 0, 0 },
- { &D_0601B3C4, 0.0f, 0, -1, 2, 0 }, { &D_0601B3C4, 1.0f, 0, -1, 0, -4 }, { &D_06019EB4, 1.0f, 0, -1, 2, -4 },
+ { &object_in_Anim_001D10, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_001D10, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_014F8C, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_014F8C, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_000CB0, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_0003B4, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_001BE0, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_015918, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_01C0B0, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01C0B0, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_01A140, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01A140, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_01B904, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01B904, 1.0f, 0, -1, 0, -4 },
+ { &object_in_Anim_01B3C4, 1.0f, 0, -1, 0, 0 }, { &object_in_Anim_01B3C4, 0.0f, 0, -1, 2, 0 },
+ { &object_in_Anim_01B3C4, 1.0f, 0, -1, 0, -4 }, { &object_in_Anim_019EB4, 1.0f, 0, -1, 2, -4 },
};
static u16 D_808F6C0C[] = {
@@ -344,10 +300,11 @@ void func_808F3690(EnIn* this, GlobalContext* globalCtx) {
}
void func_808F374C(EnIn* this, GlobalContext* globalCtx) {
- AnimationHeader* animations[] = { &D_06015E38, &D_06016A60, &D_060177AC, &D_06016484,
- &D_060170DC, &D_06018240, &D_060187C8, &D_060198A8 };
+ AnimationHeader* animations[] = { &object_in_Anim_015E38, &object_in_Anim_016A60, &object_in_Anim_0177AC,
+ &object_in_Anim_016484, &object_in_Anim_0170DC, &object_in_Anim_018240,
+ &object_in_Anim_0187C8, &object_in_Anim_0198A8 };
- if (this->skelAnime.animation == &D_06016484 || this->skelAnime.animation == &D_060170DC) {
+ if (this->skelAnime.animation == &object_in_Anim_016484 || this->skelAnime.animation == &object_in_Anim_0170DC) {
if (Animation_OnFrame(&this->skelAnime, 8.0f)) {
func_8019F88C(&this->actor.projectedPos, NA_SE_VO_IN_LASH_0, 2);
if (Rand_ZeroOne() < 0.3f) {
@@ -356,7 +313,7 @@ void func_808F374C(EnIn* this, GlobalContext* globalCtx) {
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_LASH);
}
}
- if (this->skelAnime.animation == &D_060198A8 && Animation_OnFrame(&this->skelAnime, 20.0f)) {
+ if (this->skelAnime.animation == &object_in_Anim_0198A8 && Animation_OnFrame(&this->skelAnime, 20.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_IN_CRY_0);
}
if (SkelAnime_Update(&this->skelAnime)) {
@@ -1402,7 +1359,8 @@ void EnIn_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06014EA8, NULL, this->jointTable, this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in_Skel_014EA8, NULL, this->jointTable, this->morphTable,
+ 20);
func_808F30B0(&this->skelAnime, 0);
Collider_InitCylinder(globalCtx, &this->colliderCylinder);
Collider_SetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -1418,7 +1376,8 @@ void EnIn_Init(Actor* thisx, GlobalContext* globalCtx) {
if (type == ENIN_HORSE_RIDER_YELLOW_SHIRT || type == ENIN_HORSE_RIDER_BLUE_SHIRT) {
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
this->unk488 = 1;
- Animation_Change(&this->skelAnime, &D_06016A60, 1.0f, 0.0f, Animation_GetLastFrame(&D_06016A60), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_in_Anim_016A60, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_in_Anim_016A60), 2, 0.0f);
Actor_SetScale(&this->actor, 0.01f);
this->unk23C = 0;
this->unk23D = 1;
@@ -1541,9 +1500,26 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnIn* this = THIS;
s32 pad;
Gfx* sp50[] = {
- NULL, NULL, D_060149A8, D_06014AE0, D_06014C30, D_060145D8, D_06014710,
- D_06014860, D_06014420, D_06012A78, D_06013DE0, D_06013F10, D_06014040, D_060137A0,
- D_060138D0, D_06013A00, D_06012DF8, D_06013670, D_06013540, D_06013440,
+ NULL,
+ NULL,
+ object_in_DL_0149A8,
+ object_in_DL_014AE0,
+ object_in_DL_014C30,
+ object_in_DL_0145D8,
+ object_in_DL_014710,
+ object_in_DL_014860,
+ object_in_DL_014420,
+ object_in_DL_012A78,
+ object_in_DL_013DE0,
+ object_in_DL_013F10,
+ object_in_DL_014040,
+ object_in_DL_0137A0,
+ object_in_DL_0138D0,
+ object_in_DL_013A00,
+ object_in_DL_012DF8,
+ object_in_DL_013670,
+ object_in_DL_013540,
+ object_in_DL_013440,
};
if (this->unk23C != 0 && limbIndex != 16) {
@@ -1552,16 +1528,18 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
}
if (this->unk4AC & 4 && limbIndex == 16) {
- *dList = D_0601C528;
+ *dList = object_in_DL_01C528;
}
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 16) {
- void* sp38[] = { &D_060035E0, &D_06004820, &D_06004C20, &D_060043E0 };
+ TexturePtr sp38[] = { object_in_Tex_0035E0, object_in_Tex_004820, object_in_Tex_004C20, object_in_Tex_0043E0 };
+
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sp38[this->unk482]));
- gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(&D_06003520));
+ gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(object_in_Tex_003520));
} else {
- AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(&D_06001C30), this->unk4AC & 8 ? 1 : 0);
+ AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(object_in_Matanimheader_001C30),
+ this->unk4AC & 8 ? 1 : 0);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -1619,10 +1597,10 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
if (!(this->unk4AC & 8)) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 12) {
- gSPDisplayList(POLY_OPA_DISP++, D_06007A70);
+ gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007A70);
}
if (limbIndex == 15) {
- gSPDisplayList(POLY_OPA_DISP++, D_06007C48);
+ gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007C48);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1631,7 +1609,7 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
if (this->unk4AC & 0x20) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 12) {
- gSPDisplayList(POLY_OPA_DISP++, D_06007C48);
+ gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007C48);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
index f6b2438d48..16439b5b9f 100644
--- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
+++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
@@ -3,9 +3,14 @@
* Overlay: ovl_En_Invadepoh
* Description: Ranch nighttime actors
*/
-#include "prevent_bss_reordering.h"
#include "z_en_invadepoh.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_ma1/object_ma1.h"
+#include "objects/object_ma2/object_ma2.h"
+#include "objects/object_dog/object_dog.h"
+#include "objects/object_cow/object_cow.h"
+#include "objects/object_uch/object_uch.h"
#define FLAGS 0x00000010
@@ -170,56 +175,6 @@ void func_80B45A4C(EnInvadePohStruct* s, unkstructInvadepoh4** u);
void func_80B45A94(EnInvadePohStruct* s, unkstructInvadepoh4** u);
void func_80B45B1C(EnInvadePohStruct* s, unkstructInvadepoh4** u);
-extern AnimatedMaterial D_06000550;
-extern AnimatedMaterial D_06000560;
-
-extern AnimationHeader D_06000608;
-extern AnimationHeader D_060006C8;
-extern AnimationHeader D_06000998;
-extern AnimationHeader D_06001560;
-extern AnimationHeader D_06001674;
-extern AnimationHeader D_06001BD8;
-extern AnimationHeader D_06001D80;
-extern AnimationHeader D_060021C8;
-extern AnimationHeader D_06002A8C;
-extern AnimationHeader D_06004264;
-extern AnimationHeader D_06004E98;
-extern AnimationHeader D_06007328;
-extern AnimationHeader D_06009E58;
-extern AnimationHeader D_0600A174;
-extern AnimationHeader D_06014088;
-extern AnimationHeader D_06016720;
-
-extern FlexSkeletonHeader D_060080F0;
-extern FlexSkeletonHeader D_06004010;
-extern FlexSkeletonHeader D_06004C30;
-extern FlexSkeletonHeader D_06004E50;
-extern FlexSkeletonHeader D_06013928;
-extern FlexSkeletonHeader D_06015C28;
-
-extern Gfx D_0600FFC8[];
-extern Gfx D_060107C8[];
-extern Gfx D_06010FC8[];
-extern Gfx D_060117C8[];
-extern Gfx D_06011FC8[];
-extern Gfx D_060127C8[];
-extern Gfx D_06012BC8[];
-extern Gfx D_06012FC8[];
-extern Gfx D_060133C8[];
-extern Gfx D_06011AD8[];
-extern Gfx D_060122D8[];
-extern Gfx D_06012AD8[];
-extern Gfx D_060132D8[];
-extern Gfx D_06013AD8[];
-extern Gfx D_060142D8[];
-extern Gfx D_06014AD8[];
-extern Gfx D_06014ED8[];
-extern Gfx D_060152D8[];
-extern Gfx D_060156D8[];
-extern Gfx D_060003B0[];
-extern Gfx D_06000720[];
-extern Gfx D_06000080[];
-
extern s32 D_801BDA9C;
const ActorInit En_Invadepoh_InitVars = {
@@ -298,28 +253,29 @@ static Vec3f D_80B4E934 = { 216.0f, -20.0f, 1395.0f };
static s32 D_80B4E940 = 0;
-static Gfx* D_80B4E944[] = {
- D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
+static TexturePtr D_80B4E944[] = {
+ object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
-static Gfx* D_80B4E958[] = {
- D_060127C8,
- D_06012BC8,
- D_06012FC8,
- D_060133C8,
+static TexturePtr D_80B4E958[] = {
+ object_ma1_Tex_0127C8,
+ object_ma1_Tex_012BC8,
+ object_ma1_Tex_012FC8,
+ object_ma1_Tex_0133C8,
};
static s8 D_80B4E968 = 0;
-static Gfx* D_80B4E96C[] = {
- D_06011AD8, D_060122D8, D_06012AD8, D_060132D8, D_06013AD8, D_060142D8,
+static TexturePtr D_80B4E96C[] = {
+ object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
+ object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
};
-static Gfx* D_80B4E984[] = {
- D_06014AD8,
- D_06014ED8,
- D_060152D8,
- D_060156D8,
+static TexturePtr D_80B4E984[] = {
+ object_ma2_Tex_014AD8,
+ object_ma2_Tex_014ED8,
+ object_ma2_Tex_0152D8,
+ object_ma2_Tex_0156D8,
};
static s8 D_80B4E994 = 0;
@@ -1237,7 +1193,7 @@ void func_80B44EFC(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B44F58(void) {
s32 i;
- Gfx** iter;
+ TexturePtr* iter;
if (!D_80B4E968) {
D_80B4E968 = true;
@@ -1253,7 +1209,7 @@ void func_80B44F58(void) {
void func_80B44FEC(void) {
s32 i;
- Gfx** iter;
+ TexturePtr* iter;
if (!D_80B4E994) {
D_80B4E994 = true;
@@ -1268,8 +1224,8 @@ void func_80B44FEC(void) {
}
void func_80B45080(void) {
- D_80B50400 = Lib_SegmentedToVirtual(&D_06000560);
- D_80B503FC = Lib_SegmentedToVirtual(&D_06000550);
+ D_80B50400 = Lib_SegmentedToVirtual(object_uch_Matanimheader_000560);
+ D_80B503FC = Lib_SegmentedToVirtual(object_uch_Matanimheader_000550);
}
s32 func_80B450C0(f32* x1, f32* z1, f32 x2, f32 z2, f32 speed) {
@@ -2159,7 +2115,7 @@ void func_80B474DC(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B47568(EnInvadepoh* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06001D80, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_uch_Anim_001D80, -6.0f);
this->collider.base.atFlags &= ~0x1;
this->collider.base.acFlags &= ~0x1;
this->collider.base.ocFlags1 &= ~0x1;
@@ -2201,8 +2157,8 @@ void func_80B47600(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4770C(EnInvadepoh* this) {
- if (this->skelAnime.animation != &D_06001D80) {
- Animation_MorphToLoop(&this->skelAnime, &D_06001D80, -6.0f);
+ if (this->skelAnime.animation != &object_uch_Anim_001D80) {
+ Animation_MorphToLoop(&this->skelAnime, &object_uch_Anim_001D80, -6.0f);
}
this->collider.base.atFlags |= 1;
this->collider.base.acFlags |= 1;
@@ -2230,7 +2186,7 @@ void func_80B47830(EnInvadepoh* this) {
this->collider.base.atFlags &= ~1;
this->collider.base.acFlags &= ~1;
this->collider.base.ocFlags1 |= 1;
- Animation_PlayLoop(&this->skelAnime, &D_060006C8);
+ Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_0006C8);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 16);
this->alienAlpha = 255;
this->actor.draw = func_80B4DB14;
@@ -2255,7 +2211,7 @@ void func_80B47938(EnInvadepoh* this) {
this->collider.base.atFlags &= ~1;
this->collider.base.acFlags &= ~1;
this->collider.base.ocFlags1 &= ~1;
- Animation_PlayLoop(&this->skelAnime, &D_06000608);
+ Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_000608);
this->actor.flags &= ~1;
this->actionTimer = 10;
this->alienAlpha = 255;
@@ -2326,8 +2282,8 @@ void func_80B47BAC(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B45080();
this->actor.update = func_80B47D30;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004E50, &D_06001D80, this->jointTable, this->morphTable,
- 14);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_uch_Skel_004E50, &object_uch_Anim_001D80,
+ this->jointTable, this->morphTable, 14);
this->skelAnime.curFrame = (this->actor.params & 7) * this->skelAnime.endFrame * 0.125f;
func_80B444BC(this, globalCtx);
func_80B442E4(this);
@@ -2409,8 +2365,8 @@ void func_80B47FA8(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, thisx);
this->actor.update = func_80B48060;
this->actor.draw = func_80B4E158;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable, 6);
- Animation_PlayLoop(&this->skelAnime, &D_06004264);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable, 6);
+ Animation_PlayLoop(&this->skelAnime, &gCowBodyMoveHeadAnim);
}
}
@@ -2452,8 +2408,8 @@ void func_80B481C4(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
this->actor.update = func_80B4827C;
this->actor.draw = func_80B4E1B0;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable, 6);
- Animation_PlayLoop(&this->skelAnime, &D_06004E98);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable, 6);
+ Animation_PlayLoop(&this->skelAnime, &gCowTailSwishAnim);
}
}
@@ -2470,7 +2426,7 @@ void func_80B4827C(Actor* thisx, GlobalContext* globalCtx) {
void func_80B482D4(EnInvadepoh* this) {
this->actionTimer = 40;
- Animation_MorphToLoop(&this->skelAnime, &D_06002A8C, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
this->actor.draw = NULL;
this->actionFunc = func_80B48324;
}
@@ -2486,7 +2442,7 @@ void func_80B48324(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B48374(EnInvadepoh* this) {
this->actionTimer = 60;
- Animation_MorphToLoop(&this->skelAnime, &D_06002A8C, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B483CC;
}
@@ -2518,7 +2474,7 @@ void func_80B4843C(EnInvadepoh* this) {
this->behaviorInfo.unk44 = 0.1f;
this->behaviorInfo.unk48 = 2000;
this->actionTimer = 50;
- Animation_Change(&this->skelAnime, &D_06007328, 2.0f, 0.0f, 0.0f, 0, -5.0f);
+ Animation_Change(&this->skelAnime, &object_ma1_Anim_007328, 2.0f, 0.0f, 0.0f, 0, -5.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B484EC;
}
@@ -2548,7 +2504,7 @@ void func_80B48588(EnInvadepoh* this) {
this->behaviorInfo.unk42 = 0;
this->behaviorInfo.unk44 = 0.28f;
this->behaviorInfo.unk48 = 7000;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actor.draw = func_80B4E324;
this->actionFunc = func_80B48610;
}
@@ -2565,10 +2521,10 @@ void func_80B48620(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
this->actor.update = func_80B4873C;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06009E58, this->jointTable, this->morphTable,
- 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_009E58,
+ this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 6, D_80B4EB00, 2, &gZeroVec3s, 5000, 0.05f, 0.3f, 0.12f);
- Animation_PlayLoop(&this->skelAnime, &D_06009E58);
+ Animation_PlayLoop(&this->skelAnime, &object_ma1_Anim_009E58);
func_80B482D4(this);
}
}
@@ -2601,7 +2557,7 @@ void func_80B487B4(EnInvadepoh* this) {
substruct->unk26.z = 0;
substruct->unk30 = 0.1f;
substruct->unk2C = 800;
- Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
this->actionFunc = func_80B48848;
}
@@ -2661,7 +2617,7 @@ void func_80B48948(EnInvadepoh* this) {
substruct->unk2C = 1000;
}
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actionFunc = func_80B48AD4;
}
@@ -2732,7 +2688,7 @@ void func_80B48DE4(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
this->actor.speedXZ = 0.0f;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
substruct->unk30 = 0.05f;
substruct->unk2C = 1200;
@@ -2769,8 +2725,8 @@ void func_80B48FB0(Actor* thisx, GlobalContext* globalCtx) {
this->actor.update = func_80B490F0;
this->actor.draw = func_80B4E324;
this->actor.textId = 0x3330;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06009E58, this->jointTable, this->morphTable,
- 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_009E58,
+ this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 6, D_80B4EB00, 2, &gZeroVec3s, 100, 0.03, 0.3, 0.03);
func_80B444F4(this, globalCtx);
EnInvadepoh_SetPathPointToWorldPos(this, 0);
@@ -3039,7 +2995,7 @@ void func_80B49B1C(Actor* thisx, GlobalContext* globalCtx) {
void func_80B49BD0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3083,7 +3039,7 @@ void func_80B49DA0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
this->behaviorInfo.unk4C = 0;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->actionFunc = func_80B49DFC;
}
@@ -3121,8 +3077,8 @@ void func_80B49F88(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
- 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
+ this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 1, &gZeroVec3s, 100, 0.03, 0.3, 0.03);
func_80B44540(this, globalCtx);
func_80B44570(this);
@@ -3188,7 +3144,7 @@ void func_80B4A1B8(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4A2C0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3247,7 +3203,7 @@ void func_80B4A350(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4A570(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A8C, -10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_ma1_Anim_002A8C, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3266,7 +3222,7 @@ void func_80B4A5E4(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4A614(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToLoop(&this->skelAnime, &D_06014088, 0.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, 0.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3309,7 +3265,7 @@ void func_80B4A7C0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
this->behaviorInfo.unk4C = 0;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, 0.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, 0.0f);
this->actionFunc = func_80B4A81C;
}
@@ -3352,8 +3308,8 @@ void func_80B4A9C8(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
- 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
+ this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 1, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
func_80B44620(this, globalCtx);
if ((sp38 < CLOCK_TIME(2, 15)) || (sp38 >= CLOCK_TIME(6, 0))) {
@@ -3527,9 +3483,9 @@ void func_80B4B0C4(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
this->actor.update = func_80B4B218;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
- 23);
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
+ this->jointTable, this->morphTable, 23);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, 0.0f);
substruct = &this->behaviorInfo;
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 3, &gZeroVec3s, 2000, 0.08f, 0.3f, 0.03f);
substruct->unk30 = 0.08f;
@@ -3576,7 +3532,7 @@ void func_80B4B3DC(EnInvadepoh* this) {
}
void func_80B4B430(EnInvadepoh* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060021C8, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dog_Anim_0021C8, -6.0f);
this->actionTimer = Rand_S16Offset(50, 80);
this->actionFunc = func_80B4B484;
}
@@ -3599,7 +3555,7 @@ void func_80B4B484(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B510(EnInvadepoh* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06001BD8, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_dog_Anim_001BD8, -6.0f);
this->actionTimer = Rand_S16Offset(50, 200);
this->actionFunc = func_80B4B564;
}
@@ -3643,7 +3599,7 @@ void func_80B4B564(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B724(EnInvadepoh* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000998, -6.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dog_Anim_000998, -6.0f);
this->actionFunc = func_80B4B768;
}
@@ -3663,7 +3619,7 @@ void func_80B4B768(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4B820(EnInvadepoh* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001560, -6.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_dog_Anim_001560, -6.0f);
this->actionFunc = func_80B4B864;
}
@@ -3682,8 +3638,8 @@ void func_80B4B8BC(Actor* thisx, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->bankIndex)) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060080F0, &D_060021C8, this->jointTable, this->morphTable,
- 13);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_0080F0, &object_dog_Anim_0021C8,
+ this->jointTable, this->morphTable, 13);
func_80B45C04(&this->behaviorInfo, 0, 0, 0, 0, &gZeroVec3s, 3000, 0.1f, 0.0f, 0.0f);
func_80B44664(this, globalCtx);
EnInvadepoh_SetPathPointToWorldPos(this, 0);
@@ -3763,7 +3719,7 @@ void func_80B4BA84(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4BBE0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToLoop(&this->skelAnime, &D_06016720, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_016720, -6.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -3844,7 +3800,7 @@ void func_80B4BC4C(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4BFFC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
- Animation_MorphToLoop(&this->skelAnime, &D_0600A174, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C058;
}
@@ -3876,7 +3832,7 @@ void func_80B4C058(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4C1BC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
- Animation_MorphToLoop(&this->skelAnime, &D_0600A174, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C218;
}
@@ -3916,8 +3872,8 @@ void func_80B4C3A0(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44FEC();
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06015C28, &D_06016720, this->jointTable, this->morphTable,
- 22);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_015C28, &object_ma2_Anim_016720,
+ this->jointTable, this->morphTable, 22);
func_80B45C04(&this->behaviorInfo, D_80B4EBDC, 1, D_80B4EC08, 0, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
this->actor.textId = 0x33CD;
if (currentTime < 0xD5A0) {
@@ -3979,7 +3935,7 @@ void func_80B4C5C0(Actor* thisx, GlobalContext* globalCtx) {
void func_80B4C6C8(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
- Animation_MorphToLoop(&this->skelAnime, &D_06014088, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_014088, -10.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@@ -4069,7 +4025,7 @@ void func_80B4C730(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4CAB0(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 4000;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4CB0C;
}
@@ -4098,7 +4054,7 @@ void func_80B4CB0C(EnInvadepoh* this, GlobalContext* globalCtx) {
void func_80B4CC70(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
- Animation_MorphToLoop(&this->skelAnime, &D_06009E58, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_ma1_Anim_009E58, -10.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4CCCC;
}
@@ -4137,8 +4093,8 @@ void func_80B4CE54(Actor* thisx, GlobalContext* globalCtx) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B44F58();
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, &D_06014088, this->jointTable, this->morphTable,
- 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, &object_ma1_Anim_014088,
+ this->jointTable, this->morphTable, 23);
func_80B45C04(&this->behaviorInfo, D_80B4EA90, 1, D_80B4EB00, 3, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
func_80B446D0(this, globalCtx);
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -4197,7 +4153,7 @@ void func_80B4D15C(EnInvadepoh* this) {
s32 temp_v1 = this->actor.params & 7;
unkstruct80B4EE0C* temp_v0;
- Animation_PlayLoop(&this->skelAnime, &D_06001674);
+ Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_001674);
this->skelAnime.curFrame = ((this->actor.params & 7) * this->skelAnime.endFrame) * 0.25f;
this->alienAlpha = 255;
this->actor.draw = func_80B4DB14;
@@ -4249,7 +4205,7 @@ void func_80B4D290(EnInvadepoh* this, GlobalContext* globalCtx) {
}
void func_80B4D3E4(EnInvadepoh* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06001674);
+ Animation_PlayLoop(&this->skelAnime, &object_uch_Anim_001674);
this->skelAnime.curFrame = (this->actor.params & 7) * this->skelAnime.endFrame * 0.25f;
this->alienAlpha = 255;
this->actor.draw = NULL;
@@ -4326,8 +4282,8 @@ void func_80B4D670(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetObjectDependency(globalCtx, &this->actor);
func_80B45080();
this->actor.update = func_80B4D760;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004E50, &D_06001674, this->jointTable, this->morphTable,
- 14);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_uch_Skel_004E50, &object_uch_Anim_001674,
+ this->jointTable, this->morphTable, 14);
if (invadepohType < 3) {
func_80B453F4(this, globalCtx, invadepohType);
func_80B4D15C(this);
@@ -4372,7 +4328,7 @@ void func_80B4D7B8(GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, temp_s5, 0, 0x20, 0x40, 1, 0, temp_s6, 0x20, 0x40));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, &D_0402E510);
+ gSPDisplayList(POLY_XLU_DISP++, &gameplay_keep_DL_02E510);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@@ -4449,10 +4405,10 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(spBC++, 255, 255, 255, this->alienBeamAlpha * (150.0f / 255.0f));
Matrix_InsertMatrix(&D_80B502A0, MTXMODE_NEW);
gSPMatrix(spBC++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(spBC++, D_06000080);
+ gSPDisplayList(spBC++, object_uch_DL_000080);
Matrix_InsertMatrix(&D_80B502E0, MTXMODE_NEW);
gSPMatrix(spBC++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(spBC++, D_06000080);
+ gSPDisplayList(spBC++, object_uch_DL_000080);
spB8->polyXlu.p = spBC;
}
}
@@ -4464,7 +4420,7 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
MTXMODE_APPLY);
gSPMatrix(spCC->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(spCC->polyXlu.p++, D_06000720);
+ gSPDisplayList(spCC->polyXlu.p++, object_uch_DL_000720);
}
if (this->drawAlien) {
@@ -4487,10 +4443,10 @@ void func_80B4DB14(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertTranslation(sp74.x, sp74.y, sp74.z, MTXMODE_NEW);
Matrix_Scale(0.25f, 0.25f, 0.25f, MTXMODE_APPLY);
alpha2 = this->alienAlpha * (100.0f / 255.0f);
- gSPDisplayList(gfx++, D_04029CB0);
+ gSPDisplayList(gfx++, gameplay_keep_DL_029CB0);
gDPSetPrimColor(gfx++, 0, 0, 240, 180, 100, alpha2);
gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(gfx++, D_04029CF0);
+ gSPDisplayList(gfx++, gameplay_keep_DL_029CF0);
sp6C->polyXlu.p = gfx;
if ((this->alienAlpha > 128) && func_80B456A8(globalCtx, &sp74)) {
func_800F9824(globalCtx, &globalCtx->envCtx, &globalCtx->view, globalCtx->state.gfxCtx, sp74, 10.0f, 9.0f,
@@ -4547,7 +4503,7 @@ void func_80B4E2AC(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
if (limbIndex == 19) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else if (limbIndex == 14) {
Matrix_MultiplyVector3fByState(&D_80B4EE30, &this->actor.focus.pos);
@@ -4585,7 +4541,7 @@ void func_80B4E3F0(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0xFF, 0x80, 255, 255, 0, 180);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0);
- gSPDisplayList(POLY_XLU_DISP++, D_04023210);
+ gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
if (func_80B456A8(globalCtx, &sp5C)) {
func_800F9824(globalCtx, &globalCtx->envCtx, &globalCtx->view, globalCtx->state.gfxCtx, sp5C, 20.0f, 9.0f, 0,
0);
diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c
index c1b5d13277..46122b5370 100644
--- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c
+++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c
@@ -5,6 +5,7 @@
*/
#include "z_en_jc_mato.h"
+#include "objects/object_tru/object_tru.h"
#define FLAGS 0x00004030
@@ -86,8 +87,6 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(1, 0x0),
};
-extern Gfx D_06000390[];
-
s32 EnJcMato_CheckForHit(EnJcMato* this, GlobalContext* globalCtx) {
this->collider.dim.worldSphere.center.x = this->pos.x;
this->collider.dim.worldSphere.center.y = this->pos.y;
@@ -162,7 +161,7 @@ void EnJcMato_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000390);
+ gSPDisplayList(POLY_OPA_DISP++, object_tru_DL_000390);
Matrix_MultiplyVector3fByState(&movement, &this->pos);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index 10bb3fff40..01a95e9882 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -5,6 +5,7 @@
*/
#include "z_en_kakasi.h"
+#include "objects/object_ka/object_ka.h"
#define FLAGS 0x02000019
@@ -125,18 +126,10 @@ typedef enum {
/* 0x8 */ ENKAKASI_ANIM_IDLE, // slow stretching wiggle, ends in regular position
} EnKakasi_Animations;
-extern AnimationHeader D_06007444;
-extern AnimationHeader D_0600686C;
-extern AnimationHeader D_060081A4;
-extern AnimationHeader D_06007B90;
-extern AnimationHeader D_060071EC;
-extern AnimationHeader D_06007444;
-extern AnimationHeader D_0600686C;
-extern AnimationHeader D_060081A4;
-extern AnimationHeader D_06000214;
-
static AnimationHeader* kakasiAnimations[] = {
- &D_06007444, &D_0600686C, &D_060081A4, &D_06007B90, &D_060071EC, &D_06007444, &D_0600686C, &D_060081A4, &D_06000214,
+ &object_ka_Anim_007444, &object_ka_Anim_00686C, &object_ka_Anim_0081A4,
+ &object_ka_Anim_007B90, &object_ka_Anim_0071EC, &object_ka_Anim_007444,
+ &object_ka_Anim_00686C, &object_ka_Anim_0081A4, &object_ka_Anim_000214,
};
static u8 sAnimModes[] = { ANIMMODE_LOOP, ANIMMODE_LOOP, ANIMMODE_LOOP, ANIMMODE_ONCE, ANIMMODE_ONCE,
@@ -148,15 +141,13 @@ void EnKakasi_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyCylinder(globalCtx, &this->collider);
}
-extern FlexSkeletonHeader D_060065B0;
-
void EnKakasi_Init(Actor* thisx, GlobalContext* globalCtx) {
EnKakasi* this = THIS;
s32 tempCutscene;
s32 i;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &D_80971D80);
- SkelAnime_InitFlex(globalCtx, &this->skelanime, &D_060065B0, &D_06000214, 0, 0, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelanime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, 0, 0, 0);
this->songSummonDist = GET_KAKASI_SUMMON_DISTANCE(this) * 20.0f;
if (this->songSummonDist < 40.0f) {
diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
index 4d0e7f9fe1..ae86a001f6 100644
--- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
@@ -7,6 +7,8 @@
#include "overlays/actors/ovl_En_Kbt/z_en_kbt.h"
#include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h"
#include "z_en_kgy.h"
+#include "objects/object_kgy/object_kgy.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000009
@@ -31,24 +33,6 @@ void func_80B425A0(EnKgy* this, GlobalContext* globalCtx);
void func_80B42714(EnKgy* this, GlobalContext* globalCtx);
void func_80B42D28(EnKgy* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060008FC;
-extern AnimationHeader D_06001764;
-extern Gfx D_04001D00[];
-extern AnimationHeader D_06001EA4;
-extern Gfx D_040021A8[];
-extern AnimationHeader D_0600292C;
-extern AnimationHeader D_06003334;
-extern AnimationHeader D_06003D88;
-extern AnimationHeader D_060042E4;
-extern AnimationHeader D_06004B98;
-extern Gfx D_0600E8F0[];
-extern Gfx D_0600EE58[];
-extern Gfx D_0600F180[];
-extern Gfx D_0600F6A0[];
-extern FlexSkeletonHeader D_0600F910;
-extern AnimationHeader D_06010B84;
-extern AnimationHeader D_060101F0;
-
const ActorInit En_Kgy_InitVars = {
ACTOR_EN_KGY,
ACTORCAT_NPC,
@@ -67,7 +51,8 @@ void EnKgy_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 i;
Actor_SetScale(&this->actor, 0.01f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F910, &D_06004B98, this->jointTable, this->morphTable, 23);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_kgy_Skel_00F910, &object_kgy_Anim_004B98, this->jointTable,
+ this->morphTable, 23);
this->unk_2D2 = -1;
this->unk_29C = 0;
this->unk_2E4 = 0;
@@ -127,8 +112,9 @@ void EnKgy_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnKgy_ChangeAnim(EnKgy* this, s16 animIndex, u8 mode, f32 transitionRate) {
static AnimationHeader* sAnimations[] = {
- &D_06004B98, &D_060008FC, &D_0600292C, &D_060042E4, &D_060101F0,
- &D_06001764, &D_06003334, &D_06010B84, &D_06001EA4, &D_06003D88,
+ &object_kgy_Anim_004B98, &object_kgy_Anim_0008FC, &object_kgy_Anim_00292C, &object_kgy_Anim_0042E4,
+ &object_kgy_Anim_0101F0, &object_kgy_Anim_001764, &object_kgy_Anim_003334, &object_kgy_Anim_010B84,
+ &object_kgy_Anim_001EA4, &object_kgy_Anim_003D88,
};
Animation_Change(&this->skelAnime, sAnimations[animIndex], 1.0f, 0.0f,
@@ -1155,20 +1141,20 @@ void func_80B43074(EnKgy* this, GlobalContext* globalCtx) {
Matrix_InsertXRotation_s(0x4000, MTXMODE_APPLY);
if (func_80B40D8C(globalCtx)) {
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(D_0600F6A0));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_kgy_Matanimheader_00F6A0));
} else {
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(D_0600EE58));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_kgy_Matanimheader_00EE58));
}
gfx = POLY_OPA_DISP;
gSPMatrix(gfx, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (func_80B40D8C(globalCtx)) {
- gSPDisplayList(&gfx[1], D_04001D00);
- gSPDisplayList(&gfx[2], D_0600F180);
+ gSPDisplayList(&gfx[1], gameplay_keep_DL_001D00);
+ gSPDisplayList(&gfx[2], object_kgy_DL_00F180);
} else {
- gSPDisplayList(&gfx[1], D_040021A8);
- gSPDisplayList(&gfx[2], D_0600E8F0);
+ gSPDisplayList(&gfx[1], gameplay_keep_DL_0021A8);
+ gSPDisplayList(&gfx[2], object_kgy_DL_00E8F0);
}
POLY_OPA_DISP = &gfx[3];
diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
index d32735035d..12ce6eecf5 100644
--- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
+++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
@@ -5,6 +5,8 @@
*/
#include "z_en_kusa2.h"
+#include "objects/gameplay_field_keep/gameplay_field_keep.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00800010
@@ -1308,8 +1310,8 @@ void EnKusa2_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A5E6F0(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80A5EB68[] = {
- D_040528B0,
- D_040527F0,
+ gameplay_keep_DL_0528B0,
+ gameplay_keep_DL_0527F0,
};
EnKusa2* this = THIS;
s32 i;
@@ -1341,7 +1343,7 @@ void func_80A5E80C(GlobalContext* globalCtx, s32 arg1) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, arg1);
- gSPDisplayList(POLY_XLU_DISP++, D_05007938);
+ gSPDisplayList(POLY_XLU_DISP++, gameplay_field_keep_DL_007938);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1354,7 +1356,7 @@ void EnKusa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
(this->actor.projectedPos.z < 400.0f)) {
func_80A5B954(&D_80A60908[this->unk_1CE], 0.0015f);
}
- Gfx_DrawDListOpa(globalCtx, D_050078A0);
+ Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
} else if (this->actor.projectedPos.z < 1300.0f) {
func_80A5E80C(globalCtx, (1300.0f - this->actor.projectedPos.z) * 2.55f);
}
@@ -1368,14 +1370,14 @@ void func_80A5E9B4(Actor* thisx, GlobalContext* globalCtx) {
sp18.z = thisx->shape.rot.z + D_80A5EAFC.z;
Matrix_SetStateRotationAndTranslation(thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, &sp18);
Matrix_Scale(thisx->scale.x, thisx->scale.y, thisx->scale.z, MTXMODE_APPLY);
- Gfx_DrawDListOpa(globalCtx, D_050078A0);
+ Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
}
void func_80A5EA48(Actor* thisx, GlobalContext* globalCtx) {
EnKusa2* this = THIS;
if (this->unk_1CF == 0xFF) {
- Gfx_DrawDListOpa(globalCtx, D_050078A0);
+ Gfx_DrawDListOpa(globalCtx, gameplay_field_keep_DL_0078A0);
} else {
func_80A5E80C(globalCtx, this->unk_1CF);
}
diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
index 0901fd9b22..0f9c79c435 100644
--- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
+++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ma4.h"
+#include "objects/object_ma1/object_ma1.h"
#define FLAGS 0x02000039
@@ -54,35 +55,6 @@ typedef enum {
/* 3 */ MA4_STATE_AFTERDESCRIBETHEMCS,
} EnMa4State;
-extern FlexSkeletonHeader D_06013928;
-
-extern AnimationHeader D_06009E58;
-extern AnimationHeader D_06002A8C;
-extern AnimationHeader D_06018948;
-extern AnimationHeader D_0601B76C;
-extern AnimationHeader D_06007328;
-extern AnimationHeader D_06014088;
-extern AnimationHeader D_06015B7C;
-extern AnimationHeader D_06007D98;
-extern AnimationHeader D_0600852C;
-extern AnimationHeader D_06008F6C;
-
-extern u64 D_0600FFC8[];
-extern u64 D_060107C8[];
-extern u64 D_06010FC8[];
-extern u64 D_060117C8[];
-extern u64 D_06011FC8[];
-
-extern u64 D_060127C8[];
-extern u64 D_06012BC8[];
-extern u64 D_06012FC8[];
-extern u64 D_060133C8[];
-
-extern Gfx D_060003B0[];
-
-// Box
-extern Gfx D_06000A20[];
-
const ActorInit En_Ma4_InitVars = {
ACTOR_EN_MA4,
ACTORCAT_NPC,
@@ -117,15 +89,15 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 D_80AC00DC = { 0, 0, 0, 0, MASS_IMMOVABLE };
-static void* sEyeTextures[] = {
- D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
+static TexturePtr sEyeTextures[] = {
+ object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
-static void* sMouthTextures[] = {
- D_060127C8,
- D_06012BC8,
- D_06012FC8,
- D_060133C8,
+static TexturePtr sMouthTextures[] = {
+ object_ma1_Tex_0127C8,
+ object_ma1_Tex_012BC8,
+ object_ma1_Tex_012FC8,
+ object_ma1_Tex_0133C8,
};
void EnMa4_UpdateEyes(EnMa4* this) {
@@ -141,16 +113,26 @@ void EnMa4_UpdateEyes(EnMa4* this) {
}
static struct_80B8E1A8 sAnimationInfo[] = {
- { &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, // Idle anim
- { &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f }, // Looking around anim
- { &D_06018948, 1.0f, 2, 0.0f }, { &D_06018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
- { &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
- { &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, // Walking anim
- { &D_06014088, 1.0f, 0, 0.0f }, { &D_06014088, 1.0f, 0, -6.0f }, //
- { &D_06015B7C, 1.0f, 2, 0.0f }, { &D_06015B7C, 1.0f, 2, -6.0f }, // Shoot arrow anim
- { &D_06007D98, 1.0f, 0, 0.0f }, { &D_06007D98, 1.0f, 0, -6.0f }, // Sitting anim
- { &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
- { &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
+ { &object_ma1_Anim_009E58, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_009E58, 1.0f, 0, -6.0f }, // Idle anim
+ { &object_ma1_Anim_002A8C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_002A8C, 1.0f, 0, -6.0f }, // Looking around anim
+ { &object_ma1_Anim_018948, 1.0f, 2, 0.0f },
+ { &object_ma1_Anim_018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
+ { &object_ma1_Anim_01B76C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_01B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
+ { &object_ma1_Anim_007328, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_007328, 1.0f, 0, -6.0f }, // Walking anim
+ { &object_ma1_Anim_014088, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_014088, 1.0f, 0, -6.0f }, //
+ { &object_ma1_Anim_015B7C, 1.0f, 2, 0.0f },
+ { &object_ma1_Anim_015B7C, 1.0f, 2, -6.0f }, // Shoot arrow anim
+ { &object_ma1_Anim_007D98, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_007D98, 1.0f, 0, -6.0f }, // Sitting anim
+ { &object_ma1_Anim_00852C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_00852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
+ { &object_ma1_Anim_008F6C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
};
void EnMa4_ChangeAnim(EnMa4* this, s32 index) {
@@ -163,9 +145,9 @@ void func_80ABDD9C(EnMa4* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 flag;
- if (this->unk_1D8.unk_00 == 0 &&
- ((this->skelAnime.animation == &D_06007328) || (this->skelAnime.animation == &D_06002A8C) ||
- (this->skelAnime.animation == &D_06015B7C))) {
+ if (this->unk_1D8.unk_00 == 0 && ((this->skelAnime.animation == &object_ma1_Anim_007328) ||
+ (this->skelAnime.animation == &object_ma1_Anim_002A8C) ||
+ (this->skelAnime.animation == &object_ma1_Anim_015B7C))) {
flag = 1;
} else {
flag = (this->type == MA4_TYPE_ALIENS_WON && this->actionFunc != EnMa4_DialogueHandler) ? 1 : 0;
@@ -201,7 +183,7 @@ void EnMa4_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, NULL, this->jointTable, this->morphTable,
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, NULL, this->jointTable, this->morphTable,
MA1_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->collider);
@@ -318,7 +300,7 @@ void EnMa4_RunInCircles(EnMa4* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
Actor_MoveWithGravity(&this->actor);
- if (this->skelAnime.animation == &D_06007328) { // Walking animation
+ if (this->skelAnime.animation == &object_ma1_Anim_007328) { // Walking animation
if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 4.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_ROMANI_WALK);
}
@@ -1074,7 +1056,7 @@ void EnMa4_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
} else if (limbIndex == MA1_LIMB_HAND_LEFT) {
if (this->hasBow == true) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@@ -1086,7 +1068,7 @@ void EnMa4_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->type == MA4_TYPE_ALIENS_WON) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000A20);
+ gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_000A20);
}
func_8012C28C(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
index 92a56a4198..67d44caffb 100644
--- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
+++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ma_yto.h"
+#include "objects/object_ma2/object_ma2.h"
#define FLAGS 0x02100009
@@ -108,60 +109,31 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
0, 0, 0, 0, MASS_IMMOVABLE,
};
-extern FlexSkeletonHeader D_06015C28;
-
-extern AnimationHeader D_0600A174;
-extern AnimationHeader D_0600AF7C;
-extern AnimationHeader D_06000CC0;
-extern AnimationHeader D_06016720;
-extern AnimationHeader D_06005314;
-extern AnimationHeader D_060093E8;
-extern AnimationHeader D_06007E28;
-extern AnimationHeader D_060070EC;
-extern AnimationHeader D_06003D54;
-extern AnimationHeader D_06001FD0;
-extern AnimationHeader D_060030B4;
-extern AnimationHeader D_06004370;
-
-extern void* D_06014AD8[];
-extern void* D_06014ED8[];
-extern void* D_060152D8[];
-extern void* D_060156D8[];
-
-extern void* D_06011AD8[];
-extern void* D_060122D8[];
-extern void* D_06012AD8[];
-extern void* D_060132D8[];
-extern void* D_06013AD8[];
-extern void* D_060142D8[];
-
-// gCremiaWoodenBox
-extern Gfx D_06005430[];
-
static struct_80B8E1A8 sAnimationInfo[] = {
- { &D_0600A174, 1.0f, 0, 0.0f }, { &D_0600A174, 1.0f, 0, -6.0f }, //
- { &D_0600AF7C, 1.0f, 2, 0.0f }, { &D_0600AF7C, 1.0f, 2, -6.0f }, //
- { &D_06000CC0, 1.0f, 0, 0.0f }, { &D_06000CC0, 1.0f, 0, -6.0f }, //
- { &D_06016720, 1.0f, 0, 0.0f }, { &D_06016720, 1.0f, 0, -8.0f }, //
- { &D_06005314, 1.0f, 0, 0.0f }, { &D_06005314, 1.0f, 0, -8.0f }, //
- { &D_060093E8, 1.0f, 0, 0.0f }, { &D_060093E8, 1.0f, 0, -10.0f }, //
- { &D_06007E28, 1.0f, 0, 0.0f }, { &D_06007E28, 1.0f, 0, -8.0f }, //
- { &D_060070EC, 1.0f, 0, 0.0f }, { &D_060070EC, 1.0f, 0, -8.0f }, //
- { &D_06003D54, 1.0f, 0, 0.0f }, { &D_06003D54, 1.0f, 0, -8.0f }, //
- { &D_06001FD0, 1.0f, 0, 0.0f }, { &D_06001FD0, 1.0f, 0, -8.0f }, //
- { &D_060030B4, 1.0f, 0, 0.0f }, { &D_060030B4, 1.0f, 0, -8.0f }, //
- { &D_06004370, 1.0f, 0, 0.0f }, { &D_06004370, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_00A174, 1.0f, 0, 0.0f }, { &object_ma2_Anim_00A174, 1.0f, 0, -6.0f }, //
+ { &object_ma2_Anim_00AF7C, 1.0f, 2, 0.0f }, { &object_ma2_Anim_00AF7C, 1.0f, 2, -6.0f }, //
+ { &object_ma2_Anim_000CC0, 1.0f, 0, 0.0f }, { &object_ma2_Anim_000CC0, 1.0f, 0, -6.0f }, //
+ { &object_ma2_Anim_016720, 1.0f, 0, 0.0f }, { &object_ma2_Anim_016720, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_005314, 1.0f, 0, 0.0f }, { &object_ma2_Anim_005314, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_0093E8, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0093E8, 1.0f, 0, -10.0f }, //
+ { &object_ma2_Anim_007E28, 1.0f, 0, 0.0f }, { &object_ma2_Anim_007E28, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_0070EC, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0070EC, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_003D54, 1.0f, 0, 0.0f }, { &object_ma2_Anim_003D54, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_001FD0, 1.0f, 0, 0.0f }, { &object_ma2_Anim_001FD0, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_0030B4, 1.0f, 0, 0.0f }, { &object_ma2_Anim_0030B4, 1.0f, 0, -8.0f }, //
+ { &object_ma2_Anim_004370, 1.0f, 0, 0.0f }, { &object_ma2_Anim_004370, 1.0f, 0, -8.0f }, //
};
-static void* sMouthTextures[] = {
- D_06014AD8,
- D_06014ED8,
- D_060152D8,
- D_060156D8,
+static TexturePtr sMouthTextures[] = {
+ object_ma2_Tex_014AD8,
+ object_ma2_Tex_014ED8,
+ object_ma2_Tex_0152D8,
+ object_ma2_Tex_0156D8,
};
-static void* sEyesTextures[] = {
- D_06011AD8, D_060122D8, D_06012AD8, D_060132D8, D_06013AD8, D_060142D8,
+static TexturePtr sEyesTextures[] = {
+ object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
+ object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
};
void EnMaYto_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -189,7 +161,7 @@ void EnMaYto_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06015C28, NULL, this->jointTable, this->morphTable,
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_015C28, NULL, this->jointTable, this->morphTable,
MA2_LIMB_MAX);
EnMaYto_InitAnimation(this, globalCtx);
@@ -464,7 +436,7 @@ void EnMaYto_DefaultDialogueHandler(EnMaYto* this, GlobalContext* globalCtx) {
}
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x3000, 0x100);
- if (this->textId == 0x3395 && this->skelAnime.animation == &D_0600AF7C &&
+ if (this->textId == 0x3395 && this->skelAnime.animation == &object_ma2_Anim_00AF7C &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 4);
}
@@ -1081,7 +1053,7 @@ void EnMaYto_WarmFuzzyFeelingCs(EnMaYto* this, GlobalContext* globalCtx) {
}
func_800EDF24(&this->actor, globalCtx, csActionIndex);
- if (D_80B915F0 == 2 && this->skelAnime.animation == &D_06001FD0 &&
+ if (D_80B915F0 == 2 && this->skelAnime.animation == &object_ma2_Anim_001FD0 &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 20);
}
@@ -1464,12 +1436,14 @@ s32 EnMaYto_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
rot->x += sp4.y;
rot->z += sp4.x;
} else if (limbIndex == MA2_LIMB_TORSO) {
- if (this->skelAnime.animation != &D_06007E28 && this->skelAnime.animation != &D_06003D54) {
+ if (this->skelAnime.animation != &object_ma2_Anim_007E28 &&
+ this->skelAnime.animation != &object_ma2_Anim_003D54) {
sp4 = this->unk_1D8.unk_0E;
rot->x += sp4.y;
- if (this->skelAnime.animation == &D_0600A174 || this->skelAnime.animation == &D_060070EC ||
- this->skelAnime.animation == &D_06003D54) {
+ if (this->skelAnime.animation == &object_ma2_Anim_00A174 ||
+ this->skelAnime.animation == &object_ma2_Anim_0070EC ||
+ this->skelAnime.animation == &object_ma2_Anim_003D54) {
rot->z += sp4.x;
}
}
@@ -1492,7 +1466,7 @@ void EnMaYto_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->type == MA_YTO_TYPE_BARN && (gSaveContext.weekEventReg[0x16] & 1)) { // Alieans defeated
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06005430);
+ gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBox);
}
func_8012C28C(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
index 7b9a0b879b..ee186086cc 100644
--- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
+++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
@@ -5,6 +5,7 @@
*/
#include "z_en_ma_yts.h"
+#include "objects/object_ma1/object_ma1.h"
#define FLAGS 0x02100009
@@ -29,40 +30,6 @@ void EnMaYts_SetFaceExpression(EnMaYts* this, s16 overrideEyeTexIndex, s16 mouth
void EnMaYts_DrawSleeping(Actor* thisx, GlobalContext* globalCtx);
-extern AnimationHeader D_06009E58;
-extern AnimationHeader D_06018948;
-extern AnimationHeader D_0601B76C;
-extern AnimationHeader D_06007328;
-extern AnimationHeader D_06014088;
-extern AnimationHeader D_06002A8C;
-extern AnimationHeader D_06015B7C;
-extern AnimationHeader D_06007D98;
-extern AnimationHeader D_0600852C;
-extern AnimationHeader D_06008F6C;
-extern AnimationHeader D_060180DC;
-
-extern u64 D_060127C8[];
-extern u64 D_06012BC8[];
-extern u64 D_06012FC8[];
-extern u64 D_060133C8[];
-
-extern u64 D_0600FFC8[];
-extern u64 D_060107C8[];
-extern u64 D_06010FC8[];
-extern u64 D_060117C8[];
-extern u64 D_06011FC8[];
-
-extern FlexSkeletonHeader D_06013928;
-
-extern AnimationHeader D_06009E58;
-extern AnimationHeader D_06007D98;
-
-// Bow
-extern Gfx D_060003B0[];
-
-// Sleeping
-extern Gfx D_060043A0[];
-
const ActorInit En_Ma_Yts_InitVars = {
ACTOR_EN_MA_YTS,
ACTORCAT_NPC,
@@ -112,28 +79,39 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static struct_80B8E1A8 sAnimationInfo[] = {
- { &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, // Idle anim
- { &D_06018948, 1.0f, 2, 0.0f }, { &D_06018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
- { &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
- { &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, // Walking anim
- { &D_06014088, 1.0f, 0, 0.0f }, { &D_06014088, 1.0f, 0, -6.0f }, //
- { &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f }, // Looking around anim
- { &D_06015B7C, 1.0f, 0, 0.0f }, { &D_06015B7C, 1.0f, 0, -6.0f }, // Shoot arrow anim
- { &D_06007D98, 1.0f, 0, 0.0f }, { &D_06007D98, 1.0f, 0, -6.0f }, // Sitting anim
- { &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
- { &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
- { &D_060180DC, 1.0f, 2, 0.0f }, { &D_060180DC, 1.0f, 2, -6.0f }, // Turns around anim
+ { &object_ma1_Anim_009E58, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_009E58, 1.0f, 0, -6.0f }, // Idle anim
+ { &object_ma1_Anim_018948, 1.0f, 2, 0.0f },
+ { &object_ma1_Anim_018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
+ { &object_ma1_Anim_01B76C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_01B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
+ { &object_ma1_Anim_007328, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_007328, 1.0f, 0, -6.0f }, // Walking anim
+ { &object_ma1_Anim_014088, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_014088, 1.0f, 0, -6.0f }, //
+ { &object_ma1_Anim_002A8C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_002A8C, 1.0f, 0, -6.0f }, // Looking around anim
+ { &object_ma1_Anim_015B7C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_015B7C, 1.0f, 0, -6.0f }, // Shoot arrow anim
+ { &object_ma1_Anim_007D98, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_007D98, 1.0f, 0, -6.0f }, // Sitting anim
+ { &object_ma1_Anim_00852C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_00852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
+ { &object_ma1_Anim_008F6C, 1.0f, 0, 0.0f },
+ { &object_ma1_Anim_008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
+ { &object_ma1_Anim_0180DC, 1.0f, 2, 0.0f },
+ { &object_ma1_Anim_0180DC, 1.0f, 2, -6.0f }, // Turns around anim
};
-static void* sMouthTextures[] = {
- D_060127C8,
- D_06012BC8,
- D_06012FC8,
- D_060133C8,
+static TexturePtr sMouthTextures[] = {
+ object_ma1_Tex_0127C8,
+ object_ma1_Tex_012BC8,
+ object_ma1_Tex_012FC8,
+ object_ma1_Tex_0133C8,
};
-static void* sEyeTextures[] = {
- D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
+static TexturePtr sEyeTextures[] = {
+ object_ma1_Tex_00FFC8, object_ma1_Tex_0107C8, object_ma1_Tex_010FC8, object_ma1_Tex_0117C8, object_ma1_Tex_011FC8,
};
void EnMaYts_ChangeAnim(EnMaYts* this, s32 index) {
@@ -247,7 +225,7 @@ void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013928, NULL, this->jointTable, this->morphTable,
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma1_Skel_013928, NULL, this->jointTable, this->morphTable,
MA1_LIMB_MAX);
EnMaYts_InitAnimation(this, globalCtx);
@@ -531,7 +509,8 @@ s32 EnMaYts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
if (limbIndex == MA1_LIMB_HEAD) {
sp4 = this->unk_1D8.unk_08;
rot->x += sp4.y;
- if ((this->skelAnime.animation == &D_06009E58) || (this->skelAnime.animation == &D_06007D98)) {
+ if ((this->skelAnime.animation == &object_ma1_Anim_009E58) ||
+ (this->skelAnime.animation == &object_ma1_Anim_007D98)) {
rot->z += sp4.x;
}
} else if (limbIndex == MA1_LIMB_TORSO) {
@@ -551,7 +530,7 @@ void EnMaYts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
} else if (limbIndex == MA1_LIMB_HAND_LEFT) {
if (this->hasBow == true) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_060003B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0003B0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@@ -578,7 +557,7 @@ void EnMaYts_DrawSleeping(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060043A0);
+ gSPDisplayList(POLY_OPA_DISP++, object_ma1_DL_0043A0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
index 2f0834514b..ea3b7a45ee 100644
--- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
+++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
@@ -5,6 +5,8 @@
*/
#include "z_en_minifrog.h"
+#include "objects/object_fr/object_fr.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -24,12 +26,6 @@ void EnMinifrog_UpdateMissingFrog(Actor* thisx, GlobalContext* globalCtx);
void EnMinifrog_YellowFrogDialog(EnMinifrog* this, GlobalContext* globalCtx);
void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060007BC;
-extern AnimationHeader D_06001534;
-extern FlexSkeletonHeader D_0600B538;
-extern UNK_TYPE4 D_060059A0;
-extern UNK_TYPE4 D_06005BA0;
-
const ActorInit En_Minifrog_InitVars = {
ACTOR_EN_MINIFROG,
ACTORCAT_NPC,
@@ -65,9 +61,9 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 1, 12, 14, MASS_IMMOVABLE };
// sEyeTextures???
-static UNK_TYPE4* D_808A4D74[] = {
- &D_060059A0,
- &D_06005BA0,
+static TexturePtr D_808A4D74[] = {
+ object_fr_Tex_0059A0,
+ object_fr_Tex_005BA0,
};
// gSaveContext.weekEventReg[KEY] = VALUE
@@ -92,7 +88,8 @@ void EnMinifrog_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B538, &D_06001534, this->jointTable, this->morphTable, 24);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fr_Skel_00B538, &object_fr_Anim_001534, this->jointTable,
+ this->morphTable, 24);
CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -180,7 +177,7 @@ EnMinifrog* EnMinifrog_GetFrog(GlobalContext* globalCtx) {
void EnMinifrog_SetJumpState(EnMinifrog* this) {
if (this->jumpState == MINIFROG_STATE_GROUND) {
this->jumpState = MINIFROG_STATE_JUMP;
- Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, 7.0f, 2, -5.0f);
+ Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, 7.0f, 2, -5.0f);
}
}
@@ -207,7 +204,7 @@ void EnMinifrog_Jump(EnMinifrog* this) {
case MINIFROG_STATE_AIR:
if (this->actor.bgCheckFlags & 1) {
this->jumpState = MINIFROG_STATE_GROUND;
- Animation_MorphToLoop(&this->skelAnime, &D_06001534, -2.5f);
+ Animation_MorphToLoop(&this->skelAnime, &object_fr_Anim_001534, -2.5f);
SkelAnime_Update(&this->skelAnime);
}
break;
@@ -413,7 +410,7 @@ void EnMinifrog_NextFrogReturned(EnMinifrog* this, GlobalContext* globalCtx) {
this->actionFunc = EnMinifrog_ContinueChoirCutscene;
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
0x2 << MINIFROG_WHITE);
- globalCtx->setPlayerTalkAnim(globalCtx, &D_0400DEA8, 0);
+ globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00DEA8, 0);
}
}
@@ -444,7 +441,7 @@ void EnMinifrog_SetupNextFrogChoir(EnMinifrog* this, GlobalContext* globalCtx) {
this->flags &= ~0x100;
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
0x2 << MINIFROG_WHITE);
- globalCtx->setPlayerTalkAnim(globalCtx, &D_0400DEA8, 0);
+ globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00DEA8, 0);
} else if (this->timer <= 0) {
this->actionFunc = EnMinifrog_NextFrogReturned;
this->timer = 30;
@@ -464,7 +461,7 @@ void EnMinifrog_BeginChoirCutscene(EnMinifrog* this, GlobalContext* globalCtx) {
this->timer = 5;
func_801A1F00(3, NA_BGM_FROG_SONG);
this->flags |= 0x100;
- globalCtx->setPlayerTalkAnim(globalCtx, &D_0400E2A8, 0);
+ globalCtx->setPlayerTalkAnim(globalCtx, &gameplay_keep_Linkanim_00E2A8, 0);
} else {
ActorCutscene_SetIntentToPlay(this->actor.cutscene);
}
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
index 58de48dbd7..86b9810c5d 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
@@ -5,6 +5,7 @@
*/
#include "z_en_mm.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -216,6 +217,6 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(-rotY, MTXMODE_APPLY);
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, &D_04055628);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_055628);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
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 77b3d70dda..8e17adbaf8 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
@@ -56,14 +57,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP),
};
-extern AnimationHeader D_060005EC;
-extern FlexSkeletonHeader D_06003DC0;
-
void EnMs_Init(Actor* thisx, GlobalContext* globalCtx) {
EnMs* this = THIS;
Actor_ProcessInitChain(thisx, sInitChain);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, this->jointTable, this->morphTable, 9);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ms_Skel_003DC0, &object_ms_Anim_0005EC, 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_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
index ab94425ea8..fecbf05d39 100644
--- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
+++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
@@ -6,6 +6,7 @@
#include "overlays/actors/ovl_Obj_Bean/z_obj_bean.h"
#include "z_en_mushi2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -31,8 +32,6 @@ void func_80A6AE7C(EnMushi2* this, GlobalContext* globalCtx);
void func_80A6B078(EnMushi2* this);
void func_80A6B0D8(EnMushi2* this, GlobalContext* globalCtx);
-extern SkeletonHeader D_040527A0;
-
const ActorInit En_Mushi2_InitVars = {
ACTOR_EN_MUSHI2,
ACTORCAT_ITEMACTION,
@@ -751,8 +750,9 @@ void EnMushi2_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.home.rot.y = this->actor.shape.rot.y;
this->actor.world.rot.y = this->actor.shape.rot.y;
func_80A68F24(this);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_040527A0, &D_0405140C, this->jointTable, this->morphTable, 24);
- Animation_Change(&this->skelAnime, &D_0405140C, 1.0f, 0.0f, 0.0f, 1, 0.0f);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &gameplay_keep_Skel_0527A0, &gameplay_keep_Anim_05140C,
+ this->jointTable, this->morphTable, 24);
+ Animation_Change(&this->skelAnime, &gameplay_keep_Anim_05140C, 1.0f, 0.0f, 0.0f, 1, 0.0f);
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
func_80A68808(this);
diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c
index 00c3ed0c98..ed752ea1cf 100644
--- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c
+++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c
@@ -5,6 +5,7 @@
*/
#include "z_en_muto.h"
+#include "objects/object_toryo/object_toryo.h"
#define FLAGS 0x00000009
@@ -23,9 +24,6 @@ void EnMuto_SetupDialogue(EnMuto* this, GlobalContext* globalCtx);
void EnMuto_InDialogue(EnMuto* this, GlobalContext* globalCtx);
s32 EnMuto_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
-extern AnimationHeader D_06000E50;
-extern FlexSkeletonHeader D_06007150;
-
const ActorInit En_Muto_InitVars = {
ACTOR_EN_MUTO,
ACTORCAT_NPC,
@@ -65,7 +63,8 @@ void EnMuto_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007150, &D_06000E50, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_toryo_Skel_007150, &object_toryo_Anim_000E50,
+ this->jointTable, this->morphTable, 17);
this->isInMayorsRoom = this->actor.params;
if (!this->isInMayorsRoom) {
@@ -101,7 +100,7 @@ void EnMuto_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void EnMuto_ChangeAnim(EnMuto* this, s32 animIndex) {
- static AnimationHeader* sAnimations[] = { &D_06000E50, &D_06000E50 };
+ static AnimationHeader* sAnimations[] = { &object_toryo_Anim_000E50, &object_toryo_Anim_000E50 };
static u8 sAnimationModes[] = { 0, 2 };
this->animIndex = animIndex;
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 47dad2a781..fa560f013b 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -5,6 +5,7 @@
*/
#include "z_en_niw.h"
+#include "objects/object_niw/object_niw.h"
#define FLAGS 0x00800010
@@ -32,11 +33,6 @@ void EnNiw_CheckRage(EnNiw* this, GlobalContext* globalCtx);
void func_80891320(EnNiw* this, GlobalContext* globalCtx, s16 arg2);
void EnNiw_SpawnFeather(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 scale);
-extern FlexSkeletonHeader D_06002530;
-extern AnimationHeader D_060000E8;
-extern Gfx D_060023B0[]; // gNiwFeatherMaterialDL
-extern Gfx D_06002428[]; // gNiwFeatherDL
-
// turned on during cucco storm, but not read by anything?
// maybe read by En_Attack_Niw
s16 D_80893460 = false;
@@ -126,8 +122,8 @@ void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx) {
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelanime, &D_06002530, &D_060000E8, this->jointTable, this->morphTable,
- ENNIW_LIMBCOUNT);
+ SkelAnime_InitFlex(globalCtx, &this->skelanime, &object_niw_Skel_002530, &object_niw_Anim_0000E8, this->jointTable,
+ this->morphTable, ENNIW_LIMBCOUNT);
Math_Vec3f_Copy(&this->unk2A4, &this->actor.world.pos);
Math_Vec3f_Copy(&this->unk2B0, &this->actor.world.pos);
@@ -327,7 +323,8 @@ void func_808917F8(EnNiw* this, GlobalContext* globalCtx, s32 arg2) {
}
void EnNiw_SetupIdle(EnNiw* this) {
- Animation_Change(&this->skelanime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), 0, -10.0f);
+ Animation_Change(&this->skelanime, &object_niw_Anim_0000E8, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_niw_Anim_0000E8), 0, -10.0f);
this->unknownState28E = 0;
this->actionFunc = EnNiw_Idle;
}
@@ -629,7 +626,8 @@ void EnNiw_CuccoStorm(EnNiw* this, GlobalContext* globalCtx) {
}
void EnNiw_SetupRunAway(EnNiw* this) {
- Animation_Change(&this->skelanime, &D_060000E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000E8), 0, -10.0f);
+ Animation_Change(&this->skelanime, &object_niw_Anim_0000E8, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_niw_Anim_0000E8), 0, -10.0f);
this->unk29A = Rand_ZeroFloat(1.99f);
this->unknownState28E = 7;
this->actionFunc = EnNiw_RunAway;
@@ -1002,7 +1000,7 @@ void EnNiw_DrawFeathers(EnNiw* this, GlobalContext* globalCtx) {
if (feather->isEnabled == true) {
// Apply the feather material if it has not already been applied.
if (!isMaterialApplied) {
- gSPDisplayList(POLY_XLU_DISP++, D_060023B0);
+ gSPDisplayList(POLY_XLU_DISP++, gNiwFeatherMaterialDL);
isMaterialApplied++;
}
@@ -1014,7 +1012,7 @@ void EnNiw_DrawFeathers(EnNiw* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06002428);
+ gSPDisplayList(POLY_XLU_DISP++, gNiwFeatherDL);
}
}
diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c
index d106901045..c7e0d5dacd 100644
--- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c
+++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c
@@ -5,6 +5,7 @@
*/
#include "z_en_nnh.h"
+#include "objects/object_nnh/object_nnh.h"
#define FLAGS 0x00000019
@@ -52,8 +53,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 20, 50, 0, { 0, 0, 0 } },
};
-extern Gfx D_06001510[];
-
void EnNnh_Init(Actor* thisx, GlobalContext* globalCtx) {
EnNnh* this = THIS;
@@ -110,5 +109,5 @@ void EnNnh_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(gfxCtx->polyOpa.p++, D_06001510);
+ gSPDisplayList(gfxCtx->polyOpa.p++, object_nnh_DL_001510);
}
diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
index 9c3d7d99d9..4c2cec3fa5 100644
--- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
+++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
@@ -6,6 +6,7 @@
#include "z_en_nutsball.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000010
@@ -173,6 +174,6 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertMatrix(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_InsertZRotation_s(this->actor.home.rot.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_04058BA0);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_058BA0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 9a1a076402..151ca6259e 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -5,6 +5,9 @@
*/
#include "z_en_ossan.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_fsn/object_fsn.h"
+#include "objects/object_ani/object_ani.h"
#define FLAGS 0x00000019
@@ -50,29 +53,6 @@ void EnOssan_GetCutscenes(EnOssan* this, GlobalContext* globalCtx);
s32 EnOssan_ReturnItemToShelf(EnOssan* this);
s32 EnOssan_TakeItemOffShelf(EnOssan* this);
-extern FlexSkeletonHeader D_060028A0;
-extern TexturePtr D_06005BC0;
-extern TexturePtr D_06006498;
-extern TexturePtr D_06006B18;
-extern TexturePtr D_06006D40;
-extern TexturePtr D_06006F18;
-extern TexturePtr D_06007140;
-extern AnimationHeader D_06009D34;
-extern AnimationHeader D_0600A460;
-extern AnimationHeader D_0600CB3C;
-extern AnimationHeader D_0600DE34;
-extern AnimationHeader D_0600E3EC;
-extern AnimationHeader D_0600C58C;
-extern AnimationHeader D_0600F00C;
-extern AnimationHeader D_0600B9D8;
-extern AnimationHeader D_0600C26C;
-extern AnimationHeader D_0600D354;
-extern AnimationHeader D_06012C34;
-extern AnimationHeader D_060131FC;
-extern FlexSkeletonHeader D_06013320;
-extern AnimationHeader D_060138B0;
-extern AnimationHeader D_0601430C;
-
const ActorInit En_Ossan_InitVars = {
ACTOR_EN_OSSAN,
ACTORCAT_NPC,
@@ -86,18 +66,22 @@ const ActorInit En_Ossan_InitVars = {
};
static ActorAnimationEntryS sAnimationsCuriosityShopMan[] = {
- { &D_06012C34, 1.0f, 0, -1, 0, 0 }, { &D_060131FC, 1.0f, 0, -1, 0, 0 }, { &D_0600C58C, 1.0f, 0, -1, 2, 0 },
- { &D_0600C58C, -1.0f, 0, -1, 2, 0 }, { &D_0600E3EC, 1.0f, 0, -1, 2, 0 }, { &D_0600F00C, 1.0f, 0, -1, 0, 0 },
- { &D_0600CB3C, 1.0f, 0, -1, 2, 0 }, { &D_0600D354, 1.0f, 0, -1, 0, 0 }, { &D_060138B0, 1.0f, 0, -1, 2, 0 },
- { &D_0601430C, 1.0f, 0, -1, 0, 0 }, { &D_0600B9D8, 1.0f, 0, -1, 2, 0 }, { &D_0600C26C, 1.0f, 0, -1, 0, 0 },
- { &D_0600DE34, 1.0f, 0, -1, 2, 0 },
+ { &object_fsn_Anim_012C34, 1.0f, 0, -1, 0, 0 }, { &object_fsn_Anim_0131FC, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00C58C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C58C, -1.0f, 0, -1, 2, 0 },
+ { &object_fsn_Anim_00E3EC, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00F00C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00CB3C, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00D354, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_0138B0, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_01430C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00B9D8, 1.0f, 0, -1, 2, 0 }, { &object_fsn_Anim_00C26C, 1.0f, 0, -1, 0, 0 },
+ { &object_fsn_Anim_00DE34, 1.0f, 0, -1, 2, 0 },
};
static ActorAnimationEntryS sAnimationsPartTimeWorker[] = {
- { &D_06009D34, 1.0f, 0, -1, 0, -10 }, { &D_06009D34, 1.0f, 0, -1, 0, -10 }, { &D_06009D34, 1.0f, 0, -1, 2, 0 },
- { &D_06009D34, -1.0f, 0, -1, 2, 0 }, { &D_06009D34, 1.0f, 0, -1, 2, 0 }, { &D_06009D34, 1.0f, 0, -1, 0, 0 },
- { &D_06009D34, 1.0f, 0, -1, 2, 0 }, { &D_06009D34, 1.0f, 0, -1, 0, 0 }, { &D_0600A460, 1.0f, 0, -1, 2, -5 },
- { &D_0600A460, 1.0f, 0, -1, 0, -5 }, { &D_06009D34, 1.0f, 0, -1, 2, 0 }, { &D_06009D34, 1.0f, 0, -1, 0, 0 },
+ { &object_ani_Anim_009D34, 1.0f, 0, -1, 0, -10 }, { &object_ani_Anim_009D34, 1.0f, 0, -1, 0, -10 },
+ { &object_ani_Anim_009D34, 1.0f, 0, -1, 2, 0 }, { &object_ani_Anim_009D34, -1.0f, 0, -1, 2, 0 },
+ { &object_ani_Anim_009D34, 1.0f, 0, -1, 2, 0 }, { &object_ani_Anim_009D34, 1.0f, 0, -1, 0, 0 },
+ { &object_ani_Anim_009D34, 1.0f, 0, -1, 2, 0 }, { &object_ani_Anim_009D34, 1.0f, 0, -1, 0, 0 },
+ { &object_ani_Anim_00A460, 1.0f, 0, -1, 2, -5 }, { &object_ani_Anim_00A460, 1.0f, 0, -1, 0, -5 },
+ { &object_ani_Anim_009D34, 1.0f, 0, -1, 2, 0 }, { &object_ani_Anim_009D34, 1.0f, 0, -1, 0, 0 },
};
static s16 sObjectIds[] = { OBJECT_FSN, OBJECT_ANI };
@@ -1329,12 +1313,14 @@ void EnOssan_Blink(EnOssan* this) {
}
void EnOssan_InitCuriosityShopMan(EnOssan* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013320, &D_06012C34, this->jointTable, this->morphTable, 19);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fsn_Skel_013320, &object_fsn_Anim_012C34, this->jointTable,
+ this->morphTable, 19);
this->actor.draw = EnOssan_DrawCuriosityShopMan;
}
void EnOssan_InitPartTimeWorker(EnOssan* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060028A0, &D_06009D34, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ani_Skel_0028A0, &object_ani_Anim_009D34, this->jointTable,
+ this->morphTable, 16);
this->actor.draw = EnOssan_DrawPartTimeWorker;
}
@@ -1537,8 +1523,8 @@ void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f
func_8012C654(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColor.r, this->cursorColor.g, this->cursorColor.b,
this->cursorColor.a);
- gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_0401F740, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
- G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock_4b(OVERLAY_DISP++, gameplay_keep_Tex_01F740, G_IM_FMT_IA, 16, 16, 0,
+ G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
w = 16.0f * z;
ulx = (x - w) * 4.0f;
uly = (y - w) * 4.0f;
@@ -1589,7 +1575,7 @@ void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this)
if (drawStickRightPrompt || drawStickLeftPrompt) {
func_8012C654(globalCtx->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F8C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F8C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1610,7 +1596,7 @@ void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this)
this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY,
this->stickRightPrompt.texZ, 0, 0, 1.0f, 1.0f);
}
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F7C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F7C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1677,7 +1663,7 @@ void EnOssan_PostLimbDrawPartTimeWorker(GlobalContext* globalCtx, s32 limbIndex,
}
void EnOssan_DrawCuriosityShopMan(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sEyeTextures[] = { &D_06005BC0, &D_06006D40, &D_06007140 };
+ static TexturePtr sEyeTextures[] = { object_fsn_Tex_005BC0, object_fsn_Tex_006D40, object_fsn_Tex_007140 };
EnOssan* this = THIS;
s32 pad;
@@ -1692,7 +1678,7 @@ void EnOssan_DrawCuriosityShopMan(Actor* thisx, GlobalContext* globalCtx) {
}
void EnOssan_DrawPartTimeWorker(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sEyeTextures[] = { &D_06006498, &D_06006B18, &D_06006F18 };
+ static TexturePtr sEyeTextures[] = { object_ani_Tex_006498, object_ani_Tex_006B18, object_ani_Tex_006F18 };
EnOssan* this = THIS;
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c
index 24acaa6a1b..ecaae682a9 100644
--- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c
+++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c
@@ -6,6 +6,8 @@
#include "z_en_ot.h"
#include "prevent_bss_reordering.h"
+#include "objects/object_ot/object_ot.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -57,15 +59,6 @@ EnOtUnkStruct* func_80B5DF58(EnOtUnkStruct* arg0, u8 arg1, Vec3f* arg2, Vec3s* a
void func_80B5E078(GlobalContext* globalCtx, EnOtUnkStruct* arg1, s32 arg2);
void func_80B5E1D8(GlobalContext* globalCtx, EnOtUnkStruct* arg1, s32 arg2);
-extern Gfx D_06000040[];
-extern Gfx D_06000078[];
-extern AnimationHeader D_06000420;
-extern Gfx D_060004A0[];
-extern AnimatedMaterial D_060005F8;
-extern AnimationHeader D_060008D8;
-extern FlexSkeletonHeader D_06004800;
-extern AnimationHeader D_06004B30;
-
static EnOt* D_80B5E880;
static EnOt* D_80B5E884;
static EnOt* D_80B5E888;
@@ -103,9 +96,9 @@ static ColliderCylinderInit sCylinderInit = {
};
static struct_80B8E1A8 sAnimations[] = {
- { &D_06004B30, 1.0f, 0, -5.0f },
- { &D_060008D8, 1.0f, 0, -5.0f },
- { &D_06000420, 1.0f, 0, 0.0f },
+ { &object_ot_Anim_004B30, 1.0f, 0, -5.0f },
+ { &object_ot_Anim_0008D8, 1.0f, 0, -5.0f },
+ { &object_ot_Anim_000420, 1.0f, 0, 0.0f },
};
static InitChainEntry sInitChain[] = {
@@ -156,7 +149,8 @@ void EnOt_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004800, &D_060008D8, this->jointTable, this->morphTable, 19);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ot_Skel_004800, &object_ot_Anim_0008D8, this->jointTable,
+ this->morphTable, 19);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
Animation_Change(&this->skelAnime, sAnimations[0].animationSeg, 1.0f,
Animation_GetLastFrame(&sAnimations[0].animationSeg->common) * Rand_ZeroOne(),
@@ -1044,7 +1038,7 @@ void EnOt_Draw(Actor* thisx, GlobalContext* globalCtx) {
CLOSE_DISPS(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, (AnimatedMaterial*)Lib_SegmentedToVirtual(&D_060005F8));
+ AnimatedMat_Draw(globalCtx, (AnimatedMaterial*)Lib_SegmentedToVirtual(object_ot_Matanimheader_0005F8));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
NULL, EnOt_PostLimbDraw, &this->actor);
Matrix_InsertTranslation(this->unk_378.x, this->unk_378.y, this->unk_378.z, MTXMODE_NEW);
@@ -1057,10 +1051,10 @@ void EnOt_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSetOtherMode(&gfx[0], G_SETOTHERMODE_H, 4, 4, 0x00000080);
gDPSetCombineLERP(&gfx[1], 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
0);
- gSPDisplayList(&gfx[2], D_04029CB0);
+ gSPDisplayList(&gfx[2], gameplay_keep_DL_029CB0);
gDPSetPrimColor(&gfx[3], 0, 0, this->unk_747.r, this->unk_747.g, this->unk_747.b, 50);
gSPMatrix(&gfx[4], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(&gfx[5], D_04029CF0);
+ gSPDisplayList(&gfx[5], gameplay_keep_DL_029CF0);
POLY_XLU_DISP = &gfx[6];
@@ -1075,7 +1069,7 @@ void EnOt_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
OPEN_DISPS(globalCtx->state.gfxCtx);
Gfx* gfx = POLY_OPA_DISP;
- gSPDisplayList(&gfx[0], D_060004A0);
+ gSPDisplayList(&gfx[0], object_ot_DL_0004A0);
POLY_OPA_DISP = &gfx[1];
Matrix_MultiplyVector3fByState(&D_80B5E410, &this->unk_74C);
@@ -1152,7 +1146,7 @@ void func_80B5E1D8(GlobalContext* globalCtx, EnOtUnkStruct* arg1, s32 arg2) {
for (i = 0; i < arg2; i++, arg1++) {
if (arg1->unk_00) {
if (!flag) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000040);
+ gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000040);
flag = true;
if (globalCtx) {}
}
@@ -1161,10 +1155,10 @@ void func_80B5E1D8(GlobalContext* globalCtx, EnOtUnkStruct* arg1, s32 arg2) {
Matrix_RotateY(BINANG_ROT180(func_800DFCDC(GET_ACTIVE_CAM(globalCtx))), MTXMODE_APPLY);
Matrix_Scale(arg1->unk_04, arg1->unk_04, arg1->unk_04, MTXMODE_APPLY);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_0405E6F0));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000078);
+ gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000078);
}
}
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 5bf520f91b..1b6059607e 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"
#define FLAGS 0x00000019
@@ -47,18 +48,6 @@ typedef enum {
/* 0x01 */ OWL_OK
} EnOwlMessageChoice;
-extern AnimationHeader D_06001168;
-extern Gfx D_06001200[];
-extern AnimationHeader D_06001ADC;
-extern TexturePtr D_06008EB8;
-extern TexturePtr D_060092B8;
-extern TexturePtr D_060096B8;
-extern FlexSkeletonHeader D_0600C5F8;
-extern AnimationHeader D_0600C6D4;
-extern AnimationHeader D_0600CB94;
-extern AnimationHeader D_0600CDB0;
-extern FlexSkeletonHeader D_060105C0;
-
const ActorInit En_Owl_InitVars = {
ACTOR_EN_OWL,
ACTORCAT_NPC,
@@ -139,15 +128,15 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime1, &D_0600C5F8, &D_06001ADC, this->jointTable1, this->morphTable1,
- 21);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime2, &D_060105C0, &D_0600CDB0, this->jointTable2, this->morphTable2,
- 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime1, &object_owl_Skel_00C5F8, &object_owl_Anim_001ADC,
+ this->jointTable1, this->morphTable1, 21);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime2, &object_owl_Skel_0105C0, &object_owl_Anim_00CDB0,
+ this->jointTable2, this->morphTable2, 16);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.terminalVelocity = -10.0f;
this->actor.targetArrowOffset = 500.0f;
- EnOwl_ChangeMode(this, func_8095BF58, func_8095C484, &this->skelAnime2, &D_0600CDB0, 0.0f);
+ EnOwl_ChangeMode(this, func_8095BF58, func_8095C484, &this->skelAnime2, &object_owl_Anim_00CDB0, 0.0f);
this->actionFlags = 0;
this->unk_40D = 0;
@@ -260,7 +249,7 @@ s32 func_8095A9FC(EnOwl* this, GlobalContext* globalCtx, u16 textId) {
}
void func_8095AA70(EnOwl* this) {
- EnOwl_ChangeMode(this, func_8095C1C8, func_8095C484, &this->skelAnime1, &D_0600CB94, 0.0f);
+ EnOwl_ChangeMode(this, func_8095C1C8, func_8095C484, &this->skelAnime1, &object_owl_Anim_00CB94, 0.0f);
this->eyeTexIndex = 0;
this->blinkTimer = Rand_S16Offset(60, 60);
}
@@ -450,7 +439,7 @@ void func_8095B254(EnOwl* this, GlobalContext* globalCtx) {
}
if (this->actionFlags & 1) {
- EnOwl_ChangeMode(this, func_8095B1E4, func_8095C328, &this->skelAnime1, &D_06001ADC, 0.0f);
+ EnOwl_ChangeMode(this, func_8095B1E4, func_8095C328, &this->skelAnime1, &object_owl_Anim_001ADC, 0.0f);
this->unk_3EA = 6;
this->actor.flags |= 0x20;
}
@@ -468,7 +457,7 @@ void func_8095B2F8(EnOwl* this, GlobalContext* globalCtx) {
if ((this->actor.shape.rot.y == this->unk_3EC) && (this->actionFlags & 1)) {
this->actionFunc = func_8095B254;
Animation_Change(this->skelAnime3, this->skelAnime3->animation, 1.0f, 19.0f,
- Animation_GetLastFrame(&D_06001168), 2, 0.0f);
+ Animation_GetLastFrame(&object_owl_Anim_001168), 2, 0.0f);
this->unk_414 = func_8095C484;
}
@@ -478,7 +467,7 @@ void func_8095B2F8(EnOwl* this, GlobalContext* globalCtx) {
void func_8095B3DC(EnOwl* this, GlobalContext* globalCtx) {
if (this->actionFlags & 1) {
this->actionFunc = func_8095B2F8;
- Animation_Change(this->skelAnime3, &D_06001168, 1.0f, 0.0f, 35.0f, 2, 0.0f);
+ Animation_Change(this->skelAnime3, &object_owl_Anim_001168, 1.0f, 0.0f, 35.0f, 2, 0.0f);
this->unk_414 = func_8095C408;
this->unk_3EC = 0x5500;
this->actor.world.pos.y += 100.0f;
@@ -491,7 +480,7 @@ void func_8095B480(EnOwl* this, GlobalContext* globalCtx) {
if (player->stateFlags3 & 0x10000000) {
this->actor.textId = 0xBF1;
- EnOwl_ChangeMode(this, func_8095BF58, func_8095C484, &this->skelAnime2, &D_0600CDB0, 0.0f);
+ EnOwl_ChangeMode(this, func_8095BF58, func_8095C484, &this->skelAnime2, &object_owl_Anim_00CDB0, 0.0f);
this->eyeTexIndex = 0;
this->actionFlags &= ~8;
this->blinkTimer = Rand_S16Offset(60, 60);
@@ -525,7 +514,7 @@ void func_8095B574(EnOwl* this, GlobalContext* globalCtx) {
void func_8095B650(EnOwl* this, GlobalContext* globalCtx) {
if (this->actionFlags & 1) {
- EnOwl_ChangeMode(this, func_8095B574, func_8095C484, &this->skelAnime2, &D_0600CDB0, 0.0f);
+ EnOwl_ChangeMode(this, func_8095B574, func_8095C484, &this->skelAnime2, &object_owl_Anim_00CDB0, 0.0f);
this->actor.textId = 0xBF5;
this->actionFlags &= ~8;
}
@@ -534,7 +523,8 @@ void func_8095B650(EnOwl* this, GlobalContext* globalCtx) {
void func_8095B6C8(EnOwl* this, GlobalContext* globalCtx) {
if (this->actionFlags & 1) {
- Animation_Change(this->skelAnime3, &D_0600CB94, -1.0f, Animation_GetLastFrame(&D_0600CB94), 0.0f, 2, 0.0f);
+ Animation_Change(this->skelAnime3, &object_owl_Anim_00CB94, -1.0f,
+ Animation_GetLastFrame(&object_owl_Anim_00CB94), 0.0f, 2, 0.0f);
this->unk_414 = func_8095C484;
this->actionFunc = func_8095B650;
}
@@ -606,7 +596,7 @@ void func_8095B960(EnOwl* this, GlobalContext* globalCtx) {
void func_8095B9FC(EnOwl* this, GlobalContext* globalCtx) {
if (this->actionFlags & 1) {
this->actionFunc = func_8095B960;
- Animation_Change(this->skelAnime3, &D_06001168, 1.0f, 0.0f, 35.0f, 2, 0.0f);
+ Animation_Change(this->skelAnime3, &object_owl_Anim_001168, 1.0f, 0.0f, 35.0f, 2, 0.0f);
this->unk_414 = func_8095C408;
func_8095B0C8(this);
}
@@ -676,7 +666,8 @@ void func_8095BA84(EnOwl* this, GlobalContext* globalCtx) {
case 0xBEE:
func_801477B4(globalCtx);
Audio_QueueSeqCmd(0x110000FF);
- EnOwl_ChangeMode(this, func_8095B9FC, func_8095C484, &this->skelAnime1, &D_0600CB94, 0.0f);
+ EnOwl_ChangeMode(this, func_8095B9FC, func_8095C484, &this->skelAnime1, &object_owl_Anim_00CB94,
+ 0.0f);
this->eyeTexIndex = 0;
this->blinkTimer = Rand_S16Offset(60, 60);
this->actionFlags |= 8;
@@ -705,7 +696,8 @@ void func_8095BA84(EnOwl* this, GlobalContext* globalCtx) {
func_801477B4(globalCtx);
Audio_QueueSeqCmd(0x110000FF);
this->actor.flags &= ~0x10000;
- EnOwl_ChangeMode(this, func_8095B3DC, func_8095C484, &this->skelAnime1, &D_0600CB94, 0.0f);
+ EnOwl_ChangeMode(this, func_8095B3DC, func_8095C484, &this->skelAnime1, &object_owl_Anim_00CB94,
+ 0.0f);
this->eyeTexIndex = 0;
this->blinkTimer = Rand_S16Offset(60, 60);
this->actionFlags |= 8;
@@ -783,7 +775,7 @@ void func_8095C09C(EnOwl* this, GlobalContext* globalCtx) {
}
if (this->actionFlags & 1) {
- EnOwl_ChangeMode(this, func_8095BF78, func_8095C328, &this->skelAnime1, &D_06001ADC, 0.0f);
+ EnOwl_ChangeMode(this, func_8095BF78, func_8095C328, &this->skelAnime1, &object_owl_Anim_001ADC, 0.0f);
this->unk_3EA = 6;
this->unk_3EC += 0x2000;
}
@@ -794,7 +786,7 @@ void func_8095C09C(EnOwl* this, GlobalContext* globalCtx) {
void func_8095C1C8(EnOwl* this, GlobalContext* globalCtx) {
if (this->actionFlags & 1) {
this->unk_3EA = 3;
- EnOwl_ChangeMode(this, func_8095C09C, func_8095C484, &this->skelAnime1, &D_06001168, 0.0f);
+ EnOwl_ChangeMode(this, func_8095C09C, func_8095C484, &this->skelAnime1, &object_owl_Anim_001168, 0.0f);
this->unk_3EC = BINANG_ADD(this->actor.world.rot.y, 0x4000);
this->unk_3E4 = this->actor.world.pos.y;
this->actor.velocity.y = 2.0f;
@@ -810,7 +802,8 @@ void func_8095C258(EnOwl* this) {
} else {
this->unk_414 = func_8095C328;
this->unk_3EA = 6;
- Animation_Change(this->skelAnime3, &D_06001ADC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001ADC), 2, 5.0f);
+ Animation_Change(this->skelAnime3, &object_owl_Anim_001ADC, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_owl_Anim_001ADC), 2, 5.0f);
}
}
@@ -823,7 +816,8 @@ void func_8095C328(EnOwl* this) {
} else {
this->unk_3EA = 160;
this->unk_414 = func_8095C258;
- Animation_Change(this->skelAnime3, &D_0600C6D4, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C6D4), 0, 5.0f);
+ Animation_Change(this->skelAnime3, &object_owl_Anim_00C6D4, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_owl_Anim_00C6D4), 0, 5.0f);
}
}
}
@@ -904,7 +898,7 @@ void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (this->actor.update != NULL) {
- if ((this->skelAnime1.animation == &D_06001ADC) && Animation_OnFrame(&this->skelAnime1, 4.0f)) {
+ if ((this->skelAnime1.animation == &object_owl_Anim_001ADC) && Animation_OnFrame(&this->skelAnime1, 4.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OWL_FLUTTER);
}
@@ -1148,9 +1142,9 @@ void EnOwl_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr eyeTextures[] = {
- &D_06008EB8,
- &D_060092B8,
- &D_060096B8,
+ object_owl_Tex_008EB8,
+ object_owl_Tex_0092B8,
+ object_owl_Tex_0096B8,
};
s32 pad;
EnOwl* this = THIS;
@@ -1182,7 +1176,7 @@ void func_8095D074(Actor* thisx, GlobalContext* globalCtx) {
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
- gSPDisplayList(POLY_OPA_DISP++, D_06001200);
+ gSPDisplayList(POLY_OPA_DISP++, object_owl_DL_001200);
} else {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1190,7 +1184,7 @@ void func_8095D074(Actor* thisx, GlobalContext* globalCtx) {
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_XLU_SURF2);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, (u8)(this->unk_3DC * 8));
- gSPDisplayList(POLY_XLU_DISP++, D_06001200);
+ gSPDisplayList(POLY_XLU_DISP++, object_owl_DL_001200);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
index baf840980c..d445b962d6 100644
--- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
+++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
@@ -7,6 +7,7 @@
#include "z_en_pamera.h"
#include "../ovl_En_Bom/z_en_bom.h"
#include "../ovl_En_Door/z_en_door.h"
+#include "objects/object_pamera/object_pamera.h"
#define FLAGS 0x00000019
@@ -69,29 +70,6 @@ void func_80BDA288(EnPamera* this);
void func_80BDA2E0(EnPamera* this, GlobalContext* globalCtx);
void func_80BDA344(Actor* thisx, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_06008448;
-extern AnimationHeader D_060005BC;
-extern AnimationHeader D_06008AE0; // Pamela Walking
-extern AnimationHeader D_06008E38;
-extern AnimationHeader D_0600A844; // Pamela Looking down the well
-extern AnimationHeader D_0600B0C4;
-extern AnimationHeader D_06009870;
-extern AnimationHeader D_06009F54; // HoldBack En_Hgo
-extern AnimationHeader D_0600B5B0; // PushBack En_Hgo
-extern AnimationHeader D_0600BCC4; // Defend En_Hgo
-extern AnimationHeader D_0600D9DC;
-extern AnimationHeader D_0600E16C; // Hugging En_Hg
-extern AnimationHeader D_0600C9F4;
-extern AnimationHeader D_0600D0F0;
-
-extern TexturePtr D_060074E8;
-extern TexturePtr D_060078E8;
-extern TexturePtr D_060066E8;
-extern TexturePtr D_06006AE8;
-extern TexturePtr D_06006EE8;
-extern TexturePtr D_060072E8;
-extern TexturePtr D_060073E8;
-
const ActorInit En_Pamera_InitVars = {
ACTOR_EN_PAMERA,
ACTORCAT_NPC,
@@ -129,22 +107,22 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_060005BC, 1.0f, 0, 0.0f, 0, -4.0f }, { &D_06008AE0, 1.0f, 0, 0.0f, 0, -4.0f },
- { &D_06008E38, 1.0f, 0, 0.0f, 0, -4.0f }, { &D_0600A844, 1.0f, 0, 0.0f, 0, -4.0f },
- { &D_0600B0C4, 1.0f, 0, 0.0f, 0, -4.0f }, { &D_06009870, 1.0f, 0, 0.0f, 0, 0.0f },
- { &D_06009F54, 1.0f, 0, 0.0f, 0, 0.0f }, { &D_0600B5B0, 1.0f, 0, 0.0f, 0, 0.0f },
- { &D_0600BCC4, 1.0f, 0, 0.0f, 0, 0.0f }, { &D_0600D9DC, 1.0f, 0, 0.0f, 0, 0.0f },
- { &D_0600E16C, 1.0f, 0, 0.0f, 0, 0.0f }, { &D_0600C9F4, 1.0f, 0, 0.0f, 2, 0.0f },
- { &D_0600D0F0, 1.0f, 0, 0.0f, 0, 0.0f },
+ { &object_pamera_Anim_0005BC, 1.0f, 0, 0.0f, 0, -4.0f }, { &object_pamera_Anim_008AE0, 1.0f, 0, 0.0f, 0, -4.0f },
+ { &object_pamera_Anim_008E38, 1.0f, 0, 0.0f, 0, -4.0f }, { &object_pamera_Anim_00A844, 1.0f, 0, 0.0f, 0, -4.0f },
+ { &object_pamera_Anim_00B0C4, 1.0f, 0, 0.0f, 0, -4.0f }, { &object_pamera_Anim_009870, 1.0f, 0, 0.0f, 0, 0.0f },
+ { &object_pamera_Anim_009F54, 1.0f, 0, 0.0f, 0, 0.0f }, { &object_pamera_Anim_00B5B0, 1.0f, 0, 0.0f, 0, 0.0f },
+ { &object_pamera_Anim_00BCC4, 1.0f, 0, 0.0f, 0, 0.0f }, { &object_pamera_Anim_00D9DC, 1.0f, 0, 0.0f, 0, 0.0f },
+ { &object_pamera_Anim_00E16C, 1.0f, 0, 0.0f, 0, 0.0f }, { &object_pamera_Anim_00C9F4, 1.0f, 0, 0.0f, 2, 0.0f },
+ { &object_pamera_Anim_00D0F0, 1.0f, 0, 0.0f, 0, 0.0f },
};
static Vec3f D_80BDA5F0 = { 1000.0f, 0.0f, 0.0f };
-static TexturePtr D_80BDA5FC[] = { &D_060074E8, &D_060078E8 };
+static TexturePtr D_80BDA5FC[] = { object_pamera_Tex_0074E8, object_pamera_Tex_0078E8 };
-static TexturePtr D_80BDA604[] = { &D_060066E8, &D_06006AE8, &D_06006EE8 };
+static TexturePtr D_80BDA604[] = { object_pamera_Tex_0066E8, object_pamera_Tex_006AE8, object_pamera_Tex_006EE8 };
-static TexturePtr D_80BDA610[] = { &D_060072E8, &D_060073E8 };
+static TexturePtr D_80BDA610[] = { object_pamera_Tex_0072E8, object_pamera_Tex_0073E8 };
void EnPamera_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
@@ -152,8 +130,8 @@ void EnPamera_Init(Actor* thisx, GlobalContext* globalCtx) {
Vec3f sp44;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 15.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008448, &D_060005BC, this->jointTable, this->morphTable,
- PAMERA_LIMB_MAX);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_pamera_Skel_008448, &object_pamera_Anim_0005BC,
+ this->jointTable, this->morphTable, PAMERA_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit2);
@@ -510,11 +488,11 @@ void func_80BD93CC(EnPamera* this, s16 arg1, s16 arg2) {
void func_80BD93F4(EnPamera* this, GlobalContext* globalCtx) {
if ((this->actionFunc == func_80BD8B70) || (this->actionFunc == func_80BD8DB0) ||
(this->actionFunc == func_80BD8964) || (this->actionFunc == func_80BD8A7C)) {
- if (this->skelAnime.animation == &D_06008AE0) {
+ if (this->skelAnime.animation == &object_pamera_Anim_008AE0) {
if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK);
}
- } else if ((this->skelAnime.animation == &D_06008E38) &&
+ } else if ((this->skelAnime.animation == &object_pamera_Anim_008E38) &&
(Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f))) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PAMERA_WALK);
}
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
index 04cc359b8d..6b39406652 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
@@ -6,6 +6,7 @@
#include "z_en_pm.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "objects/object_mm/object_mm.h"
#define FLAGS 0x00000039
@@ -19,25 +20,6 @@ void EnPm_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80AFA4D0(EnPm* this, GlobalContext* globalCtx);
void func_80AFA5FC(EnPm* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000468;
-extern AnimationHeader D_0600099C;
-extern AnimationHeader D_06000FC4;
-extern AnimationHeader D_06001F84;
-extern AnimationHeader D_06002238;
-extern UNK_PTR D_06002750;
-extern UNK_PTR D_06002950;
-extern Gfx D_06008348[];
-extern Gfx D_060083E0[];
-extern Gfx D_060085C8[];
-extern FlexSkeletonHeader D_060096E8;
-extern AnimationHeader D_060099B4;
-extern AnimationHeader D_0600A4E0;
-extern AnimationHeader D_0600A8D8;
-extern AnimationHeader D_0600B09C;
-extern AnimationHeader D_0600BA78;
-extern AnimationHeader D_0600C32C;
-extern AnimationHeader D_0600C640;
-
// Game scripts
static UNK_TYPE D_80AFAD80[] = {
0x0D000102, 0x3B030900, 0x0C00010B, 0x030C000D, 0x0100F902, 0x0D010F00, 0x12020F00, 0x00050105, 0x0A002E06,
@@ -249,11 +231,13 @@ static ColliderSphereInit sSphereInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static ActorAnimationEntryS sAnimations[] = {
- { &D_06002238, 1.0f, 0, -1, 0, 0 }, { &D_06002238, 1.0f, 0, -1, 0, -4 }, { &D_0600A4E0, 1.0f, 0, -1, 2, 0 },
- { &D_0600B09C, 1.0f, 0, -1, 0, 0 }, { &D_0600B09C, 1.0f, 0, -1, 0, -4 }, { &D_0600BA78, 1.0f, 0, -1, 2, 0 },
- { &D_0600C32C, 1.0f, 0, -1, 0, -4 }, { &D_060099B4, 1.0f, 0, -1, 0, 0 }, { &D_06000FC4, 1.0f, 0, -1, 0, 0 },
- { &D_0600A8D8, 1.0f, 0, -1, 0, 0 }, { &D_0600099C, 1.0f, 0, -1, 0, 0 }, { &D_06001F84, 1.0f, 0, -1, 2, 0 },
- { &D_06000468, 1.0f, 0, -1, 0, 0 }, { &D_0600C640, 1.0f, 0, -1, 0, 0 },
+ { &object_mm_Anim_002238, 1.0f, 0, -1, 0, 0 }, { &object_mm_Anim_002238, 1.0f, 0, -1, 0, -4 },
+ { &object_mm_Anim_00A4E0, 1.0f, 0, -1, 2, 0 }, { &object_mm_Anim_00B09C, 1.0f, 0, -1, 0, 0 },
+ { &object_mm_Anim_00B09C, 1.0f, 0, -1, 0, -4 }, { &object_mm_Anim_00BA78, 1.0f, 0, -1, 2, 0 },
+ { &object_mm_Anim_00C32C, 1.0f, 0, -1, 0, -4 }, { &object_mm_Anim_0099B4, 1.0f, 0, -1, 0, 0 },
+ { &object_mm_Anim_000FC4, 1.0f, 0, -1, 0, 0 }, { &object_mm_Anim_00A8D8, 1.0f, 0, -1, 0, 0 },
+ { &object_mm_Anim_00099C, 1.0f, 0, -1, 0, 0 }, { &object_mm_Anim_001F84, 1.0f, 0, -1, 2, 0 },
+ { &object_mm_Anim_000468, 1.0f, 0, -1, 0, 0 }, { &object_mm_Anim_00C640, 1.0f, 0, -1, 0, 0 },
};
s32 func_80AF7B40(void) {
@@ -754,19 +738,19 @@ void func_80AF8890(EnPm* this, Gfx** gfx, s32 arg2) {
switch (arg2) {
case 0:
if (this->unk_356 & 0x800) {
- gSPDisplayList((*gfx)++, D_06008348);
+ gSPDisplayList((*gfx)++, object_mm_DL_008348);
}
break;
case 1:
if (this->unk_356 & 0x1000) {
- gSPDisplayList((*gfx)++, D_060085C8);
+ gSPDisplayList((*gfx)++, object_mm_DL_0085C8);
}
break;
case 2:
if (this->unk_356 & 0x1000) {
- gSPDisplayList((*gfx)++, D_060083E0);
+ gSPDisplayList((*gfx)++, object_mm_DL_0083E0);
}
break;
}
@@ -1766,7 +1750,8 @@ void EnPm_Init(Actor* thisx, GlobalContext* globalCtx) {
EnPm* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 14.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060096E8, NULL, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mm_Skel_0096E8, NULL, this->jointTable, this->morphTable,
+ 16);
this->unk_384 = -1;
func_80AF7E98(this, 0);
Collider_InitAndSetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -1885,9 +1870,9 @@ void EnPm_TransformLimbDraw(GlobalContext* globalCtx, s32 arg1, Actor* thisx, Gf
}
void EnPm_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static UNK_PTR D_80AFB914[] = {
- &D_06002950,
- &D_06002750,
+ static TexturePtr D_80AFB914[] = {
+ object_mm_Tex_002950,
+ object_mm_Tex_002750,
};
EnPm* this = THIS;
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
index dae1f4e07d..5641c83e7c 100644
--- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
+++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
@@ -6,6 +6,7 @@
#include "z_en_po_fusen.h"
#include "overlays/actors/ovl_En_Ma4/z_en_ma4.h"
+#include "objects/object_po_fusen/object_po_fusen.h"
#define FLAGS 0x80100030
@@ -28,9 +29,6 @@ void EnPoFusen_IdleFuse(EnPoFusen* this, GlobalContext* globalCtx);
s32 EnPoFusen_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* thisx);
-extern AnimationHeader D_06000040;
-extern FlexSkeletonHeader D_060024F0;
-
const ActorInit En_Po_Fusen_InitVars = {
ACTOR_EN_PO_FUSEN,
ACTORCAT_PROP,
@@ -111,7 +109,8 @@ void EnPoFusen_Init(Actor* thisx, GlobalContext* globalCtx) {
if (0) {}
this->collider.dim.worldSphere.radius = 40;
- SkelAnime_InitFlex(globalCtx, &this->anime, &D_060024F0, &D_06000040, this->jointTable, this->morphTable, 10);
+ SkelAnime_InitFlex(globalCtx, &this->anime, &object_po_fusen_Skel_0024F0, &object_po_fusen_Anim_000040,
+ this->jointTable, this->morphTable, 10);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 0x4);
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index a2e299290f..af8e0f11bb 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -6,6 +6,7 @@
#include "z_en_po_sisters.h"
#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_po_sisters/object_po_sisters.h"
#define FLAGS 0x00005015
@@ -47,24 +48,6 @@ void func_80B1C0A4(EnPoSisters* this, GlobalContext* globalCtx);
void func_80B1C2E8(EnPoSisters* this);
void func_80B1C340(EnPoSisters* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000114;
-extern AnimationHeader D_060008C0;
-extern AnimationHeader D_06000A54;
-extern AnimationHeader D_06000D40;
-extern AnimationHeader D_0600119C;
-extern AnimationHeader D_060014CC;
-extern Gfx D_06001CB0[];
-extern Gfx D_06001DE0[];
-extern Gfx D_060027B0[];
-extern Gfx D_06002EB8[];
-extern Gfx D_06002F88[];
-extern Gfx D_06003628[];
-extern Gfx D_06003880[];
-extern Gfx D_06003DC8[];
-extern Gfx D_06004020[];
-extern Gfx D_060046E0[];
-extern SkeletonHeader D_060065C8;
-
static Color_RGBA8 D_80B1DA30[] = {
{ 255, 170, 255, 255 },
{ 255, 200, 0, 255 },
@@ -159,7 +142,8 @@ void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_060065C8, &D_060014CC, this->jointTable, this->morphTable, 12);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_po_sisters_Skel_0065C8, &object_po_sisters_Anim_0014CC,
+ this->jointTable, this->morphTable, 12);
this->unk_226 = 255;
this->unk_227 = 255;
this->unk_228 = 210;
@@ -293,7 +277,7 @@ void func_80B1A9B0(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1AA88(EnPoSisters* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060014CC, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_0014CC, -3.0f);
this->actor.speedXZ = 0.0f;
this->unk_192 = Rand_S16Offset(100, 50);
this->actionFunc = func_80B1AAE8;
@@ -308,7 +292,7 @@ void func_80B1AAE8(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1AB5C(EnPoSisters* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060014CC, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_0014CC, -3.0f);
this->unk_192 = Rand_S16Offset(2, 3);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_80B1ABB8;
@@ -329,7 +313,7 @@ void func_80B1ABB8(EnPoSisters* this, GlobalContext* globalCtx) {
void func_80B1AC40(EnPoSisters* this) {
if (this->actionFunc != func_80B1AE3C) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000D40, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000D40, -3.0f);
}
this->unk_192 = Rand_S16Offset(15, 3);
this->unk_191 |= (0x6 | 0x1);
@@ -391,9 +375,9 @@ void func_80B1AF8C(EnPoSisters* this) {
this->collider.base.acFlags |= AC_HARD;
}
- Animation_MorphToLoop(&this->skelAnime, &D_06000114, -5.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000114, -5.0f);
this->actor.speedXZ = 0.0f;
- this->unk_192 = Animation_GetLastFrame(&D_06000114.common) * 3 + 3;
+ this->unk_192 = Animation_GetLastFrame(&object_po_sisters_Anim_000114.common) * 3 + 3;
this->unk_191 &= ~2;
this->actionFunc = func_80B1B020;
}
@@ -418,7 +402,7 @@ void func_80B1B0E0(EnPoSisters* this) {
if (this->unk_18C == 0) {
this->collider.base.colType = COLTYPE_METAL;
this->collider.base.acFlags |= AC_HARD;
- Animation_MorphToLoop(&this->skelAnime, &D_06000114, -5.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000114, -5.0f);
}
this->unk_192 = 5;
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
@@ -456,7 +440,7 @@ void func_80B1B168(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1B280(EnPoSisters* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000D40, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000D40, -3.0f);
this->actor.world.rot.y = BINANG_ROT180(this->actor.yawTowardsPlayer);
if (this->unk_18C != 0) {
this->collider.base.colType = COLTYPE_HIT3;
@@ -480,7 +464,7 @@ void func_80B1B2F0(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1B3A8(EnPoSisters* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060008C0, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_po_sisters_Anim_0008C0, -3.0f);
if (this->collider.base.ac != NULL) {
func_800BE504(&this->actor, &this->collider);
}
@@ -524,7 +508,7 @@ void func_80B1B444(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1B5B4(EnPoSisters* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000A54, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000A54, -3.0f);
this->actor.world.rot.y = BINANG_ROT180(this->actor.shape.rot.y);
this->unk_192 = 5;
this->unk_191 |= (0x8 | 0x2 | 0x1);
@@ -552,7 +536,8 @@ void func_80B1B628(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1B70C(EnPoSisters* this) {
- Animation_Change(&this->skelAnime, &D_0600119C, 1.5f, 0.0f, Animation_GetLastFrame(&D_0600119C.common), 2, -3.0f);
+ Animation_Change(&this->skelAnime, &object_po_sisters_Anim_00119C, 1.5f, 0.0f,
+ Animation_GetLastFrame(&object_po_sisters_Anim_00119C.common), 2, -3.0f);
this->unk_194 = 100;
this->actor.speedXZ = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -576,7 +561,8 @@ void func_80B1B7BC(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1B860(EnPoSisters* this, GlobalContext* globalCtx) {
- Animation_Change(&this->skelAnime, &D_0600119C, 1.5f, 0.0f, Animation_GetLastFrame(&D_0600119C.common), 2, -3.0f);
+ Animation_Change(&this->skelAnime, &object_po_sisters_Anim_00119C, 1.5f, 0.0f,
+ Animation_GetLastFrame(&object_po_sisters_Anim_00119C.common), 2, -3.0f);
if (this->unk_18C == 0) {
this->unk_2EC = 110.0f;
func_80B1A768(this, globalCtx);
@@ -758,7 +744,7 @@ void func_80B1BF2C(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1C030(EnPoSisters* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000D40, -3.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_sisters_Anim_000D40, -3.0f);
this->unk_229 = 255;
this->unk_192 = 300;
this->unk_194 = 3;
@@ -825,7 +811,7 @@ void func_80B1C0A4(EnPoSisters* this, GlobalContext* globalCtx) {
}
void func_80B1C2E8(EnPoSisters* this) {
- Animation_PlayOnce(&this->skelAnime, &D_0600119C);
+ Animation_PlayOnce(&this->skelAnime, &object_po_sisters_Anim_00119C);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR);
this->unk_229 = 0;
this->unk_191 = 0x20;
@@ -980,15 +966,15 @@ void EnPoSisters_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80B1C974(EnPoSisters* this) {
- if (this->skelAnime.animation == &D_06000114) {
+ if (this->skelAnime.animation == &object_po_sisters_Anim_000114) {
this->unk_226 = CLAMP_MAX(this->unk_226 + 5, 255);
this->unk_227 = CLAMP_MIN(this->unk_227 - 5, 50);
this->unk_228 = CLAMP_MIN(this->unk_228 - 5, 0);
- } else if (this->skelAnime.animation == &D_06000A54) {
+ } else if (this->skelAnime.animation == &object_po_sisters_Anim_000A54) {
this->unk_226 = CLAMP_MAX(this->unk_226 + 5, 80);
this->unk_227 = CLAMP_MAX(this->unk_227 + 5, 255);
this->unk_228 = CLAMP_MAX(this->unk_228 + 5, 225);
- } else if (this->skelAnime.animation == &D_060008C0) {
+ } else if (this->skelAnime.animation == &object_po_sisters_Anim_0008C0) {
if (this->actor.colorFilterTimer & 0x2) {
this->unk_226 = 0;
this->unk_227 = 0;
@@ -1014,16 +1000,16 @@ void func_80B1C974(EnPoSisters* this) {
s32 EnPoSisters_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* thisx, Gfx** gfx) {
static Gfx* D_80B1DACC[] = {
- D_06001DE0,
- D_06002F88,
- D_06003628,
- D_06003DC8,
+ object_po_sisters_DL_001DE0,
+ object_po_sisters_DL_002F88,
+ object_po_sisters_DL_003628,
+ object_po_sisters_DL_003DC8,
};
static Gfx* D_80B1DADC[] = {
- D_06001CB0,
- D_06002EB8,
- D_06003880,
- D_06004020,
+ object_po_sisters_DL_001CB0,
+ object_po_sisters_DL_002EB8,
+ object_po_sisters_DL_003880,
+ object_po_sisters_DL_004020,
};
static Color_RGBA8 D_80B1DAEC[] = {
{ 80, 0, 100, 0 },
@@ -1083,7 +1069,7 @@ void EnPoSisters_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
if ((this->actionFunc == func_80B1BA90) && (this->unk_192 >= 8) && (limbIndex == 9)) {
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList((*gfx)++, D_060046E0);
+ gSPDisplayList((*gfx)++, object_po_sisters_DL_0046E0);
}
if (limbIndex == 8) {
@@ -1153,7 +1139,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_358);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060027B0);
+ gSPDisplayList(POLY_OPA_DISP++, object_po_sisters_DL_0027B0);
}
gSPSegment(POLY_XLU_DISP++, 0x08,
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
index 670c0a6156..a5b377ecba 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@@ -5,6 +5,7 @@
*/
#include "z_en_poh.h"
+#include "objects/object_po/object_po.h"
#define FLAGS 0x00001205
@@ -45,17 +46,6 @@ void func_80B2E3F8(EnPoh* this, GlobalContext* globalCtx);
void func_80B2F328(Actor* thisx, GlobalContext* globalCtx);
void func_80B2F37C(Actor* thisx, GlobalContext* globalCtx);
-extern AnimationHeader D_060001A8;
-extern AnimationHeader D_060004EC;
-extern AnimationHeader D_060006E0;
-extern AnimationHeader D_06000A60;
-extern AnimationHeader D_060011C4;
-extern AnimationHeader D_060015B0;
-extern Gfx D_06002608[];
-extern Gfx D_06002D28[];
-extern Gfx D_06003850[];
-extern SkeletonHeader D_060050D0;
-
const ActorInit En_Poh_InitVars = {
ACTOR_EN_POH,
ACTORCAT_ENEMY,
@@ -175,7 +165,8 @@ void EnPoh_Init(Actor* thisx, GlobalContext* globalCtx) {
this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo);
Lights_PointGlowSetInfo(&this->lightInfo, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z,
255, 255, 255, 0);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_060050D0, &D_06000A60, this->jointTable, this->morphTable, 21);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_po_Skel_0050D0, &object_po_Anim_000A60, this->jointTable,
+ this->morphTable, 21);
this->actor.bgCheckFlags |= 0x400;
func_80B2D0E8(this);
}
@@ -222,7 +213,7 @@ void func_80B2C9B8(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2CA4C(EnPoh* this) {
- Animation_PlayLoop(&this->skelAnime, &D_060015B0);
+ Animation_PlayLoop(&this->skelAnime, &object_po_Anim_0015B0);
this->unk_18E = Rand_S16Offset(2, 3);
this->actionFunc = func_80B2CAA4;
this->actor.speedXZ = 0.0f;
@@ -248,7 +239,7 @@ void func_80B2CAA4(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2CB60(EnPoh* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06000A60);
+ Animation_PlayLoop(&this->skelAnime, &object_po_Anim_000A60);
this->unk_18E = Rand_S16Offset(15, 3);
this->colliderCylinder.base.acFlags |= AC_ON;
this->actionFunc = func_80B2CBBC;
@@ -283,7 +274,7 @@ void func_80B2CBBC(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2CD14(EnPoh* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06000A60);
+ Animation_PlayLoop(&this->skelAnime, &object_po_Anim_000A60);
this->actionFunc = func_80B2CD64;
this->unk_18E = 0;
this->actor.speedXZ = 2.0f;
@@ -322,7 +313,7 @@ void func_80B2CD64(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2CEC8(EnPoh* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060001A8, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_Anim_0001A8, -6.0f);
this->unk_18E = 12;
this->actor.speedXZ = 0.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_PO_LAUGH);
@@ -351,7 +342,7 @@ void func_80B2CF28(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2CFF8(EnPoh* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060004EC, -6.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_po_Anim_0004EC, -6.0f);
func_800BE504(&this->actor, &this->colliderCylinder);
this->colliderCylinder.base.acFlags &= ~AC_ON;
this->actor.speedXZ = 5.0f;
@@ -373,7 +364,7 @@ void func_80B2D07C(EnPoh* this, GlobalContext* globalCtx) {
void func_80B2D0E8(EnPoh* this) {
this->unk_197 = 0;
this->actor.flags &= ~1;
- Animation_PlayOnceSetSpeed(&this->skelAnime, &D_060011C4, 0.0f);
+ Animation_PlayOnceSetSpeed(&this->skelAnime, &object_po_Anim_0011C4, 0.0f);
this->actionFunc = func_80B2D140;
}
@@ -452,7 +443,7 @@ void func_80B2D300(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2D5DC(EnPoh* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06000A60);
+ Animation_PlayOnce(&this->skelAnime, &object_po_Anim_000A60);
this->actionFunc = func_80B2D628;
this->actor.speedXZ = -5.0f;
}
@@ -469,7 +460,7 @@ void func_80B2D628(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2D694(EnPoh* this) {
- Animation_PlayLoop(&this->skelAnime, &D_060015B0);
+ Animation_PlayLoop(&this->skelAnime, &object_po_Anim_0015B0);
this->unk_192 = BINANG_ROT180(this->actor.world.rot.y);
this->actionFunc = func_80B2D6EC;
this->actor.speedXZ = 0.0f;
@@ -547,7 +538,7 @@ void func_80B2D980(EnPoh* this, GlobalContext* globalCtx) {
}
void func_80B2DAD0(EnPoh* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060006E0, -5.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_po_Anim_0006E0, -5.0f);
this->actor.speedXZ = 5.0f;
this->actor.world.rot.y = BINANG_ROT180(this->actor.shape.rot.y);
this->colliderCylinder.base.acFlags |= AC_ON;
@@ -592,7 +583,8 @@ void func_80B2DC50(EnPoh* this, GlobalContext* globalCtx) {
void func_80B2DD2C(EnPoh* this, GlobalContext* globalCtx) {
if ((this->actor.bgCheckFlags & 1) || (this->actor.floorHeight <= BGCHECK_Y_MIN)) {
- EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 6.0f, 0, 1, 1, 15, OBJECT_PO, 10, D_06002D28);
+ EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 6.0f, 0, 1, 1, 15, OBJECT_PO, 10,
+ object_po_DL_002D28);
func_80B2E0B0(this);
}
@@ -888,7 +880,7 @@ void EnPoh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
Collider_UpdateSpheres(limbIndex, &this->colliderSph);
if ((this->actionFunc == func_80B2D300) && (this->unk_18E >= 2) && (limbIndex == 5)) {
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList((*gfx)++, D_06002608);
+ gSPDisplayList((*gfx)++, object_po_DL_002608);
}
if (limbIndex == 18) {
@@ -963,7 +955,7 @@ void EnPoh_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_3D8);
gSPMatrix(&gfx[2], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(&gfx[3], D_06002D28);
+ gSPDisplayList(&gfx[3], object_po_DL_002D28);
POLY_OPA_DISP = &gfx[4];
func_800BE680(globalCtx, &this->actor, this->unk_2A0, 10, this->actor.scale.x * 100.0f * this->unk_29C, 0.0f,
@@ -1002,7 +994,7 @@ void func_80B2F37C(Actor* thisx, GlobalContext* globalCtx) {
this->actor.world.pos.z + sp7C.z, this->unk_198, this->unk_199, this->unk_19A, 200);
gSPMatrix(&gfx[2], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(&gfx[3], D_06002D28);
+ gSPDisplayList(&gfx[3], object_po_DL_002D28);
POLY_OPA_DISP = &gfx[4];
} else {
@@ -1017,7 +1009,7 @@ void func_80B2F37C(Actor* thisx, GlobalContext* globalCtx) {
Matrix_InsertYRotation_f((func_800DFCDC(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * (M_PI / 32768), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06003850);
+ gSPDisplayList(POLY_XLU_DISP++, object_po_DL_003850);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
index 16b8d4fe6d..37d1d120e6 100644
--- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
+++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
@@ -5,6 +5,7 @@
*/
#include "z_en_railgibud.h"
+#include "objects/object_rd/object_rd.h"
#define FLAGS 0x00000415
@@ -47,28 +48,6 @@ void func_80BA7D04(EnRailgibud* this, GlobalContext* globalCtx);
void func_80BA7D30(EnRailgibud* this, GlobalContext* globalCtx);
void func_80BA8050(Actor* thisx, GlobalContext* globalCtx);
-extern AnimationHeader D_060009C4;
-extern AnimationHeader D_06000F1C;
-extern AnimationHeader D_06001600;
-extern FlexSkeletonHeader D_060053E8;
-extern AnimationHeader D_06005DF4;
-extern AnimationHeader D_060061E4;
-extern AnimationHeader D_06006678;
-extern AnimationHeader D_06006B08;
-extern AnimationHeader D_06006EEC;
-extern AnimationHeader D_060073A4;
-extern AnimationHeader D_06007BBC;
-extern AnimationHeader D_060081A8;
-extern AnimationHeader D_06009298;
-extern AnimationHeader D_06009900;
-extern AnimationHeader D_0600A450;
-extern AnimationHeader D_0600ABE0;
-extern FlexSkeletonHeader D_06010B88;
-extern AnimationHeader D_060113EC;
-extern AnimationHeader D_060118D8;
-extern AnimationHeader D_06011DB8;
-extern AnimationHeader D_0601216C;
-
const ActorInit En_Railgibud_InitVars = {
ACTOR_EN_RAILGIBUD,
ACTORCAT_ENEMY,
@@ -82,16 +61,16 @@ const ActorInit En_Railgibud_InitVars = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_06006678, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &D_06006B08, 0.5f, 0.0f, 0.0f, 3, 0.0f },
- { &D_06006EEC, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_060073A4, 0.0f, 0.0f, 0.0f, 2, -8.0f },
- { &D_06007BBC, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_060081A8, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_06009298, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_06009900, 1.0f, 0.0f, 0.0f, 2, -8.0f },
- { &D_0600A450, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_0600ABE0, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_060113EC, 0.4f, 0.0f, 0.0f, 1, -8.0f }, { &D_0601216C, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_060118D8, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &D_06011DB8, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_0600A450, 3.0f, 0.0f, 0.0f, 2, -6.0f }, { &D_06005DF4, 1.0f, 0.0f, 0.0f, 2, -8.0f },
- { &D_060061E4, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &D_06001600, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_060009C4, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_06000F1C, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_006678, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &object_rd_Anim_006B08, 0.5f, 0.0f, 0.0f, 3, 0.0f },
+ { &object_rd_Anim_006EEC, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_rd_Anim_0073A4, 0.0f, 0.0f, 0.0f, 2, -8.0f },
+ { &object_rd_Anim_007BBC, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_rd_Anim_0081A8, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_009298, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_rd_Anim_009900, 1.0f, 0.0f, 0.0f, 2, -8.0f },
+ { &object_rd_Anim_00A450, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_rd_Anim_00ABE0, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_0113EC, 0.4f, 0.0f, 0.0f, 1, -8.0f }, { &object_rd_Anim_01216C, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_0118D8, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &object_rd_Anim_011DB8, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_00A450, 3.0f, 0.0f, 0.0f, 2, -6.0f }, { &object_rd_Anim_005DF4, 1.0f, 0.0f, 0.0f, 2, -8.0f },
+ { &object_rd_Anim_0061E4, 1.0f, 0.0f, 0.0f, 0, -8.0f }, { &object_rd_Anim_001600, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_rd_Anim_0009C4, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_rd_Anim_000F1C, 1.0f, 0.0f, 0.0f, 0, -8.0f },
};
static ColliderCylinderInit sCylinderInit = {
@@ -220,7 +199,8 @@ void EnRailgibud_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060053E8, &D_0600ABE0, this->jointTable, this->morphTable, 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_0053E8, &object_rd_Anim_00ABE0, this->jointTable,
+ this->morphTable, 26);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -521,7 +501,8 @@ void func_80BA64AC(EnRailgibud* this, GlobalContext* globalCtx) {
this->actor.world.rot.y = this->actor.shape.rot.y;
if ((this->unk_3F6 > 0) && (this->unk_404 == 0) && (this->unk_3F8 == 0)) {
this->actor.hintId = 0x2A;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06010B88, NULL, this->jointTable, this->morphTable, 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_010B88, NULL, this->jointTable,
+ this->morphTable, 26);
this->unk_3F8 = 1;
}
func_80BA6284(this);
@@ -584,7 +565,8 @@ void func_80BA66C8(EnRailgibud* this, GlobalContext* globalCtx) {
}
if ((this->unk_3F2 == 20) && (this->unk_3F6 > 0) && (this->unk_404 == 0) && (this->unk_3F8 == 0)) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06010B88, NULL, this->jointTable, this->morphTable, 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_010B88, NULL, this->jointTable,
+ this->morphTable, 26);
this->unk_3F8 = 1;
}
}
@@ -996,7 +978,8 @@ void func_80BA7B6C(EnRailgibud* this, GlobalContext* globalCtx) {
this->actor.flags |= 0x100000;
this->actor.flags |= 0x10;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060053E8, &D_0600ABE0, this->jointTable, this->morphTable, 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_0053E8, &object_rd_Anim_00ABE0, this->jointTable,
+ this->morphTable, 26);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
index 766d03070d..313937a88a 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@@ -5,6 +5,7 @@
*/
#include "z_en_rd.h"
+#include "objects/object_rd/object_rd.h"
#define FLAGS 0x00000415
@@ -49,23 +50,6 @@ void func_808D6200(EnRd* this, GlobalContext* globalCtx);
void func_808D6388(EnRd* this, GlobalContext* globalCtx);
void func_808D65BC(EnRd* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_060053E8;
-extern AnimationHeader D_06006678;
-extern AnimationHeader D_06006B08;
-extern AnimationHeader D_06006EEC;
-extern AnimationHeader D_060073A4;
-extern AnimationHeader D_06007BBC;
-extern AnimationHeader D_060081A8;
-extern AnimationHeader D_06009298;
-extern AnimationHeader D_06009900;
-extern AnimationHeader D_0600A450;
-extern AnimationHeader D_0600ABE0;
-extern FlexSkeletonHeader D_06010B88;
-extern AnimationHeader D_060113EC;
-extern AnimationHeader D_060118D8;
-extern AnimationHeader D_06011DB8;
-extern AnimationHeader D_0601216C;
-
const ActorInit En_Rd_InitVars = {
ACTOR_EN_RD,
ACTORCAT_ENEMY,
@@ -163,11 +147,11 @@ void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (this->actor.params >= ENRD_GET_MINUS_1) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06010B88, &D_0600ABE0, this->jointTable, this->morphTable,
- 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_010B88, &object_rd_Anim_00ABE0,
+ this->jointTable, this->morphTable, 26);
} else {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060053E8, &D_0600ABE0, this->jointTable, this->morphTable,
- 26);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_0053E8, &object_rd_Anim_00ABE0,
+ this->jointTable, this->morphTable, 26);
}
Collider_InitCylinder(globalCtx, &this->collider);
@@ -280,9 +264,9 @@ void func_808D4260(EnRd* this, GlobalContext* globalCtx) {
void func_808D4308(EnRd* this) {
if (this->actor.params != ENRD_GET_2) {
- Animation_MorphToLoop(&this->skelAnime, &D_0600ABE0, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_00ABE0, -6.0f);
} else {
- Animation_PlayLoop(&this->skelAnime, &D_060081A8);
+ Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_0081A8);
}
this->unk_3EF = 0;
@@ -298,9 +282,9 @@ void func_808D43AC(EnRd* this, GlobalContext* globalCtx) {
Math_SmoothStepToS(&this->unk_3DA, 0, 1, 100, 0);
if ((this->actor.params == ENRD_GET_2) && Animation_OnFrame(&this->skelAnime, 0.0f)) {
if (Rand_ZeroOne() >= 0.5f) {
- Animation_PlayLoop(&this->skelAnime, &D_060081A8);
+ Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_0081A8);
} else {
- Animation_PlayLoop(&this->skelAnime, &D_06007BBC);
+ Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_007BBC);
}
} else {
this->unk_3D6--;
@@ -343,7 +327,7 @@ void func_808D43AC(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D45D4(EnRd* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_0601216C, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_01216C, -6.0f);
this->unk_3EF = 14;
this->unk_3D6 = (Rand_ZeroOne() * 10.0f) + 5.0f;
this->unk_3E4 = 0;
@@ -367,7 +351,7 @@ void func_808D4660(EnRd* this, GlobalContext* globalCtx) {
} else {
this->actor.hintId = 0x2A;
}
- Animation_Change(&this->skelAnime, &D_060073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
this->actionFunc = func_808D49E4;
}
@@ -386,7 +370,7 @@ void func_808D4660(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D47DC(EnRd* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06011DB8, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_011DB8, -6.0f);
this->unk_3EF = 15;
this->unk_3D6 = (Rand_ZeroOne() * 10.0f) + 5.0f;
this->unk_3E4 = 0;
@@ -410,7 +394,7 @@ void func_808D4868(EnRd* this, GlobalContext* globalCtx) {
} else {
this->actor.hintId = 0x2A;
}
- Animation_Change(&this->skelAnime, &D_060073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
this->actionFunc = func_808D49E4;
}
@@ -446,7 +430,7 @@ void func_808D49E4(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D4A90(EnRd* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060118D8, -6.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_0118D8, -6.0f);
this->unk_3EF = 16;
this->unk_3D6 = (Rand_ZeroOne() * 10.0f) + 5.0f;
this->unk_3E4 = 4370;
@@ -507,7 +491,7 @@ void func_808D4CA8(EnRd* this, GlobalContext* globalCtx) {
this->unk_3E4 -= 100;
if ((this->unk_3E4 < 2100) && (this->unk_3E4 >= 2000)) {
- Animation_Change(&this->skelAnime, &D_060073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0073A4, 0.0f, 0.0f, 19.0f, 2, -10.0f);
} else if (this->unk_3E4 < 1000) {
if ((this->actor.params != ENRD_GET_2) && (this->unk_3EC == 0)) {
func_808D5C54(this);
@@ -518,7 +502,8 @@ void func_808D4CA8(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D4DC4(EnRd* this) {
- Animation_Change(&this->skelAnime, &D_0600ABE0, 0.0f, 0.0f, Animation_GetLastFrame(&D_0600ABE0), 0, -6.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_00ABE0, 0.0f, 0.0f,
+ Animation_GetLastFrame(&object_rd_Anim_00ABE0), 0, -6.0f);
this->unk_3EF = 13;
this->unk_3D6 = 6;
this->actor.shape.rot.x = -0x4000;
@@ -552,9 +537,9 @@ void func_808D4E60(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D4FE0(EnRd* this, GlobalContext* globalCtx) {
- f32 frameCount = Animation_GetLastFrame(&D_060113EC);
+ f32 frameCount = Animation_GetLastFrame(&object_rd_Anim_0113EC);
- Animation_Change(&this->skelAnime, &D_060113EC, 1.0f, 4.0f, frameCount, 1, -4.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0113EC, 1.0f, 4.0f, frameCount, 1, -4.0f);
this->actor.speedXZ = 0.4f;
this->unk_3EF = 4;
this->actionFunc = func_808D506C;
@@ -627,7 +612,8 @@ void func_808D506C(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D53C0(EnRd* this, GlobalContext* globalCtx) {
- Animation_Change(&this->skelAnime, &D_060113EC, 0.5f, 0.0f, Animation_GetLastFrame(&D_060113EC), 1, -4.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0113EC, 0.5f, 0.0f,
+ Animation_GetLastFrame(&object_rd_Anim_0113EC), 1, -4.0f);
this->unk_3EF = 2;
this->actionFunc = func_808D5440;
}
@@ -677,9 +663,9 @@ void func_808D5440(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D5660(EnRd* this) {
- f32 frameCount = Animation_GetLastFrame(&D_060113EC);
+ f32 frameCount = Animation_GetLastFrame(&object_rd_Anim_0113EC);
- Animation_Change(&this->skelAnime, &D_060113EC, 0.5f, 0.0f, frameCount, 1, -4.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0113EC, 0.5f, 0.0f, frameCount, 1, -4.0f);
this->unk_3EF = 3;
this->unk_3EC = 1;
this->actionFunc = func_808D56E4;
@@ -722,7 +708,7 @@ void func_808D56E4(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D586C(EnRd* this) {
- Animation_PlayOnce(&this->skelAnime, &D_06006EEC);
+ Animation_PlayOnce(&this->skelAnime, &object_rd_Anim_006EEC);
this->unk_3D6 = 0;
this->unk_3EB = 0;
this->unk_3EA = 200;
@@ -741,7 +727,7 @@ void func_808D58CC(EnRd* this, GlobalContext* globalCtx) {
switch (this->unk_3EB) {
case 1:
- Animation_PlayLoop(&this->skelAnime, &D_06006678);
+ Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_006678);
this->unk_3EB++;
globalCtx->damagePlayer(globalCtx, -8);
func_8013ECE0(this->actor.xzDistToPlayer, 255, 1, 12);
@@ -757,8 +743,8 @@ void func_808D58CC(EnRd* this, GlobalContext* globalCtx) {
player->stateFlags2 &= ~0x80;
player->unk_AE8 = 100;
}
- Animation_Change(&this->skelAnime, &D_06006B08, 0.5f, 0.0f, Animation_GetLastFrame(&D_06006B08), 3,
- 0.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_006B08, 0.5f, 0.0f,
+ Animation_GetLastFrame(&object_rd_Anim_006B08), 3, 0.0f);
this->unk_3EB++;
this->unk_3EF = 4;
break;
@@ -818,7 +804,8 @@ void func_808D58CC(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D5C54(EnRd* this) {
- Animation_Change(&this->skelAnime, &D_060073A4, 0.0f, 0.0f, Animation_GetLastFrame(&D_060073A4), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0073A4, 0.0f, 0.0f,
+ Animation_GetLastFrame(&object_rd_Anim_0073A4), 2, 0.0f);
this->unk_3EF = 7;
this->actionFunc = func_808D5CCC;
}
@@ -840,7 +827,7 @@ void func_808D5CCC(EnRd* this, GlobalContext* globalCtx) {
void func_808D5D88(EnRd* this) {
this->unk_3EF = 8;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009900, -6.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_009900, -6.0f);
this->actor.speedXZ = -2.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_DAMAGE);
this->unk_3EF = 8;
@@ -862,9 +849,9 @@ void func_808D5DF4(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D5E98(EnRd* this) {
- f32 frameCount = Animation_GetLastFrame(&D_060113EC);
+ f32 frameCount = Animation_GetLastFrame(&object_rd_Anim_0113EC);
- Animation_Change(&this->skelAnime, &D_060113EC, 0.5f, 0.0f, frameCount, 1, -4.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_0113EC, 0.5f, 0.0f, frameCount, 1, -4.0f);
this->unk_3EF = 9;
this->unk_3D4 = 0;
this->actionFunc = func_808D5F18;
@@ -884,7 +871,7 @@ void func_808D5F18(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D6008(EnRd* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600A450, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_00A450, -4.0f);
this->unk_3EF = 5;
this->actionFunc = func_808D6054;
}
@@ -900,7 +887,8 @@ void func_808D6054(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D60B0(EnRd* this) {
- Animation_Change(&this->skelAnime, &D_0600A450, -1.0f, Animation_GetLastFrame(&D_0600A450), 0.0f, 2, -4.0f);
+ Animation_Change(&this->skelAnime, &object_rd_Anim_00A450, -1.0f, Animation_GetLastFrame(&object_rd_Anim_00A450),
+ 0.0f, 2, -4.0f);
this->unk_3EF = 6;
this->actionFunc = func_808D6130;
}
@@ -913,7 +901,7 @@ void func_808D6130(EnRd* this, GlobalContext* globalCtx) {
void func_808D616C(EnRd* this) {
this->actor.shape.yOffset = 0.0f;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009900, -6.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_009900, -6.0f);
if (this->actor.bgCheckFlags & 1) {
this->actor.speedXZ = -2.0f;
}
@@ -949,7 +937,7 @@ void func_808D6200(EnRd* this, GlobalContext* globalCtx) {
}
void func_808D6310(EnRd* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009298, -1.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_009298, -1.0f);
this->unk_3EF = 12;
this->unk_3D6 = 300;
this->actor.flags &= ~1;
diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
index 022e50dc29..2cc5970bff 100644
--- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
+++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
@@ -5,6 +5,7 @@
*/
#include "z_en_recepgirl.h"
+#include "objects/object_bg/object_bg.h"
#define FLAGS 0x00000009
@@ -32,11 +33,8 @@ const ActorInit En_Recepgirl_InitVars = {
(ActorFunc)EnRecepgirl_Draw,
};
-extern TexturePtr D_0600F8F0;
-extern TexturePtr D_0600FCF0;
-extern TexturePtr D_060100F0;
-
-static TexturePtr sEyeTextures[] = { &D_0600F8F0, &D_0600FCF0, &D_060100F0, &D_0600FCF0 };
+static TexturePtr sEyeTextures[] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0,
+ object_bg_Tex_00FCF0 };
static InitChainEntry sInitChain[] = {
ICHAIN_U8(targetMode, 6, ICHAIN_CONTINUE),
@@ -45,20 +43,14 @@ static InitChainEntry sInitChain[] = {
static s32 texturesDesegmented = false;
-extern AnimationHeader D_06000968;
-extern AnimationHeader D_06001384;
-extern AnimationHeader D_06009890;
-extern AnimationHeader D_0600A280;
-extern AnimationHeader D_0600AD98;
-extern FlexSkeletonHeader D_06011B60;
-
void EnRecepgirl_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRecepgirl* this = THIS;
s32 i;
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, -60.0f, NULL, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011B60, &D_06009890, this->jointTable, this->morphTable, 24);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bg_Skel_011B60, &object_bg_Anim_009890, this->jointTable,
+ this->morphTable, 24);
if (!texturesDesegmented) {
for (i = 0; i < ARRAY_COUNT(sEyeTextures); i++) {
@@ -93,18 +85,18 @@ void EnRecepgirl_UpdateEyes(EnRecepgirl* this) {
}
void EnRecepgirl_SetupWait(EnRecepgirl* this) {
- if (this->skelAnime.animation == &D_06001384) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600AD98, 5.0f);
+ if (this->skelAnime.animation == &object_bg_Anim_001384) {
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 5.0f);
}
this->actionFunc = EnRecepgirl_Wait;
}
void EnRecepgirl_Wait(EnRecepgirl* this, GlobalContext* globalCtx) {
if (SkelAnime_Update(&this->skelAnime) != 0) {
- if (this->skelAnime.animation == &D_0600A280) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600AD98, 5.0f);
+ if (this->skelAnime.animation == &object_bg_Anim_00A280) {
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 5.0f);
} else {
- Animation_MorphToLoop(&this->skelAnime, &D_06009890, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_bg_Anim_009890, -4.0f);
}
}
@@ -123,7 +115,7 @@ void EnRecepgirl_Wait(EnRecepgirl* this, GlobalContext* globalCtx) {
}
void EnRecepgirl_SetupTalk(EnRecepgirl* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600A280, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00A280, -4.0f);
this->actionFunc = EnRecepgirl_Talk;
}
@@ -131,19 +123,19 @@ void EnRecepgirl_Talk(EnRecepgirl* this, GlobalContext* globalCtx) {
u8 temp_v0_2;
if (SkelAnime_Update(&this->skelAnime)) {
- if (this->skelAnime.animation == &D_0600A280) {
- Animation_PlayLoop(&this->skelAnime, &D_06001384);
- } else if (this->skelAnime.animation == &D_0600AD98) {
+ if (this->skelAnime.animation == &object_bg_Anim_00A280) {
+ Animation_PlayLoop(&this->skelAnime, &object_bg_Anim_001384);
+ } else if (this->skelAnime.animation == &object_bg_Anim_00AD98) {
if (this->actor.textId == 0x2ADA) { // Mayor's office is on the left (meeting ongoing)
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000968, 10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_000968, 10.0f);
} else {
- Animation_MorphToLoop(&this->skelAnime, &D_06009890, 10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_bg_Anim_009890, 10.0f);
}
} else {
if (this->actor.textId == 0x2ADA) { // Mayor's office is on the left (meeting ongoing)
- Animation_MorphToLoop(&this->skelAnime, &D_06009890, 10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_bg_Anim_009890, 10.0f);
} else {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600A280, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00A280, -4.0f);
}
}
}
@@ -155,7 +147,7 @@ void EnRecepgirl_Talk(EnRecepgirl* this, GlobalContext* globalCtx) {
} else if ((temp_v0_2 == 5) && (func_80147624(globalCtx) != 0)) {
if (this->actor.textId == 0x2AD9) { // "Welcome..."
Flags_SetSwitch(globalCtx, this->actor.params);
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600AD98, 10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 10.0f);
if (gSaveContext.weekEventReg[63] & 0x80) { // showed Couple's Mask to meeting
this->actor.textId = 0x2ADF; // Mayor's office is on the left (meeting ended)
@@ -163,10 +155,10 @@ void EnRecepgirl_Talk(EnRecepgirl* this, GlobalContext* globalCtx) {
this->actor.textId = 0x2ADA; // Mayor's office is on the left (meeting ongoing)
}
} else if (this->actor.textId == 0x2ADC) { // hear directions again?
- Animation_MorphToPlayOnce(&this->skelAnime, &D_0600AD98, 10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_00AD98, 10.0f);
this->actor.textId = 0x2ADD; // "So..."
} else {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000968, 10.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_bg_Anim_000968, 10.0f);
if (this->actor.textId == 0x2ADD) { // "So..."
this->actor.textId = 0x2ADE; // Mayor's office is on the left, drawing room on the right
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 f1c6e9a168..4bb1ba80f2 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"
#define FLAGS 0x00000405
@@ -26,8 +27,6 @@ void func_808FB710(EnRr* this, GlobalContext* globalCtx);
void func_808FAD1C(EnRr* this, GlobalContext* globalCtx);
void func_808FB398(EnRr* this, GlobalContext* globalCtx);
-extern Gfx D_06000470[];
-
const ActorInit En_Rr_InitVars = {
ACTOR_EN_RR,
ACTORCAT_ENEMY,
@@ -931,7 +930,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx2) {
this->collider2.dim.pos.y = ((this->unk_228.y - spA4.y) * 0.85f) + spA4.y;
this->collider2.dim.pos.z = ((this->unk_228.z - spA4.z) * 0.85f) + spA4.z;
- gSPDisplayList(POLY_OPA_DISP++, D_06000470);
+ gSPDisplayList(POLY_OPA_DISP++, object_rr_DL_000470);
func_800BE680(globalCtx, &this->actor, this->unk_234, ARRAY_COUNT(this->unk_234),
this->actor.scale.y * 66.66667f * this->unk_220, this->unk_224, this->unk_21C, this->unk_1E0);
diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
index 32b199da1f..cd7bcf6fa7 100644
--- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
+++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
@@ -5,6 +5,7 @@
*/
#include "z_en_rsn.h"
+#include "objects/object_rs/object_rs.h"
#define FLAGS 0x02000019
@@ -29,12 +30,7 @@ const ActorInit En_Rsn_InitVars = {
(ActorFunc)EnRsn_Draw,
};
-extern FlexSkeletonHeader D_06009220;
-extern AnimationHeader D_06009120;
-extern AnimationHeader D_0600788C;
-extern Gfx D_06005458[];
-
-static ActorAnimationEntry animations[] = { { &D_0600788C, 1.0f, 0.0f, 0.0f, 0x00, 0.0f } };
+static ActorAnimationEntry animations[] = { { &object_rs_Anim_00788C, 1.0f, 0.0f, 0.0f, 0, 0.0f } };
void func_80C25D40(EnRsn* this) {
Actor_ChangeAnimation(&this->skelAnime, animations, 0);
@@ -48,7 +44,7 @@ void EnRsn_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRsn* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009220, &D_06009120, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rs_Skel_009220, &object_rs_Anim_009120, NULL, NULL, 0);
this->actor.flags &= ~1;
func_80C25D40(this);
}
@@ -93,7 +89,7 @@ void EnRsn_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C5B0(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_06005458));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_rs_Tex_005458));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnRsn_OverrideLimbDraw, EnRsn_PostLimbDraw, &this->actor);
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
index 59417e2b23..b264a068b5 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
@@ -5,6 +5,7 @@
*/
#include "z_en_sb.h"
+#include "objects/object_sb/object_sb.h"
#define FLAGS 0x00000005
@@ -103,13 +104,6 @@ static Vec3f sFlamePosOffsets[] = {
{ 0.0f, 0.0f, -5.0f },
};
-extern FlexSkeletonHeader D_06002BF0;
-extern AnimationHeader D_06000194;
-extern AnimationHeader D_0600004C;
-extern AnimationHeader D_06000124;
-extern AnimationHeader D_06002C8C;
-extern AnimationHeader D_060000B4;
-
void EnSb_Init(Actor* thisx, GlobalContext* globalCtx) {
EnSb* this = THIS;
@@ -117,7 +111,8 @@ void EnSb_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.damageTable = &sDamageTable;
this->actor.colChkInfo.mass = 0xA;
this->actor.colChkInfo.health = 2;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06002BF0, &D_06000194, this->jointTable, this->morphTable, 9);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_sb_Skel_002BF0, &object_sb_Anim_000194, this->jointTable,
+ this->morphTable, 9);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->isDead = false;
@@ -149,45 +144,49 @@ void EnSb_SpawnBubbles(GlobalContext* globalCtx, EnSb* this) {
}
void EnSb_SetupWaitClosed(EnSb* this) {
- Animation_Change(&this->skelAnime, &D_0600004C, 1.0f, 0, Animation_GetLastFrame(&D_0600004C), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_00004C, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_00004C),
+ 2, 0.0f);
this->state = SHELLBLADE_WAIT_CLOSED;
this->actionFunc = EnSb_Idle;
}
void EnSb_SetupOpen(EnSb* this) {
- Animation_Change(&this->skelAnime, &D_06000194, 1.0f, 0, Animation_GetLastFrame(&D_06000194), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_000194, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_000194),
+ 2, 0.0f);
this->state = SHELLBLADE_OPEN;
this->actionFunc = EnSb_Open;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE);
}
void EnSb_SetupWaitOpen(EnSb* this) {
- Animation_Change(&this->skelAnime, &D_06002C8C, 1.0f, 0, Animation_GetLastFrame(&D_06002C8C), 0, 0.0f);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_002C8C, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_002C8C),
+ 0, 0.0f);
this->state = SHELLBLADE_WAIT_OPEN;
this->actionFunc = EnSb_WaitOpen;
}
void EnSb_SetupLunge(EnSb* this) {
- f32 frameCount = Animation_GetLastFrame(&D_06000124);
+ f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_000124);
f32 playbackSpeed = this->actor.depthInWater > 0.0f ? 1.0f : 0.0f;
- Animation_Change(&this->skelAnime, &D_06000124, playbackSpeed, 0.0f, frameCount, 2, 0);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_000124, playbackSpeed, 0.0f, frameCount, 2, 0);
this->state = SHELLBLADE_LUNGE;
this->actionFunc = EnSb_Lunge;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE);
}
void EnSb_SetupBounce(EnSb* this) {
- Animation_Change(&this->skelAnime, &D_060000B4, 1.0f, 0, Animation_GetLastFrame(&D_060000B4), 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_0000B4, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_0000B4),
+ 2, 0.0f);
this->state = SHELLBLADE_BOUNCE;
this->actionFunc = EnSb_Bounce;
}
void EnSb_SetupIdle(EnSb* this, s32 changeSpeed) {
- f32 frameCount = Animation_GetLastFrame(&D_0600004C);
+ f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_00004C);
if (this->state != SHELLBLADE_WAIT_CLOSED) {
- Animation_Change(&this->skelAnime, &D_0600004C, 1.0f, 0, frameCount, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &object_sb_Anim_00004C, 1.0f, 0, frameCount, 2, 0.0f);
}
this->state = SHELLBLADE_WAIT_CLOSED;
if (changeSpeed) {
@@ -217,7 +216,7 @@ void EnSb_Idle(EnSb* this, GlobalContext* globalCtx) {
void EnSb_Open(EnSb* this, GlobalContext* globalCtx) {
f32 currentFrame = this->skelAnime.curFrame;
- if (Animation_GetLastFrame(&D_06000194) <= currentFrame) {
+ if (Animation_GetLastFrame(&object_sb_Anim_000194) <= currentFrame) {
this->vulnerableTimer = 20;
EnSb_SetupWaitOpen(this);
} else {
@@ -281,7 +280,7 @@ void EnSb_Lunge(EnSb* this, GlobalContext* globalCtx) {
void EnSb_Bounce(EnSb* this, GlobalContext* globalCtx) {
s32 pad;
f32 currentFrame = currentFrame = this->skelAnime.curFrame;
- f32 frameCount = frameCount = Animation_GetLastFrame(&D_060000B4);
+ f32 frameCount = frameCount = Animation_GetLastFrame(&object_sb_Anim_0000B4);
Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f);
if (currentFrame == frameCount) {
diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
index e71a241e7c..1365860727 100644
--- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
+++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
@@ -5,6 +5,7 @@
*/
#include "z_en_scopecoin.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000030
@@ -83,8 +84,10 @@ void EnScopecoin_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
}
-static UNK_PTR D_80BFD280[] = { &D_04061FC0, &D_04061FE0, &D_04062000, &D_04062040,
- &D_04062020, &D_04062060, &D_04062000 };
+static TexturePtr D_80BFD280[] = {
+ gameplay_keep_Tex_061FC0, gameplay_keep_Tex_061FE0, gameplay_keep_Tex_062000, gameplay_keep_Tex_062040,
+ gameplay_keep_Tex_062020, gameplay_keep_Tex_062060, gameplay_keep_Tex_062000,
+};
void EnScopecoin_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnScopecoin* this = THIS;
@@ -96,7 +99,7 @@ void EnScopecoin_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80BFD280[this->unk148]));
- gSPDisplayList(POLY_OPA_DISP++, D_040622C0);
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0);
CLOSE_DISPS(gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
index 2a33601b87..6291c2b84a 100644
--- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
+++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
@@ -5,6 +5,7 @@
*/
#include "z_en_sellnuts.h"
+#include "objects/object_dnt/object_dnt.h"
#define FLAGS 0x00000039
@@ -34,28 +35,6 @@ void func_80ADCA64(EnSellnuts* this, GlobalContext* globalCtx);
s32 func_80ADCE4C(EnSellnuts* this, Path* path, s32 arg2);
f32 func_80ADCFE8(Path* path, s32 arg1, Vec3f* pos, Vec3s* arg3);
-extern AnimationHeader D_06000994;
-extern AnimationHeader D_060012F4;
-extern Gfx D_06001350[];
-extern AnimationHeader D_06001BC8;
-extern AnimationHeader D_06001E2C;
-extern AnimationHeader D_06002268;
-extern AnimationHeader D_06002670;
-extern AnimationHeader D_060029E8;
-extern AnimationHeader D_06002F08;
-extern AnimationHeader D_06003438;
-extern AnimationHeader D_060038CC;
-extern AnimationHeader D_06003CC0;
-extern AnimationHeader D_06004700;
-extern AnimationHeader D_06004AA0;
-extern AnimationHeader D_06004E38;
-extern AnimationHeader D_06005488;
-extern AnimationHeader D_0600577C;
-extern AnimationHeader D_06005CA8;
-extern Gfx D_06008290[];
-extern FlexSkeletonHeader D_0600AC70;
-extern AnimationHeader D_0600B0B4;
-
static u16 D_80ADD910[] = {
0x0614,
0x060E,
@@ -106,14 +85,18 @@ static ColliderCylinderInitType1 sCylinderInit = {
};
static ActorAnimationEntryS D_80ADD990[] = {
- { &D_06005488, 1.0f, 0, -1, 0, 0 }, { &D_0600B0B4, 1.0f, 0, -1, 0, 0 }, { &D_06004AA0, 1.0f, 0, -1, 2, 0 },
- { &D_06004E38, 1.0f, 0, -1, 2, 0 }, { &D_060029E8, 1.0f, 0, -1, 2, 0 }, { &D_06005CA8, 1.0f, 0, -1, 2, 0 },
- { &D_060038CC, 1.0f, 0, -1, 0, 0 }, { &D_06003CC0, 1.0f, 0, -1, 0, 0 }, { &D_060012F4, 1.0f, 0, -1, 2, 0 },
- { &D_06004700, 1.0f, 0, -1, 2, 0 }, { &D_06001BC8, 1.0f, 0, -1, 0, 0 }, { &D_06003438, 1.0f, 0, -1, 2, 0 },
- { &D_06001E2C, 1.0f, 0, -1, 0, 0 }, { &D_06000994, 1.0f, 0, -1, 0, 0 }, { &D_06002268, 1.0f, 0, -1, 2, 0 },
- { &D_06002F08, 1.0f, 0, -1, 0, 0 }, { &D_0600577C, 1.0f, 0, -1, 0, -4 }, { &D_060029E8, 1.0f, 8, -1, 2, 0 },
- { &D_060029E8, 1.0f, 4, -1, 2, -4 }, { &D_060029E8, 1.0f, 0, -1, 2, 0 }, { &D_06001BC8, 1.0f, 0, -1, 0, 0 },
- { &D_060012F4, -1.0f, 0, -1, 2, 0 }, { &D_06002670, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_005488, 1.0f, 0, -1, 0, 0 }, { &object_dnt_Anim_00B0B4, 1.0f, 0, -1, 0, 0 },
+ { &object_dnt_Anim_004AA0, 1.0f, 0, -1, 2, 0 }, { &object_dnt_Anim_004E38, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_0029E8, 1.0f, 0, -1, 2, 0 }, { &object_dnt_Anim_005CA8, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_0038CC, 1.0f, 0, -1, 0, 0 }, { &object_dnt_Anim_003CC0, 1.0f, 0, -1, 0, 0 },
+ { &object_dnt_Anim_0012F4, 1.0f, 0, -1, 2, 0 }, { &object_dnt_Anim_004700, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_001BC8, 1.0f, 0, -1, 0, 0 }, { &object_dnt_Anim_003438, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_001E2C, 1.0f, 0, -1, 0, 0 }, { &object_dnt_Anim_000994, 1.0f, 0, -1, 0, 0 },
+ { &object_dnt_Anim_002268, 1.0f, 0, -1, 2, 0 }, { &object_dnt_Anim_002F08, 1.0f, 0, -1, 0, 0 },
+ { &object_dnt_Anim_00577C, 1.0f, 0, -1, 0, -4 }, { &object_dnt_Anim_0029E8, 1.0f, 8, -1, 2, 0 },
+ { &object_dnt_Anim_0029E8, 1.0f, 4, -1, 2, -4 }, { &object_dnt_Anim_0029E8, 1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_001BC8, 1.0f, 0, -1, 0, 0 }, { &object_dnt_Anim_0012F4, -1.0f, 0, -1, 2, 0 },
+ { &object_dnt_Anim_002670, 1.0f, 0, -1, 2, 0 },
};
static InitChainEntry sInitChain[] = {
@@ -962,7 +945,8 @@ void EnSellnuts_Init(Actor* thisx, GlobalContext* globalCtx) {
}
Actor_ProcessInitChain(&this->actor, sInitChain);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600AC70, &D_06005488, this->jointTable, this->morphTable, 28);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dnt_Skel_00AC70, &object_dnt_Anim_005488, this->jointTable,
+ this->morphTable, 28);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
@@ -1115,9 +1099,9 @@ s32 EnSellnuts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
if (limbIndex == 26) {
if ((this->unk_34C == 6) || (this->unk_34C == 5) || (this->unk_34C == 7)) {
- *dList = D_06001350;
+ *dList = object_dnt_DL_001350;
} else {
- *dList = D_06008290;
+ *dList = object_dnt_DL_008290;
}
}
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
index 32802fb01e..fb0f3d28c0 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@@ -7,6 +7,7 @@
#include "z_en_skb.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "overlays/actors/ovl_En_Encount4/z_en_encount4.h"
+#include "objects/object_skb/object_skb.h"
#define FLAGS 0x00000005
@@ -48,26 +49,14 @@ void func_809964A0(EnSkb* this, GlobalContext* globalCtx);
s32 func_80996594(EnSkb* this, GlobalContext* globalCtx);
void func_80996BEC(EnSkb* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060009E4;
-extern AnimationHeader D_060015EC;
-extern AnimationHeader D_06001D1C;
-extern AnimationHeader D_06002190;
-extern AnimationHeader D_0600270C;
-extern AnimationHeader D_06002AC8;
-extern AnimationHeader D_06003584;
-extern SkeletonHeader D_06005EF8;
-extern AnimationHeader D_060064E0;
-extern AnimationHeader D_0600697C;
-extern AnimationHeader D_06006D90;
-
static ActorAnimationEntry sAnimations[] = {
- { &D_060064E0, 1.0f, 0.0f, 0.0f, 0, -4.0 }, { &D_06003584, 1.0f, 0.0f, 0.0f, 2, -1.0f },
- { &D_06002190, 0.6f, 0.0f, 0.0f, 3, 4.0f }, { &D_06002AC8, 1.0f, 0.0f, 0.0f, 2, -4.0 },
- { &D_0600270C, 1.0f, 0.0f, 0.0f, 2, -4.0 }, { &D_0600697C, 1.0f, 0.0f, 0.0f, 0, -4.0 },
- { &D_06006D90, 1.0f, 0.0f, 0.0f, 0, -4.0 }, { &D_06001D1C, 1.0f, 0.0f, 0.0f, 0, -4.0 },
- { &D_06003584, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_06003584, 1.0f, 0.0f, 0.0f, 2, -16.0f },
- { &D_06002AC8, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &D_060015EC, 1.0f, 0.0f, 0.0f, 2, -4.0 },
- { &D_060009E4, 1.0f, 0.0f, 0.0f, 0, -4.0 },
+ { &object_skb_Anim_0064E0, 1.0f, 0.0f, 0.0f, 0, -4.0 }, { &object_skb_Anim_003584, 1.0f, 0.0f, 0.0f, 2, -1.0f },
+ { &object_skb_Anim_002190, 0.6f, 0.0f, 0.0f, 3, 4.0f }, { &object_skb_Anim_002AC8, 1.0f, 0.0f, 0.0f, 2, -4.0 },
+ { &object_skb_Anim_00270C, 1.0f, 0.0f, 0.0f, 2, -4.0 }, { &object_skb_Anim_00697C, 1.0f, 0.0f, 0.0f, 0, -4.0 },
+ { &object_skb_Anim_006D90, 1.0f, 0.0f, 0.0f, 0, -4.0 }, { &object_skb_Anim_001D1C, 1.0f, 0.0f, 0.0f, 0, -4.0 },
+ { &object_skb_Anim_003584, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_skb_Anim_003584, 1.0f, 0.0f, 0.0f, 2, -16.0f },
+ { &object_skb_Anim_002AC8, 1.0f, 0.0f, 0.0f, 2, -8.0f }, { &object_skb_Anim_0015EC, 1.0f, 0.0f, 0.0f, 2, -4.0 },
+ { &object_skb_Anim_0009E4, 1.0f, 0.0f, 0.0f, 0, -4.0 },
};
static Vec3f D_80997468[] = {
@@ -181,25 +170,29 @@ void func_809947B0(GlobalContext* globalCtx, EnSkb* this, Vec3f* inPos) {
}
void func_8099495C(EnSkb* this, GlobalContext* globalCtx) {
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005EF8, &D_06003584, this->jointTable, this->morphTable, 20);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_skb_Skel_005EF8, &object_skb_Anim_003584, this->jointTable,
+ this->morphTable, 20);
this->unk_3DC = 0;
func_80994E2C(this);
}
void func_809949C4(EnSkb* this, GlobalContext* globalCtx) {
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005EF8, &D_0600697C, this->jointTable, this->morphTable, 20);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_skb_Skel_005EF8, &object_skb_Anim_00697C, this->jointTable,
+ this->morphTable, 20);
this->unk_3DC = 1;
func_809952D8(this);
}
void func_80994A30(EnSkb* this, GlobalContext* globalCtx) {
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005EF8, &D_06006D90, this->jointTable, this->morphTable, 20);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_skb_Skel_005EF8, &object_skb_Anim_006D90, this->jointTable,
+ this->morphTable, 20);
this->unk_3DC = 1;
func_809953E8(this);
}
void func_80994A9C(EnSkb* this, GlobalContext* globalCtx) {
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005EF8, &D_06001D1C, this->jointTable, this->morphTable, 20);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_skb_Skel_005EF8, &object_skb_Anim_001D1C, this->jointTable,
+ this->morphTable, 20);
this->unk_3DC = 1;
func_809954F8(this);
}
@@ -536,7 +529,8 @@ void func_80995818(EnSkb* this, GlobalContext* globalCtx) {
}
void func_809958F4(EnSkb* this) {
- Animation_Change(&this->skelAnime, &D_06003584, -1.0f, Animation_GetLastFrame(&D_06003584), 0.0f, 2, -4.0f);
+ Animation_Change(&this->skelAnime, &object_skb_Anim_003584, -1.0f, Animation_GetLastFrame(&object_skb_Anim_003584),
+ 0.0f, 2, -4.0f);
this->unk_3E4 = 0;
this->actor.flags &= ~1;
this->actor.speedXZ = 0.0f;
@@ -620,7 +614,7 @@ void func_80995C84(EnSkb* this, GlobalContext* globalCtx) {
}
void func_80995D3C(EnSkb* this) {
- Animation_Change(&this->skelAnime, &D_06002190, -0.4f, this->skelAnime.curFrame - 1.0f, 0.0f, 3, 0.0f);
+ Animation_Change(&this->skelAnime, &object_skb_Anim_002190, -0.4f, this->skelAnime.curFrame - 1.0f, 0.0f, 3, 0.0f);
this->collider.base.atFlags &= ~AT_BOUNCED;
this->unk_3DE = 4;
this->unk_3E4 = 0;
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
index 4d0b5f094b..10d6c168ac 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
@@ -5,6 +5,12 @@
*/
#include "z_en_sob1.h"
+#include "objects/object_rs/object_rs.h"
+#include "objects/object_zo/object_zo.h"
+#include "objects/object_mastergolon/object_mastergolon.h"
+#include "objects/object_masterzoora/object_masterzoora.h"
+#include "objects/object_oF1d_map/object_oF1d_map.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000019
@@ -48,30 +54,10 @@ s32 EnSob1_TakeItemOffShelf(EnSob1* this);
s32 EnSob1_ReturnItemToShelf(EnSob1* this);
s16 EnSob1_GetXZAngleAndDistanceSqToPoint(Path* path, s32 pointIdx, Vec3f* pos, f32* distSq);
-extern UNK_TYPE D_0401F740;
-extern UNK_TYPE D_0401F8C0;
-extern UNK_TYPE D_0401F7C0;
-extern AnimationHeader D_06009120;
-extern AnimationHeader D_06008268;
-extern FlexSkeletonHeader D_0600D208;
-extern AnimationHeader D_0600078C;
-extern AnimationHeader D_060087BC;
-extern FlexSkeletonHeader D_06011AC8;
-extern AnimationHeader D_060000FC;
-extern FlexSkeletonHeader D_06009220;
-extern Gfx D_06000970[];
-extern UNK_TYPE D_06005458;
-extern TexturePtr D_060050A0;
-extern TexturePtr D_060058A0;
-extern TexturePtr D_060060A0;
-extern TexturePtr D_06010438;
-extern TexturePtr D_06010C38;
-extern TexturePtr D_06011038;
-
static ActorAnimationEntryS sAnimationsBombShopkeeper[] = {
- { &D_06009120, 2.0f, 0, -1, 0, 20 },
- { &D_06008268, 1.0f, 0, -1, 2, 0 },
- { &D_060087BC, 1.0f, 0, -1, 0, 0 },
+ { &object_rs_Anim_009120, 2.0f, 0, -1, 0, 20 },
+ { &object_rs_Anim_008268, 1.0f, 0, -1, 2, 0 },
+ { &object_rs_Anim_0087BC, 1.0f, 0, -1, 0, 0 },
};
const ActorInit En_Sob1_InitVars = {
@@ -722,7 +708,7 @@ void EnSob1_EndWalk(EnSob1* this, GlobalContext* globalCtx) {
s32 pad;
f32 distSq;
s16 curFrame = this->skelAnime.curFrame / this->skelAnime.playSpeed;
- s16 animLastFrame = Animation_GetLastFrame(&D_06009120) / (s16)this->skelAnime.playSpeed;
+ s16 animLastFrame = Animation_GetLastFrame(&object_rs_Anim_009120) / (s16)this->skelAnime.playSpeed;
Math_SmoothStepToS(
&this->actor.world.rot.y,
@@ -743,7 +729,7 @@ void EnSob1_EndWalk(EnSob1* this, GlobalContext* globalCtx) {
void EnSob1_SetupIdle(EnSob1* this, GlobalContext* globalCtx) {
s16 curFrame = this->skelAnime.curFrame;
- if (Animation_GetLastFrame(&D_06008268) == curFrame) {
+ if (Animation_GetLastFrame(&object_rs_Anim_008268) == curFrame) {
EnSob1_ChangeAnim(&this->skelAnime, sAnimationsBombShopkeeper, 2);
EnSob1_SetupAction(this, EnSob1_Idle);
}
@@ -1334,23 +1320,28 @@ s32 EnSob1_AreObjectsLoaded(EnSob1* this, GlobalContext* globalCtx) {
}
void EnSob1_InitZoraShopkeeper(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600D208, NULL, this->jointTable, this->morphTable, 20);
- gSegments[0x06] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
- Animation_Change(&this->skelAnime, &D_0600078C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600078C), 0, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_zo_Skel_00D208, NULL, this->jointTable, this->morphTable,
+ 20);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
+ Animation_Change(&this->skelAnime, &object_masterzoora_Anim_00078C, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_masterzoora_Anim_00078C), 0, 0.0f);
this->actor.draw = EnSob1_DrawZoraShopkeeper;
this->changeObjectFunc = EnSob1_ChangeObject;
}
void EnSob1_InitGoronShopkeeper(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011AC8, NULL, this->jointTable, this->morphTable, 18);
- gSegments[0x06] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
- Animation_Change(&this->skelAnime, &D_060000FC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000FC), 0, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_oF1d_map_Skel_011AC8, NULL, this->jointTable,
+ this->morphTable, 18);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
+ Animation_Change(&this->skelAnime, &object_mastergolon_Anim_0000FC, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_mastergolon_Anim_0000FC), 0, 0.0f);
this->actor.draw = EnSob1_DrawGoronShopkeeper;
this->changeObjectFunc = EnSob1_ChangeObject;
}
void EnSob1_InitBombShopkeeper(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009220, &D_06009120, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rs_Skel_009220, &object_rs_Anim_009120, this->jointTable,
+ this->morphTable, 16);
this->actor.draw = EnSob1_DrawBombShopkeeper;
this->changeObjectFunc = NULL;
this->skelAnime.playSpeed = 2.0f;
@@ -1495,8 +1486,8 @@ void EnSob1_DrawCursor(GlobalContext* globalCtx, EnSob1* this, f32 x, f32 y, f32
func_8012C654(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColor.r, this->cursorColor.g, this->cursorColor.b,
this->cursorColor.a);
- gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_0401F740, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
- G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock_4b(OVERLAY_DISP++, gameplay_keep_Tex_01F740, G_IM_FMT_IA, 16, 16, 0,
+ G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
w = 16.0f * z;
ulx = (x - w) * 4.0f;
uly = (y - w + -12.0f) * 4.0f;
@@ -1547,7 +1538,7 @@ void EnSob1_DrawStickDirectionPrompt(GlobalContext* globalCtx, EnSob1* this) {
if (drawStickRightPrompt || drawStickLeftPrompt) {
func_8012C654(globalCtx->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F8C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F8C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1568,7 +1559,7 @@ void EnSob1_DrawStickDirectionPrompt(GlobalContext* globalCtx, EnSob1* this) {
this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY,
this->stickRightPrompt.texZ, 0, 0, 1.0f, 1.0f);
}
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F7C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F7C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1616,7 +1607,7 @@ s32 EnSob1_OverrideLimbDrawBombShopkeeper(GlobalContext* globalCtx, s32 limbInde
void EnSob1_PostLimbDrawBombShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 11) {
- gSPDisplayList(POLY_OPA_DISP++, D_06000970);
+ gSPDisplayList(POLY_OPA_DISP++, object_rs_DL_000970);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1632,7 +1623,8 @@ Gfx* EnSob1_EndDList(GraphicsContext* gfxCtx) {
}
void EnSob1_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sZoraShopkeeperEyeTextures[] = { &D_060050A0, &D_060058A0, &D_060060A0 };
+ static TexturePtr sZoraShopkeeperEyeTextures[] = { object_zo_Tex_0050A0, object_zo_Tex_0058A0,
+ object_zo_Tex_0060A0 };
EnSob1* this = THIS;
s32 pad;
s32 i;
@@ -1655,7 +1647,8 @@ void EnSob1_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSob1_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sGoronShopkeeperEyeTextures[] = { &D_06010438, &D_06010C38, &D_06011038 };
+ static TexturePtr sGoronShopkeeperEyeTextures[] = { object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38,
+ object_oF1d_map_Tex_011038 };
EnSob1* this = THIS;
s32 pad;
s32 i;
@@ -1683,7 +1676,7 @@ void EnSob1_DrawBombShopkeeper(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_06005458));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_rs_Tex_005458));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnSob1_OverrideLimbDrawBombShopkeeper, EnSob1_PostLimbDrawBombShopkeeper, &this->actor);
for (i = 0; i < ARRAY_COUNT(this->items); i++) {
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
index 6777bd2d57..e8fabc11fc 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
@@ -7,6 +7,7 @@
#include "z_en_suttari.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "objects/object_boj/object_boj.h"
#define FLAGS 0x00000019
@@ -36,17 +37,6 @@ void func_80BADE14(EnSuttari* this, GlobalContext* globalCtx);
void func_80BADE8C(EnSuttari* this, GlobalContext* globalCtx);
void func_80BADF3C(EnSuttari* this, GlobalContext* globalCtx);
-extern FlexSkeletonHeader D_0600C240;
-extern AnimationHeader D_0600071C;
-extern AnimationHeader D_06010BDC;
-extern AnimationHeader D_0601139C;
-extern AnimationHeader D_06011F84;
-extern AnimationHeader D_06011C38;
-extern AnimationHeader D_060128F4;
-extern AnimationHeader D_06012E84;
-extern Gfx D_0600AF90[];
-extern Gfx D_06013380[];
-
const ActorInit En_Suttari_InitVars = {
ACTOR_EN_SUTTARI,
ACTORCAT_NPC,
@@ -60,11 +50,11 @@ const ActorInit En_Suttari_InitVars = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_0600071C, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_060128F4, 1.0f, 0.0f, 0.0f, 0, 0.0f },
- { &D_06011F84, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_06012E84, 1.0f, 0.0f, 0.0f, 0, -6.0f },
- { &D_0601139C, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_0600071C, 2.0f, 0.0f, 0.0f, 0, 0.0f },
- { &D_06011F84, 2.0f, 0.0f, 0.0f, 0, 0.0f }, { &D_06011C38, 1.0f, 0.0f, 0.0f, 2, 0.0f },
- { &D_06010BDC, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_boj_Anim_00071C, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &object_boj_Anim_0128F4, 1.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_boj_Anim_011F84, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &object_boj_Anim_012E84, 1.0f, 0.0f, 0.0f, 0, -6.0f },
+ { &object_boj_Anim_01139C, 1.0f, 0.0f, 0.0f, 0, 0.0f }, { &object_boj_Anim_00071C, 2.0f, 0.0f, 0.0f, 0, 0.0f },
+ { &object_boj_Anim_011F84, 2.0f, 0.0f, 0.0f, 0, 0.0f }, { &object_boj_Anim_011C38, 1.0f, 0.0f, 0.0f, 2, 0.0f },
+ { &object_boj_Anim_010BDC, 1.0f, 0.0f, 0.0f, 0, 0.0f },
};
static ColliderCylinderInit sCylinderInit = {
@@ -908,7 +898,8 @@ void func_80BAC2FC(EnSuttari* this, GlobalContext* globalCtx) {
void func_80BAC6E8(EnSuttari* this, GlobalContext* globalCtx) {
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C240, &D_0600071C, this->jointTable, this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_boj_Skel_00C240, &object_boj_Anim_00071C, this->jointTable,
+ this->morphTable, 16);
this->actor.draw = EnSuttari_Draw;
this->actor.flags |= 1;
if (globalCtx->sceneNum == SCENE_IKANA) {
@@ -1471,7 +1462,7 @@ s32 EnSuttari_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
EnSuttari* this = THIS;
if (limbIndex == 15) {
- *dList = D_0600AF90;
+ *dList = object_boj_DL_00AF90;
if (!(this->flags1 & 4)) {
Matrix_InsertTranslation(1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
Matrix_InsertXRotation_s(this->unk3F2, MTXMODE_APPLY);
@@ -1514,7 +1505,7 @@ void EnSuttari_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
} else {
func_8012C28C(globalCtx->state.gfxCtx);
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_06013380);
+ gSPDisplayList(POLY_OPA_DISP++, object_boj_DL_013380);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
index a851f2ee9b..392fe62bc2 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
@@ -5,6 +5,7 @@
*/
#include "z_en_sw.h"
+#include "objects/object_st/object_st.h"
#define FLAGS 0x00000005
@@ -27,21 +28,6 @@ void func_808DB100(EnSw* this, GlobalContext* globalCtx);
void func_808DB25C(EnSw* this, GlobalContext* globalCtx);
void func_808DB2E0(EnSw* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000304;
-extern Gfx D_06003FB0[];
-extern Gfx D_060043D8[];
-extern Gfx D_060045C0[];
-extern Gfx D_06004658[];
-extern Gfx D_060046F0[];
-extern Gfx D_06004788[];
-extern Gfx D_06004820[];
-extern Gfx D_060048B8[];
-extern Gfx D_06004950[];
-extern Gfx D_060049E8[];
-extern SkeletonHeader D_06005298;
-extern AnimationHeader D_060055A8;
-extern AnimationHeader D_06005B98;
-
const ActorInit En_Sw_InitVars = {
ACTOR_EN_SW,
ACTORCAT_NPC,
@@ -149,10 +135,10 @@ static DamageTable sDamageTable2 = {
};
static ActorAnimationEntryS sAnimations[] = {
- { &D_06000304, 1.0f, 0, -1, 3, 0 },
- { &D_06000304, 1.0f, 0, -1, 3, -4 },
- { &D_060055A8, 1.0f, 0, -1, 1, -4 },
- { &D_06005B98, 1.0f, 0, -1, 1, -4 },
+ { &object_st_Anim_000304, 1.0f, 0, -1, 3, 0 },
+ { &object_st_Anim_000304, 1.0f, 0, -1, 3, -4 },
+ { &object_st_Anim_0055A8, 1.0f, 0, -1, 1, -4 },
+ { &object_st_Anim_005B98, 1.0f, 0, -1, 1, -4 },
};
void func_808D8940(EnSw* this, GlobalContext* globalCtx) {
@@ -1171,7 +1157,8 @@ void EnSw_Init(Actor* thisx, GlobalContext* globalCtx) {
if (!func_808D9968(this, globalCtx)) {
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable,
+ 30);
func_8013BC6C(&this->skelAnime, sAnimations, 0);
this->skelAnime.playSpeed = 4.0f;
@@ -1276,43 +1263,43 @@ s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (ENSW_GET_3(&this->actor)) {
switch (limbIndex) {
case 23:
- *dList = D_06004788;
+ *dList = object_st_DL_004788;
break;
case 8:
- *dList = D_060046F0;
+ *dList = object_st_DL_0046F0;
break;
case 14:
- *dList = D_06004658;
+ *dList = object_st_DL_004658;
break;
case 11:
- *dList = D_060045C0;
+ *dList = object_st_DL_0045C0;
break;
case 26:
- *dList = D_06004820;
+ *dList = object_st_DL_004820;
break;
case 20:
- *dList = D_060048B8;
+ *dList = object_st_DL_0048B8;
break;
case 17:
- *dList = D_06004950;
+ *dList = object_st_DL_004950;
break;
case 29:
- *dList = D_060049E8;
+ *dList = object_st_DL_0049E8;
break;
case 5:
- *dList = D_06003FB0;
+ *dList = object_st_DL_003FB0;
break;
case 4:
- *dList = D_060043D8;
+ *dList = object_st_DL_0043D8;
break;
}
}
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 6defe10cb3..ce19d95305 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -5,6 +5,7 @@
*/
#include "z_en_syateki_man.h"
+#include "objects/object_shn/object_shn.h"
#define FLAGS 0x08000019
@@ -34,16 +35,6 @@ void func_809C8808(EnSyatekiMan* this, GlobalContext* globalCtx);
void func_809C898C(EnSyatekiMan* this, GlobalContext* globalCtx);
void func_809C8BF0(EnSyatekiMan* this, GlobalContext* globalCtx);
-extern UNK_PTR D_06005AC8;
-extern UNK_PTR D_060062C8;
-extern AnimationHeader D_0600D2F8;
-extern AnimationHeader D_0600D9D0;
-extern AnimationHeader D_0600DFEC;
-extern FlexSkeletonHeader D_0600E7D0;
-extern Gfx D_0600F2D0[];
-extern UNK_PTR D_0600FB90;
-extern UNK_PTR D_06010390;
-
const ActorInit En_Syateki_Man_InitVars = {
ACTOR_EN_SYATEKI_MAN,
ACTORCAT_NPC,
@@ -57,9 +48,9 @@ const ActorInit En_Syateki_Man_InitVars = {
};
static ActorAnimationEntry sAnimations[] = {
- { &D_0600D9D0, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_0600DFEC, 1.0f, 0.0f, 0.0f, 0, -8.0f },
- { &D_0600D2F8, 1.0f, 0.0f, 0.0f, 2, -8.0f },
+ { &object_shn_Anim_00D9D0, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_shn_Anim_00DFEC, 1.0f, 0.0f, 0.0f, 0, -8.0f },
+ { &object_shn_Anim_00D2F8, 1.0f, 0.0f, 0.0f, 2, -8.0f },
};
static s16 D_809C91C8[] = {
@@ -141,11 +132,11 @@ void EnSyatekiMan_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.targetMode = 1;
Actor_SetScale(&this->actor, 0.01f);
if (globalCtx->sceneNum == SCENE_SYATEKI_MORI) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E7D0, &D_0600DFEC, this->jointTable, this->morphTable,
- 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_shn_Skel_00E7D0, &object_shn_Anim_00DFEC,
+ this->jointTable, this->morphTable, 16);
} else {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E7D0, &D_0600D9D0, this->jointTable, this->morphTable,
- 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_shn_Skel_00E7D0, &object_shn_Anim_00D9D0,
+ this->jointTable, this->morphTable, 16);
}
this->actor.colChkInfo.cylRadius = 100;
@@ -417,7 +408,7 @@ void func_809C6E30(EnSyatekiMan* this, GlobalContext* globalCtx) {
break;
}
- if (this->skelAnime.animation == &D_0600D2F8) {
+ if (this->skelAnime.animation == &object_shn_Anim_00D2F8) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
Actor_ChangeAnimation(&this->skelAnime, sAnimations, 0);
}
@@ -1251,7 +1242,7 @@ s32 EnSyatekiMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
EnSyatekiMan* this = THIS;
if ((globalCtx->sceneNum == SCENE_SYATEKI_MIZU) && (limbIndex == 15)) {
- *dList = D_0600F2D0;
+ *dList = object_shn_DL_00F2D0;
}
if (limbIndex == 15) {
@@ -1276,22 +1267,22 @@ void EnSyatekiMan_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
}
void EnSyatekiMan_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static UNK_PTR D_809C94B8[] = {
- &D_06005AC8,
- &D_060062C8,
- &D_060062C8,
+ static TexturePtr D_809C94B8[] = {
+ object_shn_Tex_005AC8,
+ object_shn_Tex_0062C8,
+ object_shn_Tex_0062C8,
};
EnSyatekiMan* this = THIS;
s32 pad;
if (globalCtx->sceneNum == SCENE_SYATEKI_MIZU) {
- D_809C94B8[0] = &D_0600FB90;
- D_809C94B8[1] = &D_06010390;
- D_809C94B8[2] = &D_06010390;
+ D_809C94B8[0] = object_shn_Tex_00FB90;
+ D_809C94B8[1] = object_shn_Tex_010390;
+ D_809C94B8[2] = object_shn_Tex_010390;
} else {
- D_809C94B8[0] = &D_06005AC8;
- D_809C94B8[1] = &D_060062C8;
- D_809C94B8[2] = &D_060062C8;
+ D_809C94B8[0] = object_shn_Tex_005AC8;
+ D_809C94B8[1] = object_shn_Tex_0062C8;
+ D_809C94B8[2] = object_shn_Tex_0062C8;
}
OPEN_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
index c735f4ca25..86bc7d6a81 100644
--- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
+++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
@@ -6,6 +6,7 @@
#include "z_en_tanron3.h"
#include "overlays/actors/ovl_Boss_03/z_boss_03.h"
+#include "objects/object_boss03/object_boss03.h"
#define FLAGS 0x00000035
@@ -78,9 +79,6 @@ static ColliderCylinderInit sUnusedCylinderInit = {
{ 20, 20, -10, { 0, 0, 0 } },
};
-extern FlexSkeletonHeader D_0600DA20;
-extern AnimationHeader D_0600DAAC;
-
void EnTanron3_CreateEffect(GlobalContext* globalCtx, Vec3f* effectPos) {
UnkTanron3Effect* effectPtr = (UnkTanron3Effect*)globalCtx->specialEffects;
s16 i;
@@ -109,7 +107,8 @@ void EnTanron3_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.gravity = -1.0f;
Collider_InitAndSetCylinder(globalCtx, &this->atCollider, &this->actor, &sCylinderInit);
Collider_InitAndSetCylinder(globalCtx, &this->acCollider, &this->actor, &sCylinderInit);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600DA20, &D_0600DAAC, this->jointTable, this->morphTable, 10);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_boss03_Skel_00DA20, &object_boss03_Anim_00DAAC,
+ this->jointTable, this->morphTable, 10);
Actor_SetScale(&this->actor, 0.02f);
EnTanron3_SetupLive(this, globalCtx);
this->actor.flags &= ~1;
@@ -143,7 +142,7 @@ void EnTanron3_SpawnBubbles(EnTanron3* this, GlobalContext* globalCtx) {
void EnTanron3_SetupLive(EnTanron3* this, GlobalContext* globalCtx) {
this->actionFunc = EnTanron3_Live;
- Animation_MorphToLoop(&this->skelAnime, &D_0600DAAC, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_boss03_Anim_00DAAC, -10.0f);
this->rotationStep = 0;
this->rotationScale = 5;
this->workTimer[TANRON3_WORK_TIMER_PICK_NEW_DEVIATION] = 50;
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
index 1593e5dc8a..3ab03f3f07 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
@@ -5,6 +5,7 @@
*/
#include "z_en_thiefbird.h"
+#include "objects/object_thiefbird/object_thiefbird.h"
#define FLAGS 0x80001205
@@ -32,19 +33,6 @@ void func_80C126D8(EnThiefbird* this, GlobalContext* globalCtx);
void func_80C12744(EnThiefbird* this);
void func_80C127F4(EnThiefbird* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06000088;
-extern AnimationHeader D_06000278;
-extern AnimationHeader D_06000604;
-extern Gfx D_06003060[];
-extern Gfx D_060030D8[];
-extern Gfx D_060033B0[];
-extern Gfx D_06003D58[];
-extern Gfx D_06004348[];
-extern Gfx D_06004B88[];
-extern Gfx D_060055E0[];
-extern FlexSkeletonHeader D_060061A0;
-extern AnimationHeader D_060063C4;
-
const ActorInit En_Thiefbird_InitVars = {
ACTOR_EN_THIEFBIRD,
ACTORCAT_ENEMY,
@@ -162,7 +150,8 @@ void EnThiefbird_Init(Actor* thisx, GlobalContext* globalCtx) {
ColliderJntSphElementDim* dim;
Actor_ProcessInitChain(&this->actor, sInitChain);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060061A0, &D_06000604, this->jointTable, this->morphTable, 17);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_thiefbird_Skel_0061A0, &object_thiefbird_Anim_000604,
+ this->jointTable, this->morphTable, 17);
Collider_InitAndSetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) {
@@ -217,7 +206,7 @@ void func_80C10984(EnThiefbird* this, s32 arg1) {
}
s32 func_80C10B0C(EnThiefbird* this, GlobalContext* globalCtx) {
- static Gfx* D_80C13680[] = { D_06004348, D_06004B88, D_060055E0 };
+ static Gfx* D_80C13680[] = { object_thiefbird_DL_004348, object_thiefbird_DL_004B88, object_thiefbird_DL_0055E0 };
s32 isItemFound = false;
s32 phi_a3 = 0;
s32 slotId = SLOT_BOTTLE_1;
@@ -250,7 +239,7 @@ s32 func_80C10B0C(EnThiefbird* this, GlobalContext* globalCtx) {
if (isItemFound) {
func_801149A0(itemId2, slotId);
- this->unk_3E8 = D_060033B0;
+ this->unk_3E8 = object_thiefbird_DL_0033B0;
if (!Message_GetState(&globalCtx->msgCtx)) {
func_801518B0(globalCtx, 0xF4, NULL);
}
@@ -267,7 +256,7 @@ s32 func_80C10B0C(EnThiefbird* this, GlobalContext* globalCtx) {
itemId1 = phi_a3 + (ITEM_SWORD_KOKIRI - 1);
if (phi_a3 == 4) {
func_801149A0(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY);
- this->unk_3E8 = D_06003D58;
+ this->unk_3E8 = object_thiefbird_DL_003D58;
itemId1 = ITEM_SWORD_GREAT_FAIRY;
} else {
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;
@@ -472,7 +461,7 @@ void func_80C114C0(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C11538(EnThiefbird* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000604, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_thiefbird_Anim_000604, -4.0f);
this->unk_18E = 60;
this->collider.base.acFlags |= AC_ON;
this->actionFunc = func_80C11590;
@@ -536,7 +525,7 @@ void func_80C11590(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C118E4(EnThiefbird* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060063C4, -10.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_thiefbird_Anim_0063C4, -10.0f);
this->unk_18E = 300;
this->actionFunc = func_80C1193C;
this->actor.speedXZ = 5.0f;
@@ -603,7 +592,7 @@ void func_80C1193C(EnThiefbird* this, GlobalContext* globalCtx) {
void func_80C11C60(EnThiefbird* this) {
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
- Animation_PlayOnce(&this->skelAnime, &D_06000088);
+ Animation_PlayOnce(&this->skelAnime, &object_thiefbird_Anim_000088);
this->actor.bgCheckFlags &= ~1;
this->actor.shape.rot.x = 0;
this->unk_18E = 40;
@@ -675,7 +664,7 @@ void func_80C11DF0(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C11F6C(EnThiefbird* this, GlobalContext* globalCtx) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000278, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_thiefbird_Anim_000278, -4.0f);
func_80C10984(this, 15);
if (this->actor.colChkInfo.damageEffect != 3) {
this->actor.speedXZ = 4.0f;
@@ -759,7 +748,7 @@ void func_80C1215C(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C12308(EnThiefbird* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000278, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_thiefbird_Anim_000278, -4.0f);
func_80C10984(this, 15);
this->unk_190 = -0x1000;
this->unk_192 = BINANG_ROT180(this->actor.yawTowardsPlayer);
@@ -788,7 +777,7 @@ void func_80C12378(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C1242C(EnThiefbird* this) {
- Animation_Change(&this->skelAnime, &D_06000278, 2.0f, 0.0f, 0.0f, 0, -4.0f);
+ Animation_Change(&this->skelAnime, &object_thiefbird_Anim_000278, 2.0f, 0.0f, 0.0f, 0, -4.0f);
this->actor.flags |= 0x10;
this->collider.base.acFlags |= AC_ON;
this->actionFunc = func_80C124B0;
@@ -848,8 +837,8 @@ void func_80C126D8(EnThiefbird* this, GlobalContext* globalCtx) {
}
void func_80C12744(EnThiefbird* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06000604, -4.0f);
- Animation_Change(&this->skelAnime, &D_06000604, 1.0f, 0.0f, 0.0f, 1, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_thiefbird_Anim_000604, -4.0f);
+ Animation_Change(&this->skelAnime, &object_thiefbird_Anim_000604, 1.0f, 0.0f, 0.0f, 1, -4.0f);
this->unk_190 = 0;
this->collider.base.acFlags |= AC_ON;
this->actor.flags |= 0x10;
@@ -1042,8 +1031,8 @@ void EnThiefbird_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
func_80C12D00(this);
- if (((this->skelAnime.animation == &D_06000604) && Animation_OnFrame(&this->skelAnime, 13.0f)) ||
- ((this->skelAnime.animation == &D_06000278) && Animation_OnFrame(&this->skelAnime, 1.0f))) {
+ if (((this->skelAnime.animation == &object_thiefbird_Anim_000604) && Animation_OnFrame(&this->skelAnime, 13.0f)) ||
+ ((this->skelAnime.animation == &object_thiefbird_Anim_000278) && Animation_OnFrame(&this->skelAnime, 1.0f))) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_FLUTTER);
}
}
@@ -1088,7 +1077,7 @@ void EnThiefbird_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
if (this->unk_3E8 != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- if (this->unk_3E8 == D_060033B0) {
+ if (this->unk_3E8 == object_thiefbird_DL_0033B0) {
gfx = POLY_XLU_DISP;
} else {
gfx = POLY_OPA_DISP;
@@ -1097,7 +1086,7 @@ void EnThiefbird_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
gSPMatrix(&gfx[0], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(&gfx[1], this->unk_3E8);
- if (this->unk_3E8 == D_060033B0) {
+ if (this->unk_3E8 == object_thiefbird_DL_0033B0) {
POLY_XLU_DISP = &gfx[2];
} else {
POLY_OPA_DISP = &gfx[2];
@@ -1130,7 +1119,7 @@ void func_80C13354(EnThiefbird* this, GlobalContext* globalCtx2) {
gfx = POLY_OPA_DISP;
gSPDisplayList(&gfx[0], &sSetupDL[6 * 25]);
- gSPDisplayList(&gfx[1], D_06003060);
+ gSPDisplayList(&gfx[1], object_thiefbird_DL_003060);
gfx = &gfx[2];
for (i = 0; i < ARRAY_COUNT(this->unk_3F0); i++, ptr++) {
@@ -1143,7 +1132,7 @@ void func_80C13354(EnThiefbird* this, GlobalContext* globalCtx2) {
Matrix_Scale(ptr->unk_18, ptr->unk_18, 1.0f, MTXMODE_APPLY);
gSPMatrix(&gfx[0], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(&gfx[1], D_060030D8);
+ gSPDisplayList(&gfx[1], object_thiefbird_DL_0030D8);
gfx = &gfx[2];
}
}
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
index 5afdd500f6..ba37818aa3 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@@ -5,6 +5,7 @@
*/
#include "z_en_tite.h"
+#include "objects/object_tite/object_tite.h"
#define FLAGS 0x00000205
@@ -45,20 +46,6 @@ void func_80895CB0(EnTite* this);
void func_80895D08(EnTite* this, GlobalContext* globalCtx);
void func_80895E28(EnTite* this, GlobalContext* globalCtx);
-extern AnimationHeader D_060004F8;
-extern AnimationHeader D_0600069C;
-extern AnimationHeader D_0600083C;
-extern AnimationHeader D_06000A14;
-extern AnimationHeader D_06000C70;
-extern AnimationHeader D_060012E4;
-extern SkeletonHeader D_06003A20;
-extern UNK_PTR D_06001300;
-extern UNK_PTR D_06001700;
-extern UNK_PTR D_06001900;
-extern UNK_PTR D_06001B00;
-extern UNK_PTR D_06001F00;
-extern UNK_PTR D_06002100;
-
const ActorInit En_Tite_InitVars = {
ACTOR_EN_TITE,
ACTORCAT_ENEMY,
@@ -128,9 +115,9 @@ static DamageTable sDamageTable = {
static CollisionCheckInfoInit sColChkInfoInit = { 2, 40, 40, MASS_HEAVY };
-static UNK_PTR D_80896B24[2][3] = {
- { &D_06001300, &D_06001700, &D_06001900 },
- { &D_06001B00, &D_06001F00, &D_06002100 },
+static TexturePtr D_80896B24[2][3] = {
+ { object_tite_Tex_001300, object_tite_Tex_001700, object_tite_Tex_001900 },
+ { object_tite_Tex_001B00, object_tite_Tex_001F00, object_tite_Tex_002100 },
};
static Color_RGBA8 D_80896B3C = { 250, 250, 250, 255 };
@@ -153,7 +140,8 @@ void EnTite_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 j;
Actor_ProcessInitChain(&this->actor, sInitChain);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_06003A20, &D_060012E4, this->jointTable, this->morphTable, 25);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_tite_Skel_003A20, &object_tite_Anim_0012E4, this->jointTable,
+ this->morphTable, 25);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 60.0f);
Actor_SetFocus(&this->actor, 20.0f);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@@ -297,7 +285,7 @@ void func_80893E54(EnTite* this, GlobalContext* globalCtx) {
}
void func_80893ED4(EnTite* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f);
this->unk_2BC = Rand_S16Offset(15, 30);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_80893F30;
@@ -315,7 +303,7 @@ void func_80893F30(EnTite* this, GlobalContext* globalCtx) {
}
void func_80893FD0(EnTite* this) {
- Animation_PlayOnce(&this->skelAnime, &D_0600083C);
+ Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_00083C);
this->actor.velocity.y = 0.0f;
this->actor.speedXZ = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@@ -333,7 +321,7 @@ void func_80894024(EnTite* this, GlobalContext* globalCtx) {
}
void func_8089408C(EnTite* this, GlobalContext* globalCtx) {
- Animation_PlayOnce(&this->skelAnime, &D_060004F8);
+ Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_0004F8);
if (!func_80893ADC(this)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_TEKU_JUMP);
} else {
@@ -403,7 +391,7 @@ void func_808942B4(EnTite* this, GlobalContext* globalCtx) {
}
void func_80894414(EnTite* this) {
- Animation_PlayOnce(&this->skelAnime, &D_0600069C);
+ Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_00069C);
this->actionFunc = func_80894454;
}
@@ -441,7 +429,7 @@ void func_808945B4(EnTite* this, GlobalContext* globalCtx) {
}
void func_808945EC(EnTite* this) {
- Animation_PlayLoop(&this->skelAnime, &D_06000A14);
+ Animation_PlayLoop(&this->skelAnime, &object_tite_Anim_000A14);
this->actor.speedXZ = 0.0f;
this->actor.velocity.y = 0.0f;
this->actionFunc = func_80894638;
@@ -486,7 +474,7 @@ void func_80894638(EnTite* this, GlobalContext* globalCtx) {
}
void func_8089484C(EnTite* this) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000C70, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_tite_Anim_000C70, -3.0f);
if (this->actionFunc != func_80894910) {
this->unk_2B8 = Rand_S16Offset(1, 3);
}
@@ -547,7 +535,7 @@ void func_80894910(EnTite* this, GlobalContext* globalCtx) {
}
void func_80894B2C(EnTite* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f);
this->actor.speedXZ = -6.0f;
this->actor.gravity = -1.0f;
if (this->collider.base.ac != NULL) {
@@ -690,7 +678,7 @@ void func_808951B8(EnTite* this, GlobalContext* globalCtx) {
}
void func_808952EC(EnTite* this) {
- Animation_PlayLoopSetSpeed(&this->skelAnime, &D_06000A14, 1.5f);
+ Animation_PlayLoopSetSpeed(&this->skelAnime, &object_tite_Anim_000A14, 1.5f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_LAST1_GROW_HEAD);
this->collider.base.acFlags &= ~AC_ON;
func_80893A18(this);
@@ -823,7 +811,7 @@ void func_80895A10(EnTite* this) {
s32 pad;
s16 rand;
- Animation_Change(&this->skelAnime, &D_06000A14, 2.0f, 0.0f, 0.0f, 0, 4.0f);
+ Animation_Change(&this->skelAnime, &object_tite_Anim_000A14, 2.0f, 0.0f, 0.0f, 0, 4.0f);
this->actor.speedXZ = 0.0f;
rand = Rand_S16Offset(20, 20);
this->unk_2BC = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * rand;
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 4ba5a32b71..0647b1d698 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -7,6 +7,7 @@
#include "z_en_tk.h"
#include "overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "objects/object_tk/object_tk.h"
#define FLAGS 0x00000009
@@ -59,19 +60,6 @@ void func_80AEF2C8(Actor* thisx, GlobalContext* globalCtx);
void func_80AEF2D8(Actor* thisx, GlobalContext* globalCtx);
void func_80AEF5F4(Actor* thisx, GlobalContext* globalCtx);
-extern AnimationHeader D_06001144;
-extern AnimationHeader D_06001FA8;
-extern AnimationHeader D_060020C8;
-extern AnimationHeader D_060030A4;
-extern AnimationHeader D_06003724;
-extern AnimationHeader D_06003B10;
-extern AnimationHeader D_06003FB8;
-extern UNK_PTR D_06004390;
-extern UNK_PTR D_06004B90;
-extern UNK_PTR D_06005390;
-extern Gfx D_0600B530[];
-extern FlexSkeletonHeader D_0600B9E8;
-
static s32 D_80AF0050;
static u32 D_80AEF800[] = {
@@ -121,9 +109,10 @@ static u32 D_80AEF85C[] = {
};
static struct_80B8E1A8 D_80AEF868[] = {
- { &D_06001FA8, 1.0f, 0, -10.0f }, { &D_06001FA8, 2.0f, 0, -10.0f }, { &D_060030A4, 1.0f, 0, -10.0f },
- { &D_06001144, 1.0f, 2, -10.0f }, { &D_06003724, 1.0f, 2, -10.0f }, { &D_06003FB8, 1.0f, 0, -10.0f },
- { &D_060020C8, 1.0f, 0, -10.0f }, { &D_06003B10, 1.0f, 0, -10.0f },
+ { &object_tk_Anim_001FA8, 1.0f, 0, -10.0f }, { &object_tk_Anim_001FA8, 2.0f, 0, -10.0f },
+ { &object_tk_Anim_0030A4, 1.0f, 0, -10.0f }, { &object_tk_Anim_001144, 1.0f, 2, -10.0f },
+ { &object_tk_Anim_003724, 1.0f, 2, -10.0f }, { &object_tk_Anim_003FB8, 1.0f, 0, -10.0f },
+ { &object_tk_Anim_0020C8, 1.0f, 0, -10.0f }, { &object_tk_Anim_003B10, 1.0f, 0, -10.0f },
};
static s32 D_80AEF8E8[2] = { 0, 0 };
@@ -236,8 +225,10 @@ void EnTk_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B9E8, NULL, this->jointTable, this->morphTable, 18);
- Animation_Change(&this->skelAnime, &D_060030A4, 1.0f, 0.0f, Animation_GetLastFrame(&D_060030A4.common), 0, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tk_Skel_00B9E8, NULL, this->jointTable, this->morphTable,
+ 18);
+ Animation_Change(&this->skelAnime, &object_tk_Anim_0030A4, 1.0f, 0.0f,
+ Animation_GetLastFrame(&object_tk_Anim_0030A4.common), 0, 0.0f);
this->unk_318 = 0;
this->unk_2D4 = -1;
Actor_SetScale(&this->actor, 0.01f);
@@ -1369,7 +1360,7 @@ void EnTk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, D_0600B530);
+ gSPDisplayList(POLY_OPA_DISP++, object_tk_DL_00B530);
CLOSE_DISPS(globalCtx->state.gfxCtx);
break;
@@ -1378,10 +1369,10 @@ void EnTk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static UNK_PTR D_80AEFA90[] = {
- &D_06004390,
- &D_06004B90,
- &D_06005390,
+ static TexturePtr D_80AEFA90[] = {
+ object_tk_Tex_004390,
+ object_tk_Tex_004B90,
+ object_tk_Tex_005390,
};
s32 pad;
EnTk* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
index 9f0ce13f8d..50ff93937f 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
@@ -5,6 +5,8 @@
*/
#include "z_en_torch2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+
#define FLAGS 0x00000010
#define THIS ((EnTorch2*)thisx)
@@ -43,11 +45,11 @@ static InitChainEntry sInitChain[] = {
// Shells for each of Link's different forms
// (Playing elegy as Fierce Deity puts down a human shell)
static Gfx* sShellDLists[] = {
- D_0401C430, // Human
- D_04048DF0, // Zora
- D_04089070, // Deku
- D_04057B10, // Goron
- D_0401C430, // Human
+ gameplay_keep_DL_01C430, // Human
+ gameplay_keep_DL_048DF0, // Zora
+ gameplay_keep_DL_089070, // Deku
+ gameplay_keep_DL_057B10, // Goron
+ gameplay_keep_DL_01C430, // Human
};
void EnTorch2_Init(Actor* thisx, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c
index f92ef5afda..00696ffae7 100644
--- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c
+++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c
@@ -5,6 +5,7 @@
*/
#include "z_en_toto.h"
+#include "objects/object_zm/object_zm.h"
#define FLAGS 0x00000009
@@ -61,23 +62,6 @@ const ActorInit En_Toto_InitVars = {
(ActorFunc)EnToto_Draw,
};
-extern AnimationHeader D_06000C80;
-extern AnimationHeader D_06001324;
-extern AnimationHeader D_060016A4;
-extern AnimationHeader D_06001DF0;
-extern AnimationHeader D_060022C8;
-extern AnimationHeader D_060028B8;
-extern AnimationHeader D_06002F20;
-extern AnimationHeader D_06003AA8;
-extern UNK_TYPE D_06008AE8;
-extern UNK_TYPE D_0600A068;
-extern UNK_TYPE D_0600A468;
-extern FlexSkeletonHeader D_0600A978;
-extern AnimationHeader D_0600B3E0;
-extern AnimationHeader D_0600B894;
-extern AnimationHeader D_0600BC08;
-extern AnimationHeader D_0600C880;
-
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_METAL,
@@ -142,7 +126,8 @@ static EnTotoText D_80BA5074[] = {
{ 4, 0, 0x2AE4 },
};
-static AnimationHeader* D_80BA5078[] = { &D_060028B8, &D_0600B894, &D_06002F20, &D_0600BC08 };
+static AnimationHeader* D_80BA5078[] = { &object_zm_Anim_0028B8, &object_zm_Anim_00B894, &object_zm_Anim_002F20,
+ &object_zm_Anim_00BC08 };
static EnTotoText D_80BA5088[] = {
{ 5, 0, 0 }, { 6, 20, 0 }, { 7, 0, 0 }, { 8, 9, 0 }, { 9, 10, 0 }, { 1, 0, 0 }, { 10, 0, 0 },
@@ -205,9 +190,9 @@ void EnToto_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
this->actor.bgCheckFlags |= 0x400;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A978,
- ((globalCtx->sceneNum == 0x12) ? &D_06003AA8 : &D_0600C880), this->jointTable, this->morphTable,
- 18);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_zm_Skel_00A978,
+ ((globalCtx->sceneNum == 0x12) ? &object_zm_Anim_003AA8 : &object_zm_Anim_00C880),
+ this->jointTable, this->morphTable, 18);
func_80BA36C0(this, globalCtx, 0);
this->actor.shape.rot.x = 0;
}
@@ -219,7 +204,8 @@ void EnToto_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80BA383C(EnToto* this, GlobalContext* globalCtx) {
- if (SkelAnime_Update(&this->skelAnime) && this->actionFuncIndex == 1 && this->skelAnime.animation != &D_06000C80) {
+ if (SkelAnime_Update(&this->skelAnime) && this->actionFuncIndex == 1 &&
+ this->skelAnime.animation != &object_zm_Anim_000C80) {
if (globalCtx->msgCtx.unk11F04 != 0x2A98 && globalCtx->msgCtx.unk11F04 != 0x2A99) {
if (this->unk2B4 & 1 || Rand_ZeroOne() > 0.5f) {
this->unk2B4 = (this->unk2B4 + 1) & 3;
@@ -231,10 +217,10 @@ void func_80BA383C(EnToto* this, GlobalContext* globalCtx) {
}
void func_80BA3930(EnToto* this, GlobalContext* globalCtx) {
- AnimationHeader* animationHeader = &D_0600C880;
+ AnimationHeader* animationHeader = &object_zm_Anim_00C880;
if (globalCtx->sceneNum == 0x12) {
- animationHeader = &D_06003AA8;
+ animationHeader = &object_zm_Anim_003AA8;
}
Animation_MorphToLoop(&this->skelAnime, animationHeader, -4.0f);
}
@@ -298,13 +284,13 @@ void func_80BA39C8(EnToto* this, GlobalContext* globalCtx) {
void func_80BA3BFC(EnToto* this, GlobalContext* globalCtx) {
if (globalCtx->sceneNum == 0x12) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06000C80, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_zm_Anim_000C80, -4.0f);
this->unk2B4 = 0;
} else {
if (this->text->unk0 == 4) {
func_80151BB4(globalCtx, 9);
}
- Animation_MorphToLoop(&this->skelAnime, &D_0600B3E0, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_zm_Anim_00B3E0, -4.0f);
}
}
@@ -652,7 +638,7 @@ s32 func_80BA4B24(EnToto* this, GlobalContext* globalCtx) {
if (func_80BA40D4(this, globalCtx)) {
player = GET_PLAYER(globalCtx);
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060028B8, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_zm_Anim_0028B8, -4.0f);
if (player->transformation == PLAYER_FORM_ZORA) {
if (!Flags_GetSwitch(globalCtx, this->actor.params & 0x7F)) {
Flags_SetSwitch(globalCtx, this->actor.params & 0x7F);
@@ -695,9 +681,10 @@ void func_80BA4CB4(EnToto* this, GlobalContext* globalCtx) {
this->unk2B5 = action->unk0;
if (this->unk2B5 != 4) {
if (this->unk2B5 == 3) {
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06001DF0, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_zm_Anim_001DF0, -4.0f);
} else {
- Animation_PlayOnce(&this->skelAnime, this->unk2B5 == 1 ? &D_060016A4 : &D_060022C8);
+ Animation_PlayOnce(&this->skelAnime,
+ this->unk2B5 == 1 ? &object_zm_Anim_0016A4 : &object_zm_Anim_0022C8);
if (this->unk2B5 == 2 && this->unk2B3 != 0xF) {
func_80151BB4(globalCtx, 9);
func_80151BB4(globalCtx, 10);
@@ -708,7 +695,7 @@ void func_80BA4CB4(EnToto* this, GlobalContext* globalCtx) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x320);
if (SkelAnime_Update(&this->skelAnime)) {
if (this->unk2B5 != 3) {
- Animation_PlayLoop(&this->skelAnime, this->unk2B5 == 1 ? &D_0600C880 : &D_06001324);
+ Animation_PlayLoop(&this->skelAnime, this->unk2B5 == 1 ? &object_zm_Anim_00C880 : &object_zm_Anim_001324);
}
}
if (this->unk2B5 == 4 && !Actor_HasParent(&this->actor, globalCtx)) {
@@ -734,7 +721,7 @@ void EnToto_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnToto_Draw(Actor* thisx, GlobalContext* globalCtx) {
- void* sp4C[] = { &D_06008AE8, &D_0600A068, &D_0600A468 };
+ TexturePtr sp4C[] = { object_zm_Tex_008AE8, object_zm_Tex_00A068, object_zm_Tex_00A468 };
EnToto* this = THIS;
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c
index 17c85cb0e6..92162d5fa6 100644
--- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c
+++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c
@@ -5,6 +5,8 @@
*/
#include "z_en_trt.h"
+#include "objects/object_trt/object_trt.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000009
@@ -62,29 +64,12 @@ void EnTrt_Blink(EnTrt* this);
void EnTrt_OpenEyes2(EnTrt* this);
void EnTrt_NodOff(EnTrt* this);
-extern UNK_TYPE D_0401F740;
-extern UNK_TYPE D_0401F8C0;
-extern UNK_TYPE D_0401F7C0;
-extern FlexSkeletonHeader D_0600FEF0;
-extern AnimationHeader D_0600FD34;
-extern AnimationHeader D_0600DE68;
-extern AnimationHeader D_06002224;
-extern AnimationHeader D_06001EF4;
-extern AnimationHeader D_060030EC;
-extern AnimationHeader D_0600D52C;
-extern AnimationHeader D_06002CB0;
-extern AnimationHeader D_0600EE98;
-extern AnimationHeader D_06003D78;
-extern AnimationHeader D_06000A44;
-extern TexturePtr D_0600B0B8;
-extern TexturePtr D_0600B8B8;
-extern TexturePtr D_0600C0B8;
-
static ActorAnimationEntryS sAnimations[] = {
- { &D_0600DE68, 1.0f, 0, -1, 2, 0 }, { &D_0600EE98, 1.0f, 0, -1, 2, 0 }, { &D_0600FD34, 1.0f, 0, -1, 0, 0 },
- { &D_060030EC, 1.0f, 0, -1, 2, 0 }, { &D_06003D78, 1.0f, 0, -1, 2, 0 }, { &D_0600D52C, 1.0f, 0, -1, 0, 0 },
- { &D_06000A44, 1.0f, 0, -1, 0, 0 }, { &D_06001EF4, 1.0f, 0, -1, 0, 0 }, { &D_06002224, 1.0f, 0, -1, 0, 0 },
- { &D_06002CB0, 1.0f, 0, -1, 0, 0 },
+ { &object_trt_Anim_00DE68, 1.0f, 0, -1, 2, 0 }, { &object_trt_Anim_00EE98, 1.0f, 0, -1, 2, 0 },
+ { &object_trt_Anim_00FD34, 1.0f, 0, -1, 0, 0 }, { &object_trt_Anim_0030EC, 1.0f, 0, -1, 2, 0 },
+ { &object_trt_Anim_003D78, 1.0f, 0, -1, 2, 0 }, { &object_trt_Anim_00D52C, 1.0f, 0, -1, 0, 0 },
+ { &object_trt_Anim_000A44, 1.0f, 0, -1, 0, 0 }, { &object_trt_Anim_001EF4, 1.0f, 0, -1, 0, 0 },
+ { &object_trt_Anim_002224, 1.0f, 0, -1, 0, 0 }, { &object_trt_Anim_002CB0, 1.0f, 0, -1, 0, 0 },
};
const ActorInit En_Trt_InitVars = {
@@ -852,7 +837,7 @@ void EnTrt_IdleAwake(EnTrt* this, GlobalContext* globalCtx) {
void EnTrt_BeginInteraction(EnTrt* this, GlobalContext* globalCtx) {
s16 curFrame = this->skelAnime.curFrame / this->skelAnime.playSpeed;
- s16 animLastFrame = Animation_GetLastFrame(&D_060030EC) / (s16)this->skelAnime.playSpeed;
+ s16 animLastFrame = Animation_GetLastFrame(&object_trt_Anim_0030EC) / (s16)this->skelAnime.playSpeed;
if (this->cutsceneState == ENTRT_CUTSCENESTATE_WAITING) {
if (ActorCutscene_GetCanPlayNext(this->cutscene)) {
@@ -1452,7 +1437,7 @@ void EnTrt_LookToShopkeeperFromShelf(EnTrt* this, GlobalContext* globalCtx) {
}
void EnTrt_InitShopkeeper(EnTrt* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, &D_0600FD34, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_trt_Skel_00FEF0, &object_trt_Anim_00FD34, NULL, NULL, 0);
if (!(gSaveContext.weekEventReg[0xC] & 8) && !(gSaveContext.weekEventReg[0x54] & 0x40) && gSaveContext.day >= 2) {
this->actor.draw = NULL;
} else {
@@ -1564,8 +1549,8 @@ void EnTrt_DrawCursor(GlobalContext* globalCtx, EnTrt* this, f32 x, f32 y, f32 z
func_8012C654(globalCtx->state.gfxCtx);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColor.r, this->cursorColor.g, this->cursorColor.b,
this->cursorColor.a);
- gDPLoadTextureBlock_4b(OVERLAY_DISP++, &D_0401F740, G_IM_FMT_IA, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP,
- G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
+ gDPLoadTextureBlock_4b(OVERLAY_DISP++, gameplay_keep_Tex_01F740, G_IM_FMT_IA, 16, 16, 0,
+ G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
w = 16.0f * z;
ulx = (x - w) * 4.0f;
uly = (y - w + -12.0f) * 4.0f;
@@ -1616,7 +1601,7 @@ void EnTrt_DrawStickDirectionPrompt(GlobalContext* globalCtx, EnTrt* this) {
if (drawStickRightPrompt || drawStickLeftPrompt) {
func_8012C654(globalCtx->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F8C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F8C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1637,7 +1622,7 @@ void EnTrt_DrawStickDirectionPrompt(GlobalContext* globalCtx, EnTrt* this) {
this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY,
this->stickRightPrompt.texZ, 0, 0, 1.0f, 1.0f);
}
- gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &D_0401F7C0);
+ gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, gameplay_keep_Tex_01F7C0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD);
gDPLoadSync(OVERLAY_DISP++);
@@ -1780,7 +1765,7 @@ void EnTrt_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void EnTrt_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sEyeTextures[] = { &D_0600B0B8, &D_0600B8B8, &D_0600C0B8 };
+ static TexturePtr sEyeTextures[] = { object_trt_Tex_00B0B8, object_trt_Tex_00B8B8, object_trt_Tex_00C0B8 };
EnTrt* this = THIS;
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c
index 46ef783065..56d570e5b2 100644
--- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c
+++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c
@@ -69,6 +69,7 @@ const ActorInit En_Tru_InitVars = {
};
#include "overlays/ovl_En_Tru/ovl_En_Tru.c"
+#include "objects/gameplay_keep/gameplay_keep.h"
static Vec3f D_80A8B250 = { 0.0f, 0.02f, 0.0f };
@@ -79,8 +80,8 @@ static Color_RGBA8 D_80A8B25C[] = {
static f32 D_80A8B274[] = { 60.0f, 255.0f, 60.0f };
-static UNK_TYPE D_80A8B280[] = {
- &D_0408F7E0, &D_0408F3E0, &D_0408EFE0, &D_0408EBE0, &D_0408E7E0, &D_0408E3E0, &D_0408DFE0, &D_0408DBE0,
+static TexturePtr D_80A8B280[] = {
+ gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
static ColliderSphereInit sSphereInit = {
@@ -1235,10 +1236,10 @@ void EnTru_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
void EnTru_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80A8B408[] = {
- &object_tru_Tex_018FA0,
- &object_tru_Tex_0197A0,
- &object_tru_Tex_019FA0,
- &object_tru_Tex_0197A0,
+ object_tru_Tex_018FA0,
+ object_tru_Tex_0197A0,
+ object_tru_Tex_019FA0,
+ object_tru_Tex_0197A0,
};
s32 pad;
EnTru* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
index 05f4e76d73..c2d9e8d64d 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
@@ -120,7 +120,8 @@ void EnTuboTrap_SpawnEffectsOnLand(EnTuboTrap* this, GlobalContext* globalCtx) {
arg5 = 0x20;
}
EffectSsKakera_Spawn(globalCtx, &pos, &vel, actorPos, -0xF0, arg5, 0x14, 0, 0,
- ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x3C, -1, GAMEPLAY_DANGEON_KEEP, D_05018090);
+ ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x3C, -1, GAMEPLAY_DANGEON_KEEP,
+ gameplay_dangeon_keep_DL_018090);
}
func_800BBFB0(globalCtx, actorPos, 30.0f, 4, 0x14, 0x32, 0);
@@ -165,7 +166,8 @@ void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, GlobalContext* globalCtx)
}
EffectSsKakera_Spawn(globalCtx, &pos, &vel, actorPos, -0xAA, arg5, 0x32, 5, 0,
- ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x46, -1, GAMEPLAY_DANGEON_KEEP, D_05018090);
+ ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x46, -1, GAMEPLAY_DANGEON_KEEP,
+ gameplay_dangeon_keep_DL_018090);
}
}
diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c
index 5959841904..2a38c90423 100644
--- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c
+++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c
@@ -5,6 +5,7 @@
*/
#include "z_en_warp_uzu.h"
+#include "objects/object_warp_uzu/object_warp_uzu.h"
#define FLAGS 0x00000019
@@ -59,8 +60,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern Gfx D_06000EC0[];
-
void EnWarpUzu_Init(Actor* thisx, GlobalContext* globalCtx) {
EnWarpUzu* this = THIS;
@@ -133,5 +132,5 @@ void EnWarpUzu_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnWarpUzu_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000EC0);
+ Gfx_DrawDListOpa(globalCtx, object_warp_uzu_DL_000EC0);
}
diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
index 5e45f8c033..3d2f837a00 100644
--- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
+++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
@@ -285,7 +285,7 @@ void EnWaterEffect_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (!phi_s4) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_08DBE0));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gDust1Tex));
gSPDisplayList(POLY_XLU_DISP++, object_water_effect_DL_004260);
gDPSetEnvColor(POLY_XLU_DISP++, 250, 250, 255, 0);
phi_s4++;
@@ -317,7 +317,7 @@ void EnWaterEffect_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (!phi_s4) {
func_8012C448(gfxCtx);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_08DBE0));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gDust1Tex));
gDPSetEnvColor(POLY_XLU_DISP++, 250, 250, 255, 0);
gSPDisplayList(POLY_XLU_DISP++, object_water_effect_DL_004260);
phi_s4++;
@@ -624,7 +624,7 @@ void func_80A5A6B8(Actor* thisx, GlobalContext* globalCtx2) {
if ((this->actor.params == ENWATEREFFECT_777) || (this->actor.params == ENWATEREFFECT_778)) {
if (this->unk_E2C > 1.0f) {
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_water_effect_Matanimheader_000DE0));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000DE0));
Matrix_Scale(this->unk_DC8[1].y, this->unk_DC8[1].z, this->unk_DC8[1].y, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
@@ -637,7 +637,7 @@ void func_80A5A6B8(Actor* thisx, GlobalContext* globalCtx2) {
if (this->unk_E30 > 1.0f) {
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_water_effect_Matanimheader_000E0C));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000E0C));
Matrix_Scale(this->unk_DC8[2].y, this->unk_DC8[2].z, this->unk_DC8[2].y, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
@@ -653,7 +653,7 @@ void func_80A5A6B8(Actor* thisx, GlobalContext* globalCtx2) {
if ((this->unk_E34 > 1.0f) && (this->actor.params != ENWATEREFFECT_780)) {
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_water_effect_Matanimheader_000E40));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000E40));
Matrix_Scale(this->unk_DC8[3].y, this->unk_DC8[3].z, this->unk_DC8[3].y, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -665,7 +665,7 @@ void func_80A5A6B8(Actor* thisx, GlobalContext* globalCtx2) {
if ((this->actor.params == ENWATEREFFECT_777) || (this->actor.params == ENWATEREFFECT_780)) {
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_water_effect_Matanimheader_000E58));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000E58));
Matrix_Scale(this->unk_DC8[4].y, this->unk_DC8[4].z, this->unk_DC8[4].y, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -681,7 +681,7 @@ void func_80A5A6B8(Actor* thisx, GlobalContext* globalCtx2) {
if (!phi_s4) {
func_8012C448(globalCtx->state.gfxCtx);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_08DBE0));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gDust1Tex));
gDPSetEnvColor(POLY_XLU_DISP++, 250, 250, 255, 0);
gSPDisplayList(POLY_XLU_DISP++, object_water_effect_DL_004260);
phi_s4++;
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
index 080aeeba53..12bed5ca19 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
@@ -7,6 +7,7 @@
#include "z_en_wf.h"
#include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
#include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h"
+#include "objects/object_wf/object_wf.h"
#define FLAGS 0x00000415
@@ -55,23 +56,6 @@ void func_80993524(EnWf* this);
void func_8099357C(EnWf* this, GlobalContext* globalCtx);
s32 func_8099408C(GlobalContext* globalCtx, EnWf* this);
-extern UNK_TYPE D_06000300;
-extern UNK_TYPE D_060027D8;
-extern UNK_TYPE D_060029D8;
-extern FlexSkeletonHeader D_06003BC0;
-extern AnimationHeader D_06004638;
-extern AnimationHeader D_06004A90;
-extern AnimationHeader D_06004C44;
-extern AnimationHeader D_060053D0;
-extern AnimationHeader D_06005700;
-extern UNK_TYPE D_06007AA8;
-extern UNK_TYPE D_060082A8;
-extern UNK_TYPE D_060084A8;
-extern FlexSkeletonHeader D_060095D0;
-extern AnimationHeader D_06009808;
-extern AnimationHeader D_06009A50;
-extern AnimationHeader D_0600A3CC;
-
const ActorInit En_Wf_InitVars = {
ACTOR_EN_WF,
ACTORCAT_PROP,
@@ -256,18 +240,18 @@ static DamageTable sDamageTable2 = {
static CollisionCheckInfoInit sColChkInfoInit = { 8, 50, 100, MASS_HEAVY };
-static UNK_TYPE D_809942B0[] = {
- &D_06007AA8,
- &D_060082A8,
- &D_060084A8,
- &D_060082A8,
+static TexturePtr D_809942B0[] = {
+ object_wf_Tex_007AA8,
+ object_wf_Tex_0082A8,
+ object_wf_Tex_0084A8,
+ object_wf_Tex_0082A8,
};
-static UNK_TYPE D_809942C0[] = {
- &D_06000300,
- &D_060027D8,
- &D_060029D8,
- &D_060027D8,
+static TexturePtr D_809942C0[] = {
+ object_wf_Tex_000300,
+ object_wf_Tex_0027D8,
+ object_wf_Tex_0029D8,
+ object_wf_Tex_0027D8,
};
static InitChainEntry sInitChain[] = {
@@ -334,16 +318,16 @@ void EnWf_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.0075f);
if (this->actor.params == 0) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060095D0, &D_0600A3CC, this->jointTable, this->morphTable,
- 22);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_wf_Skel_0095D0, &object_wf_Anim_00A3CC,
+ this->jointTable, this->morphTable, 22);
this->actor.hintId = 0x4C;
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable2, &sColChkInfoInit);
this->collider1.elements[0].info.toucher.damage = 8;
this->collider1.elements[1].info.toucher.damage = 8;
this->actor.colChkInfo.health = 6;
} else {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06003BC0, &D_0600A3CC, this->jointTable, this->morphTable,
- 22);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_wf_Skel_003BC0, &object_wf_Anim_00A3CC,
+ this->jointTable, this->morphTable, 22);
this->actor.hintId = 0x57;
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable1, &sColChkInfoInit);
}
@@ -566,7 +550,7 @@ void func_80990F50(EnWf* this, GlobalContext* globalCtx) {
}
void func_80990FC8(EnWf* this) {
- Animation_Change(&this->skelAnime, &D_060053D0, 0.5f, 0.0f, 7.0f, 3, 0.0f);
+ Animation_Change(&this->skelAnime, &object_wf_Anim_0053D0, 0.5f, 0.0f, 7.0f, 3, 0.0f);
this->unk_2A0 = 5;
this->actor.flags |= 1;
this->actionFunc = func_80991040;
@@ -589,7 +573,7 @@ void func_80991040(EnWf* this, GlobalContext* globalCtx) {
void func_809910F0(EnWf* this) {
this->collider2.base.acFlags &= ~AC_ON;
this->actor.speedXZ = 0.0f;
- Animation_Change(&this->skelAnime, &D_060053D0, 0.5f, 0.0f, 7.0f, 3, -5.0f);
+ Animation_Change(&this->skelAnime, &object_wf_Anim_0053D0, 0.5f, 0.0f, 7.0f, 3, -5.0f);
this->unk_2A0 = 5;
this->actionFunc = func_80991174;
}
@@ -608,7 +592,7 @@ void func_80991174(EnWf* this, GlobalContext* globalCtx) {
void func_80991200(EnWf* this) {
this->collider2.base.acFlags |= AC_ON;
- Animation_MorphToLoop(&this->skelAnime, &D_0600A3CC, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_00A3CC, -4.0f);
this->unk_2A0 = (s32)Rand_ZeroFloat(10.0f) + 2;
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actionFunc = func_80991280;
@@ -659,7 +643,7 @@ void func_80991280(EnWf* this, GlobalContext* globalCtx) {
void func_80991438(EnWf* this) {
this->collider2.base.acFlags |= AC_ON;
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actor.speedXZ = 8.0f;
this->actionFunc = func_8099149C;
@@ -720,7 +704,7 @@ void func_8099149C(EnWf* this, GlobalContext* globalCtx) {
}
void func_80991738(EnWf* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06009808, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_009808, -4.0f);
this->actionFunc = func_8099177C;
}
@@ -772,7 +756,7 @@ void func_8099177C(EnWf* this, GlobalContext* globalCtx) {
void func_80991948(EnWf* this) {
this->collider2.base.acFlags |= AC_ON;
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
if (Rand_ZeroOne() > 0.5f) {
this->unk_29A = 16000;
} else {
@@ -826,7 +810,7 @@ void func_809919F4(EnWf* this, GlobalContext* globalCtx) {
void func_80991C04(EnWf* this) {
this->collider2.base.acFlags |= AC_ON;
- Animation_PlayOnce(&this->skelAnime, &D_06004638);
+ Animation_PlayOnce(&this->skelAnime, &object_wf_Anim_004638);
this->collider1.base.atFlags &= ~AT_BOUNCED;
this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
this->unk_2A0 = 7;
@@ -896,7 +880,7 @@ void func_80991FD8(EnWf* this) {
if (this->skelAnime.curFrame > 15.0f) {
phi_f0 = 15.0f;
}
- Animation_Change(&this->skelAnime, &D_06004638, -0.5f, this->skelAnime.curFrame - 1.0f, phi_f0, 3, 0.0f);
+ Animation_Change(&this->skelAnime, &object_wf_Anim_004638, -0.5f, this->skelAnime.curFrame - 1.0f, phi_f0, 3, 0.0f);
this->collider1.base.atFlags &= ~AT_ON;
this->actionFunc = func_80992068;
}
@@ -939,7 +923,7 @@ void func_80992068(EnWf* this, GlobalContext* globalCtx) {
void func_8099223C(EnWf* this) {
this->collider2.base.acFlags &= ~AC_ON;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06004A90, -3.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wf_Anim_004A90, -3.0f);
this->unk_2A0 = 0;
this->actor.speedXZ = -6.0f;
this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
@@ -989,7 +973,7 @@ void func_809923E4(EnWf* this, GlobalContext* globalCtx) {
void func_8099245C(EnWf* this) {
this->collider2.base.acFlags &= ~AC_ON;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_06009A50, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wf_Anim_009A50, -4.0f);
if (this->actor.bgCheckFlags & 1) {
this->actor.speedXZ = -4.0f;
}
@@ -1037,7 +1021,8 @@ void func_809924EC(EnWf* this, GlobalContext* globalCtx) {
void func_809926D0(EnWf* this) {
this->collider2.base.acFlags &= ~AC_ON;
- Animation_Change(&this->skelAnime, &D_06004A90, -1.0f, Animation_GetLastFrame(&D_06004A90.common), 0.0f, 2, -3.0f);
+ Animation_Change(&this->skelAnime, &object_wf_Anim_004A90, -1.0f,
+ Animation_GetLastFrame(&object_wf_Anim_004A90.common), 0.0f, 2, -3.0f);
this->unk_2A0 = 0;
this->actor.speedXZ = 6.5f;
this->actor.velocity.y = 15.0f;
@@ -1068,7 +1053,8 @@ void func_8099282C(EnWf* this) {
this->collider1.base.atFlags &= ~AT_ON;
this->unk_2A0 = 10;
this->actor.speedXZ = 0.0f;
- Animation_Change(&this->skelAnime, &D_06004C44, -1.0f, Animation_GetLastFrame(&D_06004C44.common), 0.0f, 2, -2.0f);
+ Animation_Change(&this->skelAnime, &object_wf_Anim_004C44, -1.0f,
+ Animation_GetLastFrame(&object_wf_Anim_004C44.common), 0.0f, 2, -2.0f);
this->actionFunc = func_809928CC;
}
@@ -1105,7 +1091,7 @@ void func_80992A74(EnWf* this, GlobalContext* globalCtx) {
f32 temp_f0;
this->collider2.base.acFlags |= AC_ON;
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
player = GET_PLAYER(globalCtx);
temp_f0 = Math_SinS((player->actor.shape.rot.y + this->unk_29A) - this->actor.yawTowardsPlayer);
if (temp_f0 > 0.0f) {
@@ -1167,7 +1153,7 @@ void func_80992B8C(EnWf* this, GlobalContext* globalCtx) {
void func_80992D6C(EnWf* this) {
this->collider2.base.acFlags &= ~AC_ON;
- Animation_MorphToPlayOnce(&this->skelAnime, &D_060053D0, -4.0f);
+ Animation_MorphToPlayOnce(&this->skelAnime, &object_wf_Anim_0053D0, -4.0f);
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
if (this->actor.bgCheckFlags & 1) {
this->actor.speedXZ = -6.0f;
@@ -1219,7 +1205,7 @@ void func_80992E0C(EnWf* this, GlobalContext* globalCtx) {
}
void func_80992FD4(EnWf* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_0600A3CC, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_00A3CC, -4.0f);
this->actionFunc = func_80993018;
}
@@ -1246,7 +1232,7 @@ void func_80993018(EnWf* this, GlobalContext* globalCtx) {
}
void func_80993148(EnWf* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
this->actor.speedXZ = 0.0f;
this->actionFunc = func_80993194;
}
@@ -1291,7 +1277,7 @@ void func_80993194(EnWf* this, GlobalContext* globalCtx) {
}
void func_80993350(EnWf* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_WOLFOS_APPEAR);
this->actionFunc = func_809933A0;
}
@@ -1331,7 +1317,7 @@ void func_809933A0(EnWf* this, GlobalContext* globalCtx) {
}
void func_80993524(EnWf* this) {
- Animation_MorphToLoop(&this->skelAnime, &D_06005700, -4.0f);
+ Animation_MorphToLoop(&this->skelAnime, &object_wf_Anim_005700, -4.0f);
this->actor.speedXZ = 6.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actionFunc = func_8099357C;
diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c
index 8effa1d67b..b641865501 100644
--- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c
+++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c
@@ -65,9 +65,9 @@ static ColliderCylinderInit sCylinderInit = {
{ 30, 40, 0, { 0, 0, 0 } },
};
-static TexturePtr D_80B958AC[] = { &object_zog_Tex_024750, &object_zog_Tex_024F50, &object_zog_Tex_025750 };
+static TexturePtr D_80B958AC[] = { object_zog_Tex_024750, object_zog_Tex_024F50, object_zog_Tex_025750 };
-static TexturePtr D_80B958B8[] = { &object_zog_Tex_025F50, &object_zog_Tex_026750 };
+static TexturePtr D_80B958B8[] = { object_zog_Tex_025F50, object_zog_Tex_026750 };
static AnimationHeader* D_80B958C0[] = {
&object_zog_Anim_00FC0C, &object_zog_Anim_0106B0, &object_zog_Anim_0166F4, &object_zog_Anim_017170,
diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c
index e29d0643da..d03002dd7d 100644
--- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c
+++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c
@@ -5,6 +5,7 @@
*/
#include "z_en_zot.h"
+#include "objects/object_zo/object_zo.h"
#define FLAGS 0x00000019
@@ -30,21 +31,6 @@ void func_80B990A4(EnZot* this, GlobalContext* globalCtx);
void func_80B992C0(EnZot* this, GlobalContext* globalCtx);
void func_80B99384(EnZot* this, GlobalContext* globalCtx);
-extern AnimationHeader D_06002898;
-extern AnimationHeader D_06004248;
-extern UNK_PTR D_060050A0;
-extern UNK_PTR D_060058A0;
-extern UNK_PTR D_060060A0;
-extern FlexSkeletonHeader D_0600D208;
-extern AnimationHeader D_0600DE20;
-extern AnimationHeader D_0600DF54;
-extern AnimationHeader D_0600E400;
-extern AnimationHeader D_0600EDF0;
-extern AnimationHeader D_0600F4E8;
-extern AnimationHeader D_0600FDF0;
-extern AnimationHeader D_06010B18;
-extern AnimationHeader D_06011424;
-
const ActorInit En_Zot_InitVars = {
ACTOR_EN_ZOT,
ACTORCAT_NPC,
@@ -100,8 +86,9 @@ void EnZot_Init(Actor* thisx, GlobalContext* globalCtx2) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = func_80B97100;
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600D208, &D_06004248, this->jointTable, this->morphTable, 20);
- Animation_PlayLoop(&this->skelAnime, &D_0600DE20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_zo_Skel_00D208, &object_zo_Anim_004248, this->jointTable,
+ this->morphTable, 20);
+ Animation_PlayLoop(&this->skelAnime, &object_zo_Anim_00DE20);
this->unk_2F0 = 0;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -249,8 +236,9 @@ void EnZot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80B96BEC(EnZot* this, s16 arg1, u8 arg2) {
static AnimationHeader* sAnimations[] = {
- &D_0600DE20, &D_06002898, &D_0600F4E8, &D_0600E400, &D_0600FDF0,
- &D_06010B18, &D_06011424, &D_0600EDF0, &D_0600DF54, &D_0600DF54,
+ &object_zo_Anim_00DE20, &object_zo_Anim_002898, &object_zo_Anim_00F4E8, &object_zo_Anim_00E400,
+ &object_zo_Anim_00FDF0, &object_zo_Anim_010B18, &object_zo_Anim_011424, &object_zo_Anim_00EDF0,
+ &object_zo_Anim_00DF54, &object_zo_Anim_00DF54,
};
if ((arg1 >= 0) && (arg1 < 10)) {
@@ -1397,10 +1385,10 @@ void EnZot_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnZot_Draw(Actor* thisx, GlobalContext* globalCtx) {
- UNK_PTR sp4C[] = {
- &D_060050A0,
- &D_060058A0,
- &D_060060A0,
+ TexturePtr sp4C[] = {
+ object_zo_Tex_0050A0,
+ object_zo_Tex_0058A0,
+ object_zo_Tex_0060A0,
};
EnZot* this = THIS;
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
index 519d87e7fb..d02bb91da9 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
@@ -5,6 +5,7 @@
*/
#include "z_item_b_heart.h"
+#include "objects/object_gi_hearts/object_gi_hearts.h"
#define FLAGS 0x00000000
@@ -36,9 +37,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
};
-extern Gfx D_06001290[];
-extern Gfx D_06001470[];
-
void ItemBHeart_Init(Actor* thisx, GlobalContext* globalCtx) {
ItemBHeart* this = THIS;
@@ -103,13 +101,13 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (flag || thisx->world.rot.y != 0) {
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06001290);
- gSPDisplayList(POLY_XLU_DISP++, D_06001470);
+ gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001290);
+ gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001470);
} else {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06001290);
- gSPDisplayList(POLY_OPA_DISP++, D_06001470);
+ gSPDisplayList(POLY_OPA_DISP++, object_gi_hearts_DL_001290);
+ gSPDisplayList(POLY_OPA_DISP++, object_gi_hearts_DL_001470);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c
index 651adf6d22..3b00578a22 100644
--- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c
+++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_bell.h"
+#include "objects/object_f52_obj/object_f52_obj.h"
#define FLAGS 0x00000030
@@ -111,14 +112,6 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(1, 0xE),
};
-extern CollisionHeader D_06001BA8;
-extern Gfx D_06000570[]; // Bell post
-extern Gfx D_06000698[]; // Bell
-extern Gfx D_060007A8[]; // Bell Base
-extern Gfx D_06000840[]; // Bell Shadow
-extern Gfx D_060008D0[]; // Bell Hook
-extern Gfx D_06000960[]; // Bell Designs
-
s32 func_80A35510(ObjBell* this, s32 arg1) {
Vec3f bumperPos;
Vec3f worldPos;
@@ -233,10 +226,10 @@ void func_80A359B4(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000698);
- gSPDisplayList(POLY_OPA_DISP++, D_060008D0);
- gSPDisplayList(POLY_OPA_DISP++, D_06000960);
- gSPDisplayList(POLY_OPA_DISP++, D_060007A8);
+ gSPDisplayList(POLY_OPA_DISP++, object_f52_obj_DL_000698);
+ gSPDisplayList(POLY_OPA_DISP++, object_f52_obj_DL_0008D0);
+ gSPDisplayList(POLY_OPA_DISP++, object_f52_obj_DL_000960);
+ gSPDisplayList(POLY_OPA_DISP++, object_f52_obj_DL_0007A8);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -247,7 +240,7 @@ void func_80A35B18(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000570);
+ gSPDisplayList(POLY_OPA_DISP++, object_f52_obj_DL_000570);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -257,7 +250,7 @@ void func_80A35BD4(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06000840);
+ gSPDisplayList(POLY_XLU_DISP++, object_f52_obj_DL_000840);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -265,7 +258,7 @@ void ObjBell_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjBell* this = THIS;
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06001BA8);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_f52_obj_Colheader_001BA8);
Actor_SetScale(&this->dyna.actor, 0.08f);
Collider_InitAndSetSphere(globalCtx, &this->collider1, &this->dyna.actor, &sCylinderInit1);
Collider_InitAndSetSphere(globalCtx, &this->collider2, &this->dyna.actor, &sCylinderInit2);
diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c
index ce1a6c4011..c4af83d594 100644
--- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c
+++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c
@@ -7,6 +7,7 @@
#include "z_obj_boyo.h"
#include "overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+#include "objects/object_boyo/object_boyo.h"
#define FLAGS 0x00000010
@@ -56,9 +57,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern Gfx D_06000300[];
-extern AnimatedMaterial D_06000E88;
-
void ObjBoyo_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjBoyo* this = THIS;
@@ -67,7 +65,7 @@ void ObjBoyo_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
Collider_UpdateCylinder(&this->actor, &this->collider);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
- this->unk_190 = Lib_SegmentedToVirtual(&D_06000E88);
+ this->unk_190 = Lib_SegmentedToVirtual(object_boyo_Matanimheader_000E88);
}
void ObjBoyo_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
@@ -182,5 +180,5 @@ void ObjBoyo_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjBoyo* this = THIS;
AnimatedMat_Draw(globalCtx, this->unk_190);
- Gfx_DrawDListOpa(globalCtx, D_06000300);
+ Gfx_DrawDListOpa(globalCtx, object_boyo_DL_000300);
}
diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
index 2ac00d73f3..4dd0a78b1d 100644
--- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
+++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
@@ -23,7 +23,7 @@ const ActorInit Obj_Chan_InitVars = {
ACTOR_OBJ_CHAN,
ACTORCAT_BG,
FLAGS,
- OBJECT_OBJECT_UNSET_CHAN,
+ OBJECT_OBJ_CHAN,
sizeof(ObjChan),
(ActorFunc)ObjChan_Init,
(ActorFunc)ObjChan_Destroy,
diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c
index 91e4e24c7b..6e14ea0967 100644
--- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c
+++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c
@@ -20,7 +20,7 @@ const ActorInit Obj_Danpeilift_InitVars = {
ACTOR_OBJ_DANPEILIFT,
ACTORCAT_BG,
FLAGS,
- OBJECT_OBJECT_UNSET_DANPEILIFT,
+ OBJECT_OBJ_DANPEILIFT,
sizeof(ObjDanpeilift),
(ActorFunc)ObjDanpeilift_Init,
(ActorFunc)ObjDanpeilift_Destroy,
diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
index fde316a812..cec3720d25 100644
--- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
+++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_dinner.h"
+#include "objects/object_obj_dinner/object_obj_dinner.h"
#define FLAGS 0x00000020
@@ -19,7 +20,7 @@ const ActorInit Obj_Dinner_InitVars = {
ACTOR_OBJ_DINNER,
ACTORCAT_PROP,
FLAGS,
- OBJECT_OBJECT_UNSET_DINNER,
+ OBJECT_OBJ_DINNER,
sizeof(ObjDinner),
(ActorFunc)ObjDinner_Init,
(ActorFunc)ObjDinner_Destroy,
@@ -27,8 +28,6 @@ const ActorInit Obj_Dinner_InitVars = {
(ActorFunc)ObjDinner_Draw,
};
-extern Gfx D_060011E0[];
-
void ObjDinner_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjDinner* this = THIS;
@@ -49,7 +48,7 @@ void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060011E0);
+ gSPDisplayList(POLY_OPA_DISP++, object_obj_dinner_DL_0011E0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c
index cb6aabaff7..be348ef1c3 100644
--- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c
+++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_ending.h"
+#include "objects/object_ending_obj/object_ending_obj.h"
#define FLAGS 0x00000030
@@ -26,14 +27,9 @@ const ActorInit Obj_Ending_InitVars = {
(ActorFunc)ObjEnding_Draw,
};
-extern Gfx D_060003D0[];
-extern Gfx D_060031A0[];
-extern Gfx D_06003440[];
-extern AnimatedMaterial D_06001FF8;
-
static ObjEndingModelInfo sModelInfo[] = {
- { { D_06003440, D_060031A0 }, NULL },
- { { NULL, D_060003D0 }, &D_06001FF8 },
+ { { object_ending_obj_DL_003440, object_ending_obj_DL_0031A0 }, NULL },
+ { { NULL, object_ending_obj_DL_0003D0 }, object_ending_obj_Matanimheader_001FF8 },
};
static InitChainEntry sInitChain[] = {
diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c
index ca6ea9f6f0..23d2dfa7fa 100644
--- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c
+++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c
@@ -53,8 +53,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 20, 14, 0, { 0, 0, 0 } },
};
-extern ColliderCylinderInit D_80A7C790;
-
static s16 objectIds[] = {
GAMEPLAY_KEEP,
GAMEPLAY_KEEP,
diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c
index 30d0b2f0ab..5dac29b659 100644
--- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c
+++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_funen.h"
+#include "objects/object_funen/object_funen.h"
#define FLAGS 0x00000030
@@ -19,8 +20,6 @@ const ActorInit Obj_Funen_InitVars = {
(ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)ObjFunen_Draw,
};
-extern Gfx D_060000D0[];
-
f32 D_80A198D0[] = { 0.1f, 0.024390244f };
void ObjFunen_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -44,6 +43,6 @@ void ObjFunen_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, temp, 0x20, 0x20, 1, 0, temp, 0x20, 0x20));
- gSPDisplayList(POLY_XLU_DISP++, D_060000D0);
+ gSPDisplayList(POLY_XLU_DISP++, object_funen_DL_0000D0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
index 060a4e0c03..95b15c8b11 100644
--- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
+++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_ghaka.h"
+#include "objects/object_ghaka/object_ghaka.h"
#define FLAGS 0x00000029
@@ -42,10 +43,6 @@ static InitChainEntry D_80B3C96C[] = {
ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP),
};
-extern Gfx D_06001A20[];
-extern Gfx D_06001980[];
-extern CollisionHeader D_06003CD0;
-
void func_80B3C260(ObjGhaka* this) {
if (gSaveContext.weekEventReg[20] & 0x20) {
this->dyna.actor.world.pos.z = this->dyna.actor.home.pos.z + 100.0f;
@@ -154,7 +151,7 @@ void ObjGhaka_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, D_80B3C96C);
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
- CollisionHeader_GetVirtual(&D_06003CD0, &colHeader);
+ CollisionHeader_GetVirtual(&object_ghaka_Colheader_003CD0, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 0.0f, 0.0f, 0.0f, 0x4);
if (this->dyna.actor.floorPoly == 0) {
@@ -185,9 +182,9 @@ void ObjGhaka_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06001A20);
+ gSPDisplayList(POLY_OPA_DISP++, object_ghaka_DL_001A20);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06001980);
+ gSPDisplayList(POLY_XLU_DISP++, object_ghaka_DL_001980);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
index d7e0d66332..93578ac40b 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_hana.h"
+#include "objects/object_hana/object_hana.h"
#define FLAGS 0x00000000
@@ -27,8 +28,6 @@ const ActorInit Obj_Hana_InitVars = {
(ActorFunc)ObjHana_Draw,
};
-extern Gfx D_06000500[];
-
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE),
@@ -49,5 +48,5 @@ void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000500);
+ Gfx_DrawDListOpa(globalCtx, object_hana_DL_000500);
}
diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c
index c11fa4903c..b8bef84a84 100644
--- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c
+++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_hgdoor.h"
+#include "objects/object_hgdoor/object_hgdoor.h"
#define FLAGS 0x00100000
@@ -25,13 +26,6 @@ void func_80BD4460(ObjHgdoor* this);
void func_80BD4478(ObjHgdoor* this, GlobalContext* globalCtx);
s32 func_80BD44D0(ObjHgdoor* this, GlobalContext* globalCtx);
-extern CollisionHeader D_06001D10;
-extern CollisionHeader D_060018C0;
-extern Gfx D_06001AB0[];
-extern Gfx D_06001BA8[];
-extern Gfx D_06001670[];
-extern Gfx D_06001768[];
-
const ActorInit Obj_Hgdoor_InitVars = {
ACTOR_OBJ_HGDOOR,
ACTORCAT_PROP,
@@ -80,9 +74,9 @@ void ObjHgdoor_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
if (OBJHGDOOR_IS_RIGHT_DOOR(&this->dyna.actor)) {
- CollisionHeader_GetVirtual(&D_06001D10, &header);
+ CollisionHeader_GetVirtual(&object_hgdoor_Colheader_001D10, &header);
} else {
- CollisionHeader_GetVirtual(&D_060018C0, &header);
+ CollisionHeader_GetVirtual(&object_hgdoor_Colheader_0018C0, &header);
}
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, header);
this->rotation = 0;
@@ -203,11 +197,11 @@ void ObjHgdoor_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (OBJHGDOOR_IS_RIGHT_DOOR(thisx)) {
- gSPDisplayList(POLY_OPA_DISP++, D_06001AB0);
- gSPDisplayList(POLY_OPA_DISP++, D_06001BA8);
+ gSPDisplayList(POLY_OPA_DISP++, object_hgdoor_DL_001AB0);
+ gSPDisplayList(POLY_OPA_DISP++, object_hgdoor_DL_001BA8);
} else {
- gSPDisplayList(POLY_OPA_DISP++, D_06001670);
- gSPDisplayList(POLY_OPA_DISP++, D_06001768);
+ gSPDisplayList(POLY_OPA_DISP++, object_hgdoor_DL_001670);
+ gSPDisplayList(POLY_OPA_DISP++, object_hgdoor_DL_001768);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c
index cf84a1bd7e..c1a308baec 100644
--- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c
+++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_hsstump.h"
+#include "objects/object_hsstump/object_hsstump.h"
#define FLAGS 0x00000010
@@ -38,9 +39,6 @@ static InitChainEntry sInitChain[] = {
static Vec3f iceSmokeAccel = { 0.0f, 0.0f, 0.0f };
-extern Gfx D_060003B8[];
-extern CollisionHeader D_060011B0;
-
void ObjHsStump_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjHsStump* this = THIS;
@@ -48,7 +46,7 @@ void ObjHsStump_Init(Actor* thisx, GlobalContext* globalCtx) {
this->isHidden = OBJHSSTUMP_GET_ISHIDDEN(thisx);
this->switchFlag = OBJHSSTUMP_GET_SWITCHFLAG(thisx); // Must be thisx to match
DynaPolyActor_Init(&this->dyna, 1);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060011B0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hsstump_Colheader_0011B0);
switch (this->isHidden) {
case true:
if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
@@ -146,5 +144,5 @@ void ObjHsStump_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHsStump_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_060003B8);
+ Gfx_DrawDListOpa(globalCtx, object_hsstump_DL_0003B8);
}
diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
index 0c4f8f63e1..6ccc8217dd 100644
--- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
+++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
@@ -934,7 +934,7 @@ void ObjIceblock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (D_80A26E7C == NULL) {
- D_80A26E7C = Lib_SegmentedToVirtual(&object_ice_block_Matanimheader_000328);
+ D_80A26E7C = Lib_SegmentedToVirtual(object_ice_block_Matanimheader_000328);
}
if (!(this->unk_1B0 & 8)) {
@@ -1510,7 +1510,7 @@ void func_80A26B64(ObjIceblock* this, GlobalContext* globalCtx) {
void func_80A26B74(ObjIceblock* this, GlobalContext* globalCtx) {
Gfx_DrawDListXlu(globalCtx, object_ice_block_DL_0001A0);
if (OBJICEBLOCK_GET_1(&this->dyna.actor) && (this->unk_2B4 > 0.0f)) {
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_ice_block_Matanimheader_0009D0));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_ice_block_Matanimheader_0009D0));
Gfx_DrawDListXlu(globalCtx, object_ice_block_DL_0007F0);
}
}
@@ -1539,7 +1539,7 @@ void func_80A26BF8(ObjIceblock* this, GlobalContext* globalCtx) {
}
if (OBJICEBLOCK_GET_1(&this->dyna.actor) && (this->unk_2B4 > 0.0f)) {
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_ice_block_Matanimheader_0009D0));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_ice_block_Matanimheader_0009D0));
Matrix_SetStateRotationAndTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y - 20.0f,
this->dyna.actor.world.pos.z, &this->dyna.actor.shape.rot);
Matrix_Scale(this->unk_2B4, this->unk_2B4, this->unk_2B4, MTXMODE_APPLY);
diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c
index 4334659864..a70d146009 100644
--- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c
+++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_jg_gakki.h"
+#include "objects/object_jg/object_jg.h"
#define FLAGS 0x00000020
@@ -27,22 +28,19 @@ const ActorInit Obj_Jg_Gakki_InitVars = {
(ActorFunc)ObjJgGakki_Draw,
};
-extern AnimationHeader D_0601B1E8; // gGoronElderDrumAnim
-extern SkeletonHeader D_0601B210; // gGoronElderDrumSkel
-
void ObjJgGakki_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjJgGakki* this = THIS;
- f32 frameCount = Animation_GetLastFrame(&D_0601B1E8);
+ f32 frameCount = Animation_GetLastFrame(&gGoronElderDrumAnim);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_Init(globalCtx, &this->skelAnime, &D_0601B210, NULL, NULL, NULL, 0);
+ SkelAnime_Init(globalCtx, &this->skelAnime, &gGoronElderDrumSkel, NULL, NULL, NULL, 0);
if (((globalCtx->sceneNum == SCENE_SPOT00) && (gSaveContext.sceneSetupIndex == 7)) &&
(globalCtx->csCtx.unk_12 == 0)) {
- Animation_Change(&this->skelAnime, &D_0601B1E8, 1.0f, frameCount, frameCount, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &gGoronElderDrumAnim, 1.0f, frameCount, frameCount, 2, 0.0f);
} else if ((globalCtx->sceneNum == SCENE_17SETUGEN) || (globalCtx->sceneNum == SCENE_10YUKIYAMANOMURA)) {
- Animation_Change(&this->skelAnime, &D_0601B1E8, 1.0f, 0.0f, frameCount, 2, 0.0f);
+ Animation_Change(&this->skelAnime, &gGoronElderDrumAnim, 1.0f, 0.0f, frameCount, 2, 0.0f);
} else {
Actor_MarkForDeath(&this->actor);
}
diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c
index 6782e15ebe..4f8bc1d3a7 100644
--- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c
+++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_kepn_koya.h"
+#include "objects/object_kepn_koya/object_kepn_koya.h"
#define FLAGS 0x00000000
@@ -32,16 +33,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP),
};
-extern CollisionHeader D_0600805C;
-extern Gfx D_06003478[];
-
void ObjKepnKoya_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjKepnKoya* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600805C);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_kepn_koya_Colheader_00805C);
if (this->dyna.bgId == BG_ACTOR_MAX) {
Actor_MarkForDeath(&this->dyna.actor);
}
@@ -57,5 +55,5 @@ void ObjKepnKoya_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjKepnKoya_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06003478);
+ Gfx_DrawDListOpa(globalCtx, object_kepn_koya_DL_003478);
}
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
index 185361c41b..bd86f2dea9 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_lightblock.h"
+#include "objects/object_lightblock/object_lightblock.h"
#define FLAGS 0x00000000
@@ -72,9 +73,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP),
};
-extern CollisionHeader D_06000B80;
extern Gfx D_801AEF88[];
-extern Gfx D_06000178[];
extern Gfx D_801AEFA0[];
void func_80AF3910(ObjLightblock* this, GlobalContext* globalCtx) {
@@ -96,7 +95,7 @@ void ObjLightblock_Init(Actor* thisx, GlobalContext* globalCtx) {
if (Flags_GetSwitch(globalCtx, LIGHTBLOCK_DESTROYED(&this->dyna.actor))) {
Actor_MarkForDeath(&this->dyna.actor);
} else {
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000B80);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lightblock_Colheader_000B80);
Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
this->collider.dim.radius = typeVars->radius;
@@ -195,13 +194,13 @@ void ObjLightblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, this->alpha);
- gSPDisplayList(POLY_XLU_DISP++, D_06000178);
+ gSPDisplayList(POLY_XLU_DISP++, object_lightblock_DL_000178);
} else {
func_8012C28C(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 255, 255, 255);
- gSPDisplayList(POLY_OPA_DISP++, D_06000178);
+ gSPDisplayList(POLY_OPA_DISP++, object_lightblock_DL_000178);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
index 3d8b8d307d..ae7b508bd2 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_lightswitch.h"
+#include "objects/object_lightswitch/object_lightswitch.h"
#define FLAGS 0x00000010
@@ -26,13 +27,6 @@ void ObjLightSwitch_SetupDisabled(ObjLightswitch* this);
void ObjLightSwitch_Disabled(ObjLightswitch* this, GlobalContext* globalCtx);
void ObjLightswitch_Idle(ObjLightswitch* this, GlobalContext* globalCtx);
-extern Gfx D_06000260[];
-extern Gfx D_06000398[];
-extern Gfx D_06000408[];
-extern Gfx D_06000C20[];
-extern Gfx D_06000420[];
-extern Gfx D_06001420[];
-
const ActorInit Obj_Lightswitch_InitVars = {
ACTOR_OBJ_LIGHTSWITCH,
ACTORCAT_SWITCH,
@@ -73,10 +67,10 @@ static ColliderJntSphInit sJntSphInit = {
};
// different face addresses for (sleep -> waking -> awake) of light switch face
-static Gfx* sLightswitchFaceGfx[] = {
- D_06000C20,
- D_06000420,
- D_06001420,
+static TexturePtr sLightswitchFaceGfx[] = {
+ object_lightswitch_Tex_000C20,
+ object_lightswitch_Tex_000420,
+ object_lightswitch_Tex_001420,
};
static Color_RGBA8 sLightswitchEffectPrimColor = { 255, 255, 160, 160 };
@@ -385,7 +379,7 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) {
tempPos.z = this->actor.world.pos.z;
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sLightswitchFaceGfx[this->faceState]));
- gSPDisplayList(POLY_OPA_DISP++, D_06000260);
+ gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000260);
tempRot.x = this->actor.shape.rot.x;
tempRot.y = this->actor.shape.rot.y;
@@ -393,13 +387,13 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) {
Matrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000398);
+ gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000398);
tempRot.z = this->actor.shape.rot.z - this->edgeRot;
Matrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000408);
+ gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000408);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -421,7 +415,7 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) {
tempPos.z = this->actor.world.pos.z;
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sLightswitchFaceGfx[this->faceState]));
- gSPDisplayList(POLY_XLU_DISP++, D_06000260);
+ gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000260);
tempRot.x = this->actor.shape.rot.x;
tempRot.y = this->actor.shape.rot.y;
@@ -429,13 +423,13 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) {
Matrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06000398);
+ gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000398);
tempRot.z = this->actor.shape.rot.z - this->edgeRot;
Matrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06000408);
+ gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000408);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c
index 3161f708ef..353faa6d3f 100644
--- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c
+++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_milk_bin.h"
+#include "objects/object_obj_milk_bin/object_obj_milk_bin.h"
#define FLAGS 0x00000000
@@ -16,13 +17,12 @@ void ObjMilkBin_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjMilkBin_Draw(Actor* thisx, GlobalContext* globalCtx);
// gMilkBinMilkJarDL
-extern Gfx D_060004B0[];
const ActorInit Obj_Milk_Bin_InitVars = {
ACTOR_OBJ_MILK_BIN,
ACTORCAT_PROP,
FLAGS,
- OBJECT_OBJECT_UNSET_MILK_BIN,
+ OBJECT_OBJ_MILK_BIN,
sizeof(ObjMilkBin),
(ActorFunc)ObjMilkBin_Init,
(ActorFunc)ObjMilkBin_Destroy,
@@ -100,6 +100,6 @@ void ObjMilkBin_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjMilkBin* this = THIS;
if (!(this->disableDraw & 1)) {
- Gfx_DrawDListOpa(globalCtx, D_060004B0);
+ Gfx_DrawDListOpa(globalCtx, gMilkBinMilkJarDL);
}
}
diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c
index 6bacc61642..c44fdad348 100644
--- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c
+++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_moon_stone.h"
+#include "objects/object_gi_reserve00/object_gi_reserve00.h"
#define FLAGS 0x00100010
@@ -36,10 +37,6 @@ const ActorInit Obj_Moon_Stone_InitVars = {
(ActorFunc)ObjMoonStone_Draw,
};
-extern AnimatedMaterial D_06001C60;
-extern Gfx D_06000D78[];
-extern Gfx D_06000C80[];
-
void ObjMoonStone_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjMoonStone* this = THIS;
@@ -153,11 +150,11 @@ void ObjMoonStone_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06001C60));
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_gi_reserve00_Matanimheader_001C60));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000D78);
+ gSPDisplayList(POLY_OPA_DISP++, object_gi_reserve00_DL_000D78);
Matrix_NormalizeXYZ(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_06000C80);
+ gSPDisplayList(POLY_XLU_DISP++, object_gi_reserve00_DL_000C80);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c
index 45bb9ffca9..17490112ff 100644
--- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c
+++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_raillift.h"
+#include "objects/object_raillift/object_raillift.h"
#define FLAGS 0x00000010
@@ -26,12 +27,6 @@ void ObjRaillift_Teleport(ObjRaillift* this, GlobalContext* globalCtx);
void ObjRaillift_Wait(ObjRaillift* this, GlobalContext* globalCtx);
void ObjRaillift_Move(ObjRaillift* this, GlobalContext* globalCtx);
-extern CollisionHeader D_06004FF8;
-extern CollisionHeader D_060048D0;
-extern Gfx D_06004BF0[];
-extern Gfx D_06000208[];
-extern Gfx D_060071B8[];
-
const ActorInit Obj_Raillift_InitVars = {
ACTOR_OBJ_RAILLIFT,
ACTORCAT_BG,
@@ -51,7 +46,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-static CollisionHeader* sColHeaders[] = { &D_06004FF8, &D_060048D0 };
+static CollisionHeader* sColHeaders[] = { &object_raillift_Colheader_004FF8, &object_raillift_Colheader_0048D0 };
void ObjRaillift_UpdatePosition(ObjRaillift* this, s32 idx) {
Math_Vec3s_ToVec3f(&this->dyna.actor.world.pos, &this->points[idx]);
@@ -275,7 +270,7 @@ void ObjRaillift_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames, 0, 32, 32, 1, 0, 0, 32,
32, 0, 0, 0, 160));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06004BF0);
+ gSPDisplayList(POLY_OPA_DISP++, object_raillift_DL_004BF0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -283,12 +278,12 @@ void ObjRaillift_Draw(Actor* thisx, GlobalContext* globalCtx) {
The non-colorful platforms are the ones found in Woodfall Temple
*/
void ObjRaillift_DrawDekuFlowerPlatform(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_06000208);
+ Gfx_DrawDListOpa(globalCtx, object_raillift_DL_000208);
}
/*
The colorful platforms are the ones found in Deku Palace
*/
void ObjRaillift_DrawDekuFlowerPlatformColorful(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListOpa(globalCtx, D_060071B8);
+ Gfx_DrawDListOpa(globalCtx, object_raillift_DL_0071B8);
}
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index d1fb1b23ec..5033a1dc08 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -7,6 +7,7 @@
#include "z_obj_syokudai.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
+#include "objects/object_syokudai/object_syokudai.h"
#define FLAGS 0x00000410
@@ -17,10 +18,6 @@ void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx);
-extern Gfx D_060003A0[]; // sObjectSyokudaiTypeSwitchCausesFlameDL
-extern Gfx D_06000870[]; // sObjectSyokudaiTypeNoSwitchDL
-extern Gfx D_06000B90[]; // sObjectSyokudaiTypeFlameCausesSwitchDL
-
const ActorInit Obj_Syokudai_InitVars = {
ACTOR_OBJ_SYOKUDAI,
ACTORCAT_PROP,
@@ -82,7 +79,11 @@ static InitChainEntry sInitChain[] = {
static u8 sColTypes[] = { COLTYPE_METAL, COLTYPE_WOOD, COLTYPE_WOOD };
-static Gfx* sDLists[] = { D_060003A0, D_06000B90, D_06000870 };
+static Gfx* sDLists[] = {
+ gObjectSyokudaiTypeSwitchCausesFlameDL,
+ gObjectSyokudaiTypeFlameCausesSwitchDL,
+ gObjectSyokudaiTypeNoSwitchDL,
+};
static s32 sNumLitTorchesInGroup;
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
index 70a144238d..0bdb9a6ea8 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
@@ -50,7 +50,7 @@ const ActorInit Obj_Tokeidai_InitVars = {
ACTOR_OBJ_TOKEIDAI,
ACTORCAT_PROP,
FLAGS,
- OBJECT_OBJECT_UNSET_TOKEIDAI,
+ OBJECT_OBJ_TOKEIDAI,
sizeof(ObjTokeidai),
(ActorFunc)ObjTokeidai_Init,
(ActorFunc)ObjTokeidai_Destroy,
diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
index 7b756a10f8..d767e8b3b3 100644
--- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
+++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_tree.h"
+#include "objects/object_tree/object_tree.h"
#define FLAGS 0x02000000
@@ -88,10 +89,6 @@ static DamageTable sDamageTable = {
static CollisionCheckInfoInit2 sColchkInfoInit = { 8, 0, 0, 0, MASS_HEAVY };
-extern Gfx D_06000680[];
-extern Gfx D_060007C8[];
-extern CollisionHeader D_06001B2C;
-
void ObjTree_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ObjTree* this = THIS;
@@ -103,7 +100,7 @@ void ObjTree_Init(Actor* thisx, GlobalContext* globalCtx) {
} else {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
- CollisionHeader_GetVirtual(&D_06001B2C, &colHeader);
+ CollisionHeader_GetVirtual(&object_tree_Colheader_001B2C, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
}
@@ -190,11 +187,11 @@ void ObjTree_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_06000680);
+ gSPDisplayList(POLY_OPA_DISP++, object_tree_DL_000680);
Matrix_InsertRotation(xRot, 0, zRot, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, D_060007C8);
+ gSPDisplayList(POLY_OPA_DISP++, object_tree_DL_0007C8);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c
index 2a1f4bf30c..8ed03a8ef9 100644
--- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c
+++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c
@@ -20,7 +20,7 @@ const ActorInit Obj_Usiyane_InitVars = {
ACTOR_OBJ_USIYANE,
ACTORCAT_PROP,
FLAGS,
- OBJECT_OBJECT_UNSET_USIYANE,
+ OBJECT_OBJ_USIYANE,
sizeof(ObjUsiyane),
(ActorFunc)ObjUsiyane_Init,
(ActorFunc)ObjUsiyane_Destroy,
diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c
index ea27c1ad99..4fc6200c50 100644
--- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c
+++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_visiblock.h"
+#include "objects/object_visiblock/object_visiblock.h"
#define FLAGS 0x00000080
@@ -33,15 +34,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-extern CollisionHeader D_06000AD0;
-extern Gfx D_06000140[];
-
void ObjVisiblock_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjVisiblock* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000AD0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_visiblock_Colheader_000AD0);
}
void ObjVisiblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@@ -51,5 +49,5 @@ void ObjVisiblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjVisiblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
- Gfx_DrawDListXlu(globalCtx, D_06000140);
+ Gfx_DrawDListXlu(globalCtx, object_visiblock_DL_000140);
}
diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
index ee0f49bc0a..7addf258bc 100644
--- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
+++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
@@ -5,6 +5,8 @@
*/
#include "z_obj_warpstone.h"
+#include "objects/object_sek/object_sek.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000009
@@ -20,10 +22,6 @@ s32 ObjWarpstone_BeginOpeningCutscene(ObjWarpstone* this, GlobalContext* globalC
s32 ObjWarpstone_PlayOpeningCutscene(ObjWarpstone* this, GlobalContext* globalCtx);
s32 ObjWarpstone_OpenedIdle(ObjWarpstone* this, GlobalContext* globalCtx);
-extern Gfx D_04023210[]; // gOwlStatueWhiteFlashDL
-extern Gfx D_060001D0[]; // gOwlStatueClosedDL
-extern Gfx D_06003770[]; // gOwlStatueOpenedDL
-
const ActorInit Obj_Warpstone_InitVars = {
ACTOR_OBJ_WARPSTONE,
ACTORCAT_ITEMACTION,
@@ -60,7 +58,7 @@ static InitChainEntry sInitChain[] = {
ICHAIN_U8(targetMode, 1, ICHAIN_STOP),
};
-static Gfx* sOwlStatueDLs[] = { D_060001D0, D_06003770 };
+static Gfx* sOwlStatueDLs[] = { gOwlStatueClosedDL, gOwlStatueOpenedDL };
void ObjWarpstone_SetupAction(ObjWarpstone* this, ObjWarpstoneActionFunc actionFunc) {
this->actionFunc = actionFunc;
@@ -183,11 +181,11 @@ void ObjWarpstone_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255);
Matrix_InsertZRotation_f((((globalCtx->gameplayFrames * 1500) & 0xFFFF) * M_PI) / 0x8000, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_04023210);
+ gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
Matrix_StatePop();
Matrix_InsertZRotation_f((~((globalCtx->gameplayFrames * 1200) & 0xFFFF) * M_PI) / 0x8000, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_04023210);
+ gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c
index 3d34f1bf4b..3212740494 100644
--- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c
+++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_yado.h"
+#include "objects/object_yado_obj/object_yado_obj.h"
#define FLAGS 0x00000030
@@ -33,15 +34,11 @@ static InitChainEntry sInitChain[] = {
AnimatedMaterial* D_80C16470;
-extern Gfx D_06000320[];
-extern Gfx D_06000430[];
-extern AnimatedMaterial D_060012E8;
-
void ObjYado_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjYado* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
- D_80C16470 = (AnimatedMaterial*)Lib_SegmentedToVirtual(&D_060012E8);
+ D_80C16470 = (AnimatedMaterial*)Lib_SegmentedToVirtual(object_yado_obj_Matanimheader_0012E8);
this->isNight = gSaveContext.isNight;
}
@@ -69,8 +66,8 @@ void ObjYado_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
AnimatedMat_Draw(globalCtx, D_80C16470);
- Gfx_DrawDListOpa(globalCtx, D_06000430);
- Gfx_DrawDListXlu(globalCtx, D_06000320);
+ Gfx_DrawDListOpa(globalCtx, object_yado_obj_DL_000430);
+ Gfx_DrawDListXlu(globalCtx, object_yado_obj_DL_000320);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
index e79af5a3c8..5668371fbe 100644
--- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
+++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
@@ -20,7 +20,7 @@ const ActorInit Obj_Yasi_InitVars = {
ACTOR_OBJ_YASI,
ACTORCAT_PROP,
FLAGS,
- OBJECT_OBJECT_UNSET_YASI,
+ OBJECT_OBJ_YASI,
sizeof(ObjYasi),
(ActorFunc)ObjYasi_Init,
(ActorFunc)ObjYasi_Destroy,
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 0c0a722793..3195c78777 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -554,7 +554,7 @@ void func_808DD3C8(Actor* thisx, GlobalContext* globalCtx2) {
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_08EBE0));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gDust5Tex));
}
Matrix_InsertTranslation(spC4.x, spC4.y, spC4.z, MTXMODE_NEW);
@@ -629,7 +629,7 @@ void func_808DD970(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_08EBE0));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gDust5Tex));
gSPClearGeometryMode(POLY_XLU_DISP++, G_LIGHTING);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
diff --git a/tools/ZAPDConfigs/MM/ObjectList_MM.txt b/tools/ZAPDConfigs/MM/ObjectList_MM.txt
index 5d8968d973..c3848574c5 100644
--- a/tools/ZAPDConfigs/MM/ObjectList_MM.txt
+++ b/tools/ZAPDConfigs/MM/ObjectList_MM.txt
@@ -394,7 +394,7 @@ OBJECT_FALL
OBJECT_HANAREYAMA_OBJ
OBJECT_CRACE_OBJECT
OBJECT_DNQ
-OBJECT_OBJECT_UNSET_TOKEIDAI
+OBJECT_OBJ_TOKEIDAI
OBJECT_EG
OBJECT_TRU
OBJECT_TRT
@@ -534,13 +534,13 @@ OBJECT_MASK_KYOJIN
OBJECT_GI_RESERVE_C_01
OBJECT_ZOD
OBJECT_KUMO30
-OBJECT_OBJECT_UNSET_YASI
+OBJECT_OBJ_YASI
OBJECT_MASK_ROMERNY
OBJECT_TANRON1
OBJECT_TANRON2
OBJECT_TANRON3
OBJECT_GI_MAGICMUSHROOM
-OBJECT_OBJECT_UNSET_CHAN
+OBJECT_OBJ_CHAN
OBJECT_GI_MASK10
OBJECT_ZOS
OBJECT_MASK_POSTHAT
@@ -578,7 +578,7 @@ OBJECT_TANRON5
OBJECT_DT
OBJECT_GI_MASK03
OBJECT_CHA
-OBJECT_OBJECT_UNSET_DINNER
+OBJECT_OBJ_DINNER
OBJECT_GI_RESERVE_B_01
OBJECT_LASTDAY
OBJECT_BAI
@@ -597,7 +597,7 @@ OBJECT_GI_SCHEDULE
OBJECT_GI_STONEMASK
OBJECT_ZORABAND
OBJECT_KEPN_KOYA
-OBJECT_OBJECT_UNSET_USIYANE
+OBJECT_OBJ_USIYANE
OBJECT_GI_MASK05
OBJECT_GI_MASK11
OBJECT_GI_MASK20
@@ -607,7 +607,7 @@ OBJECT_MASK_YOFUKASI
OBJECT_MASK_MEOTO
OBJECT_MASK_DANCER
OBJECT_KZSAKU
-OBJECT_OBJECT_UNSET_MILK_BIN
+OBJECT_OBJ_MILK_BIN
OBJECT_RANDOM_OBJ
OBJECT_KUJIYA
OBJECT_KITAN
@@ -625,7 +625,7 @@ OBJECT_SYOTEN
OBJECT_MOONEND
OBJECT_OB
OBJECT_GI_BOTTLE_04
-OBJECT_OBJECT_UNSET_DANPEILIFT
+OBJECT_OBJ_DANPEILIFT
OBJECT_WDOR01
OBJECT_WDOR02
OBJECT_WDOR03
@@ -640,4 +640,4 @@ OBJECT_GI_MASK22
OBJECT_LBFSHOT
OBJECT_FUSEN
OBJECT_ENDING_OBJ
-OBJECT_GI_MASK13
\ No newline at end of file
+OBJECT_GI_MASK13
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 2d897a3ecb..1f6a037949 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -211,9 +211,6 @@ D_0200B998 = 0x0200B998;
D_04000320 = 0x04000320;
D_040003E0 = 0x040003E0;
-D_040008D0 = 0x040008D0;
-D_04001D00 = 0x04001D00;
-D_040021A8 = 0x040021A8;
D_040032B0 = 0x040032B0;
D_0400CF48 = 0x0400CF48;
D_0400CF58 = 0x0400CF58;
@@ -382,18 +379,9 @@ D_0400E408 = 0x0400E408;
D_0400E410 = 0x0400E410;
D_0400E418 = 0x0400E418;
D_0400E430 = 0x0400E430;
-D_0400EB7C = 0x0400EB7C;
-D_0400ED80 = 0x0400ED80;
-D_0400E710 = 0x0400E710;
-D_04011518 = 0x04011518;
-D_040117A8 = 0x040117A8;
-D_040118D8 = 0x040118D8;
-D_04011BD0 = 0x04011BD0;
-D_040127E8 = 0x040127E8;
D_04012860 = 0x04012860;
D_040128BC = 0x040128BC;
D_04014560 = 0x04014560;
-D_04014570 = 0x04014570;
D_04015DB0 = 0x04015DB0;
D_04015FA0 = 0x04015FA0;
D_04016360 = 0x04016360;
@@ -403,10 +391,7 @@ D_0401A590 = 0x0401A590;
D_0401A620 = 0x0401A620;
D_0401ACF0 = 0x0401ACF0;
D_0401ED00 = 0x0401ED00;
-D_0401F740 = 0x0401F740;
-D_0401F7C0 = 0x0401F7C0;
-D_0401F8C0 = 0x0401F8C0;
-D_0401FA40 = 0x0401FA40;
+D_0401F0F0 = 0x0401F0F0;
D_04020658 = 0x04020658;
D_04020BB8 = 0x04020BB8;
D_04020D00 = 0x04020D00;
@@ -435,13 +420,6 @@ D_04029CB0 = 0x04029CB0;
D_04029CF0 = 0x04029CF0;
D_04029D20 = 0x04029D20;
D_0402AF58 = 0x0402AF58;
-D_0402B494 = 0x0402B494;
-D_0402C818 = 0x0402C818;
-D_0402C890 = 0x0402C890;
-D_0402C908 = 0x0402C908;
-D_0402C980 = 0x0402C980;
-D_0402C9F8 = 0x0402C9F8;
-D_0402CA98 = 0x0402CA98;
D_0402E510 = 0x0402E510;
D_0402E65C = 0x0402E65C;
D_0402F028 = 0x0402F028;
@@ -453,14 +431,6 @@ D_04035710 = 0x04035710;
D_040367B0 = 0x040367B0;
D_040377B0 = 0x040377B0;
D_04037850 = 0x04037850;
-D_040378F0 = 0x040378F0;
-D_04037DF0 = 0x04037DF0;
-D_040382F0 = 0x040382F0;
-D_040387F0 = 0x040387F0;
-D_04038CF0 = 0x04038CF0;
-D_040391F0 = 0x040391F0;
-D_040396F0 = 0x040396F0;
-D_04039BF0 = 0x04039BF0;
D_0403A0F0 = 0x0403A0F0;
D_0403C190 = 0x0403C190;
D_0403F230 = 0x0403F230;
@@ -482,28 +452,15 @@ D_040549A8 = 0x040549A8;
D_04054A90 = 0x04054A90;
D_04054C90 = 0x04054C90;
D_04054F18 = 0x04054F18;
-D_04054F20 = 0x04054F20;
-D_04055628 = 0x04055628;
D_04058BA0 = 0x04058BA0;
D_0405AAB0 = 0x0405AAB0;
D_0405AED0 = 0x0405AED0;
-D_0405B6F0 = 0x0405B6F0;
D_0405BEF0 = 0x0405BEF0;
-D_0405C6F0 = 0x0405C6F0;
D_0405CEF0 = 0x0405CEF0;
D_0405E6F0 = 0x0405E6F0;
D_0405F6F0 = 0x0405F6F0;
-D_0405F7C0 = 0x0405F7C0;
D_0405FFC0 = 0x0405FFC0;
-D_040607C0 = 0x040607C0;
-D_04060FC0 = 0x04060FC0;
D_040617C0 = 0x040617C0;
-D_04061FC0 = 0x04061FC0;
-D_04061FE0 = 0x04061FE0;
-D_04062000 = 0x04062000;
-D_04062020 = 0x04062020;
-D_04062040 = 0x04062040;
-D_04062060 = 0x04062060;
D_040622C0 = 0x040622C0;
D_0406A800 = 0x0406A800;
D_0406AB30 = 0x0406AB30;
@@ -536,13 +493,7 @@ D_04081628 = 0x04081628;
D_04083534 = 0x04083534;
D_04085640 = 0x04085640;
D_0408DBE0 = 0x0408DBE0;
-D_0408DFE0 = 0x0408DFE0;
-D_0408E3E0 = 0x0408E3E0;
-D_0408E7E0 = 0x0408E7E0;
D_0408EBE0 = 0x0408EBE0;
-D_0408EFE0 = 0x0408EFE0;
-D_0408F3E0 = 0x0408F3E0;
-D_0408F7E0 = 0x0408F7E0;
D_04091BE0 = 0x04091BE0;
D_04091CE0 = 0x04091CE0;
D_04091DE0 = 0x04091DE0;
@@ -552,7 +503,6 @@ D_040923E0 = 0x040923E0;
// segment 0x05
-D_05000C40 = 0x05000C40;
D_05001D20 = 0x05001D20;
D_05002FA0 = 0x05002FA0;
D_050061E8 = 0x050061E8;
@@ -560,16 +510,12 @@ D_05006420 = 0x05006420;
D_050066B0 = 0x050066B0;
D_05006760 = 0x05006760;
D_05007498 = 0x05007498;
-D_05007890 = 0x05007890;
D_050078A0 = 0x050078A0;
D_05007938 = 0x05007938;
-D_05007980 = 0x05007980;
D_05007E00 = 0x05007E00;
D_05008018 = 0x05008018;
D_050085F0 = 0x050085F0;
D_050089D0 = 0x050089D0;
-D_05017EA0 = 0x05017EA0;
-D_05018090 = 0x05018090;
D_050182A8 = 0x050182A8;
D_0501B370 = 0x0501B370;
D_0501B508 = 0x0501B508;
@@ -577,8 +523,6 @@ D_0501BEE0 = 0x0501BEE0;
D_0501BFB8 = 0x0501BFB8;
D_0501C058 = 0x0501C058;
D_0501C118 = 0x0501C118;
-D_0501D980 = 0x0501D980;
-D_050219E0 = 0x050219E0;
D_05021EF0 = 0x05021EF0;
D_05023008 = 0x05023008;
D_0502324C = 0x0502324C;
@@ -588,8 +532,6 @@ D_0502324C = 0x0502324C;
// code
D_06001254 = 0x06001254;
-D_06001290 = 0x06001290;
-D_06001470 = 0x06001470;
D_06001C60 = 0x06001C60;
D_06007390 = 0x06007390;
D_06008AA0 = 0x06008AA0;
@@ -609,6 +551,7 @@ D_06012A80 = 0x06012A80;
D_06013138 = 0x06013138;
// z_en_hy.c
+
D_0600007C = 0x0600007C;
D_0600066C = 0x0600066C;
D_0600071C = 0x0600071C;
@@ -626,10 +569,6 @@ D_0600FC1C = 0x0600FC1C;
D_0600FEE4 = 0x0600FEE4;
D_06010330 = 0x06010330;
-// ovl_Arms_Hook
-
-D_0601D960 = 0x0601D960;
-
// ovl_Bg_Astr_Bombwall
D_06002178 = 0x06002178;
@@ -652,26 +591,6 @@ D_06000C98 = 0x06000C98;
D_060003A0 = 0x060003A0;
D_06000E00 = 0x06000E00;
-// ovl_Bg_Ctower_Gear
-
-D_06010828 = 0x06010828;
-D_06015F30 = 0x06015F30;
-D_060160A0 = 0x060160A0;
-D_06016E70 = 0x06016E70;
-D_06017018 = 0x06017018;
-D_06018118 = 0x06018118;
-D_06018588 = 0x06018588;
-
-// ovl_Bg_Ctower_Rot
-
-D_060129D0 = 0x060129D0;
-D_06012DA0 = 0x06012DA0;
-D_060142E8 = 0x060142E8;
-D_06017220 = 0x06017220;
-D_06017410 = 0x06017410;
-D_060174E0 = 0x060174E0;
-D_06017650 = 0x06017650;
-
// ovl_Bg_Dblue_Balance
D_0600CD10 = 0x0600CD10;
@@ -739,40 +658,18 @@ D_06003E80 = 0x06003E80;
D_06000040 = 0x06000040;
-// ovl_Bg_Fu_Kaiten
-
-D_060005D0 = 0x060005D0;
-D_06002D30 = 0x06002D30;
-
// ovl_Bg_Fu_Mizu
D_06002FC0 = 0x06002FC0;
D_060037D8 = 0x060037D8;
D_060037F8 = 0x060037F8;
-// ovl_Bg_Goron_Oyu
-
-D_06000080 = 0x06000080;
-D_06000158 = 0x06000158;
-D_06000968 = 0x06000968;
-D_06000988 = 0x06000988;
-
// ovl_Bg_Haka_Bombwall
D_06000040 = 0x06000040;
D_06000148 = 0x06000148;
D_06001680 = 0x06001680;
-// ovl_Bg_Haka_Curtain
-
-D_06001410 = 0x06001410;
-D_06001588 = 0x06001588;
-
-// ovl_Bg_Haka_Tomb
-
-D_060007B0 = 0x060007B0;
-D_06000EE8 = 0x06000EE8;
-
// ovl_Bg_Hakugin_Bombwall
D_06009830 = 0x06009830;
@@ -782,15 +679,6 @@ D_06009830 = 0x06009830;
D_0600ACB8 = 0x0600ACB8;
D_0600BF40 = 0x0600BF40;
-// ovl_Bg_Hakugin_Post
-
-D_0600D3B0 = 0x0600D3B0;
-D_0600C1A8 = 0x0600C1A8;
-D_0600C568 = 0x0600C568;
-D_0600CA38 = 0x0600CA38;
-D_0600CEC8 = 0x0600CEC8;
-D_0600D098 = 0x0600D098;
-
// ovl_Bg_Hakugin_Switch
D_06000268 = 0x06000268;
@@ -801,11 +689,6 @@ D_060005C8 = 0x060005C8;
D_060001E0 = 0x060001E0;
D_06000C90 = 0x06000C90;
-// ovl_Bg_Icicle
-
-D_060000D0 = 0x060000D0;
-D_06000294 = 0x06000294;
-
// ovl_Bg_Ikana_Bombwall
D_06000128 = 0x06000128;
@@ -826,11 +709,6 @@ D_06001AD8 = 0x06001AD8;
D_06001E18 = 0x06001E18;
D_06002358 = 0x06002358;
-// ovl_Bg_Ikana_Ray
-
-D_06001100 = 0x06001100;
-D_06001228 = 0x06001228;
-
// ovl_Bg_Ikana_Rotaryroom
D_06004710 = 0x06004710;
@@ -839,22 +717,11 @@ D_06007360 = 0x06007360;
D_06007448 = 0x06007448;
D_06007B68 = 0x06007B68;
-// ovl_Bg_Ikana_Shutter
-
-D_06000CE8 = 0x06000CE8;
-D_06000F28 = 0x06000F28;
-
// ovl_Bg_Ikninside
D_0600CC78 = 0x0600CC78;
D_0600DE48 = 0x0600DE48;
-// ovl_Bg_Iknin_Susceil
-
-D_0600C308 = 0x0600C308;
-D_0600C670 = 0x0600C670;
-D_0600CBAC = 0x0600CBAC;
-
// ovl_Bg_Iknv_Doukutu
D_0600DB60 = 0x0600DB60;
@@ -868,42 +735,16 @@ D_06012700 = 0x06012700;
D_06012728 = 0x06012728;
D_06012788 = 0x06012788;
-// ovl_Bg_Iknv_Obj
-
-D_06011880 = 0x06011880;
-D_060119D4 = 0x060119D4;
-D_060129C8 = 0x060129C8;
-D_06012CA4 = 0x06012CA4;
-D_06013058 = 0x06013058;
-
// ovl_Bg_Ingate
D_060006B0 = 0x060006B0;
D_060016DC = 0x060016DC;
-// ovl_Bg_Inibs_Movebg
-
-D_06001C10 = 0x06001C10;
-D_06001DC0 = 0x06001DC0;
-D_06002598 = 0x06002598;
-D_06006140 = 0x06006140;
-D_060062D8 = 0x060062D8;
-D_06006858 = 0x06006858;
-
// ovl_Bg_Keikoku_Saku
D_06001640 = 0x06001640;
D_06002300 = 0x06002300;
-// ovl_Bg_Keikoku_Spr
-
-D_06000100 = 0x06000100;
-D_060001F8 = 0x060001F8;
-D_06000300 = 0x06000300;
-D_060003F8 = 0x060003F8;
-D_06000500 = 0x06000500;
-D_060005F8 = 0x060005F8;
-
// ovl_Bg_Kin2_Bombwall
D_06000128 = 0x06000128;
@@ -911,53 +752,15 @@ D_060002C0 = 0x060002C0;
D_06000360 = 0x06000360;
D_06000490 = 0x06000490;
-// ovl_Bg_Kin2_Fence
-
-D_06000828 = 0x06000828;
-D_06000908 = 0x06000908;
-
// ovl_Bg_Kin2_Picture
D_06000658 = 0x06000658;
D_06000798 = 0x06000798;
-// ovl_Bg_Ladder
-
-D_060000A0 = 0x060000A0;
-D_060001D8 = 0x060001D8;
-D_060002D0 = 0x060002D0;
-D_06000408 = 0x06000408;
-D_06000500 = 0x06000500;
-D_06000638 = 0x06000638;
-D_06000730 = 0x06000730;
-D_06000868 = 0x06000868;
-
// ovl_Bg_Last_Bwall
D_06000098 = 0x06000098;
-// ovl_Bg_Lbfshot
-
-D_06000228 = 0x06000228;
-D_060014D8 = 0x060014D8;
-
-// ovl_Bg_Lotus
-
-D_06000040 = 0x06000040;
-D_06000A20 = 0x06000A20;
-
-// ovl_Bg_Market_Step
-
-D_0601F050 = 0x0601F050;
-D_06018DA0 = 0x06018DA0;
-D_0601EF10 = 0x0601EF10;
-D_06018C60 = 0x06018C60;
-
-// ovl_Bg_Mbar_Chair
-
-D_06000288 = 0x06000288;
-D_060019B4 = 0x060019B4;
-
// ovl_Bg_Numa_Hana
D_06000870 = 0x06000870;
@@ -993,11 +796,6 @@ D_06002678 = 0x06002678;
D_06000040 = 0x06000040;
-// ovl_Bg_Tobira01
-
-D_06000088 = 0x06000088;
-D_060011C0 = 0x060011C0;
-
// ovl_Bg_Umajump
D_06001220 = 0x06001220;
@@ -1042,35 +840,8 @@ D_06022550 = 0x06022550;
// ovl_Boss_02
-D_06000230 = 0x06000230;
-D_060002E0 = 0x060002E0;
D_060003A0 = 0x060003A0;
D_060041A0 = 0x060041A0;
-D_06008650 = 0x06008650;
-D_06009B10 = 0x06009B10;
-D_06009C78 = 0x06009C78;
-D_0600ECF0 = 0x0600ECF0;
-D_0600EF90 = 0x0600EF90;
-D_0600F310 = 0x0600F310;
-D_0600F690 = 0x0600F690;
-D_0600FA10 = 0x0600FA10;
-D_0600FD90 = 0x0600FD90;
-D_06010110 = 0x06010110;
-D_06010490 = 0x06010490;
-D_06010810 = 0x06010810;
-D_06010B90 = 0x06010B90;
-D_06010F10 = 0x06010F10;
-D_06011290 = 0x06011290;
-D_06011610 = 0x06011610;
-D_06011990 = 0x06011990;
-D_06011D10 = 0x06011D10;
-D_06012090 = 0x06012090;
-D_06012410 = 0x06012410;
-D_06012790 = 0x06012790;
-D_06012B10 = 0x06012B10;
-D_06012E90 = 0x06012E90;
-D_06013210 = 0x06013210;
-D_06013590 = 0x06013590;
// ovl_Boss_03
@@ -1203,10 +974,6 @@ D_06000050 = 0x06000050;
D_06000060 = 0x06000060;
D_060012E8 = 0x060012E8;
-// ovl_Demo_Kankyo
-
-D_06001000 = 0x06001000;
-
// ovl_Demo_Moonend
D_06001214 = 0x06001214;
@@ -1298,26 +1065,6 @@ D_060042B0 = 0x060042B0;
D_060013A8 = 0x060013A8;
D_06006868 = 0x06006868;
-// ovl_Dm_Char07
-
-D_06000100 = 0x06000100;
-D_06000240 = 0x06000240;
-D_06000650 = 0x06000650;
-D_06000790 = 0x06000790;
-D_06000B80 = 0x06000B80;
-D_06000CC0 = 0x06000CC0;
-D_060010D0 = 0x060010D0;
-D_06001210 = 0x06001210;
-D_060015E0 = 0x060015E0;
-D_060016B8 = 0x060016B8;
-D_06002BA0 = 0x06002BA0;
-D_06002CD0 = 0x06002CD0;
-D_06006688 = 0x06006688;
-D_060076A0 = 0x060076A0;
-D_06007918 = 0x06007918;
-D_060105F8 = 0x060105F8;
-D_06010D68 = 0x06010D68;
-
// ovl_Dm_Char08
D_06002328 = 0x06002328;
@@ -1335,11 +1082,6 @@ D_06001398 = 0x06001398;
D_06000E70 = 0x06000E70;
D_06012618 = 0x06012618;
-// ovl_Dm_Nb
-
-D_06000990 = 0x06000990;
-D_06008C40 = 0x06008C40;
-
// ovl_Dm_Opstage
D_06000970 = 0x06000970;
@@ -1352,108 +1094,6 @@ D_06003068 = 0x06003068;
D_06003720 = 0x06003720;
D_06003728 = 0x06003728;
-// ovl_Dm_Sa
-
-D_0600CC94 = 0x0600CC94;
-D_06013328 = 0x06013328;
-
-// ovl_Dm_Statue
-
-D_06000520 = 0x06000520;
-D_06001788 = 0x06001788;
-
-// ovl_Dm_Stk
-
-D_0600055C = 0x0600055C;
-D_06001030 = 0x06001030;
-D_0600130C = 0x0600130C;
-D_06001374 = 0x06001374;
-D_06001EDC = 0x06001EDC;
-D_06002774 = 0x06002774;
-D_06002CD8 = 0x06002CD8;
-D_06003068 = 0x06003068;
-D_060035C8 = 0x060035C8;
-D_060039F0 = 0x060039F0;
-D_06004554 = 0x06004554;
-D_06004580 = 0x06004580;
-D_060046B0 = 0x060046B0;
-D_060049C8 = 0x060049C8;
-D_060051C0 = 0x060051C0;
-D_060053C0 = 0x060053C0;
-D_06005870 = 0x06005870;
-D_06005F44 = 0x06005F44;
-D_06006BB0 = 0x06006BB0;
-D_060070DC = 0x060070DC;
-D_06007840 = 0x06007840;
-D_060079F0 = 0x060079F0;
-D_060084C0 = 0x060084C0;
-D_06008658 = 0x06008658;
-D_060087B0 = 0x060087B0;
-D_06008A80 = 0x06008A80;
-D_060090C0 = 0x060090C0;
-D_06009710 = 0x06009710;
-D_06009AC0 = 0x06009AC0;
-D_06009DA0 = 0x06009DA0;
-D_0600A530 = 0x0600A530;
-D_0600A5C0 = 0x0600A5C0;
-D_0600AE30 = 0x0600AE30;
-D_0600AEC0 = 0x0600AEC0;
-D_0600BB2C = 0x0600BB2C;
-D_0600C270 = 0x0600C270;
-D_0600C964 = 0x0600C964;
-D_0600CAD0 = 0x0600CAD0;
-D_0600CBB8 = 0x0600CBB8;
-D_0600D830 = 0x0600D830;
-D_0600E6EC = 0x0600E6EC;
-D_0600EEC0 = 0x0600EEC0;
-D_060101A4 = 0x060101A4;
-D_06010B60 = 0x06010B60;
-D_060110B4 = 0x060110B4;
-D_06011FB0 = 0x06011FB0;
-D_06012A58 = 0x06012A58;
-D_06013328 = 0x06013328;
-D_060141E4 = 0x060141E4;
-D_06014920 = 0x06014920;
-D_06015028 = 0x06015028;
-D_06015C14 = 0x06015C14;
-D_06016508 = 0x06016508;
-D_06016620 = 0x06016620;
-D_06016910 = 0x06016910;
-D_06018ED0 = 0x06018ED0;
-D_0601AA80 = 0x0601AA80;
-D_0601C114 = 0x0601C114;
-D_0601C21C = 0x0601C21C;
-D_0601D008 = 0x0601D008;
-D_0601D07C = 0x0601D07C;
-D_0601D3D0 = 0x0601D3D0;
-D_0601DDE0 = 0x0601DDE0;
-D_0601EF50 = 0x0601EF50;
-D_0601F9E4 = 0x0601F9E4;
-D_06020CAC = 0x06020CAC;
-D_0602200C = 0x0602200C;
-D_0602336C = 0x0602336C;
-D_060259F4 = 0x060259F4;
-D_060266C8 = 0x060266C8;
-D_06026CF4 = 0x06026CF4;
-D_06027CF4 = 0x06027CF4;
-D_06028F28 = 0x06028F28;
-D_06029A04 = 0x06029A04;
-D_0602A2D8 = 0x0602A2D8;
-D_0602AD54 = 0x0602AD54;
-D_0602DC64 = 0x0602DC64;
-D_0602E9A0 = 0x0602E9A0;
-D_0602FA70 = 0x0602FA70;
-D_0603021C = 0x0603021C;
-D_06031210 = 0x06031210;
-D_060322FC = 0x060322FC;
-D_06032AE0 = 0x06032AE0;
-D_0603323C = 0x0603323C;
-D_06034FD8 = 0x06034FD8;
-D_06036964 = 0x06036964;
-D_06037B94 = 0x06037B94;
-D_0603967C = 0x0603967C;
-D_0603A8F8 = 0x0603A8F8;
-
// ovl_Dm_Tsg
D_06002D30 = 0x06002D30;
@@ -1464,21 +1104,6 @@ D_06011458 = 0x06011458;
D_0600DE08 = 0x0600DE08;
D_0600E038 = 0x0600E038;
-// ovl_Door_Spiral
-
-D_06000590 = 0x06000590;
-D_060007A8 = 0x060007A8;
-D_06000EA0 = 0x06000EA0;
-D_060012C0 = 0x060012C0;
-D_060014C8 = 0x060014C8;
-D_06002110 = 0x06002110;
-D_06004448 = 0x06004448;
-D_060051B8 = 0x060051B8;
-D_06006128 = 0x06006128;
-D_06009278 = 0x06009278;
-D_06012B70 = 0x06012B70;
-D_06013EA8 = 0x06013EA8;
-
// ovl_Door_Warp1
D_06003230 = 0x06003230;
@@ -1588,13 +1213,6 @@ D_06005EF0 = 0x06005EF0;
D_06006B10 = 0x06006B10;
D_060092A0 = 0x060092A0;
-// ovl_En_Baisen
-
-D_060008B4 = 0x060008B4;
-D_06008198 = 0x06008198;
-D_060011C0 = 0x060011C0;
-D_06007908 = 0x06007908;
-
// ovl_En_Bal
D_060005FC = 0x060005FC;
@@ -1654,17 +1272,6 @@ D_06004210 = 0x06004210;
D_06007C70 = 0x06007C70;
D_0600823C = 0x0600823C;
-// ovl_En_Bji_01
-
-D_0600066C = 0x0600066C;
-D_06000AB0 = 0x06000AB0;
-D_06000FDC = 0x06000FDC;
-D_060049F0 = 0x060049F0;
-D_06004E70 = 0x06004E70;
-D_06005270 = 0x06005270;
-D_0600578C = 0x0600578C;
-D_06005B58 = 0x06005B58;
-
// ovl_En_Bjt
D_06002390 = 0x06002390;
@@ -1723,86 +1330,16 @@ D_0600C3E0 = 0x0600C3E0;
D_06001000 = 0x06001000;
-// ovl_En_Cha
-
-D_06000710 = 0x06000710;
-D_06000958 = 0x06000958;
-
// ovl_En_Cne_01
D_060000F0 = 0x060000F0;
D_06001300 = 0x06001300;
-// ovl_En_Cow
-
-D_060001CC = 0x060001CC;
-D_06004010 = 0x06004010;
-D_06004264 = 0x06004264;
-D_06004348 = 0x06004348;
-D_06004C30 = 0x06004C30;
-D_06004E98 = 0x06004E98;
-
// ovl_En_Crow
D_060000F0 = 0x060000F0;
D_060010C0 = 0x060010C0;
-// ovl_En_Dai
-
-D_06000230 = 0x06000230;
-D_060002E8 = 0x060002E8;
-D_0600C538 = 0x0600C538;
-D_060130D0 = 0x060130D0;
-D_060107B0 = 0x060107B0;
-D_06010FB0 = 0x06010FB0;
-D_060117B0 = 0x060117B0;
-D_06010FB0 = 0x06010FB0;
-D_06011FB0 = 0x06011FB0;
-D_060127B0 = 0x060127B0;
-D_060079E4 = 0x060079E4;
-D_06007354 = 0x06007354;
-D_06000CEC = 0x06000CEC;
-D_060069DC = 0x060069DC;
-D_0600563C = 0x0600563C;
-D_06002E58 = 0x06002E58;
-D_06006590 = 0x06006590;
-
-// ovl_En_Daiku
-
-D_06001114 = 0x06001114;
-D_06002FA0 = 0x06002FA0;
-D_06008EC8 = 0x06008EC8;
-D_0600A850 = 0x0600A850;
-D_0600B690 = 0x0600B690;
-D_0600ACD0 = 0x0600ACD0;
-D_0600C92C = 0x0600C92C;
-D_06000C44 = 0x06000C44;
-D_0600C234 = 0x0600C234;
-D_06000600 = 0x06000600;
-D_0600BEAC = 0x0600BEAC;
-D_060070C0 = 0x060070C0;
-D_06006FB0 = 0x06006FB0;
-D_06006E80 = 0x06006E80;
-D_06006D70 = 0x06006D70;
-
-// ovl_En_Daiku2
-
-D_0600ACD0 = 0x0600ACD0;
-D_0600C92C = 0x0600C92C;
-D_06000C44 = 0x06000C44;
-D_0600C234 = 0x0600C234;
-D_06000600 = 0x06000600;
-D_06001114 = 0x06001114;
-D_0600B690 = 0x0600B690;
-D_06001A24 = 0x06001A24;
-D_0600D328 = 0x0600D328;
-D_060009E0 = 0x060009E0;
-D_06002134 = 0x06002134;
-D_06002FA0 = 0x06002FA0;
-D_06009638 = 0x06009638;
-D_0600A390 = 0x0600A390;
-D_0600A850 = 0x0600A850;
-
// ovl_En_Death
D_06000E64 = 0x06000E64;
@@ -1834,211 +1371,18 @@ D_06001828 = 0x06001828;
D_06002A40 = 0x06002A40;
D_06003070 = 0x06003070;
-// ovl_En_Dekunuts
-
-D_06000168 = 0x06000168;
-D_06001E50 = 0x06001E50;
-D_06001F50 = 0x06001F50;
-D_06002468 = 0x06002468;
-D_0600259C = 0x0600259C;
-D_06002A5C = 0x06002A5C;
-D_06002BD4 = 0x06002BD4;
-D_06002DD4 = 0x06002DD4;
-D_06002FA4 = 0x06002FA4;
-D_06003180 = 0x06003180;
-D_0600326C = 0x0600326C;
-D_060033E4 = 0x060033E4;
-D_06003780 = 0x06003780;
-
// ovl_En_Demo_heishi
D_06003BFC = 0x06003BFC;
D_0600D640 = 0x0600D640;
-// ovl_En_Dg
-
-D_060080F0 = 0x060080F0;
-D_060021C8 = 0x060021C8;
-D_06001BD8 = 0x06001BD8;
-D_06000998 = 0x06000998;
-D_06001FB0 = 0x06001FB0;
-D_06001048 = 0x06001048;
-D_06001348 = 0x06001348;
-D_06001560 = 0x06001560;
-D_06001A84 = 0x06001A84;
-D_060017C0 = 0x060017C0;
-
-// ovl_En_Dinofos
-
-D_06000580 = 0x06000580;
-D_06000AF0 = 0x06000AF0;
-D_06001040 = 0x06001040;
-D_060013C0 = 0x060013C0;
-D_060017B8 = 0x060017B8;
-D_06001CCC = 0x06001CCC;
-D_060025B4 = 0x060025B4;
-D_06002E40 = 0x06002E40;
-D_06009570 = 0x06009570;
-D_06009B70 = 0x06009B70;
-D_0600ABD0 = 0x0600ABD0;
-D_0600C974 = 0x0600C974;
-D_0600D21C = 0x0600D21C;
-D_0600D62C = 0x0600D62C;
-D_06008E30 = 0x06008E30;
-D_06009030 = 0x06009030;
-D_06009230 = 0x06009230;
-
-// ovl_En_Dnb
-
-D_06000000 = 0x06000000;
-D_06000020 = 0x06000020;
-D_06004638 = 0x06004638;
-D_06004710 = 0x06004710;
-D_06004D8C = 0x06004D8C;
-
// ovl_En_Dnh
D_06002950 = 0x06002950;
-// ovl_En_Dnk
-
-D_060023B8 = 0x060023B8;
-D_06002468 = 0x06002468;
-D_06002848 = 0x06002848;
-D_06000B70 = 0x06000B70;
-D_06002A08 = 0x06002A08;
-D_0600031C = 0x0600031C;
-D_06000430 = 0x06000430;
-D_06000894 = 0x06000894;
-D_06002B6C = 0x06002B6C;
-D_060006CC = 0x060006CC;
-D_060024CC = 0x060024CC;
-D_060026C4 = 0x060026C4;
-D_06002894 = 0x06002894;
-D_06002B90 = 0x06002B90;
-D_06002F7C = 0x06002F7C;
-D_06003128 = 0x06003128;
-D_060029BC = 0x060029BC;
-D_06002E84 = 0x06002E84;
-D_06000168 = 0x06000168;
-D_0600259C = 0x0600259C;
-D_06002A5C = 0x06002A5C;
-D_06002BD4 = 0x06002BD4;
-D_06002DD4 = 0x06002DD4;
-D_06002FA4 = 0x06002FA4;
-D_06003180 = 0x06003180;
-D_0600326C = 0x0600326C;
-D_060033E4 = 0x060033E4;
-D_06003780 = 0x06003780;
-D_06002950 = 0x06002950;
-D_06001680 = 0x06001680;
-D_06001700 = 0x06001700;
-D_06001780 = 0x06001780;
-
// ovl_En_Dno
-D_06007CA4 = 0x06007CA4;
-D_0600E1F8 = 0x0600E1F8;
D_801C20C0 = 0x801C20C0;
-D_06000470 = 0x06000470;
-D_060008F0 = 0x060008F0;
-D_06000F6C = 0x06000F6C;
-D_06001A50 = 0x06001A50;
-D_06002530 = 0x06002530;
-D_06003320 = 0x06003320;
-D_060036D0 = 0x060036D0;
-D_060041CC = 0x060041CC;
-D_06004DD8 = 0x06004DD8;
-D_06005F98 = 0x06005F98;
-D_06006488 = 0x06006488;
-D_060073E4 = 0x060073E4;
-D_060077A8 = 0x060077A8;
-D_06008324 = 0x06008324;
-D_06008AE4 = 0x06008AE4;
-D_06009100 = 0x06009100;
-D_060051E4 = 0x060051E4;
-D_06005E20 = 0x06005E20;
-D_06006F84 = 0x06006F84;
-
-// ovl_En_Dnp
-
-D_06010D60 = 0x06010D60;
-D_060007D8 = 0x060007D8;
-D_060021DC = 0x060021DC;
-D_060026B8 = 0x060026B8;
-D_06004D08 = 0x06004D08;
-D_060071F4 = 0x060071F4;
-D_06007960 = 0x06007960;
-D_06008588 = 0x06008588;
-D_0600A900 = 0x0600A900;
-D_0600AEB8 = 0x0600AEB8;
-D_0600B754 = 0x0600B754;
-D_0600674C = 0x0600674C;
-D_0600BAD8 = 0x0600BAD8;
-D_06006B74 = 0x06006B74;
-D_06012428 = 0x06012428;
-D_0600B324 = 0x0600B324;
-D_060115B8 = 0x060115B8;
-D_0600923C = 0x0600923C;
-D_06009AA0 = 0x06009AA0;
-D_0600125C = 0x0600125C;
-D_060017F8 = 0x060017F8;
-D_06001C1C = 0x06001C1C;
-D_060057AC = 0x060057AC;
-D_0600625C = 0x0600625C;
-D_060103D0 = 0x060103D0;
-D_060105D0 = 0x060105D0;
-D_060107D0 = 0x060107D0;
-D_060109D0 = 0x060109D0;
-
-// ovl_En_Dnq
-
-D_0600EB48 = 0x0600EB48;
-D_06008328 = 0x06008328;
-D_06007528 = 0x06007528;
-D_060006F0 = 0x060006F0;
-D_06000BF8 = 0x06000BF8;
-D_06002690 = 0x06002690;
-D_06003408 = 0x06003408;
-D_06006984 = 0x06006984;
-D_06005E18 = 0x06005E18;
-D_06005284 = 0x06005284;
-D_06001AEC = 0x06001AEC;
-D_06001100 = 0x06001100;
-D_06004EA0 = 0x06004EA0;
-D_0600F504 = 0x0600F504;
-D_060047B8 = 0x060047B8;
-D_06005A14 = 0x06005A14;
-D_06003DBC = 0x06003DBC;
-
-// ovl_En_Dns
-
-D_06002C48 = 0x06002C48;
-D_06002DD8 = 0x06002DD8;
-D_06003310 = 0x06003310;
-D_060034EC = 0x060034EC;
-D_060008F4 = 0x060008F4;
-D_06000BD8 = 0x06000BD8;
-D_06000D58 = 0x06000D58;
-D_06000FEC = 0x06000FEC;
-D_060002A8 = 0x060002A8;
-D_06000734 = 0x06000734;
-D_060028E8 = 0x060028E8;
-D_06002968 = 0x06002968;
-D_060029E8 = 0x060029E8;
-D_06002968 = 0x06002968;
-
-// ovl_En_Dodongo
-
-D_060013C4 = 0x060013C4;
-D_06001A44 = 0x06001A44;
-D_060028F0 = 0x060028F0;
-D_06003088 = 0x06003088;
-D_06003B14 = 0x06003B14;
-D_060042C4 = 0x060042C4;
-D_06004C20 = 0x06004C20;
-D_06008318 = 0x06008318;
-D_06008B1C = 0x06008B1C;
// ovl_En_Dragon
@@ -2060,11 +1404,6 @@ D_06008170 = 0x06008170;
D_0600112C = 0x0600112C;
D_0600B0CC = 0x0600B0CC;
-// ovl_En_Dy_Extra
-
-D_0600DD40 = 0x0600DD40;
-D_0600DEF0 = 0x0600DEF0;
-
// ovl_En_Egblock
D_06001698 = 0x06001698;
@@ -2083,84 +1422,10 @@ D_060094E4 = 0x060094E4;
D_06009664 = 0x06009664;
D_0600EE4C = 0x0600EE4C;
-// ovl_En_Elfbub
-
-D_06001000 = 0x06001000;
-
-// ovl_En_Encount2
-
-D_06000A00 = 0x06000A00;
-D_06000D78 = 0x06000D78;
-D_06002420 = 0x06002420;
-
// ovl_En_Encount3
D_060009A0 = 0x060009A0;
-// ovl_En_Ending_Hero
-
-D_06000BE0 = 0x06000BE0;
-D_0600B0CC = 0x0600B0CC;
-D_06007350 = 0x06007350;
-D_06007750 = 0x06007750;
-D_06009590 = 0x06009590;
-D_06009F90 = 0x06009F90;
-D_0600A390 = 0x0600A390;
-D_0600A490 = 0x0600A490;
-D_0600A790 = 0x0600A790;
-D_0600AB90 = 0x0600AB90;
-
-// ovl_En_Ending_Hero2
-
-D_060011C0 = 0x060011C0;
-D_06007908 = 0x06007908;
-
-// ovl_En_Ending_Hero3
-
-D_06000E50 = 0x06000E50;
-D_06007150 = 0x06007150;
-
-// ovl_En_Ending_Hero4
-
-D_06002A84 = 0x06002A84;
-D_0600D640 = 0x0600D640;
-
-// ovl_En_Ending_Hero5
-
-D_06002FA0 = 0x06002FA0;
-D_06006D70 = 0x06006D70;
-D_06006E80 = 0x06006E80;
-D_06006FB0 = 0x06006FB0;
-D_060070C0 = 0x060070C0;
-D_0600A390 = 0x0600A390;
-D_0600A850 = 0x0600A850;
-
-// ovl_En_Ending_Hero6
-
-D_0600B0CC = 0x0600B0CC;
-D_06007908 = 0x06007908;
-D_06007150 = 0x06007150;
-D_0600D640 = 0x0600D640;
-D_0600A850 = 0x0600A850;
-D_06000BE0 = 0x06000BE0;
-D_060011C0 = 0x060011C0;
-D_06000E50 = 0x06000E50;
-D_06002A84 = 0x06002A84;
-D_06002FA0 = 0x06002FA0;
-D_060070C0 = 0x060070C0;
-D_06006FB0 = 0x06006FB0;
-D_06006E80 = 0x06006E80;
-D_06006D70 = 0x06006D70;
-D_0600A390_dl = 0x0600A390;
-D_06007350 = 0x06007350;
-D_06009590 = 0x06009590;
-D_06009F90 = 0x06009F90;
-D_0600A790 = 0x0600A790;
-D_0600AB90 = 0x0600AB90;
-D_06007750 = 0x06007750;
-D_0600A390_tex = 0x0600A390;
-D_0600A490 = 0x0600A490;
-
// ovl_En_Estone
D_06010240 = 0x06010240;
@@ -2178,84 +1443,11 @@ D_060000F8 = 0x060000F8;
D_06003D38 = 0x06003D38;
D_06003DC8 = 0x06003DC8;
-// ovl_En_Fg
-
-D_060007BC = 0x060007BC;
-D_060011C0 = 0x060011C0;
-D_06001534 = 0x06001534;
-D_060059A0 = 0x060059A0;
-D_0600B328 = 0x0600B328;
-D_0600B338 = 0x0600B338;
-D_0600B538 = 0x0600B538;
-
-// ovl_En_Firefly
-
-D_0600017C = 0x0600017C;
-D_06001678 = 0x06001678;
-D_060018B8 = 0x060018B8;
-
-// ovl_En_Fish2
-
-D_060006D8 = 0x060006D8;
-D_060007D4 = 0x060007D4;
-D_06000ACC = 0x06000ACC;
-D_06001174 = 0x06001174;
-D_060013AC = 0x060013AC;
-D_06006190 = 0x06006190;
-
// ovl_En_Fishing
D_0600CFE0 = 0x0600CFE0;
D_06011058 = 0x06011058;
-// ovl_En_Floormas
-
-D_06000590 = 0x06000590;
-D_06000EA4 = 0x06000EA4;
-D_060019CC = 0x060019CC;
-D_06002158 = 0x06002158;
-D_060039B0 = 0x060039B0;
-D_060041F4 = 0x060041F4;
-D_06008688 = 0x06008688;
-D_06008FB0 = 0x06008FB0;
-D_06009244 = 0x06009244;
-D_06009520 = 0x06009520;
-D_06009DB0 = 0x06009DB0;
-D_0600A054 = 0x0600A054;
-
-// ovl_En_Fsn
-
-D_06005BC0 = 0x06005BC0;
-D_06006D40 = 0x06006D40;
-D_06007140 = 0x06007140;
-D_0600B9D8 = 0x0600B9D8;
-D_0600C26C = 0x0600C26C;
-D_0600C58C = 0x0600C58C;
-D_0600CB3C = 0x0600CB3C;
-D_0600D354 = 0x0600D354;
-D_0600DE34 = 0x0600DE34;
-D_0600E3EC = 0x0600E3EC;
-D_0600F00C = 0x0600F00C;
-D_0600F180 = 0x0600F180;
-D_0600F218 = 0x0600F218;
-D_06012C34 = 0x06012C34;
-D_060131FC = 0x060131FC;
-D_06013320 = 0x06013320;
-D_060138B0 = 0x060138B0;
-D_0601430C = 0x0601430C;
-
-// ovl_En_Fu
-
-D_06001F74 = 0x06001F74;
-D_06002F64 = 0x06002F64;
-D_06004904 = 0x06004904;
-D_06005304 = 0x06005304;
-D_060053E0 = 0x060053E0;
-D_0600B0A0 = 0x0600B0A0;
-D_0600B0E0 = 0x0600B0E0;
-D_0600B2B0 = 0x0600B2B0;
-D_0600BAC4 = 0x0600BAC4;
-
// ovl_En_Fu_Kago
D_060006A0 = 0x060006A0;
@@ -2301,16 +1493,6 @@ D_0600F6C0 = 0x0600F6C0;
D_0600F578 = 0x0600F578;
D_0600F6C0 = 0x0600F6C0;
-// ovl_En_Ginko_Man
-
-D_060008C0 = 0x060008C0;
-D_06000AC4 = 0x06000AC4;
-D_060043F0 = 0x060043F0;
-D_06004A7C = 0x06004A7C;
-D_06004F40 = 0x06004F40;
-D_0600B1D8 = 0x0600B1D8;
-D_0600C240 = 0x0600C240;
-
// ovl_En_Gk
D_06006680 = 0x06006680;
@@ -2318,76 +1500,21 @@ D_06006688 = 0x06006688;
D_0600787C = 0x0600787C;
D_060079C0 = 0x060079C0;
-// ovl_En_Gm
+// ovl_En_Goron_Oyu
-D_06005028 = 0x06005028;
-D_060054A8 = 0x060054A8;
-D_06005CE8 = 0x06005CE8;
-D_06006828 = 0x06006828;
-D_06006C68 = 0x06006C68;
-D_06007528 = 0x06007528;
-D_060078B0 = 0x060078B0;
-D_06008090 = 0x06008090;
-D_0600898C = 0x0600898C;
-D_06009450 = 0x06009450;
-D_06009CDC = 0x06009CDC;
-D_0600A5E0 = 0x0600A5E0;
-D_0600A70C = 0x0600A70C;
-D_0600AD18 = 0x0600AD18;
-D_0600B8B0 = 0x0600B8B0;
-D_0600B990 = 0x0600B990;
-D_0600BA80 = 0x0600BA80;
-D_0600C03C = 0x0600C03C;
-
-// ovl_En_Goroiwa
-
-D_060032E0 = 0x060032E0;
-D_060082D0 = 0x060082D0;
-D_06005C20 = 0x06005C20;
-D_06003B40 = 0x06003B40;
-D_06008B90 = 0x06008B90;
-D_060042B0 = 0x060042B0;
-D_06004960 = 0x06004960;
-D_06004EF0 = 0x06004EF0;
-D_060003B0 = 0x060003B0;
-D_060028E0 = 0x060028E0;
-D_06002D70 = 0x06002D70;
-D_060072F0 = 0x060072F0;
-D_060077D0 = 0x060077D0;
-D_06007C60 = 0x06007C60;
+D_06000988 = 0x06000988;
// ovl_En_Grasshopper
D_06000F9C = 0x06000F9C;
D_06003F00 = 0x06003F00;
-// ovl_En_Gs
-
-D_06000950 = 0x06000950;
-D_060009D0 = 0x060009D0;
-D_06000A60 = 0x06000A60;
-
// ovl_En_Guard_Nuts
D_06002700 = 0x06002700;
D_06002848 = 0x06002848;
D_06002A08 = 0x06002A08;
-// ovl_En_Guruguru
-
-D_06000B04 = 0x06000B04;
-D_0600057C = 0x0600057C;
-D_06005F20 = 0x06005F20;
-D_06006320 = 0x06006320;
-D_06006720 = 0x06006720;
-D_06006920 = 0x06006920;
-D_06006C90 = 0x06006C90;
-
-// ovl_En_Hakurock
-
-D_06011100 = 0x06011100;
-D_06011178 = 0x06011178;
-
// ovl_En_Hata
D_060000C0 = 0x060000C0;
@@ -2399,18 +1526,11 @@ D_06002FD0 = 0x06002FD0;
D_06003BFC = 0x06003BFC;
D_0600D640 = 0x0600D640;
-// ovl_En_Hg
+// ovl_En_Hgo
-D_06000370 = 0x06000370;
-D_06001138 = 0x06001138;
-D_060015D4 = 0x060015D4;
-D_06001960 = 0x06001960;
-D_0600260C = 0x0600260C;
-D_06005E28 = 0x06005E28;
-D_06008580 = 0x06008580;
-D_06009D44 = 0x06009D44;
-D_0600A164 = 0x0600A164;
-D_0600AE1C = 0x0600AE1C;
+D_0600B644 = 0x0600B644;
+D_0600F248 = 0x0600F248;
+D_06012A58 = 0x06012A58;
// ovl_En_Hidden_Nuts
@@ -2469,105 +1589,6 @@ D_060057F4 = 0x060057F4;
D_06006294 = 0x06006294;
D_060136A0 = 0x060136A0;
-// ovl_En_In
-
-D_060003B4 = 0x060003B4;
-D_06000CB0 = 0x06000CB0;
-D_06001BE0 = 0x06001BE0;
-D_06001C30 = 0x06001C30;
-D_06001D10 = 0x06001D10;
-D_06003520 = 0x06003520;
-D_060035E0 = 0x060035E0;
-D_060043E0 = 0x060043E0;
-D_06004820 = 0x06004820;
-D_06004C20 = 0x06004C20;
-D_06007A70 = 0x06007A70;
-D_06007C48 = 0x06007C48;
-D_06012A78 = 0x06012A78;
-D_06012DF8 = 0x06012DF8;
-D_06013440 = 0x06013440;
-D_06013540 = 0x06013540;
-D_06013670 = 0x06013670;
-D_060137A0 = 0x060137A0;
-D_060138D0 = 0x060138D0;
-D_06013A00 = 0x06013A00;
-D_06013DE0 = 0x06013DE0;
-D_06013F10 = 0x06013F10;
-D_06014040 = 0x06014040;
-D_06014420 = 0x06014420;
-D_060145D8 = 0x060145D8;
-D_06014710 = 0x06014710;
-D_06014860 = 0x06014860;
-D_060149A8 = 0x060149A8;
-D_06014AE0 = 0x06014AE0;
-D_06014C30 = 0x06014C30;
-D_06014EA8 = 0x06014EA8;
-D_06014F8C = 0x06014F8C;
-D_06015918 = 0x06015918;
-D_06015E38 = 0x06015E38;
-D_06016484 = 0x06016484;
-D_06016A60 = 0x06016A60;
-D_060170DC = 0x060170DC;
-D_060177AC = 0x060177AC;
-D_06018240 = 0x06018240;
-D_060187C8 = 0x060187C8;
-D_060198A8 = 0x060198A8;
-D_06019EB4 = 0x06019EB4;
-D_0601A140 = 0x0601A140;
-D_0601B3C4 = 0x0601B3C4;
-D_0601B904 = 0x0601B904;
-D_0601C0B0 = 0x0601C0B0;
-D_0601C528 = 0x0601C528;
-
-// ovl_En_Invadepoh
-
-D_06000080 = 0x06000080;
-D_060003B0 = 0x060003B0;
-D_06000550 = 0x06000550;
-D_06000560 = 0x06000560;
-D_06000608 = 0x06000608;
-D_060006C8 = 0x060006C8;
-D_06000720 = 0x06000720;
-D_06000998 = 0x06000998;
-D_06001560 = 0x06001560;
-D_06001674 = 0x06001674;
-D_06001BD8 = 0x06001BD8;
-D_06001D80 = 0x06001D80;
-D_060021C8 = 0x060021C8;
-D_06002A8C = 0x06002A8C;
-D_06004010 = 0x06004010;
-D_06004264 = 0x06004264;
-D_06004C30 = 0x06004C30;
-D_06004E50 = 0x06004E50;
-D_06004E98 = 0x06004E98;
-D_06007328 = 0x06007328;
-D_060080F0 = 0x060080F0;
-D_06009E58 = 0x06009E58;
-D_0600A174 = 0x0600A174;
-D_0600FFC8 = 0x0600FFC8;
-D_060107C8 = 0x060107C8;
-D_06010FC8 = 0x06010FC8;
-D_060117C8 = 0x060117C8;
-D_06011AD8 = 0x06011AD8;
-D_06011FC8 = 0x06011FC8;
-D_060122D8 = 0x060122D8;
-D_060127C8 = 0x060127C8;
-D_06012AD8 = 0x06012AD8;
-D_06012BC8 = 0x06012BC8;
-D_06012FC8 = 0x06012FC8;
-D_060132D8 = 0x060132D8;
-D_060133C8 = 0x060133C8;
-D_06013928 = 0x06013928;
-D_06013AD8 = 0x06013AD8;
-D_06014088 = 0x06014088;
-D_060142D8 = 0x060142D8;
-D_06014AD8 = 0x06014AD8;
-D_06014ED8 = 0x06014ED8;
-D_060152D8 = 0x060152D8;
-D_060156D8 = 0x060156D8;
-D_06015C28 = 0x06015C28;
-D_06016720 = 0x06016720;
-
// ovl_En_Invadepoh_Demo
D_06000080 = 0x06000080;
@@ -2590,10 +1611,6 @@ D_0600BA30 = 0x0600BA30;
D_0600BCC8 = 0x0600BCC8;
D_0600C240 = 0x0600C240;
-// ovl_En_Jc_Mato
-
-D_06000390 = 0x06000390;
-
// ovl_En_Jg
D_0601ADC0 = 0x0601ADC0;
@@ -2629,20 +1646,6 @@ D_060081F4 = 0x060081F4;
D_060058B8 = 0x060058B8;
D_0600D828 = 0x0600D828;
-// ovl_En_Kakasi
-
-D_06000214 = 0x06000214;
-D_060065B0 = 0x060065B0;
-D_06007444 = 0x06007444;
-D_0600686C = 0x0600686C;
-D_060081A4 = 0x060081A4;
-D_06007B90 = 0x06007B90;
-D_060071EC = 0x060071EC;
-D_06007444 = 0x06007444;
-D_0600686C = 0x0600686C;
-D_060081A4 = 0x060081A4;
-D_06000214 = 0x06000214;
-
// ovl_En_Kanban
D_06000C30 = 0x06000C30;
@@ -2668,26 +1671,6 @@ D_060003DC = 0x060003DC;
D_06000F4C = 0x06000F4C;
D_06006990 = 0x06006990;
-// ovl_En_Kgy
-
-D_06004B98 = 0x06004B98;
-D_0600E8F0 = 0x0600E8F0;
-D_0600EE58 = 0x0600EE58;
-D_0600F180 = 0x0600F180;
-D_0600F6A0 = 0x0600F6A0;
-D_0600F910 = 0x0600F910;
-D_060008FC = 0x060008FC;
-D_0600292C = 0x0600292C;
-D_060042E4 = 0x060042E4;
-D_060101F0 = 0x060101F0;
-D_06001764 = 0x06001764;
-D_06003334 = 0x06003334;
-D_06010B84 = 0x06010B84;
-D_06001EA4 = 0x06001EA4;
-D_06003D88 = 0x06003D88;
-D_04001D00 = 0x04001D00;
-D_040021A8 = 0x040021A8;
-
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;
@@ -2784,31 +1767,6 @@ D_06000430 = 0x06000430;
D_06002848 = 0x06002848;
D_06002B6C = 0x06002B6C;
-// ovl_En_Ma4
-
-D_060003B0 = 0x060003B0;
-D_06000A20 = 0x06000A20;
-D_06002A8C = 0x06002A8C;
-D_06007328 = 0x06007328;
-D_06007D98 = 0x06007D98;
-D_0600852C = 0x0600852C;
-D_06008F6C = 0x06008F6C;
-D_06009E58 = 0x06009E58;
-D_0600FFC8 = 0x0600FFC8;
-D_060107C8 = 0x060107C8;
-D_06010FC8 = 0x06010FC8;
-D_060117C8 = 0x060117C8;
-D_06011FC8 = 0x06011FC8;
-D_060127C8 = 0x060127C8;
-D_06012BC8 = 0x06012BC8;
-D_06012FC8 = 0x06012FC8;
-D_060133C8 = 0x060133C8;
-D_06013928 = 0x06013928;
-D_06014088 = 0x06014088;
-D_06015B7C = 0x06015B7C;
-D_06018948 = 0x06018948;
-D_0601B76C = 0x0601B76C;
-
// ovl_En_Mag
D_06000000 = 0x06000000;
@@ -2824,67 +1782,6 @@ D_06011E48 = 0x06011E48;
D_06002EC0 = 0x06002EC0;
-// ovl_En_Ma_Yto
-
-D_06000CC0 = 0x06000CC0;
-D_06001FD0 = 0x06001FD0;
-D_060030B4 = 0x060030B4;
-D_06003D54 = 0x06003D54;
-D_06004370 = 0x06004370;
-D_06005314 = 0x06005314;
-D_06005430 = 0x06005430;
-D_060070EC = 0x060070EC;
-D_06007E28 = 0x06007E28;
-D_060093E8 = 0x060093E8;
-D_0600A174 = 0x0600A174;
-D_0600AF7C = 0x0600AF7C;
-D_06011AD8 = 0x06011AD8;
-D_060122D8 = 0x060122D8;
-D_06012AD8 = 0x06012AD8;
-D_060132D8 = 0x060132D8;
-D_06013AD8 = 0x06013AD8;
-D_060142D8 = 0x060142D8;
-D_06014AD8 = 0x06014AD8;
-D_06014ED8 = 0x06014ED8;
-D_060152D8 = 0x060152D8;
-D_060156D8 = 0x060156D8;
-D_06015C28 = 0x06015C28;
-D_06016720 = 0x06016720;
-
-// ovl_En_Ma_Yts
-
-D_060003B0 = 0x060003B0;
-D_06002A8C = 0x06002A8C;
-D_060043A0 = 0x060043A0;
-D_06007328 = 0x06007328;
-D_06007D98 = 0x06007D98;
-D_0600852C = 0x0600852C;
-D_06008F6C = 0x06008F6C;
-D_06009E58 = 0x06009E58;
-D_0600FFC8 = 0x0600FFC8;
-D_060107C8 = 0x060107C8;
-D_06010FC8 = 0x06010FC8;
-D_060117C8 = 0x060117C8;
-D_06011FC8 = 0x06011FC8;
-D_060127C8 = 0x060127C8;
-D_06012BC8 = 0x06012BC8;
-D_06012FC8 = 0x06012FC8;
-D_060133C8 = 0x060133C8;
-D_06013928 = 0x06013928;
-D_06014088 = 0x06014088;
-D_06015B7C = 0x06015B7C;
-D_060180DC = 0x060180DC;
-D_06018948 = 0x06018948;
-D_0601B76C = 0x0601B76C;
-
-// ovl_En_Minifrog
-
-D_060007BC = 0x060007BC;
-D_06001534 = 0x06001534;
-D_060059A0 = 0x060059A0;
-D_06005BA0 = 0x06005BA0;
-D_0600B538 = 0x0600B538;
-
// ovl_En_Mk
D_06001C38 = 0x06001C38;
@@ -2906,16 +1803,6 @@ D_060105DC = 0x060105DC;
D_06019B88 = 0x06019B88;
D_0601D518 = 0x0601D518;
-// ovl_En_Ms
-
-D_060005EC = 0x060005EC;
-D_06003DC0 = 0x06003DC0;
-
-// ovl_En_Muto
-
-D_06000E50 = 0x06000E50;
-D_06007150 = 0x06007150;
-
// ovl_En_Nb
D_06008C40 = 0x06008C40;
@@ -2929,17 +1816,6 @@ D_06001EE8 = 0x06001EE8;
D_06013380 = 0x06013380;
-// ovl_En_Niw
-
-D_060000E8 = 0x060000E8;
-D_060023B0 = 0x060023B0;
-D_06002428 = 0x06002428;
-D_06002530 = 0x06002530;
-
-// ovl_En_Nnh
-
-D_06001510 = 0x06001510;
-
// ovl_En_Nwc
D_060000E8 = 0x060000E8;
@@ -2972,119 +1848,10 @@ D_060192A0 = 0x060192A0;
D_060201BC = 0x060201BC;
D_060202F0 = 0x060202F0;
-// ovl_En_Ossan
-
-D_060028A0 = 0x060028A0;
-D_06005BC0 = 0x06005BC0;
-D_06006498 = 0x06006498;
-D_06006B18 = 0x06006B18;
-D_06006D40 = 0x06006D40;
-D_06006F18 = 0x06006F18;
-D_06007140 = 0x06007140;
-D_06009D34 = 0x06009D34;
-D_0600A460 = 0x0600A460;
-D_0600CB3C = 0x0600CB3C;
-D_0600DE34 = 0x0600DE34;
-D_0600E3EC = 0x0600E3EC;
-D_0600C58C = 0x0600C58C;
-D_0600F00C = 0x0600F00C;
-D_0600B9D8 = 0x0600B9D8;
-D_0600C26C = 0x0600C26C;
-D_0600D354 = 0x0600D354;
-D_06012C34 = 0x06012C34;
-D_060131FC = 0x060131FC;
-D_06013320 = 0x06013320;
-D_060138B0 = 0x060138B0;
-D_0601430C = 0x0601430C;
-
-// ovl_En_Ot
-
-D_06000040 = 0x06000040;
-D_06000078 = 0x06000078;
-D_060004A0 = 0x060004A0;
-D_060005F8 = 0x060005F8;
-D_060008D8 = 0x060008D8;
-D_06004800 = 0x06004800;
-D_06000420 = 0x06000420;
-D_06004B30 = 0x06004B30;
-
-// ovl_En_Owl
-
-D_06001168 = 0x06001168;
-D_06001200 = 0x06001200;
-D_06001ADC = 0x06001ADC;
-D_0600C5F8 = 0x0600C5F8;
-D_0600C6D4 = 0x0600C6D4;
-D_0600CB94 = 0x0600CB94;
-D_0600CDB0 = 0x0600CDB0;
-D_060105C0 = 0x060105C0;
-D_06008EB8 = 0x06008EB8;
-D_060092B8 = 0x060092B8;
-D_060096B8 = 0x060096B8;
-
-// ovl_En_Pamera
-
-
-D_06008448 = 0x06008448;
-D_060005BC = 0x060005BC;
-D_06008AE0 = 0x06008AE0;
-D_06008E38 = 0x06008E38;
-D_0600A844 = 0x0600A844;
-D_0600B0C4 = 0x0600B0C4;
-D_06009870 = 0x06009870;
-D_06009F54 = 0x06009F54;
-D_0600B5B0 = 0x0600B5B0;
-D_0600BCC4 = 0x0600BCC4;
-D_0600D9DC = 0x0600D9DC;
-D_0600E16C = 0x0600E16C;
-D_0600C9F4 = 0x0600C9F4;
-D_0600D0F0 = 0x0600D0F0;
-D_060074E8 = 0x060074E8;
-D_060078E8 = 0x060078E8;
-D_060066E8 = 0x060066E8;
-D_06006AE8 = 0x06006AE8;
-D_06006EE8 = 0x06006EE8;
-D_060072E8 = 0x060072E8;
-D_060073E8 = 0x060073E8;
-
// ovl_En_Paper
D_0600D5A0 = 0x0600D5A0;
-// ovl_En_Pm
-
-D_06008348 = 0x06008348;
-D_060083E0 = 0x060083E0;
-D_060085C8 = 0x060085C8;
-D_060096E8 = 0x060096E8;
-D_06002238 = 0x06002238;
-D_0600A4E0 = 0x0600A4E0;
-D_0600B09C = 0x0600B09C;
-D_0600BA78 = 0x0600BA78;
-D_0600C32C = 0x0600C32C;
-D_060099B4 = 0x060099B4;
-D_06000FC4 = 0x06000FC4;
-D_0600A8D8 = 0x0600A8D8;
-D_0600099C = 0x0600099C;
-D_06001F84 = 0x06001F84;
-D_06000468 = 0x06000468;
-D_0600C640 = 0x0600C640;
-D_06002950 = 0x06002950;
-D_06002750 = 0x06002750;
-
-// ovl_En_Poh
-
-D_060001A8 = 0x060001A8;
-D_060004EC = 0x060004EC;
-D_060006E0 = 0x060006E0;
-D_06000A60 = 0x06000A60;
-D_060011C4 = 0x060011C4;
-D_060015B0 = 0x060015B0;
-D_06002608 = 0x06002608;
-D_06002D28 = 0x06002D28;
-D_06003850 = 0x06003850;
-D_060050D0 = 0x060050D0;
-
// ovl_En_Po_Composer
D_0600188C = 0x0600188C;
@@ -3094,31 +1861,6 @@ D_06006F38 = 0x06006F38;
D_06006FD8 = 0x06006FD8;
D_06009930 = 0x06009930;
-// ovl_En_Po_Fusen
-
-D_06000040 = 0x06000040;
-D_060024F0 = 0x060024F0;
-
-// ovl_En_Po_Sisters
-
-D_06000114 = 0x06000114;
-D_060008C0 = 0x060008C0;
-D_06000A54 = 0x06000A54;
-D_06000D40 = 0x06000D40;
-D_0600119C = 0x0600119C;
-D_060014CC = 0x060014CC;
-D_06001CB0 = 0x06001CB0;
-D_06001DE0 = 0x06001DE0;
-D_060027B0 = 0x060027B0;
-D_06002EB8 = 0x06002EB8;
-D_06002F88 = 0x06002F88;
-D_06003628 = 0x06003628;
-D_06003880 = 0x06003880;
-D_06003DC8 = 0x06003DC8;
-D_06004020 = 0x06004020;
-D_060046E0 = 0x060046E0;
-D_060065C8 = 0x060065C8;
-
// ovl_En_Pp
D_0600A844 = 0x0600A844;
@@ -3159,68 +1901,12 @@ D_06002EF8 = 0x06002EF8;
D_060032F8 = 0x060032F8;
D_06003428 = 0x06003428;
-// ovl_En_Railgibud
-
-D_060053E8 = 0x060053E8;
-D_0600ABE0 = 0x0600ABE0;
-D_06010B88 = 0x06010B88;
-D_06006678 = 0x06006678;
-D_06006B08 = 0x06006B08;
-D_06006EEC = 0x06006EEC;
-D_060073A4 = 0x060073A4;
-D_06007BBC = 0x06007BBC;
-D_060081A8 = 0x060081A8;
-D_06009298 = 0x06009298;
-D_06009900 = 0x06009900;
-D_0600A450 = 0x0600A450;
-D_060113EC = 0x060113EC;
-D_0601216C = 0x0601216C;
-D_060118D8 = 0x060118D8;
-D_06011DB8 = 0x06011DB8;
-D_0600A450 = 0x0600A450;
-D_06005DF4 = 0x06005DF4;
-D_060061E4 = 0x060061E4;
-D_06001600 = 0x06001600;
-D_060009C4 = 0x060009C4;
-D_06000F1C = 0x06000F1C;
-
// ovl_En_Rat
D_06000174 = 0x06000174;
D_0600026C = 0x0600026C;
D_06001858 = 0x06001858;
-// ovl_En_Rd
-
-D_060053E8 = 0x060053E8;
-D_06006678 = 0x06006678;
-D_06006B08 = 0x06006B08;
-D_06006EEC = 0x06006EEC;
-D_060073A4 = 0x060073A4;
-D_06007BBC = 0x06007BBC;
-D_060081A8 = 0x060081A8;
-D_06009298 = 0x06009298;
-D_06009900 = 0x06009900;
-D_0600A450 = 0x0600A450;
-D_0600ABE0 = 0x0600ABE0;
-D_06010B88 = 0x06010B88;
-D_060113EC = 0x060113EC;
-D_060118D8 = 0x060118D8;
-D_06011DB8 = 0x06011DB8;
-D_0601216C = 0x0601216C;
-
-// ovl_En_Recepgirl
-
-D_06000968 = 0x06000968;
-D_06001384 = 0x06001384;
-D_06009890 = 0x06009890;
-D_0600A280 = 0x0600A280;
-D_0600AD98 = 0x0600AD98;
-D_0600F8F0 = 0x0600F8F0;
-D_0600FCF0 = 0x0600FCF0;
-D_060100F0 = 0x060100F0;
-D_06011B60 = 0x06011B60;
-
// ovl_En_Rg
D_060091A8 = 0x060091A8;
@@ -3228,17 +1914,6 @@ D_06011AC8 = 0x06011AC8;
D_06014CF0 = 0x06014CF0;
D_06014D00 = 0x06014D00;
-// ovl_En_Rr
-
-D_06000470 = 0x06000470;
-
-// ovl_En_Rsn
-
-D_06005458 = 0x06005458;
-D_0600788C = 0x0600788C;
-D_06009120 = 0x06009120;
-D_06009220 = 0x06009220;
-
// ovl_En_Ru
D_0600C700 = 0x0600C700;
@@ -3249,15 +1924,6 @@ D_06003A20 = 0x06003A20;
D_0600D768 = 0x0600D768;
D_0600D8D8 = 0x0600D8D8;
-// ovl_En_Sb
-
-D_0600004C = 0x0600004C;
-D_060000B4 = 0x060000B4;
-D_06000124 = 0x06000124;
-D_06000194 = 0x06000194;
-D_06002BF0 = 0x06002BF0;
-D_06002C8C = 0x06002C8C;
-
// ovl_En_Scopecrow
D_060000F0 = 0x060000F0;
@@ -3270,49 +1936,11 @@ D_06005488 = 0x06005488;
D_06008290 = 0x06008290;
D_0600AC70 = 0x0600AC70;
-// ovl_En_Sellnuts
-
-D_06001350 = 0x06001350;
-D_06005488 = 0x06005488;
-D_06008290 = 0x06008290;
-D_0600AC70 = 0x0600AC70;
-D_06000994 = 0x06000994;
-D_060012F4 = 0x060012F4;
-D_06001BC8 = 0x06001BC8;
-D_06001E2C = 0x06001E2C;
-D_06002268 = 0x06002268;
-D_06002670 = 0x06002670;
-D_060029E8 = 0x060029E8;
-D_06002F08 = 0x06002F08;
-D_06003438 = 0x06003438;
-D_060038CC = 0x060038CC;
-D_06003CC0 = 0x06003CC0;
-D_06004700 = 0x06004700;
-D_06004AA0 = 0x06004AA0;
-D_06004E38 = 0x06004E38;
-D_0600577C = 0x0600577C;
-D_06005CA8 = 0x06005CA8;
-D_0600B0B4 = 0x0600B0B4;
-
// ovl_En_Shn
D_0600B738 = 0x0600B738;
D_0600E7D0 = 0x0600E7D0;
-// ovl_En_Skb
-
-D_06001D1C = 0x06001D1C;
-D_06002190 = 0x06002190;
-D_06003584 = 0x06003584;
-D_06005EF8 = 0x06005EF8;
-D_0600697C = 0x0600697C;
-D_06006D90 = 0x06006D90;
-D_060009E4 = 0x060009E4;
-D_060015EC = 0x060015EC;
-D_0600270C = 0x0600270C;
-D_06002AC8 = 0x06002AC8;
-D_060064E0 = 0x060064E0;
-
// ovl_En_Slime
D_060004C0 = 0x060004C0;
@@ -3338,22 +1966,6 @@ D_060058CC = 0x060058CC;
D_06000198 = 0x06000198;
D_06001AA0 = 0x06001AA0;
-// ovl_En_Sob1
-
-D_06008268 = 0x06008268;
-D_0600D208 = 0x0600D208;
-D_0600078C = 0x0600078C;
-D_06011AC8 = 0x06011AC8;
-D_060000FC = 0x060000FC;
-D_06000970 = 0x06000970;
-D_060087BC = 0x060087BC;
-D_060050A0 = 0x060050A0;
-D_060058A0 = 0x060058A0;
-D_060060A0 = 0x060060A0;
-D_06010438 = 0x06010438;
-D_06010C38 = 0x06010C38;
-D_06011038 = 0x06011038;
-
// ovl_En_Ssh
D_06000304 = 0x06000304;
@@ -3379,36 +1991,6 @@ D_0600D640 = 0x0600D640;
D_06006C18 = 0x06006C18;
D_0600D640 = 0x0600D640;
-// ovl_En_Suttari
-
-D_0600071C = 0x0600071C;
-D_0600AF90 = 0x0600AF90;
-D_0600C240 = 0x0600C240;
-D_06010BDC = 0x06010BDC;
-D_0601139C = 0x0601139C;
-D_06011C38 = 0x06011C38;
-D_06011F84 = 0x06011F84;
-D_060128F4 = 0x060128F4;
-D_06012E84 = 0x06012E84;
-D_06013380 = 0x06013380;
-
-// ovl_En_Sw
-
-D_06003FB0 = 0x06003FB0;
-D_060043D8 = 0x060043D8;
-D_060045C0 = 0x060045C0;
-D_06004658 = 0x06004658;
-D_060046F0 = 0x060046F0;
-D_06004788 = 0x06004788;
-D_06004820 = 0x06004820;
-D_060048B8 = 0x060048B8;
-D_06004950 = 0x06004950;
-D_060049E8 = 0x060049E8;
-D_06005298 = 0x06005298;
-D_06000304 = 0x06000304;
-D_060055A8 = 0x060055A8;
-D_06005B98 = 0x06005B98;
-
// ovl_En_Syateki_Crow
D_060000F0 = 0x060000F0;
@@ -3421,18 +2003,6 @@ D_06002468 = 0x06002468;
D_06002A5C = 0x06002A5C;
D_06003180 = 0x06003180;
-// ovl_En_Syateki_Man
-
-D_06005AC8 = 0x06005AC8;
-D_060062C8 = 0x060062C8;
-D_0600D2F8 = 0x0600D2F8;
-D_0600D9D0 = 0x0600D9D0;
-D_0600DFEC = 0x0600DFEC;
-D_0600E7D0 = 0x0600E7D0;
-D_0600F2D0 = 0x0600F2D0;
-D_0600FB90 = 0x0600FB90;
-D_06010390 = 0x06010390;
-
// ovl_En_Syateki_Okuta
D_060033D0 = 0x060033D0;
@@ -3469,11 +2039,6 @@ D_060034C8 = 0x060034C8;
D_06004510 = 0x06004510;
D_06004550 = 0x06004550;
-// ovl_En_Tanron3
-
-D_0600DA20 = 0x0600DA20;
-D_0600DAAC = 0x0600DAAC;
-
// ovl_En_Tanron4
D_06000168 = 0x06000168;
@@ -3497,94 +2062,10 @@ D_0600B0A0 = 0x0600B0A0;
D_0600B0E0 = 0x0600B0E0;
D_0600B2B0 = 0x0600B2B0;
-// ovl_En_Thiefbird
-
-D_06000088 = 0x06000088;
-D_06000278 = 0x06000278;
-D_06000604 = 0x06000604;
-D_06003060 = 0x06003060;
-D_060030D8 = 0x060030D8;
-D_060033B0 = 0x060033B0;
-D_06003D58 = 0x06003D58;
-D_060061A0 = 0x060061A0;
-D_060063C4 = 0x060063C4;
-D_06004348 = 0x06004348;
-D_06004B88 = 0x06004B88;
-D_060055E0 = 0x060055E0;
-
-// ovl_En_Tite
-
-D_060004F8 = 0x060004F8;
-D_0600069C = 0x0600069C;
-D_0600083C = 0x0600083C;
-D_06000A14 = 0x06000A14;
-D_06000C70 = 0x06000C70;
-D_060012E4 = 0x060012E4;
-D_06003A20 = 0x06003A20;
-D_06001300 = 0x06001300;
-D_06001700 = 0x06001700;
-D_06001900 = 0x06001900;
-D_06001B00 = 0x06001B00;
-D_06001F00 = 0x06001F00;
-D_06002100 = 0x06002100;
-
-// ovl_En_Tk
-
-D_06001144 = 0x06001144;
-D_06001FA8 = 0x06001FA8;
-D_060020C8 = 0x060020C8;
-D_060030A4 = 0x060030A4;
-D_06003724 = 0x06003724;
-D_06003B10 = 0x06003B10;
-D_06003FB8 = 0x06003FB8;
-D_06004390 = 0x06004390;
-D_06004B90 = 0x06004B90;
-D_06005390 = 0x06005390;
-D_0600B530 = 0x0600B530;
-D_0600B9E8 = 0x0600B9E8;
-
-// ovl_En_Torch2
-
-D_0401C430 = 0x0401C430;
-D_04048DF0 = 0x04048DF0;
-D_04057B10 = 0x04057B10;
-D_04089070 = 0x04089070;
-
-// ovl_En_Toto
-
-D_06000C80 = 0x06000C80;
-D_06001324 = 0x06001324;
-D_060016A4 = 0x060016A4;
-D_06001DF0 = 0x06001DF0;
-D_060022C8 = 0x060022C8;
-D_060028B8 = 0x060028B8;
-D_06002F20 = 0x06002F20;
-D_06003AA8 = 0x06003AA8;
-D_06008AE8 = 0x06008AE8;
-D_0600A068 = 0x0600A068;
-D_0600A468 = 0x0600A468;
-D_0600A978 = 0x0600A978;
-D_0600B3E0 = 0x0600B3E0;
-D_0600B894 = 0x0600B894;
-D_0600BC08 = 0x0600BC08;
-D_0600C880 = 0x0600C880;
-
// ovl_En_Trt
D_0600FEF0 = 0x0600FEF0;
-D_0600FD34 = 0x0600FD34;
-D_0600DE68 = 0x0600DE68;
-D_06002224 = 0x06002224;
-D_06001EF4 = 0x06001EF4;
-D_060030EC = 0x060030EC;
-D_0600D52C = 0x0600D52C;
-D_06002CB0 = 0x06002CB0;
-D_0600EE98 = 0x0600EE98;
-D_06003D78 = 0x06003D78;
D_06000A44 = 0x06000A44;
-D_0600B0B8 = 0x0600B0B8;
-D_0600B8B8 = 0x0600B8B8;
-D_0600C0B8 = 0x0600C0B8;
// ovl_En_Trt2
@@ -3633,10 +2114,6 @@ D_06009520 = 0x06009520;
D_06009DB0 = 0x06009DB0;
D_0600A054 = 0x0600A054;
-// ovl_En_Warp_Uzu
-
-D_06000EC0 = 0x06000EC0;
-
// ovl_En_Wdhand
D_060000F4 = 0x060000F4;
@@ -3647,25 +2124,6 @@ D_060014C0 = 0x060014C0;
D_060015B0 = 0x060015B0;
D_06001E20 = 0x06001E20;
-// ovl_En_Wf
-
-D_06000300 = 0x06000300;
-D_060027D8 = 0x060027D8;
-D_060029D8 = 0x060029D8;
-D_06003BC0 = 0x06003BC0;
-D_06004638 = 0x06004638;
-D_06004A90 = 0x06004A90;
-D_06004C44 = 0x06004C44;
-D_060053D0 = 0x060053D0;
-D_06005700 = 0x06005700;
-D_06007AA8 = 0x06007AA8;
-D_060082A8 = 0x060082A8;
-D_060084A8 = 0x060084A8;
-D_060095D0 = 0x060095D0;
-D_06009808 = 0x06009808;
-D_06009A50 = 0x06009A50;
-D_0600A3CC = 0x0600A3CC;
-
// ovl_En_Wiz
D_06001860 = 0x06001860;
@@ -3727,23 +2185,6 @@ D_06013088 = 0x06013088;
D_060136E0 = 0x060136E0;
D_06015238 = 0x06015238;
-// ovl_En_Zot
-
-D_06002898 = 0x06002898;
-D_06004248 = 0x06004248;
-D_060050A0 = 0x060050A0;
-D_060058A0 = 0x060058A0;
-D_060060A0 = 0x060060A0;
-D_0600D208 = 0x0600D208;
-D_0600DE20 = 0x0600DE20;
-D_0600DF54 = 0x0600DF54;
-D_0600E400 = 0x0600E400;
-D_0600EDF0 = 0x0600EDF0;
-D_0600F4E8 = 0x0600F4E8;
-D_0600FDF0 = 0x0600FDF0;
-D_06010B18 = 0x06010B18;
-D_06011424 = 0x06011424;
-
// ovl_En_Zov
D_0600D3EC = 0x0600D3EC;
@@ -3761,11 +2202,6 @@ D_0600D208 = 0x0600D208;
D_0600D220 = 0x0600D220;
D_0600D288 = 0x0600D288;
-// ovl_Item_B_Heart
-
-D_06001290 = 0x06001290;
-D_06001470 = 0x06001470;
-
// ovl_Mir_Ray
D_06000168 = 0x06000168;
@@ -3792,16 +2228,6 @@ D_060004BC = 0x060004BC;
D_06000530 = 0x06000530;
D_06002208 = 0x06002208;
-// ovl_Obj_Bell
-
-D_06000570 = 0x06000570;
-D_06000698 = 0x06000698;
-D_060007A8 = 0x060007A8;
-D_06000840 = 0x06000840;
-D_060008D0 = 0x060008D0;
-D_06000960 = 0x06000960;
-D_06001BA8 = 0x06001BA8;
-
// ovl_Obj_Bigicicle
D_060009B0 = 0x060009B0;
@@ -3820,11 +2246,6 @@ D_06004560 = 0x06004560;
D_06004688 = 0x06004688;
D_06005990 = 0x06005990;
-// ovl_Obj_Boyo
-
-D_06000300 = 0x06000300;
-D_06000E88 = 0x06000E88;
-
// ovl_Obj_Chan
D_06000A10 = 0x06000A10;
@@ -3854,10 +2275,6 @@ D_06005A78 = 0x06005A78;
D_06008040 = 0x06008040;
D_060081D8 = 0x060081D8;
-// ovl_Obj_Dinner
-
-D_060011E0 = 0x060011E0;
-
// ovl_Obj_Dora
D_06003FD0 = 0x06003FD0;
@@ -3868,28 +2285,11 @@ D_06004160 = 0x06004160;
D_060016A0 = 0x060016A0;
D_06001AA8 = 0x06001AA8;
-// ovl_Obj_Ending
-
-D_060003D0 = 0x060003D0;
-D_06001FF8 = 0x06001FF8;
-D_060031A0 = 0x060031A0;
-D_06003440 = 0x06003440;
-
// ovl_Obj_Entotu
D_06000158 = 0x06000158;
D_06001C00 = 0x06001C00;
-// ovl_Obj_Funen
-
-D_060000D0 = 0x060000D0;
-
-// ovl_Obj_Ghaka
-
-D_06001980 = 0x06001980;
-D_06001A20 = 0x06001A20;
-D_06003CD0 = 0x06003CD0;
-
// ovl_Obj_Hakaisi
D_06001F10 = 0x06001F10;
@@ -3899,29 +2299,11 @@ D_060029C0 = 0x060029C0;
D_06002CC0 = 0x06002CC0;
D_06002FC4 = 0x06002FC4;
-// ovl_Obj_Hana
-
-D_06000500 = 0x06000500;
-
// ovl_Obj_Hariko
D_06000080 = 0x06000080;
D_06000110 = 0x06000110;
-// ovl_Obj_Hgdoor
-
-D_06001670 = 0x06001670;
-D_06001768 = 0x06001768;
-D_060018C0 = 0x060018C0;
-D_06001AB0 = 0x06001AB0;
-D_06001BA8 = 0x06001BA8;
-D_06001D10 = 0x06001D10;
-
-// ovl_Obj_HsStump
-
-D_060003B8 = 0x060003B8;
-D_060011B0 = 0x060011B0;
-
// ovl_Obj_Hunsui
D_06000220 = 0x06000220;
@@ -3943,11 +2325,6 @@ D_0601B210 = 0x0601B210;
D_06000180 = 0x06000180;
-// ovl_Obj_Kepn_Koya
-
-D_06003478 = 0x06003478;
-D_0600805C = 0x0600805C;
-
// ovl_Obj_Kzsaku
D_06000040 = 0x06000040;
@@ -3958,41 +2335,17 @@ D_06001118 = 0x06001118;
D_06000D10 = 0x06000D10;
D_06000F00 = 0x06000F00;
-// ovl_Obj_Lightblock
-
-D_06000178 = 0x06000178;
-D_06000B80 = 0x06000B80;
-
-// ovl_Obj_Lightswitch
-
-D_06000260 = 0x06000260;
-D_06000398 = 0x06000398;
-D_06000408 = 0x06000408;
-D_06000420 = 0x06000420;
-D_06000C20 = 0x06000C20;
-D_06001420 = 0x06001420;
-
// ovl_Obj_Lupygamelift
D_060048D0 = 0x060048D0;
D_060071B8 = 0x060071B8;
-// ovl_Obj_Milk_Bin
-
-D_060004B0 = 0x060004B0;
-
// ovl_Obj_Mine
D_06000030 = 0x06000030;
D_06002068 = 0x06002068;
D_06002188 = 0x06002188;
-// ovl_Obj_Moon_Stone
-
-D_06000C80 = 0x06000C80;
-D_06000D78 = 0x06000D78;
-D_06001C60 = 0x06001C60;
-
// ovl_Obj_Nozoki
D_060001C0 = 0x060001C0;
@@ -4003,14 +2356,6 @@ D_06001DB0 = 0x06001DB0;
D_06001E40 = 0x06001E40;
D_060048D0 = 0x060048D0;
-// ovl_Obj_Raillift
-
-D_06000208 = 0x06000208;
-D_060048D0 = 0x060048D0;
-D_06004BF0 = 0x06004BF0;
-D_06004FF8 = 0x06004FF8;
-D_060071B8 = 0x060071B8;
-
// ovl_Obj_Shutter
D_060011E0 = 0x060011E0;
@@ -4028,12 +2373,6 @@ D_06008B90 = 0x06008B90;
D_06000460 = 0x06000460;
D_06000E68 = 0x06000E68;
-// ovl_Obj_Syokudai
-
-D_060003A0 = 0x060003A0;
-D_06000870 = 0x06000870;
-D_06000B90 = 0x06000B90;
-
// ovl_Obj_Takaraya_Wall
D_06000B70 = 0x06000B70;
@@ -4065,12 +2404,6 @@ D_06003038 = 0x06003038;
D_060023B0 = 0x060023B0;
D_060024E8 = 0x060024E8;
-// ovl_Obj_Tree
-
-D_06000680 = 0x06000680;
-D_060007C8 = 0x060007C8;
-D_06001B2C = 0x06001B2C;
-
// ovl_Obj_Um
D_06007E20 = 0x06007E20;
@@ -4084,11 +2417,6 @@ D_06000098 = 0x06000098;
D_06000838 = 0x06000838;
D_060022AC = 0x060022AC;
-// ovl_Obj_Visiblock
-
-D_06000140 = 0x06000140;
-D_06000AD0 = 0x06000AD0;
-
// ovl_Obj_Vspinyroll
D_06000460 = 0x06000460;
@@ -4099,12 +2427,6 @@ D_06000F80 = 0x06000F80;
D_06001680 = 0x06001680;
D_060019B0 = 0x060019B0;
-// ovl_Obj_Yado
-
-D_06000320 = 0x06000320;
-D_06000430 = 0x06000430;
-D_060012E8 = 0x060012E8;
-
// ovl_Obj_Yasi
D_06000360 = 0x06000360;