diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 3ad2a9d4fc..96ba7a43d1 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -26,7 +26,7 @@ void func_809527F8(EnMs* this, PlayState* play); void func_809529AC(EnMs* this, PlayState* play); void func_80952A1C(EnMs* this, PlayState* play); -const ActorInit En_Ms_InitVars = { +ActorInit En_Ms_InitVars = { ACTOR_EN_MS, ACTORCAT_NPC, FLAGS, diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index eadfa9adc5..591f12a2b2 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -27,7 +27,7 @@ void EnRecepgirl_Draw(Actor* thisx, PlayState* play); // --------------- 4 --------------- #if 0 -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -122,8 +122,6 @@ typedef struct EnRecepgirl { /* 0x02AC */ char unk_2AC[0x8]; } EnRecepgirl; // size = 0x2B4 -extern const ActorInit En_Recepgirl_InitVars; - #endif // Z_EN_RECEPGIRL_H ``` @@ -337,7 +335,7 @@ For now, we do not want to consider the data that mips2c has kindly imported for ```C #if 0 -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 0a19113e43..6884ebb125 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -43,7 +43,7 @@ Once we have decompiled enough things to know what the data is, we can import it ```C #if 0 -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -99,7 +99,7 @@ endseg Next remove all the externs, and uncomment their corresponding commented data: ```C -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -139,7 +139,7 @@ As we'd expect, of course: we didn't fulfil our promise that they were defined e For actors which have yet to be decompiled, this is mitigated by use of the file `undefined_syms.txt`, which feeds the linker the raw addresses to use as the symbol definitions. However, we want to replace these segmented addresses with proper object symbols whenever possible. In `En_Recepgirl_InitVars`, we can see that this actor uses the object `OBJECT_BG`: ```c -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index 2e98e1efdf..68c90ef665 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -48,7 +48,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play); void func_80C10290(EnRecepgirl* this); void func_80C102D4(EnRecepgirl* this, PlayState* play); -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -316,7 +316,7 @@ So it is used as an index into the array `D_80C106B0`, and the element with that As we discussed last time, `D_80C106B0` is an array of [segmented pointers](data.md#segmented-pointers). Since they are in segment `6`, they are in the actor's object file. Which object? The InitVars tell us: namely, ```C -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, diff --git a/include/initvars.h b/include/initvars.h index 4de39757cc..50668a14ca 100644 --- a/include/initvars.h +++ b/include/initvars.h @@ -34,582 +34,6 @@ extern EffectSsInit Effect_Ss_Ice_Smoke_InitVars; extern EffectSsInit Effect_En_Ice_Block_InitVars; extern EffectSsInit Effect_Ss_Sbn_InitVars; -extern ActorInit Player_InitVars; -extern ActorInit Arms_Hook_InitVars; -extern ActorInit Arrow_Fire_InitVars; -extern ActorInit Arrow_Ice_InitVars; -extern ActorInit Arrow_Light_InitVars; -extern ActorInit Bg_Astr_Bombwall_InitVars; -extern ActorInit Bg_Botihasira_InitVars; -extern ActorInit Bg_Breakwall_InitVars; -extern ActorInit Bg_Crace_Movebg_InitVars; -extern ActorInit Bg_Ctower_Gear_InitVars; -extern ActorInit Bg_Ctower_Rot_InitVars; -extern ActorInit Bg_Danpei_Movebg_InitVars; -extern ActorInit Bg_Dblue_Balance_InitVars; -extern ActorInit Bg_Dblue_Elevator_InitVars; -extern ActorInit Bg_Dblue_Movebg_InitVars; -extern ActorInit Bg_Dblue_Waterfall_InitVars; -extern ActorInit Bg_Dkjail_Ivy_InitVars; -extern ActorInit Bg_Dy_Yoseizo_InitVars; -extern ActorInit Bg_F40_Block_InitVars; -extern ActorInit Bg_F40_Flift_InitVars; -extern ActorInit Bg_F40_Switch_InitVars; -extern ActorInit Bg_F40_Swlift_InitVars; -extern ActorInit Bg_Fire_Wall_InitVars; -extern ActorInit Bg_Fu_Kaiten_InitVars; -extern ActorInit Bg_Fu_Mizu_InitVars; -extern ActorInit Bg_Goron_Oyu_InitVars; -extern ActorInit Bg_Haka_Bombwall_InitVars; -extern ActorInit Bg_Haka_Curtain_InitVars; -extern ActorInit Bg_Haka_Tomb_InitVars; -extern ActorInit Bg_Hakugin_Bombwall_InitVars; -extern ActorInit Bg_Hakugin_Elvpole_InitVars; -extern ActorInit Bg_Hakugin_Post_InitVars; -extern ActorInit Bg_Hakugin_Switch_InitVars; -extern ActorInit Bg_Icefloe_InitVars; -extern ActorInit Bg_Icicle_InitVars; -extern ActorInit Bg_Ikana_Block_InitVars; -extern ActorInit Bg_Ikana_Bombwall_InitVars; -extern ActorInit Bg_Ikana_Dharma_InitVars; -extern ActorInit Bg_Ikana_Mirror_InitVars; -extern ActorInit Bg_Ikana_Ray_InitVars; -extern ActorInit Bg_Ikana_Rotaryroom_InitVars; -extern ActorInit Bg_Ikana_Shutter_InitVars; -extern ActorInit Bg_Ikninside_InitVars; -extern ActorInit Bg_Iknin_Susceil_InitVars; -extern ActorInit Bg_Iknv_Doukutu_InitVars; -extern ActorInit Bg_Iknv_Obj_InitVars; -extern ActorInit Bg_Ingate_InitVars; -extern ActorInit Bg_Inibs_Movebg_InitVars; -extern ActorInit Bg_Keikoku_Saku_InitVars; -extern ActorInit Bg_Keikoku_Spr_InitVars; -extern ActorInit Bg_Kin2_Bombwall_InitVars; -extern ActorInit Bg_Kin2_Fence_InitVars; -extern ActorInit Bg_Kin2_Picture_InitVars; -extern ActorInit Bg_Kin2_Shelf_InitVars; -extern ActorInit Bg_Ladder_InitVars; -extern ActorInit Bg_Last_Bwall_InitVars; -extern ActorInit Bg_Lbfshot_InitVars; -extern ActorInit Bg_Lotus_InitVars; -extern ActorInit Bg_Market_Step_InitVars; -extern ActorInit Bg_Mbar_Chair_InitVars; -extern ActorInit Bg_Numa_Hana_InitVars; -extern ActorInit Bg_Open_Shutter_InitVars; -extern ActorInit Bg_Open_Spot_InitVars; -extern ActorInit Bg_Sinkai_Kabe_InitVars; -extern ActorInit Bg_Spdweb_InitVars; -extern ActorInit Bg_Spout_Fire_InitVars; -extern ActorInit Bg_Tobira01_InitVars; -extern ActorInit Bg_Umajump_InitVars; -extern ActorInit Boss_01_InitVars; -extern ActorInit Boss_02_InitVars; -extern ActorInit Boss_03_InitVars; -extern ActorInit Boss_04_InitVars; -extern ActorInit Boss_05_InitVars; -extern ActorInit Boss_06_InitVars; -extern ActorInit Boss_07_InitVars; -extern ActorInit Boss_Hakugin_InitVars; -extern ActorInit Demo_Effect_InitVars; -extern ActorInit Demo_Getitem_InitVars; -extern ActorInit Demo_Kankyo_InitVars; -extern ActorInit Demo_Moonend_InitVars; -extern ActorInit Demo_Shd_InitVars; -extern ActorInit Demo_Syoten_InitVars; -extern ActorInit Demo_Tre_Lgt_InitVars; -extern ActorInit Dm_Ah_InitVars; -extern ActorInit Dm_Al_InitVars; -extern ActorInit Dm_An_InitVars; -extern ActorInit Dm_Bal_InitVars; -extern ActorInit Dm_Char00_InitVars; -extern ActorInit Dm_Char01_InitVars; -extern ActorInit Dm_Char02_InitVars; -extern ActorInit Dm_Char03_InitVars; -extern ActorInit Dm_Char04_InitVars; -extern ActorInit Dm_Char05_InitVars; -extern ActorInit Dm_Char06_InitVars; -extern ActorInit Dm_Char07_InitVars; -extern ActorInit Dm_Char08_InitVars; -extern ActorInit Dm_Char09_InitVars; -extern ActorInit Dm_Gm_InitVars; -extern ActorInit Dm_Hina_InitVars; -extern ActorInit Dm_Nb_InitVars; -extern ActorInit Dm_Opstage_InitVars; -extern ActorInit Dm_Ravine_InitVars; -extern ActorInit Dm_Sa_InitVars; -extern ActorInit Dm_Statue_InitVars; -extern ActorInit Dm_Stk_InitVars; -extern ActorInit Dm_Tag_InitVars; -extern ActorInit Dm_Tsg_InitVars; -extern ActorInit Dm_Zl_InitVars; -extern ActorInit Door_Ana_InitVars; -extern ActorInit Door_Shutter_InitVars; -extern ActorInit Door_Spiral_InitVars; -extern ActorInit Door_Warp1_InitVars; -extern ActorInit Eff_Change_InitVars; -extern ActorInit Eff_Dust_InitVars; -extern ActorInit Eff_Kamejima_Wave_InitVars; -extern ActorInit Eff_Lastday_InitVars; -extern ActorInit Eff_Stk_InitVars; -extern ActorInit Eff_Zoraband_InitVars; -extern ActorInit Elf_Msg_InitVars; -extern ActorInit Elf_Msg2_InitVars; -extern ActorInit Elf_Msg3_InitVars; -extern ActorInit Elf_Msg4_InitVars; -extern ActorInit Elf_Msg5_InitVars; -extern ActorInit Elf_Msg6_InitVars; -extern ActorInit En_Ah_InitVars; -extern ActorInit En_Akindonuts_InitVars; -extern ActorInit En_Al_InitVars; -extern ActorInit En_Am_InitVars; -extern ActorInit En_An_InitVars; -extern ActorInit En_And_InitVars; -extern ActorInit En_Ani_InitVars; -extern ActorInit En_Aob_01_InitVars; -extern ActorInit En_Arrow_InitVars; -extern ActorInit En_Attack_Niw_InitVars; -extern ActorInit En_Az_InitVars; -extern ActorInit En_Baba_InitVars; -extern ActorInit En_Baguo_InitVars; -extern ActorInit En_Baisen_InitVars; -extern ActorInit En_Bal_InitVars; -extern ActorInit En_Bat_InitVars; -extern ActorInit En_Bb_InitVars; -extern ActorInit En_Bba_01_InitVars; -extern ActorInit En_Bbfall_InitVars; -extern ActorInit En_Bee_InitVars; -extern ActorInit En_Bh_InitVars; -extern ActorInit En_Bigokuta_InitVars; -extern ActorInit En_Bigpamet_InitVars; -extern ActorInit En_Bigpo_InitVars; -extern ActorInit En_Bigslime_InitVars; -extern ActorInit En_Bji_01_InitVars; -extern ActorInit En_Bjt_InitVars; -extern ActorInit En_Boj_01_InitVars; -extern ActorInit En_Boj_02_InitVars; -extern ActorInit En_Boj_03_InitVars; -extern ActorInit En_Boj_04_InitVars; -extern ActorInit En_Boj_05_InitVars; -extern ActorInit En_Bom_InitVars; -extern ActorInit En_Bombal_InitVars; -extern ActorInit En_Bombers_InitVars; -extern ActorInit En_Bombers2_InitVars; -extern ActorInit En_Bombf_InitVars; -extern ActorInit En_Bomjima_InitVars; -extern ActorInit En_Bomjimb_InitVars; -extern ActorInit En_Bom_Bowl_Man_InitVars; -extern ActorInit En_Bom_Chu_InitVars; -extern ActorInit En_Boom_InitVars; -extern ActorInit En_Box_InitVars; -extern ActorInit En_Bsb_InitVars; -extern ActorInit En_Bu_InitVars; -extern ActorInit En_Bubble_InitVars; -extern ActorInit En_Butte_InitVars; -extern ActorInit En_Cha_InitVars; -extern ActorInit En_Clear_Tag_InitVars; -extern ActorInit En_Cne_01_InitVars; -extern ActorInit En_Col_Man_InitVars; -extern ActorInit En_Cow_InitVars; -extern ActorInit En_Crow_InitVars; -extern ActorInit En_Dai_InitVars; -extern ActorInit En_Daiku_InitVars; -extern ActorInit En_Daiku2_InitVars; -extern ActorInit En_Death_InitVars; -extern ActorInit En_Dekubaba_InitVars; -extern ActorInit En_Dekunuts_InitVars; -extern ActorInit En_Demo_heishi_InitVars; -extern ActorInit En_Dg_InitVars; -extern ActorInit En_Dinofos_InitVars; -extern ActorInit En_Dnb_InitVars; -extern ActorInit En_Dnh_InitVars; -extern ActorInit En_Dnk_InitVars; -extern ActorInit En_Dno_InitVars; -extern ActorInit En_Dnp_InitVars; -extern ActorInit En_Dnq_InitVars; -extern ActorInit En_Dns_InitVars; -extern ActorInit En_Dodongo_InitVars; -extern ActorInit En_Door_InitVars; -extern ActorInit En_Door_Etc_InitVars; -extern ActorInit En_Dragon_InitVars; -extern ActorInit En_Drs_InitVars; -extern ActorInit En_Ds2n_InitVars; -extern ActorInit En_Dt_InitVars; -extern ActorInit En_Dy_Extra_InitVars; -extern ActorInit En_Egblock_InitVars; -extern ActorInit En_Egol_InitVars; -extern ActorInit En_Elf_InitVars; -extern ActorInit En_Elfbub_InitVars; -extern ActorInit En_Elfgrp_InitVars; -extern ActorInit En_Elforg_InitVars; -extern ActorInit En_Encount1_InitVars; -extern ActorInit En_Encount2_InitVars; -extern ActorInit En_Encount3_InitVars; -extern ActorInit En_Encount4_InitVars; -extern ActorInit En_Ending_Hero_InitVars; -extern ActorInit En_Ending_Hero2_InitVars; -extern ActorInit En_Ending_Hero3_InitVars; -extern ActorInit En_Ending_Hero4_InitVars; -extern ActorInit En_Ending_Hero5_InitVars; -extern ActorInit En_Ending_Hero6_InitVars; -extern ActorInit En_Estone_InitVars; -extern ActorInit En_Fall_InitVars; -extern ActorInit En_Fall2_InitVars; -extern ActorInit En_Famos_InitVars; -extern ActorInit En_Fg_InitVars; -extern ActorInit En_Firefly_InitVars; -extern ActorInit En_Firefly2_InitVars; -extern ActorInit En_Fire_Rock_InitVars; -extern ActorInit En_Fish_InitVars; -extern ActorInit En_Fishing_InitVars; -extern ActorInit En_Fish2_InitVars; -extern ActorInit En_Floormas_InitVars; -extern ActorInit En_Fr_InitVars; -extern ActorInit En_Fsn_InitVars; -extern ActorInit En_Fu_InitVars; -extern ActorInit En_Fu_Kago_InitVars; -extern ActorInit En_Fu_Mato_InitVars; -extern ActorInit En_Fz_InitVars; -extern ActorInit En_Gakufu_InitVars; -extern ActorInit En_Gamelupy_InitVars; -extern ActorInit En_Gb2_InitVars; -extern ActorInit En_Ge1_InitVars; -extern ActorInit En_Ge2_InitVars; -extern ActorInit En_Ge3_InitVars; -extern ActorInit En_Geg_InitVars; -extern ActorInit En_Gg_InitVars; -extern ActorInit En_Gg2_InitVars; -extern ActorInit En_Giant_InitVars; -extern ActorInit En_Ginko_Man_InitVars; -extern ActorInit En_GirlA_InitVars; -extern ActorInit En_Gk_InitVars; -extern ActorInit En_Gm_InitVars; -extern ActorInit En_Go_InitVars; -extern ActorInit En_Goroiwa_InitVars; -extern ActorInit En_Grasshopper_InitVars; -extern ActorInit En_Gs_InitVars; -extern ActorInit En_Guard_Nuts_InitVars; -extern ActorInit En_Guruguru_InitVars; -extern ActorInit En_Hakurock_InitVars; -extern ActorInit En_Hanabi_InitVars; -extern ActorInit En_Hata_InitVars; -extern ActorInit En_Heishi_InitVars; -extern ActorInit En_Hg_InitVars; -extern ActorInit En_Hgo_InitVars; -extern ActorInit En_Hidden_Nuts_InitVars; -extern ActorInit En_Hint_Skb_InitVars; -extern ActorInit En_Hit_Tag_InitVars; -extern ActorInit En_Holl_InitVars; -extern ActorInit En_Honotrap_InitVars; -extern ActorInit En_Horse_InitVars; -extern ActorInit En_Horse_Game_Check_InitVars; -extern ActorInit En_Horse_Link_Child_InitVars; -extern ActorInit En_Hs_InitVars; -extern ActorInit En_Hs2_InitVars; -extern ActorInit En_Ig_InitVars; -extern ActorInit En_Ik_InitVars; -extern ActorInit En_In_InitVars; -extern ActorInit En_Insect_InitVars; -extern ActorInit En_Invadepoh_InitVars; -extern ActorInit En_Invadepoh_Demo_InitVars; -extern ActorInit En_Invisible_Ruppe_InitVars; -extern ActorInit En_Ishi_InitVars; -extern ActorInit En_Item00_InitVars; -extern ActorInit En_Ja_InitVars; -extern ActorInit En_Jc_Mato_InitVars; -extern ActorInit En_Jg_InitVars; -extern ActorInit En_Jgame_Tsn_InitVars; -extern ActorInit En_Js_InitVars; -extern ActorInit En_Jso_InitVars; -extern ActorInit En_Jso2_InitVars; -extern ActorInit En_Kaizoku_InitVars; -extern ActorInit En_Kakasi_InitVars; -extern ActorInit En_Kame_InitVars; -extern ActorInit En_Kanban_InitVars; -extern ActorInit En_Karebaba_InitVars; -extern ActorInit En_Kbt_InitVars; -extern ActorInit En_Kendo_Js_InitVars; -extern ActorInit En_Kgy_InitVars; -extern ActorInit En_Kitan_InitVars; -extern ActorInit En_Knight_InitVars; -extern ActorInit En_Kujiya_InitVars; -extern ActorInit En_Kusa_InitVars; -extern ActorInit En_Kusa2_InitVars; -extern ActorInit En_Lift_Nuts_InitVars; -extern ActorInit En_Light_InitVars; -extern ActorInit En_Look_Nuts_InitVars; -extern ActorInit En_Ma4_InitVars; -extern ActorInit En_Mag_InitVars; -extern ActorInit En_Maruta_InitVars; -extern ActorInit En_Ma_Yto_InitVars; -extern ActorInit En_Ma_Yts_InitVars; -extern ActorInit En_Minideath_InitVars; -extern ActorInit En_Minifrog_InitVars; -extern ActorInit En_Minislime_InitVars; -extern ActorInit En_Mk_InitVars; -extern ActorInit En_Mkk_InitVars; -extern ActorInit En_Mm_InitVars; -extern ActorInit En_Mm2_InitVars; -extern ActorInit En_Mm3_InitVars; -extern ActorInit En_Mnk_InitVars; -extern ActorInit En_Ms_InitVars; -extern ActorInit En_Mt_tag_InitVars; -extern ActorInit En_Mushi2_InitVars; -extern ActorInit En_Muto_InitVars; -extern ActorInit En_M_Fire1_InitVars; -extern ActorInit En_M_Thunder_InitVars; -extern ActorInit En_Nb_InitVars; -extern ActorInit En_Neo_Reeba_InitVars; -extern ActorInit En_Nimotsu_InitVars; -extern ActorInit En_Niw_InitVars; -extern ActorInit En_Nnh_InitVars; -extern ActorInit En_Nutsball_InitVars; -extern ActorInit En_Nwc_InitVars; -extern ActorInit En_Okarina_Effect_InitVars; -extern ActorInit En_Okarina_Tag_InitVars; -extern ActorInit En_Okuta_InitVars; -extern ActorInit En_Onpuman_InitVars; -extern ActorInit En_Osk_InitVars; -extern ActorInit En_Osn_InitVars; -extern ActorInit En_Ossan_InitVars; -extern ActorInit En_Ot_InitVars; -extern ActorInit En_Owl_InitVars; -extern ActorInit En_Pamera_InitVars; -extern ActorInit En_Pametfrog_InitVars; -extern ActorInit En_Paper_InitVars; -extern ActorInit En_Part_InitVars; -extern ActorInit En_Peehat_InitVars; -extern ActorInit En_Pm_InitVars; -extern ActorInit En_Poh_InitVars; -extern ActorInit En_Po_Composer_InitVars; -extern ActorInit En_Po_Fusen_InitVars; -extern ActorInit En_Po_Sisters_InitVars; -extern ActorInit En_Pp_InitVars; -extern ActorInit En_Pr_InitVars; -extern ActorInit En_Pr2_InitVars; -extern ActorInit En_Prz_InitVars; -extern ActorInit En_Pst_InitVars; -extern ActorInit En_Racedog_InitVars; -extern ActorInit En_Raf_InitVars; -extern ActorInit En_Railgibud_InitVars; -extern ActorInit En_Rail_Skb_InitVars; -extern ActorInit En_Rat_InitVars; -extern ActorInit En_Rd_InitVars; -extern ActorInit En_Recepgirl_InitVars; -extern ActorInit En_Rg_InitVars; -extern ActorInit En_River_Sound_InitVars; -extern ActorInit En_Rr_InitVars; -extern ActorInit En_Rsn_InitVars; -extern ActorInit En_Ru_InitVars; -extern ActorInit En_Ruppecrow_InitVars; -extern ActorInit En_Rz_InitVars; -extern ActorInit En_Sb_InitVars; -extern ActorInit En_Scopecoin_InitVars; -extern ActorInit En_Scopecrow_InitVars; -extern ActorInit En_Scopenuts_InitVars; -extern ActorInit En_Sc_Ruppe_InitVars; -extern ActorInit En_Sda_InitVars; -extern ActorInit En_Sekihi_InitVars; -extern ActorInit En_Sellnuts_InitVars; -extern ActorInit En_Shn_InitVars; -extern ActorInit En_Si_InitVars; -extern ActorInit En_Skb_InitVars; -extern ActorInit En_Slime_InitVars; -extern ActorInit En_Snowman_InitVars; -extern ActorInit En_Snowwd_InitVars; -extern ActorInit En_Sob1_InitVars; -extern ActorInit En_Ssh_InitVars; -extern ActorInit En_St_InitVars; -extern ActorInit En_Sth_InitVars; -extern ActorInit En_Sth2_InitVars; -extern ActorInit En_Stone_heishi_InitVars; -extern ActorInit En_Stop_heishi_InitVars; -extern ActorInit En_Stream_InitVars; -extern ActorInit En_Suttari_InitVars; -extern ActorInit En_Sw_InitVars; -extern ActorInit En_Syateki_Crow_InitVars; -extern ActorInit En_Syateki_Dekunuts_InitVars; -extern ActorInit En_Syateki_Man_InitVars; -extern ActorInit En_Syateki_Okuta_InitVars; -extern ActorInit En_Syateki_Wf_InitVars; -extern ActorInit En_S_Goro_InitVars; -extern ActorInit En_Tab_InitVars; -extern ActorInit En_Tag_Obj_InitVars; -extern ActorInit En_Takaraya_InitVars; -extern ActorInit En_Talk_InitVars; -extern ActorInit En_Talk_Gibud_InitVars; -extern ActorInit En_Tanron1_InitVars; -extern ActorInit En_Tanron2_InitVars; -extern ActorInit En_Tanron3_InitVars; -extern ActorInit En_Tanron4_InitVars; -extern ActorInit En_Tanron5_InitVars; -extern ActorInit En_Tanron6_InitVars; -extern ActorInit En_Test_InitVars; -extern ActorInit En_Test2_InitVars; -extern ActorInit En_Test3_InitVars; -extern ActorInit En_Test4_InitVars; -extern ActorInit En_Test5_InitVars; -extern ActorInit En_Test6_InitVars; -extern ActorInit En_Test7_InitVars; -extern ActorInit En_Tg_InitVars; -extern ActorInit En_Thiefbird_InitVars; -extern ActorInit En_Time_Tag_InitVars; -extern ActorInit En_Tite_InitVars; -extern ActorInit En_Tk_InitVars; -extern ActorInit En_Torch_InitVars; -extern ActorInit En_Torch2_InitVars; -extern ActorInit En_Toto_InitVars; -extern ActorInit En_Trt_InitVars; -extern ActorInit En_Trt2_InitVars; -extern ActorInit En_Tru_InitVars; -extern ActorInit En_Tru_Mt_InitVars; -extern ActorInit En_Tsn_InitVars; -extern ActorInit En_Tubo_Trap_InitVars; -extern ActorInit En_Twig_InitVars; -extern ActorInit En_Viewer_InitVars; -extern ActorInit En_Vm_InitVars; -extern ActorInit En_Wallmas_InitVars; -extern ActorInit En_Warp_tag_InitVars; -extern ActorInit En_Warp_Uzu_InitVars; -extern ActorInit En_Water_Effect_InitVars; -extern ActorInit En_Wdhand_InitVars; -extern ActorInit En_Weather_Tag_InitVars; -extern ActorInit En_Wf_InitVars; -extern ActorInit En_Wiz_InitVars; -extern ActorInit En_Wiz_Brock_InitVars; -extern ActorInit En_Wiz_Fire_InitVars; -extern ActorInit En_Wood02_InitVars; -extern ActorInit En_Yb_InitVars; -extern ActorInit En_Zl1_InitVars; -extern ActorInit En_Zl4_InitVars; -extern ActorInit En_Zo_InitVars; -extern ActorInit En_Zob_InitVars; -extern ActorInit En_Zod_InitVars; -extern ActorInit En_Zog_InitVars; -extern ActorInit En_Zoraegg_InitVars; -extern ActorInit En_Zos_InitVars; -extern ActorInit En_Zot_InitVars; -extern ActorInit En_Zov_InitVars; -extern ActorInit En_Zow_InitVars; -extern ActorInit Item_B_Heart_InitVars; -extern ActorInit Item_Etcetera_InitVars; -extern ActorInit Item_Inbox_InitVars; -extern ActorInit Mir_Ray_InitVars; -extern ActorInit Mir_Ray2_InitVars; -extern ActorInit Mir_Ray3_InitVars; -extern ActorInit Object_Kankyo_InitVars; -extern ActorInit Obj_Aqua_InitVars; -extern ActorInit Obj_Armos_InitVars; -extern ActorInit Obj_Bean_InitVars; -extern ActorInit Obj_Bell_InitVars; -extern ActorInit Obj_Bigicicle_InitVars; -extern ActorInit Obj_Blockstop_InitVars; -extern ActorInit Obj_Boat_InitVars; -extern ActorInit Obj_Bombiwa_InitVars; -extern ActorInit Obj_Boyo_InitVars; -extern ActorInit Obj_Chan_InitVars; -extern ActorInit Obj_Chikuwa_InitVars; -extern ActorInit Obj_Comb_InitVars; -extern ActorInit Obj_Danpeilift_InitVars; -extern ActorInit Obj_Demo_InitVars; -extern ActorInit Obj_Dhouse_InitVars; -extern ActorInit Obj_Dinner_InitVars; -extern ActorInit Obj_Dora_InitVars; -extern ActorInit Obj_Dowsing_InitVars; -extern ActorInit Obj_Driftice_InitVars; -extern ActorInit Obj_Ending_InitVars; -extern ActorInit Obj_Entotu_InitVars; -extern ActorInit Obj_Etcetera_InitVars; -extern ActorInit Obj_Fireshield_InitVars; -extern ActorInit Obj_Flowerpot_InitVars; -extern ActorInit Obj_Funen_InitVars; -extern ActorInit Obj_Ghaka_InitVars; -extern ActorInit Obj_Grass_InitVars; -extern ActorInit Obj_Grass_Carry_InitVars; -extern ActorInit Obj_Grass_Unit_InitVars; -extern ActorInit Obj_Hakaisi_InitVars; -extern ActorInit Obj_Hamishi_InitVars; -extern ActorInit Obj_Hana_InitVars; -extern ActorInit Obj_Hariko_InitVars; -extern ActorInit Obj_Hgdoor_InitVars; -extern ActorInit Obj_Hsblock_InitVars; -extern ActorInit Obj_HsStump_InitVars; -extern ActorInit Obj_Hugebombiwa_InitVars; -extern ActorInit Obj_Hunsui_InitVars; -extern ActorInit Obj_Iceblock_InitVars; -extern ActorInit Obj_Ice_Poly_InitVars; -extern ActorInit Obj_Jgame_Light_InitVars; -extern ActorInit Obj_Jg_Gakki_InitVars; -extern ActorInit Obj_Kendo_Kanban_InitVars; -extern ActorInit Obj_Kepn_Koya_InitVars; -extern ActorInit Obj_Kibako_InitVars; -extern ActorInit Obj_Kibako2_InitVars; -extern ActorInit Obj_Kinoko_InitVars; -extern ActorInit Obj_Kzsaku_InitVars; -extern ActorInit Obj_Lift_InitVars; -extern ActorInit Obj_Lightblock_InitVars; -extern ActorInit Obj_Lightswitch_InitVars; -extern ActorInit Obj_Lupygamelift_InitVars; -extern ActorInit Obj_Makekinsuta_InitVars; -extern ActorInit Obj_Makeoshihiki_InitVars; -extern ActorInit Obj_Milk_Bin_InitVars; -extern ActorInit Obj_Mine_InitVars; -extern ActorInit Obj_Moon_Stone_InitVars; -extern ActorInit Obj_Mure_InitVars; -extern ActorInit Obj_Mure2_InitVars; -extern ActorInit Obj_Mure3_InitVars; -extern ActorInit Obj_Mu_Pict_InitVars; -extern ActorInit Obj_Nozoki_InitVars; -extern ActorInit Obj_Ocarinalift_InitVars; -extern ActorInit Obj_Oshihiki_InitVars; -extern ActorInit Obj_Purify_InitVars; -extern ActorInit Obj_Pzlblock_InitVars; -extern ActorInit Obj_Raillift_InitVars; -extern ActorInit Obj_Roomtimer_InitVars; -extern ActorInit Obj_Rotlift_InitVars; -extern ActorInit Obj_Shutter_InitVars; -extern ActorInit Obj_Skateblock_InitVars; -extern ActorInit Obj_Smork_InitVars; -extern ActorInit Obj_Snowball_InitVars; -extern ActorInit Obj_Snowball2_InitVars; -extern ActorInit Obj_Sound_InitVars; -extern ActorInit Obj_Spidertent_InitVars; -extern ActorInit Obj_Spinyroll_InitVars; -extern ActorInit Obj_Switch_InitVars; -extern ActorInit Obj_Swprize_InitVars; -extern ActorInit Obj_Syokudai_InitVars; -extern ActorInit Obj_Takaraya_Wall_InitVars; -extern ActorInit Obj_Taru_InitVars; -extern ActorInit Obj_Toge_InitVars; -extern ActorInit Obj_Tokeidai_InitVars; -extern ActorInit Obj_Tokei_Step_InitVars; -extern ActorInit Obj_Tokei_Tobira_InitVars; -extern ActorInit Obj_Tokei_Turret_InitVars; -extern ActorInit Obj_Toudai_InitVars; -extern ActorInit Obj_Tree_InitVars; -extern ActorInit Obj_Tsubo_InitVars; -extern ActorInit Obj_Um_InitVars; -extern ActorInit Obj_Usiyane_InitVars; -extern ActorInit Obj_Visiblock_InitVars; -extern ActorInit Obj_Vspinyroll_InitVars; -extern ActorInit Obj_Warpstone_InitVars; -extern ActorInit Obj_Wind_InitVars; -extern ActorInit Obj_Wturn_InitVars; -extern ActorInit Obj_Y2lift_InitVars; -extern ActorInit Obj_Y2shutter_InitVars; -extern ActorInit Obj_Yado_InitVars; -extern ActorInit Obj_Yasi_InitVars; -extern ActorInit Oceff_Spot_InitVars; -extern ActorInit Oceff_Storm_InitVars; -extern ActorInit Oceff_Wipe_InitVars; -extern ActorInit Oceff_Wipe2_InitVars; -extern ActorInit Oceff_Wipe3_InitVars; -extern ActorInit Oceff_Wipe4_InitVars; -extern ActorInit Oceff_Wipe5_InitVars; -extern ActorInit Oceff_Wipe6_InitVars; -extern ActorInit Oceff_Wipe7_InitVars; -extern ActorInit Shot_Sun_InitVars; -extern ActorInit TG_Sw_InitVars; - extern TransitionInit TransitionFade_InitVars; extern TransitionInit TransitionTriforce_InitVars; extern TransitionInit TransitionWipe1_InitVars; diff --git a/include/segment_symbols.h b/include/segment_symbols.h index 1339c879c2..b69439ce73 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -76,147 +76,16 @@ DECLARE_OVERLAY_SEGMENT(daytelop) DECLARE_OVERLAY_SEGMENT(kaleido_scope) DECLARE_OVERLAY_SEGMENT(player_actor) -DECLARE_OVERLAY_SEGMENT(En_Test) -DECLARE_OVERLAY_SEGMENT(En_GirlA) -DECLARE_OVERLAY_SEGMENT(En_Part) -DECLARE_OVERLAY_SEGMENT(En_Light) -DECLARE_OVERLAY_SEGMENT(En_Door) -DECLARE_OVERLAY_SEGMENT(En_Box) -DECLARE_OVERLAY_SEGMENT(En_Pametfrog) -DECLARE_OVERLAY_SEGMENT(En_Okuta) -DECLARE_OVERLAY_SEGMENT(En_Bom) -DECLARE_OVERLAY_SEGMENT(En_Wallmas) -DECLARE_OVERLAY_SEGMENT(En_Dodongo) -DECLARE_OVERLAY_SEGMENT(En_Firefly) -DECLARE_OVERLAY_SEGMENT(En_Horse) -DECLARE_OVERLAY_SEGMENT(En_Arrow) -DECLARE_OVERLAY_SEGMENT(En_Elf) -DECLARE_OVERLAY_SEGMENT(En_Niw) -DECLARE_OVERLAY_SEGMENT(En_Tite) -DECLARE_OVERLAY_SEGMENT(En_Peehat) -DECLARE_OVERLAY_SEGMENT(En_Holl) -DECLARE_OVERLAY_SEGMENT(En_Dinofos) -DECLARE_OVERLAY_SEGMENT(En_Hata) -DECLARE_OVERLAY_SEGMENT(En_Zl1) -DECLARE_OVERLAY_SEGMENT(En_Viewer) -DECLARE_OVERLAY_SEGMENT(En_Bubble) -DECLARE_OVERLAY_SEGMENT(Door_Shutter) -DECLARE_OVERLAY_SEGMENT(En_Boom) -DECLARE_OVERLAY_SEGMENT(En_Torch2) -DECLARE_OVERLAY_SEGMENT(En_Minifrog) -DECLARE_OVERLAY_SEGMENT(En_St) -DECLARE_OVERLAY_SEGMENT(Obj_Wturn) -DECLARE_OVERLAY_SEGMENT(En_River_Sound) -DECLARE_OVERLAY_SEGMENT(En_Ossan) -DECLARE_OVERLAY_SEGMENT(En_Famos) -DECLARE_OVERLAY_SEGMENT(En_Bombf) -DECLARE_OVERLAY_SEGMENT(En_Am) -DECLARE_OVERLAY_SEGMENT(En_Dekubaba) -DECLARE_OVERLAY_SEGMENT(En_M_Fire1) -DECLARE_OVERLAY_SEGMENT(En_M_Thunder) -DECLARE_OVERLAY_SEGMENT(Bg_Breakwall) -DECLARE_OVERLAY_SEGMENT(Door_Warp1) -DECLARE_OVERLAY_SEGMENT(Obj_Syokudai) -DECLARE_OVERLAY_SEGMENT(Item_B_Heart) -DECLARE_OVERLAY_SEGMENT(En_Dekunuts) -DECLARE_OVERLAY_SEGMENT(En_Bbfall) -DECLARE_OVERLAY_SEGMENT(Arms_Hook) -DECLARE_OVERLAY_SEGMENT(En_Bb) -DECLARE_OVERLAY_SEGMENT(Bg_Keikoku_Spr) -DECLARE_OVERLAY_SEGMENT(En_Wood02) -DECLARE_OVERLAY_SEGMENT(En_Death) -DECLARE_OVERLAY_SEGMENT(En_Minideath) -DECLARE_OVERLAY_SEGMENT(En_Vm) -DECLARE_OVERLAY_SEGMENT(Demo_Effect) -DECLARE_OVERLAY_SEGMENT(Demo_Kankyo) -DECLARE_OVERLAY_SEGMENT(En_Floormas) -DECLARE_OVERLAY_SEGMENT(En_Rd) -DECLARE_OVERLAY_SEGMENT(Bg_F40_Flift) -DECLARE_OVERLAY_SEGMENT(Obj_Mure) -DECLARE_OVERLAY_SEGMENT(En_Sw) -DECLARE_OVERLAY_SEGMENT(Object_Kankyo) -DECLARE_OVERLAY_SEGMENT(En_Horse_Link_Child) -DECLARE_OVERLAY_SEGMENT(Door_Ana) -DECLARE_OVERLAY_SEGMENT(En_Encount1) -DECLARE_OVERLAY_SEGMENT(Demo_Tre_Lgt) -DECLARE_OVERLAY_SEGMENT(En_Encount2) -DECLARE_OVERLAY_SEGMENT(En_Fire_Rock) -DECLARE_OVERLAY_SEGMENT(Bg_Ctower_Rot) -DECLARE_OVERLAY_SEGMENT(Mir_Ray) -DECLARE_OVERLAY_SEGMENT(En_Sb) -DECLARE_OVERLAY_SEGMENT(En_Bigslime) -DECLARE_OVERLAY_SEGMENT(En_Karebaba) -DECLARE_OVERLAY_SEGMENT(En_In) -DECLARE_OVERLAY_SEGMENT(En_Bom_Chu) -DECLARE_OVERLAY_SEGMENT(En_Horse_Game_Check) -DECLARE_OVERLAY_SEGMENT(En_Rr) -DECLARE_OVERLAY_SEGMENT(En_Fr) -DECLARE_OVERLAY_SEGMENT(En_Fishing) -DECLARE_OVERLAY_SEGMENT(Obj_Oshihiki) -DECLARE_OVERLAY_SEGMENT(Eff_Dust) -DECLARE_OVERLAY_SEGMENT(Bg_Umajump) -DECLARE_OVERLAY_SEGMENT(En_Insect) -DECLARE_OVERLAY_SEGMENT(En_Butte) -DECLARE_OVERLAY_SEGMENT(En_Fish) -DECLARE_OVERLAY_SEGMENT(Item_Etcetera) -DECLARE_OVERLAY_SEGMENT(Arrow_Fire) -DECLARE_OVERLAY_SEGMENT(Arrow_Ice) -DECLARE_OVERLAY_SEGMENT(Arrow_Light) -DECLARE_OVERLAY_SEGMENT(Obj_Kibako) -DECLARE_OVERLAY_SEGMENT(Obj_Tsubo) -DECLARE_OVERLAY_SEGMENT(En_Ik) -DECLARE_OVERLAY_SEGMENT(Demo_Shd) -DECLARE_OVERLAY_SEGMENT(En_Dns) -DECLARE_OVERLAY_SEGMENT(Elf_Msg) -DECLARE_OVERLAY_SEGMENT(En_Honotrap) -DECLARE_OVERLAY_SEGMENT(En_Tubo_Trap) -DECLARE_OVERLAY_SEGMENT(Obj_Ice_Poly) -DECLARE_OVERLAY_SEGMENT(En_Fz) -DECLARE_OVERLAY_SEGMENT(En_Kusa) -DECLARE_OVERLAY_SEGMENT(Obj_Bean) -DECLARE_OVERLAY_SEGMENT(Obj_Bombiwa) -DECLARE_OVERLAY_SEGMENT(Obj_Switch) -DECLARE_OVERLAY_SEGMENT(Obj_Lift) -DECLARE_OVERLAY_SEGMENT(Obj_Hsblock) -DECLARE_OVERLAY_SEGMENT(En_Okarina_Tag) -DECLARE_OVERLAY_SEGMENT(En_Goroiwa) -DECLARE_OVERLAY_SEGMENT(En_Daiku) -DECLARE_OVERLAY_SEGMENT(En_Nwc) -DECLARE_OVERLAY_SEGMENT(Item_Inbox) -DECLARE_OVERLAY_SEGMENT(En_Ge1) -DECLARE_OVERLAY_SEGMENT(Obj_Blockstop) -DECLARE_OVERLAY_SEGMENT(En_Sda) -DECLARE_OVERLAY_SEGMENT(En_Clear_Tag) -DECLARE_OVERLAY_SEGMENT(En_Gm) -DECLARE_OVERLAY_SEGMENT(En_Ms) -DECLARE_OVERLAY_SEGMENT(En_Hs) -DECLARE_OVERLAY_SEGMENT(Bg_Ingate) -DECLARE_OVERLAY_SEGMENT(En_Kanban) -DECLARE_OVERLAY_SEGMENT(En_Attack_Niw) -DECLARE_OVERLAY_SEGMENT(En_Mk) -DECLARE_OVERLAY_SEGMENT(En_Owl) -DECLARE_OVERLAY_SEGMENT(En_Ishi) -DECLARE_OVERLAY_SEGMENT(Obj_Hana) -DECLARE_OVERLAY_SEGMENT(Obj_Lightswitch) -DECLARE_OVERLAY_SEGMENT(Obj_Mure2) -DECLARE_OVERLAY_SEGMENT(En_Fu) -DECLARE_OVERLAY_SEGMENT(En_Stream) -DECLARE_OVERLAY_SEGMENT(En_Mm) -DECLARE_OVERLAY_SEGMENT(En_Weather_Tag) -DECLARE_OVERLAY_SEGMENT(En_Ani) -DECLARE_OVERLAY_SEGMENT(En_Js) -DECLARE_OVERLAY_SEGMENT(En_Okarina_Effect) -DECLARE_OVERLAY_SEGMENT(En_Mag) -DECLARE_OVERLAY_SEGMENT(Elf_Msg2) -DECLARE_OVERLAY_SEGMENT(Bg_F40_Swlift) -DECLARE_OVERLAY_SEGMENT(En_Kakasi) -DECLARE_OVERLAY_SEGMENT(Obj_Makeoshihiki) -DECLARE_OVERLAY_SEGMENT(Oceff_Spot) -DECLARE_OVERLAY_SEGMENT(En_Torch) -DECLARE_OVERLAY_SEGMENT(Shot_Sun) -DECLARE_OVERLAY_SEGMENT(Obj_Roomtimer) -DECLARE_OVERLAY_SEGMENT(En_Ssh) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe) +#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName) DECLARE_OVERLAY_SEGMENT(name) +#define DEFINE_ACTOR_INTERNAL(_name, _enumValue, _allocType, _debugName) +#define DEFINE_ACTOR_UNSET(_enumValue) + +#include "tables/actor_table.h" + +#undef DEFINE_ACTOR +#undef DEFINE_ACTOR_INTERNAL +#undef DEFINE_ACTOR_UNSET + DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dust) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Kirakira) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bomb2) @@ -246,446 +115,14 @@ DECLARE_OVERLAY_SEGMENT(Effect_Ss_Extra) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Db) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Dd) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Ds) -DECLARE_OVERLAY_SEGMENT(Oceff_Storm) -DECLARE_OVERLAY_SEGMENT(Obj_Demo) -DECLARE_OVERLAY_SEGMENT(En_Minislime) -DECLARE_OVERLAY_SEGMENT(En_Nutsball) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe2) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe3) -DECLARE_OVERLAY_SEGMENT(En_Dg) -DECLARE_OVERLAY_SEGMENT(En_Si) -DECLARE_OVERLAY_SEGMENT(Obj_Comb) -DECLARE_OVERLAY_SEGMENT(Obj_Kibako2) -DECLARE_OVERLAY_SEGMENT(En_Hs2) -DECLARE_OVERLAY_SEGMENT(Obj_Mure3) -DECLARE_OVERLAY_SEGMENT(En_Tg) -DECLARE_OVERLAY_SEGMENT(En_Wf) -DECLARE_OVERLAY_SEGMENT(En_Skb) -DECLARE_OVERLAY_SEGMENT(En_Gs) -DECLARE_OVERLAY_SEGMENT(Obj_Sound) -DECLARE_OVERLAY_SEGMENT(En_Crow) -DECLARE_OVERLAY_SEGMENT(En_Cow) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe4) -DECLARE_OVERLAY_SEGMENT(En_Zo) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Ice_Smoke) -DECLARE_OVERLAY_SEGMENT(Obj_Makekinsuta) -DECLARE_OVERLAY_SEGMENT(En_Ge3) -DECLARE_OVERLAY_SEGMENT(Obj_Hamishi) -DECLARE_OVERLAY_SEGMENT(En_Zl4) -DECLARE_OVERLAY_SEGMENT(En_Mm2) -DECLARE_OVERLAY_SEGMENT(Door_Spiral) -DECLARE_OVERLAY_SEGMENT(Obj_Pzlblock) -DECLARE_OVERLAY_SEGMENT(Obj_Toge) -DECLARE_OVERLAY_SEGMENT(Obj_Armos) -DECLARE_OVERLAY_SEGMENT(Obj_Boyo) -DECLARE_OVERLAY_SEGMENT(En_Grasshopper) -DECLARE_OVERLAY_SEGMENT(Obj_Grass) -DECLARE_OVERLAY_SEGMENT(Obj_Grass_Carry) -DECLARE_OVERLAY_SEGMENT(Obj_Grass_Unit) -DECLARE_OVERLAY_SEGMENT(Bg_Fire_Wall) -DECLARE_OVERLAY_SEGMENT(En_Bu) -DECLARE_OVERLAY_SEGMENT(En_Encount3) -DECLARE_OVERLAY_SEGMENT(En_Jso) -DECLARE_OVERLAY_SEGMENT(Obj_Chikuwa) -DECLARE_OVERLAY_SEGMENT(En_Knight) -DECLARE_OVERLAY_SEGMENT(En_Warp_tag) -DECLARE_OVERLAY_SEGMENT(En_Aob_01) -DECLARE_OVERLAY_SEGMENT(En_Boj_01) -DECLARE_OVERLAY_SEGMENT(En_Boj_02) -DECLARE_OVERLAY_SEGMENT(En_Boj_03) -DECLARE_OVERLAY_SEGMENT(En_Encount4) -DECLARE_OVERLAY_SEGMENT(En_Bom_Bowl_Man) -DECLARE_OVERLAY_SEGMENT(En_Syateki_Man) -DECLARE_OVERLAY_SEGMENT(Bg_Icicle) -DECLARE_OVERLAY_SEGMENT(En_Syateki_Crow) -DECLARE_OVERLAY_SEGMENT(En_Boj_04) -DECLARE_OVERLAY_SEGMENT(En_Cne_01) -DECLARE_OVERLAY_SEGMENT(En_Bba_01) -DECLARE_OVERLAY_SEGMENT(En_Bji_01) -DECLARE_OVERLAY_SEGMENT(Bg_Spdweb) -DECLARE_OVERLAY_SEGMENT(En_Mt_tag) -DECLARE_OVERLAY_SEGMENT(Boss_01) -DECLARE_OVERLAY_SEGMENT(Boss_02) -DECLARE_OVERLAY_SEGMENT(Boss_03) -DECLARE_OVERLAY_SEGMENT(Boss_04) -DECLARE_OVERLAY_SEGMENT(Boss_05) -DECLARE_OVERLAY_SEGMENT(Boss_06) -DECLARE_OVERLAY_SEGMENT(Boss_07) -DECLARE_OVERLAY_SEGMENT(Bg_Dy_Yoseizo) -DECLARE_OVERLAY_SEGMENT(En_Boj_05) -DECLARE_OVERLAY_SEGMENT(En_Sob1) -DECLARE_OVERLAY_SEGMENT(En_Go) -DECLARE_OVERLAY_SEGMENT(En_Raf) -DECLARE_OVERLAY_SEGMENT(Obj_Funen) -DECLARE_OVERLAY_SEGMENT(Obj_Raillift) -DECLARE_OVERLAY_SEGMENT(Bg_Numa_Hana) -DECLARE_OVERLAY_SEGMENT(Obj_Flowerpot) -DECLARE_OVERLAY_SEGMENT(Obj_Spinyroll) -DECLARE_OVERLAY_SEGMENT(Dm_Hina) -DECLARE_OVERLAY_SEGMENT(En_Syateki_Wf) -DECLARE_OVERLAY_SEGMENT(Obj_Skateblock) DECLARE_OVERLAY_SEGMENT(Effect_En_Ice_Block) -DECLARE_OVERLAY_SEGMENT(Obj_Iceblock) -DECLARE_OVERLAY_SEGMENT(En_Bigpamet) -DECLARE_OVERLAY_SEGMENT(Bg_Dblue_Movebg) -DECLARE_OVERLAY_SEGMENT(En_Syateki_Dekunuts) -DECLARE_OVERLAY_SEGMENT(Elf_Msg3) -DECLARE_OVERLAY_SEGMENT(En_Fg) -DECLARE_OVERLAY_SEGMENT(Dm_Ravine) -DECLARE_OVERLAY_SEGMENT(Dm_Sa) -DECLARE_OVERLAY_SEGMENT(En_Slime) -DECLARE_OVERLAY_SEGMENT(En_Pr) -DECLARE_OVERLAY_SEGMENT(Obj_Toudai) -DECLARE_OVERLAY_SEGMENT(Obj_Entotu) -DECLARE_OVERLAY_SEGMENT(Obj_Bell) -DECLARE_OVERLAY_SEGMENT(En_Syateki_Okuta) -DECLARE_OVERLAY_SEGMENT(Obj_Shutter) -DECLARE_OVERLAY_SEGMENT(Dm_Zl) -DECLARE_OVERLAY_SEGMENT(En_Ru) -DECLARE_OVERLAY_SEGMENT(En_Elfgrp) -DECLARE_OVERLAY_SEGMENT(Dm_Tsg) -DECLARE_OVERLAY_SEGMENT(En_Baguo) -DECLARE_OVERLAY_SEGMENT(Obj_Vspinyroll) -DECLARE_OVERLAY_SEGMENT(Obj_Smork) -DECLARE_OVERLAY_SEGMENT(En_Test2) -DECLARE_OVERLAY_SEGMENT(En_Test3) -DECLARE_OVERLAY_SEGMENT(En_Test4) -DECLARE_OVERLAY_SEGMENT(En_Bat) -DECLARE_OVERLAY_SEGMENT(En_Sekihi) -DECLARE_OVERLAY_SEGMENT(En_Wiz) -DECLARE_OVERLAY_SEGMENT(En_Wiz_Brock) -DECLARE_OVERLAY_SEGMENT(En_Wiz_Fire) -DECLARE_OVERLAY_SEGMENT(Eff_Change) -DECLARE_OVERLAY_SEGMENT(Dm_Statue) -DECLARE_OVERLAY_SEGMENT(Obj_Fireshield) -DECLARE_OVERLAY_SEGMENT(Bg_Ladder) -DECLARE_OVERLAY_SEGMENT(En_Mkk) -DECLARE_OVERLAY_SEGMENT(Demo_Getitem) -DECLARE_OVERLAY_SEGMENT(En_Dnb) -DECLARE_OVERLAY_SEGMENT(En_Dnh) -DECLARE_OVERLAY_SEGMENT(En_Dnk) -DECLARE_OVERLAY_SEGMENT(En_Dnq) -DECLARE_OVERLAY_SEGMENT(Bg_Keikoku_Saku) -DECLARE_OVERLAY_SEGMENT(Obj_Hugebombiwa) -DECLARE_OVERLAY_SEGMENT(En_Firefly2) -DECLARE_OVERLAY_SEGMENT(En_Rat) -DECLARE_OVERLAY_SEGMENT(En_Water_Effect) -DECLARE_OVERLAY_SEGMENT(En_Kusa2) -DECLARE_OVERLAY_SEGMENT(Bg_Spout_Fire) -DECLARE_OVERLAY_SEGMENT(En_Dy_Extra) -DECLARE_OVERLAY_SEGMENT(En_Bal) -DECLARE_OVERLAY_SEGMENT(En_Ginko_Man) -DECLARE_OVERLAY_SEGMENT(En_Warp_Uzu) -DECLARE_OVERLAY_SEGMENT(Obj_Driftice) -DECLARE_OVERLAY_SEGMENT(En_Look_Nuts) -DECLARE_OVERLAY_SEGMENT(En_Mushi2) -DECLARE_OVERLAY_SEGMENT(En_Fall) -DECLARE_OVERLAY_SEGMENT(En_Mm3) -DECLARE_OVERLAY_SEGMENT(Bg_Crace_Movebg) -DECLARE_OVERLAY_SEGMENT(En_Dno) -DECLARE_OVERLAY_SEGMENT(En_Pr2) -DECLARE_OVERLAY_SEGMENT(En_Prz) -DECLARE_OVERLAY_SEGMENT(En_Jso2) -DECLARE_OVERLAY_SEGMENT(Obj_Etcetera) -DECLARE_OVERLAY_SEGMENT(En_Egol) -DECLARE_OVERLAY_SEGMENT(Obj_Mine) -DECLARE_OVERLAY_SEGMENT(Obj_Purify) -DECLARE_OVERLAY_SEGMENT(En_Tru) -DECLARE_OVERLAY_SEGMENT(En_Trt) -DECLARE_OVERLAY_SEGMENT(En_Test5) -DECLARE_OVERLAY_SEGMENT(En_Test6) -DECLARE_OVERLAY_SEGMENT(En_Az) -DECLARE_OVERLAY_SEGMENT(En_Estone) -DECLARE_OVERLAY_SEGMENT(Bg_Hakugin_Post) -DECLARE_OVERLAY_SEGMENT(Dm_Opstage) -DECLARE_OVERLAY_SEGMENT(Dm_Stk) -DECLARE_OVERLAY_SEGMENT(Dm_Char00) -DECLARE_OVERLAY_SEGMENT(Dm_Char01) -DECLARE_OVERLAY_SEGMENT(Dm_Char02) -DECLARE_OVERLAY_SEGMENT(Dm_Char03) -DECLARE_OVERLAY_SEGMENT(Dm_Char04) -DECLARE_OVERLAY_SEGMENT(Dm_Char05) -DECLARE_OVERLAY_SEGMENT(Dm_Char06) -DECLARE_OVERLAY_SEGMENT(Dm_Char07) -DECLARE_OVERLAY_SEGMENT(Dm_Char08) -DECLARE_OVERLAY_SEGMENT(Dm_Char09) -DECLARE_OVERLAY_SEGMENT(Obj_Tokeidai) -DECLARE_OVERLAY_SEGMENT(En_Mnk) -DECLARE_OVERLAY_SEGMENT(En_Egblock) -DECLARE_OVERLAY_SEGMENT(En_Guard_Nuts) -DECLARE_OVERLAY_SEGMENT(Bg_Hakugin_Bombwall) -DECLARE_OVERLAY_SEGMENT(Obj_Tokei_Tobira) -DECLARE_OVERLAY_SEGMENT(Bg_Hakugin_Elvpole) -DECLARE_OVERLAY_SEGMENT(En_Ma4) -DECLARE_OVERLAY_SEGMENT(En_Twig) -DECLARE_OVERLAY_SEGMENT(En_Po_Fusen) -DECLARE_OVERLAY_SEGMENT(En_Door_Etc) -DECLARE_OVERLAY_SEGMENT(En_Bigokuta) -DECLARE_OVERLAY_SEGMENT(Bg_Icefloe) DECLARE_OVERLAY_SEGMENT(fbdemo_triforce) DECLARE_OVERLAY_SEGMENT(fbdemo_wipe1) DECLARE_OVERLAY_SEGMENT(fbdemo_wipe3) DECLARE_OVERLAY_SEGMENT(fbdemo_wipe4) DECLARE_OVERLAY_SEGMENT(fbdemo_wipe5) DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sbn) -DECLARE_OVERLAY_SEGMENT(Obj_Ocarinalift) -DECLARE_OVERLAY_SEGMENT(En_Time_Tag) -DECLARE_OVERLAY_SEGMENT(Bg_Open_Shutter) -DECLARE_OVERLAY_SEGMENT(Bg_Open_Spot) -DECLARE_OVERLAY_SEGMENT(Bg_Fu_Kaiten) -DECLARE_OVERLAY_SEGMENT(Obj_Aqua) -DECLARE_OVERLAY_SEGMENT(En_Elforg) -DECLARE_OVERLAY_SEGMENT(En_Elfbub) -DECLARE_OVERLAY_SEGMENT(En_Fu_Mato) -DECLARE_OVERLAY_SEGMENT(En_Fu_Kago) -DECLARE_OVERLAY_SEGMENT(En_Osn) -DECLARE_OVERLAY_SEGMENT(Bg_Ctower_Gear) -DECLARE_OVERLAY_SEGMENT(En_Trt2) -DECLARE_OVERLAY_SEGMENT(Obj_Tokei_Step) -DECLARE_OVERLAY_SEGMENT(Bg_Lotus) -DECLARE_OVERLAY_SEGMENT(En_Kame) -DECLARE_OVERLAY_SEGMENT(Obj_Takaraya_Wall) -DECLARE_OVERLAY_SEGMENT(Bg_Fu_Mizu) -DECLARE_OVERLAY_SEGMENT(En_Sellnuts) -DECLARE_OVERLAY_SEGMENT(Bg_Dkjail_Ivy) -DECLARE_OVERLAY_SEGMENT(Obj_Visiblock) -DECLARE_OVERLAY_SEGMENT(En_Takaraya) -DECLARE_OVERLAY_SEGMENT(En_Tsn) -DECLARE_OVERLAY_SEGMENT(En_Ds2n) -DECLARE_OVERLAY_SEGMENT(En_Fsn) -DECLARE_OVERLAY_SEGMENT(En_Shn) -DECLARE_OVERLAY_SEGMENT(En_Stop_heishi) -DECLARE_OVERLAY_SEGMENT(Obj_Bigicicle) -DECLARE_OVERLAY_SEGMENT(En_Lift_Nuts) -DECLARE_OVERLAY_SEGMENT(En_Tk) -DECLARE_OVERLAY_SEGMENT(Bg_Market_Step) -DECLARE_OVERLAY_SEGMENT(Obj_Lupygamelift) -DECLARE_OVERLAY_SEGMENT(En_Test7) -DECLARE_OVERLAY_SEGMENT(Obj_Lightblock) -DECLARE_OVERLAY_SEGMENT(Mir_Ray2) -DECLARE_OVERLAY_SEGMENT(En_Wdhand) -DECLARE_OVERLAY_SEGMENT(En_Gamelupy) -DECLARE_OVERLAY_SEGMENT(Bg_Danpei_Movebg) -DECLARE_OVERLAY_SEGMENT(En_Snowwd) -DECLARE_OVERLAY_SEGMENT(En_Pm) -DECLARE_OVERLAY_SEGMENT(En_Gakufu) -DECLARE_OVERLAY_SEGMENT(Elf_Msg4) -DECLARE_OVERLAY_SEGMENT(Elf_Msg5) -DECLARE_OVERLAY_SEGMENT(En_Col_Man) -DECLARE_OVERLAY_SEGMENT(En_Talk_Gibud) -DECLARE_OVERLAY_SEGMENT(En_Giant) -DECLARE_OVERLAY_SEGMENT(Obj_Snowball) -DECLARE_OVERLAY_SEGMENT(Boss_Hakugin) -DECLARE_OVERLAY_SEGMENT(En_Gb2) -DECLARE_OVERLAY_SEGMENT(En_Onpuman) -DECLARE_OVERLAY_SEGMENT(Bg_Tobira01) -DECLARE_OVERLAY_SEGMENT(En_Tag_Obj) -DECLARE_OVERLAY_SEGMENT(Obj_Dhouse) -DECLARE_OVERLAY_SEGMENT(Obj_Hakaisi) -DECLARE_OVERLAY_SEGMENT(Bg_Hakugin_Switch) -DECLARE_OVERLAY_SEGMENT(En_Snowman) -DECLARE_OVERLAY_SEGMENT(TG_Sw) -DECLARE_OVERLAY_SEGMENT(En_Po_Sisters) -DECLARE_OVERLAY_SEGMENT(En_Pp) -DECLARE_OVERLAY_SEGMENT(En_Hakurock) -DECLARE_OVERLAY_SEGMENT(En_Hanabi) -DECLARE_OVERLAY_SEGMENT(Obj_Dowsing) -DECLARE_OVERLAY_SEGMENT(Obj_Wind) -DECLARE_OVERLAY_SEGMENT(En_Racedog) -DECLARE_OVERLAY_SEGMENT(En_Kendo_Js) -DECLARE_OVERLAY_SEGMENT(Bg_Botihasira) -DECLARE_OVERLAY_SEGMENT(En_Fish2) -DECLARE_OVERLAY_SEGMENT(En_Pst) -DECLARE_OVERLAY_SEGMENT(En_Poh) -DECLARE_OVERLAY_SEGMENT(Obj_Spidertent) -DECLARE_OVERLAY_SEGMENT(En_Zoraegg) -DECLARE_OVERLAY_SEGMENT(En_Kbt) -DECLARE_OVERLAY_SEGMENT(En_Gg) -DECLARE_OVERLAY_SEGMENT(En_Maruta) -DECLARE_OVERLAY_SEGMENT(Obj_Snowball2) -DECLARE_OVERLAY_SEGMENT(En_Gg2) -DECLARE_OVERLAY_SEGMENT(Obj_Ghaka) -DECLARE_OVERLAY_SEGMENT(En_Dnp) -DECLARE_OVERLAY_SEGMENT(En_Dai) -DECLARE_OVERLAY_SEGMENT(Bg_Goron_Oyu) -DECLARE_OVERLAY_SEGMENT(En_Kgy) -DECLARE_OVERLAY_SEGMENT(En_Invadepoh) -DECLARE_OVERLAY_SEGMENT(En_Gk) -DECLARE_OVERLAY_SEGMENT(En_An) -DECLARE_OVERLAY_SEGMENT(En_Bee) -DECLARE_OVERLAY_SEGMENT(En_Ot) -DECLARE_OVERLAY_SEGMENT(En_Dragon) -DECLARE_OVERLAY_SEGMENT(Obj_Dora) -DECLARE_OVERLAY_SEGMENT(En_Bigpo) -DECLARE_OVERLAY_SEGMENT(Obj_Kendo_Kanban) -DECLARE_OVERLAY_SEGMENT(Obj_Hariko) -DECLARE_OVERLAY_SEGMENT(En_Sth) -DECLARE_OVERLAY_SEGMENT(Bg_Sinkai_Kabe) -DECLARE_OVERLAY_SEGMENT(Bg_Haka_Curtain) -DECLARE_OVERLAY_SEGMENT(Bg_Kin2_Bombwall) -DECLARE_OVERLAY_SEGMENT(Bg_Kin2_Fence) -DECLARE_OVERLAY_SEGMENT(Bg_Kin2_Picture) -DECLARE_OVERLAY_SEGMENT(Bg_Kin2_Shelf) -DECLARE_OVERLAY_SEGMENT(En_Rail_Skb) -DECLARE_OVERLAY_SEGMENT(En_Jg) -DECLARE_OVERLAY_SEGMENT(En_Tru_Mt) -DECLARE_OVERLAY_SEGMENT(Obj_Um) -DECLARE_OVERLAY_SEGMENT(En_Neo_Reeba) -DECLARE_OVERLAY_SEGMENT(Bg_Mbar_Chair) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Block) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Mirror) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Rotaryroom) -DECLARE_OVERLAY_SEGMENT(Bg_Dblue_Balance) -DECLARE_OVERLAY_SEGMENT(Bg_Dblue_Waterfall) -DECLARE_OVERLAY_SEGMENT(En_Kaizoku) -DECLARE_OVERLAY_SEGMENT(En_Ge2) -DECLARE_OVERLAY_SEGMENT(En_Ma_Yts) -DECLARE_OVERLAY_SEGMENT(En_Ma_Yto) -DECLARE_OVERLAY_SEGMENT(Obj_Tokei_Turret) -DECLARE_OVERLAY_SEGMENT(Bg_Dblue_Elevator) -DECLARE_OVERLAY_SEGMENT(Obj_Warpstone) -DECLARE_OVERLAY_SEGMENT(En_Zog) -DECLARE_OVERLAY_SEGMENT(Obj_Rotlift) -DECLARE_OVERLAY_SEGMENT(Obj_Jg_Gakki) -DECLARE_OVERLAY_SEGMENT(Bg_Inibs_Movebg) -DECLARE_OVERLAY_SEGMENT(En_Zot) -DECLARE_OVERLAY_SEGMENT(Obj_Tree) -DECLARE_OVERLAY_SEGMENT(Obj_Y2lift) -DECLARE_OVERLAY_SEGMENT(Obj_Y2shutter) -DECLARE_OVERLAY_SEGMENT(Obj_Boat) -DECLARE_OVERLAY_SEGMENT(Obj_Taru) -DECLARE_OVERLAY_SEGMENT(Obj_Hunsui) -DECLARE_OVERLAY_SEGMENT(En_Jc_Mato) -DECLARE_OVERLAY_SEGMENT(Mir_Ray3) -DECLARE_OVERLAY_SEGMENT(En_Zob) -DECLARE_OVERLAY_SEGMENT(Elf_Msg6) -DECLARE_OVERLAY_SEGMENT(Obj_Nozoki) -DECLARE_OVERLAY_SEGMENT(En_Toto) -DECLARE_OVERLAY_SEGMENT(En_Railgibud) -DECLARE_OVERLAY_SEGMENT(En_Baba) -DECLARE_OVERLAY_SEGMENT(En_Suttari) -DECLARE_OVERLAY_SEGMENT(En_Zod) -DECLARE_OVERLAY_SEGMENT(En_Kujiya) -DECLARE_OVERLAY_SEGMENT(En_Geg) -DECLARE_OVERLAY_SEGMENT(Obj_Kinoko) -DECLARE_OVERLAY_SEGMENT(Obj_Yasi) -DECLARE_OVERLAY_SEGMENT(En_Tanron1) -DECLARE_OVERLAY_SEGMENT(En_Tanron2) -DECLARE_OVERLAY_SEGMENT(En_Tanron3) -DECLARE_OVERLAY_SEGMENT(Obj_Chan) -DECLARE_OVERLAY_SEGMENT(En_Zos) -DECLARE_OVERLAY_SEGMENT(En_S_Goro) -DECLARE_OVERLAY_SEGMENT(En_Nb) -DECLARE_OVERLAY_SEGMENT(En_Ja) -DECLARE_OVERLAY_SEGMENT(Bg_F40_Block) -DECLARE_OVERLAY_SEGMENT(Bg_F40_Switch) -DECLARE_OVERLAY_SEGMENT(En_Po_Composer) -DECLARE_OVERLAY_SEGMENT(En_Guruguru) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe5) -DECLARE_OVERLAY_SEGMENT(En_Stone_heishi) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe6) -DECLARE_OVERLAY_SEGMENT(En_Scopenuts) -DECLARE_OVERLAY_SEGMENT(En_Scopecrow) -DECLARE_OVERLAY_SEGMENT(Oceff_Wipe7) -DECLARE_OVERLAY_SEGMENT(Eff_Kamejima_Wave) -DECLARE_OVERLAY_SEGMENT(En_Hg) -DECLARE_OVERLAY_SEGMENT(En_Hgo) -DECLARE_OVERLAY_SEGMENT(En_Zov) -DECLARE_OVERLAY_SEGMENT(En_Ah) -DECLARE_OVERLAY_SEGMENT(Obj_Hgdoor) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Bombwall) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Ray) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Shutter) -DECLARE_OVERLAY_SEGMENT(Bg_Haka_Bombwall) -DECLARE_OVERLAY_SEGMENT(Bg_Haka_Tomb) -DECLARE_OVERLAY_SEGMENT(En_Sc_Ruppe) -DECLARE_OVERLAY_SEGMENT(Bg_Iknv_Doukutu) -DECLARE_OVERLAY_SEGMENT(Bg_Iknv_Obj) -DECLARE_OVERLAY_SEGMENT(En_Pamera) -DECLARE_OVERLAY_SEGMENT(Obj_HsStump) -DECLARE_OVERLAY_SEGMENT(En_Hidden_Nuts) -DECLARE_OVERLAY_SEGMENT(En_Zow) -DECLARE_OVERLAY_SEGMENT(En_Talk) -DECLARE_OVERLAY_SEGMENT(En_Al) -DECLARE_OVERLAY_SEGMENT(En_Tab) -DECLARE_OVERLAY_SEGMENT(En_Nimotsu) -DECLARE_OVERLAY_SEGMENT(En_Hit_Tag) -DECLARE_OVERLAY_SEGMENT(En_Ruppecrow) -DECLARE_OVERLAY_SEGMENT(En_Tanron4) -DECLARE_OVERLAY_SEGMENT(En_Tanron5) -DECLARE_OVERLAY_SEGMENT(En_Tanron6) -DECLARE_OVERLAY_SEGMENT(En_Daiku2) -DECLARE_OVERLAY_SEGMENT(En_Muto) -DECLARE_OVERLAY_SEGMENT(En_Baisen) -DECLARE_OVERLAY_SEGMENT(En_Heishi) -DECLARE_OVERLAY_SEGMENT(En_Demo_heishi) -DECLARE_OVERLAY_SEGMENT(En_Dt) -DECLARE_OVERLAY_SEGMENT(En_Cha) -DECLARE_OVERLAY_SEGMENT(Obj_Dinner) -DECLARE_OVERLAY_SEGMENT(Eff_Lastday) -DECLARE_OVERLAY_SEGMENT(Bg_Ikana_Dharma) -DECLARE_OVERLAY_SEGMENT(En_Akindonuts) -DECLARE_OVERLAY_SEGMENT(Eff_Stk) -DECLARE_OVERLAY_SEGMENT(En_Ig) -DECLARE_OVERLAY_SEGMENT(En_Rg) -DECLARE_OVERLAY_SEGMENT(En_Osk) -DECLARE_OVERLAY_SEGMENT(En_Sth2) -DECLARE_OVERLAY_SEGMENT(En_Yb) -DECLARE_OVERLAY_SEGMENT(En_Rz) -DECLARE_OVERLAY_SEGMENT(En_Scopecoin) -DECLARE_OVERLAY_SEGMENT(En_Bjt) -DECLARE_OVERLAY_SEGMENT(En_Bomjima) -DECLARE_OVERLAY_SEGMENT(En_Bomjimb) -DECLARE_OVERLAY_SEGMENT(En_Bombers) -DECLARE_OVERLAY_SEGMENT(En_Bombers2) -DECLARE_OVERLAY_SEGMENT(En_Bombal) -DECLARE_OVERLAY_SEGMENT(Obj_Moon_Stone) -DECLARE_OVERLAY_SEGMENT(Obj_Mu_Pict) -DECLARE_OVERLAY_SEGMENT(Bg_Ikninside) -DECLARE_OVERLAY_SEGMENT(Eff_Zoraband) -DECLARE_OVERLAY_SEGMENT(Obj_Kepn_Koya) -DECLARE_OVERLAY_SEGMENT(Obj_Usiyane) -DECLARE_OVERLAY_SEGMENT(En_Nnh) -DECLARE_OVERLAY_SEGMENT(Obj_Kzsaku) -DECLARE_OVERLAY_SEGMENT(Obj_Milk_Bin) -DECLARE_OVERLAY_SEGMENT(En_Kitan) -DECLARE_OVERLAY_SEGMENT(Bg_Astr_Bombwall) -DECLARE_OVERLAY_SEGMENT(Bg_Iknin_Susceil) -DECLARE_OVERLAY_SEGMENT(En_Bsb) -DECLARE_OVERLAY_SEGMENT(En_Recepgirl) -DECLARE_OVERLAY_SEGMENT(En_Thiefbird) -DECLARE_OVERLAY_SEGMENT(En_Jgame_Tsn) -DECLARE_OVERLAY_SEGMENT(Obj_Jgame_Light) -DECLARE_OVERLAY_SEGMENT(Obj_Yado) -DECLARE_OVERLAY_SEGMENT(Demo_Syoten) -DECLARE_OVERLAY_SEGMENT(Demo_Moonend) -DECLARE_OVERLAY_SEGMENT(Bg_Lbfshot) -DECLARE_OVERLAY_SEGMENT(Bg_Last_Bwall) -DECLARE_OVERLAY_SEGMENT(En_And) -DECLARE_OVERLAY_SEGMENT(En_Invadepoh_Demo) -DECLARE_OVERLAY_SEGMENT(Obj_Danpeilift) -DECLARE_OVERLAY_SEGMENT(En_Fall2) -DECLARE_OVERLAY_SEGMENT(Dm_Al) -DECLARE_OVERLAY_SEGMENT(Dm_An) -DECLARE_OVERLAY_SEGMENT(Dm_Ah) -DECLARE_OVERLAY_SEGMENT(Dm_Nb) -DECLARE_OVERLAY_SEGMENT(En_Drs) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero) -DECLARE_OVERLAY_SEGMENT(Dm_Bal) -DECLARE_OVERLAY_SEGMENT(En_Paper) -DECLARE_OVERLAY_SEGMENT(En_Hint_Skb) -DECLARE_OVERLAY_SEGMENT(Dm_Tag) -DECLARE_OVERLAY_SEGMENT(En_Bh) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero2) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero3) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero4) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero5) -DECLARE_OVERLAY_SEGMENT(En_Ending_Hero6) -DECLARE_OVERLAY_SEGMENT(Dm_Gm) -DECLARE_OVERLAY_SEGMENT(Obj_Swprize) -DECLARE_OVERLAY_SEGMENT(En_Invisible_Ruppe) -DECLARE_OVERLAY_SEGMENT(Obj_Ending) -DECLARE_OVERLAY_SEGMENT(En_Rsn) DECLARE_ROM_SEGMENT(gameplay_keep) DECLARE_ROM_SEGMENT(gameplay_field_keep) diff --git a/include/tables/actor_table.h b/include/tables/actor_table.h new file mode 100644 index 0000000000..9019e2b806 --- /dev/null +++ b/include/tables/actor_table.h @@ -0,0 +1,703 @@ +/** + * Actor Table + * + * DEFINE_ACTOR should be used for normal actors + * - Argument 0: Name of the actor overlay segment in the spec (without the ovl_ part) + * - Argument 1: Enum value for this actor + * - Argument 2: Allocation type (normal, permanent or absolute) + * - Argument 3: Actor name, as a string (used for debug prints) + * + * DEFINE_ACTOR_INTERNAL should be used for actors that aren't an overlay, with the same arguments as DEFINE_ACTOR + * + * DEFINE_ACTOR_UNSET is needed to define empty entries from the original game + */ +/* 0x000 */ DEFINE_ACTOR_INTERNAL(Player, ACTOR_PLAYER, ALLOCTYPE_NORMAL, "Player") +/* 0x001 */ DEFINE_ACTOR(En_Test, ACTOR_EN_TEST, ALLOCTYPE_NORMAL, "En_Test") +/* 0x002 */ DEFINE_ACTOR(En_GirlA, ACTOR_EN_GIRLA, ALLOCTYPE_NORMAL, "En_GirlA") +/* 0x003 */ DEFINE_ACTOR(En_Part, ACTOR_EN_PART, ALLOCTYPE_NORMAL, "En_Part") +/* 0x004 */ DEFINE_ACTOR(En_Light, ACTOR_EN_LIGHT, ALLOCTYPE_NORMAL, "En_Light") +/* 0x005 */ DEFINE_ACTOR(En_Door, ACTOR_EN_DOOR, ALLOCTYPE_PERMANENT, "En_Door") +/* 0x006 */ DEFINE_ACTOR(En_Box, ACTOR_EN_BOX, ALLOCTYPE_NORMAL, "En_Box") +/* 0x007 */ DEFINE_ACTOR(En_Pametfrog, ACTOR_EN_PAMETFROG, ALLOCTYPE_NORMAL, "En_Pametfrog") +/* 0x008 */ DEFINE_ACTOR(En_Okuta, ACTOR_EN_OKUTA, ALLOCTYPE_NORMAL, "En_Okuta") +/* 0x009 */ DEFINE_ACTOR(En_Bom, ACTOR_EN_BOM, ALLOCTYPE_PERMANENT, "En_Bom") +/* 0x00A */ DEFINE_ACTOR(En_Wallmas, ACTOR_EN_WALLMAS, ALLOCTYPE_NORMAL, "En_Wallmas") +/* 0x00B */ DEFINE_ACTOR(En_Dodongo, ACTOR_EN_DODONGO, ALLOCTYPE_NORMAL, "En_Dodongo") +/* 0x00C */ DEFINE_ACTOR(En_Firefly, ACTOR_EN_FIREFLY, ALLOCTYPE_NORMAL, "En_Firefly") +/* 0x00D */ DEFINE_ACTOR(En_Horse, ACTOR_EN_HORSE, ALLOCTYPE_NORMAL, "En_Horse") +/* 0x00E */ DEFINE_ACTOR_INTERNAL(En_Item00, ACTOR_EN_ITEM00, ALLOCTYPE_NORMAL, "En_Item00") +/* 0x00F */ DEFINE_ACTOR(En_Arrow, ACTOR_EN_ARROW, ALLOCTYPE_PERMANENT, "En_Arrow") +/* 0x010 */ DEFINE_ACTOR(En_Elf, ACTOR_EN_ELF, ALLOCTYPE_NORMAL, "En_Elf") +/* 0x011 */ DEFINE_ACTOR(En_Niw, ACTOR_EN_NIW, ALLOCTYPE_NORMAL, "En_Niw") +/* 0x012 */ DEFINE_ACTOR(En_Tite, ACTOR_EN_TITE, ALLOCTYPE_NORMAL, "En_Tite") +/* 0x013 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_13) +/* 0x014 */ DEFINE_ACTOR(En_Peehat, ACTOR_EN_PEEHAT, ALLOCTYPE_NORMAL, "En_Peehat") +/* 0x015 */ DEFINE_ACTOR(En_Butte, ACTOR_EN_BUTTE, ALLOCTYPE_NORMAL, "En_Butte") +/* 0x016 */ DEFINE_ACTOR(En_Insect, ACTOR_EN_INSECT, ALLOCTYPE_NORMAL, "En_Insect") +/* 0x017 */ DEFINE_ACTOR(En_Fish, ACTOR_EN_FISH, ALLOCTYPE_NORMAL, "En_Fish") +/* 0x018 */ DEFINE_ACTOR(En_Holl, ACTOR_EN_HOLL, ALLOCTYPE_PERMANENT, "En_Holl") +/* 0x019 */ DEFINE_ACTOR(En_Dinofos, ACTOR_EN_DINOFOS, ALLOCTYPE_NORMAL, "En_Dinofos") +/* 0x01A */ DEFINE_ACTOR(En_Hata, ACTOR_EN_HATA, ALLOCTYPE_NORMAL, "En_Hata") +/* 0x01B */ DEFINE_ACTOR(En_Zl1, ACTOR_EN_ZL1, ALLOCTYPE_NORMAL, "En_Zl1") +/* 0x01C */ DEFINE_ACTOR(En_Viewer, ACTOR_EN_VIEWER, ALLOCTYPE_NORMAL, "En_Viewer") +/* 0x01D */ DEFINE_ACTOR(En_Bubble, ACTOR_EN_BUBBLE, ALLOCTYPE_NORMAL, "En_Bubble") +/* 0x01E */ DEFINE_ACTOR(Door_Shutter, ACTOR_DOOR_SHUTTER, ALLOCTYPE_PERMANENT, "Door_Shutter") +/* 0x01F */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1F) +/* 0x020 */ DEFINE_ACTOR(En_Boom, ACTOR_EN_BOOM, ALLOCTYPE_PERMANENT, "En_Boom") +/* 0x021 */ DEFINE_ACTOR(En_Torch2, ACTOR_EN_TORCH2, ALLOCTYPE_NORMAL, "En_Torch2") +/* 0x022 */ DEFINE_ACTOR(En_Minifrog, ACTOR_EN_MINIFROG, ALLOCTYPE_NORMAL, "En_Minifrog") +/* 0x023 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_23) +/* 0x024 */ DEFINE_ACTOR(En_St, ACTOR_EN_ST, ALLOCTYPE_NORMAL, "En_St") +/* 0x025 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_25) +/* 0x026 */ DEFINE_ACTOR_INTERNAL(En_A_Obj, ACTOR_EN_A_OBJ, ALLOCTYPE_NORMAL, "En_A_Obj") +/* 0x027 */ DEFINE_ACTOR(Obj_Wturn, ACTOR_OBJ_WTURN, ALLOCTYPE_NORMAL, "Obj_Wturn") +/* 0x028 */ DEFINE_ACTOR(En_River_Sound, ACTOR_EN_RIVER_SOUND, ALLOCTYPE_NORMAL, "En_River_Sound") +/* 0x029 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_29) +/* 0x02A */ DEFINE_ACTOR(En_Ossan, ACTOR_EN_OSSAN, ALLOCTYPE_NORMAL, "En_Ossan") +/* 0x02B */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_2B) +/* 0x02C */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_2C) +/* 0x02D */ DEFINE_ACTOR(En_Famos, ACTOR_EN_FAMOS, ALLOCTYPE_NORMAL, "En_Famos") +/* 0x02E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_2E) +/* 0x02F */ DEFINE_ACTOR(En_Bombf, ACTOR_EN_BOMBF, ALLOCTYPE_NORMAL, "En_Bombf") +/* 0x030 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_30) +/* 0x031 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_31) +/* 0x032 */ DEFINE_ACTOR(En_Am, ACTOR_EN_AM, ALLOCTYPE_NORMAL, "En_Am") +/* 0x033 */ DEFINE_ACTOR(En_Dekubaba, ACTOR_EN_DEKUBABA, ALLOCTYPE_NORMAL, "En_Dekubaba") +/* 0x034 */ DEFINE_ACTOR(En_M_Fire1, ACTOR_EN_M_FIRE1, ALLOCTYPE_PERMANENT, "En_M_Fire1") +/* 0x035 */ DEFINE_ACTOR(En_M_Thunder, ACTOR_EN_M_THUNDER, ALLOCTYPE_PERMANENT, "En_M_Thunder") +/* 0x036 */ DEFINE_ACTOR(Bg_Breakwall, ACTOR_BG_BREAKWALL, ALLOCTYPE_NORMAL, "Bg_Breakwall") +/* 0x037 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_37) +/* 0x038 */ DEFINE_ACTOR(Door_Warp1, ACTOR_DOOR_WARP1, ALLOCTYPE_NORMAL, "Door_Warp1") +/* 0x039 */ DEFINE_ACTOR(Obj_Syokudai, ACTOR_OBJ_SYOKUDAI, ALLOCTYPE_NORMAL, "Obj_Syokudai") +/* 0x03A */ DEFINE_ACTOR(Item_B_Heart, ACTOR_ITEM_B_HEART, ALLOCTYPE_NORMAL, "Item_B_Heart") +/* 0x03B */ DEFINE_ACTOR(En_Dekunuts, ACTOR_EN_DEKUNUTS, ALLOCTYPE_NORMAL, "En_Dekunuts") +/* 0x03C */ DEFINE_ACTOR(En_Bbfall, ACTOR_EN_BBFALL, ALLOCTYPE_NORMAL, "En_Bbfall") +/* 0x03D */ DEFINE_ACTOR(Arms_Hook, ACTOR_ARMS_HOOK, ALLOCTYPE_PERMANENT, "Arms_Hook") +/* 0x03E */ DEFINE_ACTOR(En_Bb, ACTOR_EN_BB, ALLOCTYPE_NORMAL, "En_Bb") +/* 0x03F */ DEFINE_ACTOR(Bg_Keikoku_Spr, ACTOR_BG_KEIKOKU_SPR, ALLOCTYPE_NORMAL, "Bg_Keikoku_Spr") +/* 0x040 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_40) +/* 0x041 */ DEFINE_ACTOR(En_Wood02, ACTOR_EN_WOOD02, ALLOCTYPE_NORMAL, "En_Wood02") +/* 0x042 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_42) +/* 0x043 */ DEFINE_ACTOR(En_Death, ACTOR_EN_DEATH, ALLOCTYPE_NORMAL, "En_Death") +/* 0x044 */ DEFINE_ACTOR(En_Minideath, ACTOR_EN_MINIDEATH, ALLOCTYPE_NORMAL, "En_Minideath") +/* 0x045 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_45) +/* 0x046 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_46) +/* 0x047 */ DEFINE_ACTOR(En_Vm, ACTOR_EN_VM, ALLOCTYPE_NORMAL, "En_Vm") +/* 0x048 */ DEFINE_ACTOR(Demo_Effect, ACTOR_DEMO_EFFECT, ALLOCTYPE_NORMAL, "Demo_Effect") +/* 0x049 */ DEFINE_ACTOR(Demo_Kankyo, ACTOR_DEMO_KANKYO, ALLOCTYPE_NORMAL, "Demo_Kankyo") +/* 0x04A */ DEFINE_ACTOR(En_Floormas, ACTOR_EN_FLOORMAS, ALLOCTYPE_NORMAL, "En_Floormas") +/* 0x04B */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_4B) +/* 0x04C */ DEFINE_ACTOR(En_Rd, ACTOR_EN_RD, ALLOCTYPE_NORMAL, "En_Rd") +/* 0x04D */ DEFINE_ACTOR(Bg_F40_Flift, ACTOR_BG_F40_FLIFT, ALLOCTYPE_NORMAL, "Bg_F40_Flift") +/* 0x04E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_4E) +/* 0x04F */ DEFINE_ACTOR(Obj_Mure, ACTOR_OBJ_MURE, ALLOCTYPE_NORMAL, "Obj_Mure") +/* 0x050 */ DEFINE_ACTOR(En_Sw, ACTOR_EN_SW, ALLOCTYPE_NORMAL, "En_Sw") +/* 0x051 */ DEFINE_ACTOR(Object_Kankyo, ACTOR_OBJECT_KANKYO, ALLOCTYPE_NORMAL, "Object_Kankyo") +/* 0x052 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_52) +/* 0x053 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_53) +/* 0x054 */ DEFINE_ACTOR(En_Horse_Link_Child, ACTOR_EN_HORSE_LINK_CHILD, ALLOCTYPE_NORMAL, "En_Horse_Link_Child") +/* 0x055 */ DEFINE_ACTOR(Door_Ana, ACTOR_DOOR_ANA, ALLOCTYPE_NORMAL, "Door_Ana") +/* 0x056 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_56) +/* 0x057 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_57) +/* 0x058 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_58) +/* 0x059 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_59) +/* 0x05A */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_5A) +/* 0x05B */ DEFINE_ACTOR(En_Encount1, ACTOR_EN_ENCOUNT1, ALLOCTYPE_NORMAL, "En_Encount1") +/* 0x05C */ DEFINE_ACTOR(Demo_Tre_Lgt, ACTOR_DEMO_TRE_LGT, ALLOCTYPE_NORMAL, "Demo_Tre_Lgt") +/* 0x05D */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_5D) +/* 0x05E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_5E) +/* 0x05F */ DEFINE_ACTOR(En_Encount2, ACTOR_EN_ENCOUNT2, ALLOCTYPE_NORMAL, "En_Encount2") +/* 0x060 */ DEFINE_ACTOR(En_Fire_Rock, ACTOR_EN_FIRE_ROCK, ALLOCTYPE_NORMAL, "En_Fire_Rock") +/* 0x061 */ DEFINE_ACTOR(Bg_Ctower_Rot, ACTOR_BG_CTOWER_ROT, ALLOCTYPE_NORMAL, "Bg_Ctower_Rot") +/* 0x062 */ DEFINE_ACTOR(Mir_Ray, ACTOR_MIR_RAY, ALLOCTYPE_NORMAL, "Mir_Ray") +/* 0x063 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_63) +/* 0x064 */ DEFINE_ACTOR(En_Sb, ACTOR_EN_SB, ALLOCTYPE_NORMAL, "En_Sb") +/* 0x065 */ DEFINE_ACTOR(En_Bigslime, ACTOR_EN_BIGSLIME, ALLOCTYPE_NORMAL, "En_Bigslime") +/* 0x066 */ DEFINE_ACTOR(En_Karebaba, ACTOR_EN_KAREBABA, ALLOCTYPE_NORMAL, "En_Karebaba") +/* 0x067 */ DEFINE_ACTOR(En_In, ACTOR_EN_IN, ALLOCTYPE_NORMAL, "En_In") +/* 0x068 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_68) +/* 0x069 */ DEFINE_ACTOR(En_Ru, ACTOR_EN_RU, ALLOCTYPE_NORMAL, "En_Ru") +/* 0x06A */ DEFINE_ACTOR(En_Bom_Chu, ACTOR_EN_BOM_CHU, ALLOCTYPE_PERMANENT, "En_Bom_Chu") +/* 0x06B */ DEFINE_ACTOR(En_Horse_Game_Check, ACTOR_EN_HORSE_GAME_CHECK, ALLOCTYPE_NORMAL, "En_Horse_Game_Check") +/* 0x06C */ DEFINE_ACTOR(En_Rr, ACTOR_EN_RR, ALLOCTYPE_NORMAL, "En_Rr") +/* 0x06D */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_6D) +/* 0x06E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_6E) +/* 0x06F */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_6F) +/* 0x070 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_70) +/* 0x071 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_71) +/* 0x072 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_72) +/* 0x073 */ DEFINE_ACTOR(En_Fr, ACTOR_EN_FR, ALLOCTYPE_NORMAL, "En_Fr") +/* 0x074 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_74) +/* 0x075 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_75) +/* 0x076 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_76) +/* 0x077 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_77) +/* 0x078 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_78) +/* 0x079 */ DEFINE_ACTOR(En_Fishing, ACTOR_EN_FISHING, ALLOCTYPE_NORMAL, "En_Fishing") +/* 0x07A */ DEFINE_ACTOR(Obj_Oshihiki, ACTOR_OBJ_OSHIHIKI, ALLOCTYPE_NORMAL, "Obj_Oshihiki") +/* 0x07B */ DEFINE_ACTOR(Eff_Dust, ACTOR_EFF_DUST, ALLOCTYPE_NORMAL, "Eff_Dust") +/* 0x07C */ DEFINE_ACTOR(Bg_Umajump, ACTOR_BG_UMAJUMP, ALLOCTYPE_NORMAL, "Bg_Umajump") +/* 0x07D */ DEFINE_ACTOR(Arrow_Fire, ACTOR_ARROW_FIRE, ALLOCTYPE_ABSOLUTE, "Arrow_Fire") +/* 0x07E */ DEFINE_ACTOR(Arrow_Ice, ACTOR_ARROW_ICE, ALLOCTYPE_ABSOLUTE, "Arrow_Ice") +/* 0x07F */ DEFINE_ACTOR(Arrow_Light, ACTOR_ARROW_LIGHT, ALLOCTYPE_ABSOLUTE, "Arrow_Light") +/* 0x080 */ DEFINE_ACTOR(Item_Etcetera, ACTOR_ITEM_ETCETERA, ALLOCTYPE_NORMAL, "Item_Etcetera") +/* 0x081 */ DEFINE_ACTOR(Obj_Kibako, ACTOR_OBJ_KIBAKO, ALLOCTYPE_NORMAL, "Obj_Kibako") +/* 0x082 */ DEFINE_ACTOR(Obj_Tsubo, ACTOR_OBJ_TSUBO, ALLOCTYPE_NORMAL, "Obj_Tsubo") +/* 0x083 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_83) +/* 0x084 */ DEFINE_ACTOR(En_Ik, ACTOR_EN_IK, ALLOCTYPE_NORMAL, "En_Ik") +/* 0x085 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_85) +/* 0x086 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_86) +/* 0x087 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_87) +/* 0x088 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_88) +/* 0x089 */ DEFINE_ACTOR(Demo_Shd, ACTOR_DEMO_SHD, ALLOCTYPE_NORMAL, "Demo_Shd") +/* 0x08A */ DEFINE_ACTOR(En_Dns, ACTOR_EN_DNS, ALLOCTYPE_NORMAL, "En_Dns") +/* 0x08B */ DEFINE_ACTOR(Elf_Msg, ACTOR_ELF_MSG, ALLOCTYPE_NORMAL, "Elf_Msg") +/* 0x08C */ DEFINE_ACTOR(En_Honotrap, ACTOR_EN_HONOTRAP, ALLOCTYPE_NORMAL, "En_Honotrap") +/* 0x08D */ DEFINE_ACTOR(En_Tubo_Trap, ACTOR_EN_TUBO_TRAP, ALLOCTYPE_NORMAL, "En_Tubo_Trap") +/* 0x08E */ DEFINE_ACTOR(Obj_Ice_Poly, ACTOR_OBJ_ICE_POLY, ALLOCTYPE_NORMAL, "Obj_Ice_Poly") +/* 0x08F */ DEFINE_ACTOR(En_Fz, ACTOR_EN_FZ, ALLOCTYPE_NORMAL, "En_Fz") +/* 0x090 */ DEFINE_ACTOR(En_Kusa, ACTOR_EN_KUSA, ALLOCTYPE_NORMAL, "En_Kusa") +/* 0x091 */ DEFINE_ACTOR(Obj_Bean, ACTOR_OBJ_BEAN, ALLOCTYPE_NORMAL, "Obj_Bean") +/* 0x092 */ DEFINE_ACTOR(Obj_Bombiwa, ACTOR_OBJ_BOMBIWA, ALLOCTYPE_NORMAL, "Obj_Bombiwa") +/* 0x093 */ DEFINE_ACTOR(Obj_Switch, ACTOR_OBJ_SWITCH, ALLOCTYPE_NORMAL, "Obj_Switch") +/* 0x094 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_94) +/* 0x095 */ DEFINE_ACTOR(Obj_Lift, ACTOR_OBJ_LIFT, ALLOCTYPE_NORMAL, "Obj_Lift") +/* 0x096 */ DEFINE_ACTOR(Obj_Hsblock, ACTOR_OBJ_HSBLOCK, ALLOCTYPE_NORMAL, "Obj_Hsblock") +/* 0x097 */ DEFINE_ACTOR(En_Okarina_Tag, ACTOR_EN_OKARINA_TAG, ALLOCTYPE_NORMAL, "En_Okarina_Tag") +/* 0x098 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_98) +/* 0x099 */ DEFINE_ACTOR(En_Goroiwa, ACTOR_EN_GOROIWA, ALLOCTYPE_NORMAL, "En_Goroiwa") +/* 0x09A */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_9A) +/* 0x09B */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_9B) +/* 0x09C */ DEFINE_ACTOR(En_Daiku, ACTOR_EN_DAIKU, ALLOCTYPE_NORMAL, "En_Daiku") +/* 0x09D */ DEFINE_ACTOR(En_Nwc, ACTOR_EN_NWC, ALLOCTYPE_NORMAL, "En_Nwc") +/* 0x09E */ DEFINE_ACTOR(Item_Inbox, ACTOR_ITEM_INBOX, ALLOCTYPE_NORMAL, "Item_Inbox") +/* 0x09F */ DEFINE_ACTOR(En_Ge1, ACTOR_EN_GE1, ALLOCTYPE_NORMAL, "En_Ge1") +/* 0x0A0 */ DEFINE_ACTOR(Obj_Blockstop, ACTOR_OBJ_BLOCKSTOP, ALLOCTYPE_NORMAL, "Obj_Blockstop") +/* 0x0A1 */ DEFINE_ACTOR(En_Sda, ACTOR_EN_SDA, ALLOCTYPE_NORMAL, "En_Sda") +/* 0x0A2 */ DEFINE_ACTOR(En_Clear_Tag, ACTOR_EN_CLEAR_TAG, ALLOCTYPE_NORMAL, "En_Clear_Tag") +/* 0x0A3 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_A3) +/* 0x0A4 */ DEFINE_ACTOR(En_Gm, ACTOR_EN_GM, ALLOCTYPE_NORMAL, "En_Gm") +/* 0x0A5 */ DEFINE_ACTOR(En_Ms, ACTOR_EN_MS, ALLOCTYPE_NORMAL, "En_Ms") +/* 0x0A6 */ DEFINE_ACTOR(En_Hs, ACTOR_EN_HS, ALLOCTYPE_NORMAL, "En_Hs") +/* 0x0A7 */ DEFINE_ACTOR(Bg_Ingate, ACTOR_BG_INGATE, ALLOCTYPE_NORMAL, "Bg_Ingate") +/* 0x0A8 */ DEFINE_ACTOR(En_Kanban, ACTOR_EN_KANBAN, ALLOCTYPE_NORMAL, "En_Kanban") +/* 0x0A9 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_A9) +/* 0x0AA */ DEFINE_ACTOR(En_Attack_Niw, ACTOR_EN_ATTACK_NIW, ALLOCTYPE_NORMAL, "En_Attack_Niw") +/* 0x0AB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_AB) +/* 0x0AC */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_AC) +/* 0x0AD */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_AD) +/* 0x0AE */ DEFINE_ACTOR(En_Mk, ACTOR_EN_MK, ALLOCTYPE_NORMAL, "En_Mk") +/* 0x0AF */ DEFINE_ACTOR(En_Owl, ACTOR_EN_OWL, ALLOCTYPE_NORMAL, "En_Owl") +/* 0x0B0 */ DEFINE_ACTOR(En_Ishi, ACTOR_EN_ISHI, ALLOCTYPE_NORMAL, "En_Ishi") +/* 0x0B1 */ DEFINE_ACTOR(Obj_Hana, ACTOR_OBJ_HANA, ALLOCTYPE_NORMAL, "Obj_Hana") +/* 0x0B2 */ DEFINE_ACTOR(Obj_Lightswitch, ACTOR_OBJ_LIGHTSWITCH, ALLOCTYPE_NORMAL, "Obj_Lightswitch") +/* 0x0B3 */ DEFINE_ACTOR(Obj_Mure2, ACTOR_OBJ_MURE2, ALLOCTYPE_NORMAL, "Obj_Mure2") +/* 0x0B4 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_B4) +/* 0x0B5 */ DEFINE_ACTOR(En_Fu, ACTOR_EN_FU, ALLOCTYPE_NORMAL, "En_Fu") +/* 0x0B6 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_B6) +/* 0x0B7 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_B7) +/* 0x0B8 */ DEFINE_ACTOR(En_Stream, ACTOR_EN_STREAM, ALLOCTYPE_NORMAL, "En_Stream") +/* 0x0B9 */ DEFINE_ACTOR(En_Mm, ACTOR_EN_MM, ALLOCTYPE_NORMAL, "En_Mm") +/* 0x0BA */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_BA) +/* 0x0BB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_BB) +/* 0x0BC */ DEFINE_ACTOR(En_Weather_Tag, ACTOR_EN_WEATHER_TAG, ALLOCTYPE_NORMAL, "En_Weather_Tag") +/* 0x0BD */ DEFINE_ACTOR(En_Ani, ACTOR_EN_ANI, ALLOCTYPE_NORMAL, "En_Ani") +/* 0x0BE */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_BE) +/* 0x0BF */ DEFINE_ACTOR(En_Js, ACTOR_EN_JS, ALLOCTYPE_NORMAL, "En_Js") +/* 0x0C0 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C0) +/* 0x0C1 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C1) +/* 0x0C2 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C2) +/* 0x0C3 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C3) +/* 0x0C4 */ DEFINE_ACTOR(En_Okarina_Effect, ACTOR_EN_OKARINA_EFFECT, ALLOCTYPE_NORMAL, "En_Okarina_Effect") +/* 0x0C5 */ DEFINE_ACTOR(En_Mag, ACTOR_EN_MAG, ALLOCTYPE_NORMAL, "En_Mag") +/* 0x0C6 */ DEFINE_ACTOR(Elf_Msg2, ACTOR_ELF_MSG2, ALLOCTYPE_NORMAL, "Elf_Msg2") +/* 0x0C7 */ DEFINE_ACTOR(Bg_F40_Swlift, ACTOR_BG_F40_SWLIFT, ALLOCTYPE_NORMAL, "Bg_F40_Swlift") +/* 0x0C8 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C8) +/* 0x0C9 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_C9) +/* 0x0CA */ DEFINE_ACTOR(En_Kakasi, ACTOR_EN_KAKASI, ALLOCTYPE_NORMAL, "En_Kakasi") +/* 0x0CB */ DEFINE_ACTOR(Obj_Makeoshihiki, ACTOR_OBJ_MAKEOSHIHIKI, ALLOCTYPE_NORMAL, "Obj_Makeoshihiki") +/* 0x0CC */ DEFINE_ACTOR(Oceff_Spot, ACTOR_OCEFF_SPOT, ALLOCTYPE_ABSOLUTE, "Oceff_Spot") +/* 0x0CD */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_CD) +/* 0x0CE */ DEFINE_ACTOR(En_Torch, ACTOR_EN_TORCH, ALLOCTYPE_NORMAL, "En_Torch") +/* 0x0CF */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_CF) +/* 0x0D0 */ DEFINE_ACTOR(Shot_Sun, ACTOR_SHOT_SUN, ALLOCTYPE_NORMAL, "Shot_Sun") +/* 0x0D1 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_D1) +/* 0x0D2 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_D2) +/* 0x0D3 */ DEFINE_ACTOR(Obj_Roomtimer, ACTOR_OBJ_ROOMTIMER, ALLOCTYPE_NORMAL, "Obj_Roomtimer") +/* 0x0D4 */ DEFINE_ACTOR(En_Ssh, ACTOR_EN_SSH, ALLOCTYPE_NORMAL, "En_Ssh") +/* 0x0D5 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_D5) +/* 0x0D6 */ DEFINE_ACTOR(Oceff_Wipe, ACTOR_OCEFF_WIPE, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe") +/* 0x0D7 */ DEFINE_ACTOR(Oceff_Storm, ACTOR_OCEFF_STORM, ALLOCTYPE_ABSOLUTE, "Oceff_Storm") +/* 0x0D8 */ DEFINE_ACTOR(Obj_Demo, ACTOR_OBJ_DEMO, ALLOCTYPE_NORMAL, "Obj_Demo") +/* 0x0D9 */ DEFINE_ACTOR(En_Minislime, ACTOR_EN_MINISLIME, ALLOCTYPE_NORMAL, "En_Minislime") +/* 0x0DA */ DEFINE_ACTOR(En_Nutsball, ACTOR_EN_NUTSBALL, ALLOCTYPE_NORMAL, "En_Nutsball") +/* 0x0DB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_DB) +/* 0x0DC */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_DC) +/* 0x0DD */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_DD) +/* 0x0DE */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_DE) +/* 0x0DF */ DEFINE_ACTOR(Oceff_Wipe2, ACTOR_OCEFF_WIPE2, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe2") +/* 0x0E0 */ DEFINE_ACTOR(Oceff_Wipe3, ACTOR_OCEFF_WIPE3, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe3") +/* 0x0E1 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_E1) +/* 0x0E2 */ DEFINE_ACTOR(En_Dg, ACTOR_EN_DG, ALLOCTYPE_NORMAL, "En_Dg") +/* 0x0E3 */ DEFINE_ACTOR(En_Si, ACTOR_EN_SI, ALLOCTYPE_NORMAL, "En_Si") +/* 0x0E4 */ DEFINE_ACTOR(Obj_Comb, ACTOR_OBJ_COMB, ALLOCTYPE_NORMAL, "Obj_Comb") +/* 0x0E5 */ DEFINE_ACTOR(Obj_Kibako2, ACTOR_OBJ_KIBAKO2, ALLOCTYPE_NORMAL, "Obj_Kibako2") +/* 0x0E6 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_E6) +/* 0x0E7 */ DEFINE_ACTOR(En_Hs2, ACTOR_EN_HS2, ALLOCTYPE_NORMAL, "En_Hs2") +/* 0x0E8 */ DEFINE_ACTOR(Obj_Mure3, ACTOR_OBJ_MURE3, ALLOCTYPE_NORMAL, "Obj_Mure3") +/* 0x0E9 */ DEFINE_ACTOR(En_Tg, ACTOR_EN_TG, ALLOCTYPE_NORMAL, "En_Tg") +/* 0x0EA */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_EA) +/* 0x0EB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_EB) +/* 0x0EC */ DEFINE_ACTOR(En_Wf, ACTOR_EN_WF, ALLOCTYPE_NORMAL, "En_Wf") +/* 0x0ED */ DEFINE_ACTOR(En_Skb, ACTOR_EN_SKB, ALLOCTYPE_NORMAL, "En_Skb") +/* 0x0EE */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_EE) +/* 0x0EF */ DEFINE_ACTOR(En_Gs, ACTOR_EN_GS, ALLOCTYPE_NORMAL, "En_Gs") +/* 0x0F0 */ DEFINE_ACTOR(Obj_Sound, ACTOR_OBJ_SOUND, ALLOCTYPE_NORMAL, "Obj_Sound") +/* 0x0F1 */ DEFINE_ACTOR(En_Crow, ACTOR_EN_CROW, ALLOCTYPE_NORMAL, "En_Crow") +/* 0x0F2 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_F2) +/* 0x0F3 */ DEFINE_ACTOR(En_Cow, ACTOR_EN_COW, ALLOCTYPE_NORMAL, "En_Cow") +/* 0x0F4 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_F4) +/* 0x0F5 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_F5) +/* 0x0F6 */ DEFINE_ACTOR(Oceff_Wipe4, ACTOR_OCEFF_WIPE4, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe4") +/* 0x0F7 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_F7) +/* 0x0F8 */ DEFINE_ACTOR(En_Zo, ACTOR_EN_ZO, ALLOCTYPE_NORMAL, "En_Zo") +/* 0x0F9 */ DEFINE_ACTOR(Obj_Makekinsuta, ACTOR_OBJ_MAKEKINSUTA, ALLOCTYPE_NORMAL, "Obj_Makekinsuta") +/* 0x0FA */ DEFINE_ACTOR(En_Ge3, ACTOR_EN_GE3, ALLOCTYPE_NORMAL, "En_Ge3") +/* 0x0FB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_FB) +/* 0x0FC */ DEFINE_ACTOR(Obj_Hamishi, ACTOR_OBJ_HAMISHI, ALLOCTYPE_NORMAL, "Obj_Hamishi") +/* 0x0FD */ DEFINE_ACTOR(En_Zl4, ACTOR_EN_ZL4, ALLOCTYPE_NORMAL, "En_Zl4") +/* 0x0FE */ DEFINE_ACTOR(En_Mm2, ACTOR_EN_MM2, ALLOCTYPE_NORMAL, "En_Mm2") +/* 0x0FF */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_FF) +/* 0x100 */ DEFINE_ACTOR(Door_Spiral, ACTOR_DOOR_SPIRAL, ALLOCTYPE_PERMANENT, "Door_Spiral") +/* 0x101 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_101) +/* 0x102 */ DEFINE_ACTOR(Obj_Pzlblock, ACTOR_OBJ_PZLBLOCK, ALLOCTYPE_NORMAL, "Obj_Pzlblock") +/* 0x103 */ DEFINE_ACTOR(Obj_Toge, ACTOR_OBJ_TOGE, ALLOCTYPE_NORMAL, "Obj_Toge") +/* 0x104 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_104) +/* 0x105 */ DEFINE_ACTOR(Obj_Armos, ACTOR_OBJ_ARMOS, ALLOCTYPE_NORMAL, "Obj_Armos") +/* 0x106 */ DEFINE_ACTOR(Obj_Boyo, ACTOR_OBJ_BOYO, ALLOCTYPE_NORMAL, "Obj_Boyo") +/* 0x107 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_107) +/* 0x108 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_108) +/* 0x109 */ DEFINE_ACTOR(En_Grasshopper, ACTOR_EN_GRASSHOPPER, ALLOCTYPE_NORMAL, "En_Grasshopper") +/* 0x10A */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_10A) +/* 0x10B */ DEFINE_ACTOR(Obj_Grass, ACTOR_OBJ_GRASS, ALLOCTYPE_NORMAL, "Obj_Grass") +/* 0x10C */ DEFINE_ACTOR(Obj_Grass_Carry, ACTOR_OBJ_GRASS_CARRY, ALLOCTYPE_NORMAL, "Obj_Grass_Carry") +/* 0x10D */ DEFINE_ACTOR(Obj_Grass_Unit, ACTOR_OBJ_GRASS_UNIT, ALLOCTYPE_NORMAL, "Obj_Grass_Unit") +/* 0x10E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_10E) +/* 0x10F */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_10F) +/* 0x110 */ DEFINE_ACTOR(Bg_Fire_Wall, ACTOR_BG_FIRE_WALL, ALLOCTYPE_NORMAL, "Bg_Fire_Wall") +/* 0x111 */ DEFINE_ACTOR(En_Bu, ACTOR_EN_BU, ALLOCTYPE_NORMAL, "En_Bu") +/* 0x112 */ DEFINE_ACTOR(En_Encount3, ACTOR_EN_ENCOUNT3, ALLOCTYPE_NORMAL, "En_Encount3") +/* 0x113 */ DEFINE_ACTOR(En_Jso, ACTOR_EN_JSO, ALLOCTYPE_NORMAL, "En_Jso") +/* 0x114 */ DEFINE_ACTOR(Obj_Chikuwa, ACTOR_OBJ_CHIKUWA, ALLOCTYPE_NORMAL, "Obj_Chikuwa") +/* 0x115 */ DEFINE_ACTOR(En_Knight, ACTOR_EN_KNIGHT, ALLOCTYPE_NORMAL, "En_Knight") +/* 0x116 */ DEFINE_ACTOR(En_Warp_tag, ACTOR_EN_WARP_TAG, ALLOCTYPE_NORMAL, "En_Warp_tag") +/* 0x117 */ DEFINE_ACTOR(En_Aob_01, ACTOR_EN_AOB_01, ALLOCTYPE_NORMAL, "En_Aob_01") +/* 0x118 */ DEFINE_ACTOR(En_Boj_01, ACTOR_EN_BOJ_01, ALLOCTYPE_NORMAL, "En_Boj_01") +/* 0x119 */ DEFINE_ACTOR(En_Boj_02, ACTOR_EN_BOJ_02, ALLOCTYPE_NORMAL, "En_Boj_02") +/* 0x11A */ DEFINE_ACTOR(En_Boj_03, ACTOR_EN_BOJ_03, ALLOCTYPE_NORMAL, "En_Boj_03") +/* 0x11B */ DEFINE_ACTOR(En_Encount4, ACTOR_EN_ENCOUNT4, ALLOCTYPE_NORMAL, "En_Encount4") +/* 0x11C */ DEFINE_ACTOR(En_Bom_Bowl_Man, ACTOR_EN_BOM_BOWL_MAN, ALLOCTYPE_NORMAL, "En_Bom_Bowl_Man") +/* 0x11D */ DEFINE_ACTOR(En_Syateki_Man, ACTOR_EN_SYATEKI_MAN, ALLOCTYPE_NORMAL, "En_Syateki_Man") +/* 0x11E */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_11E) +/* 0x11F */ DEFINE_ACTOR(Bg_Icicle, ACTOR_BG_ICICLE, ALLOCTYPE_NORMAL, "Bg_Icicle") +/* 0x120 */ DEFINE_ACTOR(En_Syateki_Crow, ACTOR_EN_SYATEKI_CROW, ALLOCTYPE_NORMAL, "En_Syateki_Crow") +/* 0x121 */ DEFINE_ACTOR(En_Boj_04, ACTOR_EN_BOJ_04, ALLOCTYPE_NORMAL, "En_Boj_04") +/* 0x122 */ DEFINE_ACTOR(En_Cne_01, ACTOR_EN_CNE_01, ALLOCTYPE_NORMAL, "En_Cne_01") +/* 0x123 */ DEFINE_ACTOR(En_Bba_01, ACTOR_EN_BBA_01, ALLOCTYPE_NORMAL, "En_Bba_01") +/* 0x124 */ DEFINE_ACTOR(En_Bji_01, ACTOR_EN_BJI_01, ALLOCTYPE_NORMAL, "En_Bji_01") +/* 0x125 */ DEFINE_ACTOR(Bg_Spdweb, ACTOR_BG_SPDWEB, ALLOCTYPE_NORMAL, "Bg_Spdweb") +/* 0x126 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_126) +/* 0x127 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_127) +/* 0x128 */ DEFINE_ACTOR(En_Mt_tag, ACTOR_EN_MT_TAG, ALLOCTYPE_NORMAL, "En_Mt_tag") +/* 0x129 */ DEFINE_ACTOR(Boss_01, ACTOR_BOSS_01, ALLOCTYPE_NORMAL, "Boss_01") +/* 0x12A */ DEFINE_ACTOR(Boss_02, ACTOR_BOSS_02, ALLOCTYPE_NORMAL, "Boss_02") +/* 0x12B */ DEFINE_ACTOR(Boss_03, ACTOR_BOSS_03, ALLOCTYPE_NORMAL, "Boss_03") +/* 0x12C */ DEFINE_ACTOR(Boss_04, ACTOR_BOSS_04, ALLOCTYPE_NORMAL, "Boss_04") +/* 0x12D */ DEFINE_ACTOR(Boss_05, ACTOR_BOSS_05, ALLOCTYPE_NORMAL, "Boss_05") +/* 0x12E */ DEFINE_ACTOR(Boss_06, ACTOR_BOSS_06, ALLOCTYPE_NORMAL, "Boss_06") +/* 0x12F */ DEFINE_ACTOR(Boss_07, ACTOR_BOSS_07, ALLOCTYPE_NORMAL, "Boss_07") +/* 0x130 */ DEFINE_ACTOR(Bg_Dy_Yoseizo, ACTOR_BG_DY_YOSEIZO, ALLOCTYPE_NORMAL, "Bg_Dy_Yoseizo") +/* 0x131 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_131) +/* 0x132 */ DEFINE_ACTOR(En_Boj_05, ACTOR_EN_BOJ_05, ALLOCTYPE_NORMAL, "En_Boj_05") +/* 0x133 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_133) +/* 0x134 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_134) +/* 0x135 */ DEFINE_ACTOR(En_Sob1, ACTOR_EN_SOB1, ALLOCTYPE_NORMAL, "En_Sob1") +/* 0x136 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_136) +/* 0x137 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_137) +/* 0x138 */ DEFINE_ACTOR(En_Go, ACTOR_EN_GO, ALLOCTYPE_NORMAL, "En_Go") +/* 0x139 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_139) +/* 0x13A */ DEFINE_ACTOR(En_Raf, ACTOR_EN_RAF, ALLOCTYPE_NORMAL, "En_Raf") +/* 0x13B */ DEFINE_ACTOR(Obj_Funen, ACTOR_OBJ_FUNEN, ALLOCTYPE_NORMAL, "Obj_Funen") +/* 0x13C */ DEFINE_ACTOR(Obj_Raillift, ACTOR_OBJ_RAILLIFT, ALLOCTYPE_NORMAL, "Obj_Raillift") +/* 0x13D */ DEFINE_ACTOR(Bg_Numa_Hana, ACTOR_BG_NUMA_HANA, ALLOCTYPE_NORMAL, "Bg_Numa_Hana") +/* 0x13E */ DEFINE_ACTOR(Obj_Flowerpot, ACTOR_OBJ_FLOWERPOT, ALLOCTYPE_NORMAL, "Obj_Flowerpot") +/* 0x13F */ DEFINE_ACTOR(Obj_Spinyroll, ACTOR_OBJ_SPINYROLL, ALLOCTYPE_NORMAL, "Obj_Spinyroll") +/* 0x140 */ DEFINE_ACTOR(Dm_Hina, ACTOR_DM_HINA, ALLOCTYPE_NORMAL, "Dm_Hina") +/* 0x141 */ DEFINE_ACTOR(En_Syateki_Wf, ACTOR_EN_SYATEKI_WF, ALLOCTYPE_NORMAL, "En_Syateki_Wf") +/* 0x142 */ DEFINE_ACTOR(Obj_Skateblock, ACTOR_OBJ_SKATEBLOCK, ALLOCTYPE_NORMAL, "Obj_Skateblock") +/* 0x143 */ DEFINE_ACTOR(Obj_Iceblock, ACTOR_OBJ_ICEBLOCK, ALLOCTYPE_NORMAL, "Obj_Iceblock") +/* 0x144 */ DEFINE_ACTOR(En_Bigpamet, ACTOR_EN_BIGPAMET, ALLOCTYPE_NORMAL, "En_Bigpamet") +/* 0x145 */ DEFINE_ACTOR(En_Syateki_Dekunuts, ACTOR_EN_SYATEKI_DEKUNUTS, ALLOCTYPE_NORMAL, "En_Syateki_Dekunuts") +/* 0x146 */ DEFINE_ACTOR(Elf_Msg3, ACTOR_ELF_MSG3, ALLOCTYPE_NORMAL, "Elf_Msg3") +/* 0x147 */ DEFINE_ACTOR(En_Fg, ACTOR_EN_FG, ALLOCTYPE_NORMAL, "En_Fg") +/* 0x148 */ DEFINE_ACTOR(Dm_Ravine, ACTOR_DM_RAVINE, ALLOCTYPE_NORMAL, "Dm_Ravine") +/* 0x149 */ DEFINE_ACTOR(Dm_Sa, ACTOR_DM_SA, ALLOCTYPE_NORMAL, "Dm_Sa") +/* 0x14A */ DEFINE_ACTOR(En_Slime, ACTOR_EN_SLIME, ALLOCTYPE_NORMAL, "En_Slime") +/* 0x14B */ DEFINE_ACTOR(En_Pr, ACTOR_EN_PR, ALLOCTYPE_NORMAL, "En_Pr") +/* 0x14C */ DEFINE_ACTOR(Obj_Toudai, ACTOR_OBJ_TOUDAI, ALLOCTYPE_NORMAL, "Obj_Toudai") +/* 0x14D */ DEFINE_ACTOR(Obj_Entotu, ACTOR_OBJ_ENTOTU, ALLOCTYPE_NORMAL, "Obj_Entotu") +/* 0x14E */ DEFINE_ACTOR(Obj_Bell, ACTOR_OBJ_BELL, ALLOCTYPE_NORMAL, "Obj_Bell") +/* 0x14F */ DEFINE_ACTOR(En_Syateki_Okuta, ACTOR_EN_SYATEKI_OKUTA, ALLOCTYPE_NORMAL, "En_Syateki_Okuta") +/* 0x150 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_150) +/* 0x151 */ DEFINE_ACTOR(Obj_Shutter, ACTOR_OBJ_SHUTTER, ALLOCTYPE_NORMAL, "Obj_Shutter") +/* 0x152 */ DEFINE_ACTOR(Dm_Zl, ACTOR_DM_ZL, ALLOCTYPE_NORMAL, "Dm_Zl") +/* 0x153 */ DEFINE_ACTOR(En_Elfgrp, ACTOR_EN_ELFGRP, ALLOCTYPE_NORMAL, "En_Elfgrp") +/* 0x154 */ DEFINE_ACTOR(Dm_Tsg, ACTOR_DM_TSG, ALLOCTYPE_NORMAL, "Dm_Tsg") +/* 0x155 */ DEFINE_ACTOR(En_Baguo, ACTOR_EN_BAGUO, ALLOCTYPE_NORMAL, "En_Baguo") +/* 0x156 */ DEFINE_ACTOR(Obj_Vspinyroll, ACTOR_OBJ_VSPINYROLL, ALLOCTYPE_NORMAL, "Obj_Vspinyroll") +/* 0x157 */ DEFINE_ACTOR(Obj_Smork, ACTOR_OBJ_SMORK, ALLOCTYPE_NORMAL, "Obj_Smork") +/* 0x158 */ DEFINE_ACTOR(En_Test2, ACTOR_EN_TEST2, ALLOCTYPE_NORMAL, "En_Test2") +/* 0x159 */ DEFINE_ACTOR(En_Test3, ACTOR_EN_TEST3, ALLOCTYPE_NORMAL, "En_Test3") +/* 0x15A */ DEFINE_ACTOR(En_Test4, ACTOR_EN_TEST4, ALLOCTYPE_NORMAL, "En_Test4") +/* 0x15B */ DEFINE_ACTOR(En_Bat, ACTOR_EN_BAT, ALLOCTYPE_NORMAL, "En_Bat") +/* 0x15C */ DEFINE_ACTOR(En_Sekihi, ACTOR_EN_SEKIHI, ALLOCTYPE_NORMAL, "En_Sekihi") +/* 0x15D */ DEFINE_ACTOR(En_Wiz, ACTOR_EN_WIZ, ALLOCTYPE_NORMAL, "En_Wiz") +/* 0x15E */ DEFINE_ACTOR(En_Wiz_Brock, ACTOR_EN_WIZ_BROCK, ALLOCTYPE_NORMAL, "En_Wiz_Brock") +/* 0x15F */ DEFINE_ACTOR(En_Wiz_Fire, ACTOR_EN_WIZ_FIRE, ALLOCTYPE_NORMAL, "En_Wiz_Fire") +/* 0x160 */ DEFINE_ACTOR(Eff_Change, ACTOR_EFF_CHANGE, ALLOCTYPE_NORMAL, "Eff_Change") +/* 0x161 */ DEFINE_ACTOR(Dm_Statue, ACTOR_DM_STATUE, ALLOCTYPE_NORMAL, "Dm_Statue") +/* 0x162 */ DEFINE_ACTOR(Obj_Fireshield, ACTOR_OBJ_FIRESHIELD, ALLOCTYPE_NORMAL, "Obj_Fireshield") +/* 0x163 */ DEFINE_ACTOR(Bg_Ladder, ACTOR_BG_LADDER, ALLOCTYPE_NORMAL, "Bg_Ladder") +/* 0x164 */ DEFINE_ACTOR(En_Mkk, ACTOR_EN_MKK, ALLOCTYPE_NORMAL, "En_Mkk") +/* 0x165 */ DEFINE_ACTOR(Demo_Getitem, ACTOR_DEMO_GETITEM, ALLOCTYPE_NORMAL, "Demo_Getitem") +/* 0x166 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_166) +/* 0x167 */ DEFINE_ACTOR(En_Dnb, ACTOR_EN_DNB, ALLOCTYPE_NORMAL, "En_Dnb") +/* 0x168 */ DEFINE_ACTOR(En_Dnh, ACTOR_EN_DNH, ALLOCTYPE_NORMAL, "En_Dnh") +/* 0x169 */ DEFINE_ACTOR(En_Dnk, ACTOR_EN_DNK, ALLOCTYPE_NORMAL, "En_Dnk") +/* 0x16A */ DEFINE_ACTOR(En_Dnq, ACTOR_EN_DNQ, ALLOCTYPE_NORMAL, "En_Dnq") +/* 0x16B */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_16B) +/* 0x16C */ DEFINE_ACTOR(Bg_Keikoku_Saku, ACTOR_BG_KEIKOKU_SAKU, ALLOCTYPE_NORMAL, "Bg_Keikoku_Saku") +/* 0x16D */ DEFINE_ACTOR(Obj_Hugebombiwa, ACTOR_OBJ_HUGEBOMBIWA, ALLOCTYPE_NORMAL, "Obj_Hugebombiwa") +/* 0x16E */ DEFINE_ACTOR(En_Firefly2, ACTOR_EN_FIREFLY2, ALLOCTYPE_NORMAL, "En_Firefly2") +/* 0x16F */ DEFINE_ACTOR(En_Rat, ACTOR_EN_RAT, ALLOCTYPE_NORMAL, "En_Rat") +/* 0x170 */ DEFINE_ACTOR(En_Water_Effect, ACTOR_EN_WATER_EFFECT, ALLOCTYPE_NORMAL, "En_Water_Effect") +/* 0x171 */ DEFINE_ACTOR(En_Kusa2, ACTOR_EN_KUSA2, ALLOCTYPE_NORMAL, "En_Kusa2") +/* 0x172 */ DEFINE_ACTOR(Bg_Spout_Fire, ACTOR_BG_SPOUT_FIRE, ALLOCTYPE_NORMAL, "Bg_Spout_Fire") +/* 0x173 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_173) +/* 0x174 */ DEFINE_ACTOR(Bg_Dblue_Movebg, ACTOR_BG_DBLUE_MOVEBG, ALLOCTYPE_NORMAL, "Bg_Dblue_Movebg") +/* 0x175 */ DEFINE_ACTOR(En_Dy_Extra, ACTOR_EN_DY_EXTRA, ALLOCTYPE_NORMAL, "En_Dy_Extra") +/* 0x176 */ DEFINE_ACTOR(En_Bal, ACTOR_EN_BAL, ALLOCTYPE_NORMAL, "En_Bal") +/* 0x177 */ DEFINE_ACTOR(En_Ginko_Man, ACTOR_EN_GINKO_MAN, ALLOCTYPE_NORMAL, "En_Ginko_Man") +/* 0x178 */ DEFINE_ACTOR(En_Warp_Uzu, ACTOR_EN_WARP_UZU, ALLOCTYPE_NORMAL, "En_Warp_Uzu") +/* 0x179 */ DEFINE_ACTOR(Obj_Driftice, ACTOR_OBJ_DRIFTICE, ALLOCTYPE_NORMAL, "Obj_Driftice") +/* 0x17A */ DEFINE_ACTOR(En_Look_Nuts, ACTOR_EN_LOOK_NUTS, ALLOCTYPE_NORMAL, "En_Look_Nuts") +/* 0x17B */ DEFINE_ACTOR(En_Mushi2, ACTOR_EN_MUSHI2, ALLOCTYPE_NORMAL, "En_Mushi2") +/* 0x17C */ DEFINE_ACTOR(En_Fall, ACTOR_EN_FALL, ALLOCTYPE_NORMAL, "En_Fall") +/* 0x17D */ DEFINE_ACTOR(En_Mm3, ACTOR_EN_MM3, ALLOCTYPE_NORMAL, "En_Mm3") +/* 0x17E */ DEFINE_ACTOR(Bg_Crace_Movebg, ACTOR_BG_CRACE_MOVEBG, ALLOCTYPE_NORMAL, "Bg_Crace_Movebg") +/* 0x17F */ DEFINE_ACTOR(En_Dno, ACTOR_EN_DNO, ALLOCTYPE_NORMAL, "En_Dno") +/* 0x180 */ DEFINE_ACTOR(En_Pr2, ACTOR_EN_PR2, ALLOCTYPE_NORMAL, "En_Pr2") +/* 0x181 */ DEFINE_ACTOR(En_Prz, ACTOR_EN_PRZ, ALLOCTYPE_NORMAL, "En_Prz") +/* 0x182 */ DEFINE_ACTOR(En_Jso2, ACTOR_EN_JSO2, ALLOCTYPE_NORMAL, "En_Jso2") +/* 0x183 */ DEFINE_ACTOR(Obj_Etcetera, ACTOR_OBJ_ETCETERA, ALLOCTYPE_NORMAL, "Obj_Etcetera") +/* 0x184 */ DEFINE_ACTOR(En_Egol, ACTOR_EN_EGOL, ALLOCTYPE_NORMAL, "En_Egol") +/* 0x185 */ DEFINE_ACTOR(Obj_Mine, ACTOR_OBJ_MINE, ALLOCTYPE_NORMAL, "Obj_Mine") +/* 0x186 */ DEFINE_ACTOR(Obj_Purify, ACTOR_OBJ_PURIFY, ALLOCTYPE_NORMAL, "Obj_Purify") +/* 0x187 */ DEFINE_ACTOR(En_Tru, ACTOR_EN_TRU, ALLOCTYPE_NORMAL, "En_Tru") +/* 0x188 */ DEFINE_ACTOR(En_Trt, ACTOR_EN_TRT, ALLOCTYPE_NORMAL, "En_Trt") +/* 0x189 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_189) +/* 0x18A */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_18A) +/* 0x18B */ DEFINE_ACTOR(En_Test5, ACTOR_EN_TEST5, ALLOCTYPE_NORMAL, "En_Test5") +/* 0x18C */ DEFINE_ACTOR(En_Test6, ACTOR_EN_TEST6, ALLOCTYPE_NORMAL, "En_Test6") +/* 0x18D */ DEFINE_ACTOR(En_Az, ACTOR_EN_AZ, ALLOCTYPE_NORMAL, "En_Az") +/* 0x18E */ DEFINE_ACTOR(En_Estone, ACTOR_EN_ESTONE, ALLOCTYPE_NORMAL, "En_Estone") +/* 0x18F */ DEFINE_ACTOR(Bg_Hakugin_Post, ACTOR_BG_HAKUGIN_POST, ALLOCTYPE_NORMAL, "Bg_Hakugin_Post") +/* 0x190 */ DEFINE_ACTOR(Dm_Opstage, ACTOR_DM_OPSTAGE, ALLOCTYPE_NORMAL, "Dm_Opstage") +/* 0x191 */ DEFINE_ACTOR(Dm_Stk, ACTOR_DM_STK, ALLOCTYPE_NORMAL, "Dm_Stk") +/* 0x192 */ DEFINE_ACTOR(Dm_Char00, ACTOR_DM_CHAR00, ALLOCTYPE_NORMAL, "Dm_Char00") +/* 0x193 */ DEFINE_ACTOR(Dm_Char01, ACTOR_DM_CHAR01, ALLOCTYPE_NORMAL, "Dm_Char01") +/* 0x194 */ DEFINE_ACTOR(Dm_Char02, ACTOR_DM_CHAR02, ALLOCTYPE_NORMAL, "Dm_Char02") +/* 0x195 */ DEFINE_ACTOR(Dm_Char03, ACTOR_DM_CHAR03, ALLOCTYPE_NORMAL, "Dm_Char03") +/* 0x196 */ DEFINE_ACTOR(Dm_Char04, ACTOR_DM_CHAR04, ALLOCTYPE_NORMAL, "Dm_Char04") +/* 0x197 */ DEFINE_ACTOR(Dm_Char05, ACTOR_DM_CHAR05, ALLOCTYPE_NORMAL, "Dm_Char05") +/* 0x198 */ DEFINE_ACTOR(Dm_Char06, ACTOR_DM_CHAR06, ALLOCTYPE_NORMAL, "Dm_Char06") +/* 0x199 */ DEFINE_ACTOR(Dm_Char07, ACTOR_DM_CHAR07, ALLOCTYPE_NORMAL, "Dm_Char07") +/* 0x19A */ DEFINE_ACTOR(Dm_Char08, ACTOR_DM_CHAR08, ALLOCTYPE_NORMAL, "Dm_Char08") +/* 0x19B */ DEFINE_ACTOR(Dm_Char09, ACTOR_DM_CHAR09, ALLOCTYPE_NORMAL, "Dm_Char09") +/* 0x19C */ DEFINE_ACTOR(Obj_Tokeidai, ACTOR_OBJ_TOKEIDAI, ALLOCTYPE_NORMAL, "Obj_Tokeidai") +/* 0x19D */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_19D) +/* 0x19E */ DEFINE_ACTOR(En_Mnk, ACTOR_EN_MNK, ALLOCTYPE_NORMAL, "En_Mnk") +/* 0x19F */ DEFINE_ACTOR(En_Egblock, ACTOR_EN_EGBLOCK, ALLOCTYPE_NORMAL, "En_Egblock") +/* 0x1A0 */ DEFINE_ACTOR(En_Guard_Nuts, ACTOR_EN_GUARD_NUTS, ALLOCTYPE_NORMAL, "En_Guard_Nuts") +/* 0x1A1 */ DEFINE_ACTOR(Bg_Hakugin_Bombwall, ACTOR_BG_HAKUGIN_BOMBWALL, ALLOCTYPE_NORMAL, "Bg_Hakugin_Bombwall") +/* 0x1A2 */ DEFINE_ACTOR(Obj_Tokei_Tobira, ACTOR_OBJ_TOKEI_TOBIRA, ALLOCTYPE_NORMAL, "Obj_Tokei_Tobira") +/* 0x1A3 */ DEFINE_ACTOR(Bg_Hakugin_Elvpole, ACTOR_BG_HAKUGIN_ELVPOLE, ALLOCTYPE_NORMAL, "Bg_Hakugin_Elvpole") +/* 0x1A4 */ DEFINE_ACTOR(En_Ma4, ACTOR_EN_MA4, ALLOCTYPE_NORMAL, "En_Ma4") +/* 0x1A5 */ DEFINE_ACTOR(En_Twig, ACTOR_EN_TWIG, ALLOCTYPE_NORMAL, "En_Twig") +/* 0x1A6 */ DEFINE_ACTOR(En_Po_Fusen, ACTOR_EN_PO_FUSEN, ALLOCTYPE_NORMAL, "En_Po_Fusen") +/* 0x1A7 */ DEFINE_ACTOR(En_Door_Etc, ACTOR_EN_DOOR_ETC, ALLOCTYPE_NORMAL, "En_Door_Etc") +/* 0x1A8 */ DEFINE_ACTOR(En_Bigokuta, ACTOR_EN_BIGOKUTA, ALLOCTYPE_NORMAL, "En_Bigokuta") +/* 0x1A9 */ DEFINE_ACTOR(Bg_Icefloe, ACTOR_BG_ICEFLOE, ALLOCTYPE_NORMAL, "Bg_Icefloe") +/* 0x1AA */ DEFINE_ACTOR(Obj_Ocarinalift, ACTOR_OBJ_OCARINALIFT, ALLOCTYPE_NORMAL, "Obj_Ocarinalift") +/* 0x1AB */ DEFINE_ACTOR(En_Time_Tag, ACTOR_EN_TIME_TAG, ALLOCTYPE_NORMAL, "En_Time_Tag") +/* 0x1AC */ DEFINE_ACTOR(Bg_Open_Shutter, ACTOR_BG_OPEN_SHUTTER, ALLOCTYPE_NORMAL, "Bg_Open_Shutter") +/* 0x1AD */ DEFINE_ACTOR(Bg_Open_Spot, ACTOR_BG_OPEN_SPOT, ALLOCTYPE_NORMAL, "Bg_Open_Spot") +/* 0x1AE */ DEFINE_ACTOR(Bg_Fu_Kaiten, ACTOR_BG_FU_KAITEN, ALLOCTYPE_NORMAL, "Bg_Fu_Kaiten") +/* 0x1AF */ DEFINE_ACTOR(Obj_Aqua, ACTOR_OBJ_AQUA, ALLOCTYPE_NORMAL, "Obj_Aqua") +/* 0x1B0 */ DEFINE_ACTOR(En_Elforg, ACTOR_EN_ELFORG, ALLOCTYPE_NORMAL, "En_Elforg") +/* 0x1B1 */ DEFINE_ACTOR(En_Elfbub, ACTOR_EN_ELFBUB, ALLOCTYPE_NORMAL, "En_Elfbub") +/* 0x1B2 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1B2) +/* 0x1B3 */ DEFINE_ACTOR(En_Fu_Mato, ACTOR_EN_FU_MATO, ALLOCTYPE_NORMAL, "En_Fu_Mato") +/* 0x1B4 */ DEFINE_ACTOR(En_Fu_Kago, ACTOR_EN_FU_KAGO, ALLOCTYPE_NORMAL, "En_Fu_Kago") +/* 0x1B5 */ DEFINE_ACTOR(En_Osn, ACTOR_EN_OSN, ALLOCTYPE_NORMAL, "En_Osn") +/* 0x1B6 */ DEFINE_ACTOR(Bg_Ctower_Gear, ACTOR_BG_CTOWER_GEAR, ALLOCTYPE_NORMAL, "Bg_Ctower_Gear") +/* 0x1B7 */ DEFINE_ACTOR(En_Trt2, ACTOR_EN_TRT2, ALLOCTYPE_NORMAL, "En_Trt2") +/* 0x1B8 */ DEFINE_ACTOR(Obj_Tokei_Step, ACTOR_OBJ_TOKEI_STEP, ALLOCTYPE_NORMAL, "Obj_Tokei_Step") +/* 0x1B9 */ DEFINE_ACTOR(Bg_Lotus, ACTOR_BG_LOTUS, ALLOCTYPE_NORMAL, "Bg_Lotus") +/* 0x1BA */ DEFINE_ACTOR(En_Kame, ACTOR_EN_KAME, ALLOCTYPE_NORMAL, "En_Kame") +/* 0x1BB */ DEFINE_ACTOR(Obj_Takaraya_Wall, ACTOR_OBJ_TAKARAYA_WALL, ALLOCTYPE_NORMAL, "Obj_Takaraya_Wall") +/* 0x1BC */ DEFINE_ACTOR(Bg_Fu_Mizu, ACTOR_BG_FU_MIZU, ALLOCTYPE_NORMAL, "Bg_Fu_Mizu") +/* 0x1BD */ DEFINE_ACTOR(En_Sellnuts, ACTOR_EN_SELLNUTS, ALLOCTYPE_NORMAL, "En_Sellnuts") +/* 0x1BE */ DEFINE_ACTOR(Bg_Dkjail_Ivy, ACTOR_BG_DKJAIL_IVY, ALLOCTYPE_NORMAL, "Bg_Dkjail_Ivy") +/* 0x1BF */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1BF) +/* 0x1C0 */ DEFINE_ACTOR(Obj_Visiblock, ACTOR_OBJ_VISIBLOCK, ALLOCTYPE_NORMAL, "Obj_Visiblock") +/* 0x1C1 */ DEFINE_ACTOR(En_Takaraya, ACTOR_EN_TAKARAYA, ALLOCTYPE_NORMAL, "En_Takaraya") +/* 0x1C2 */ DEFINE_ACTOR(En_Tsn, ACTOR_EN_TSN, ALLOCTYPE_NORMAL, "En_Tsn") +/* 0x1C3 */ DEFINE_ACTOR(En_Ds2n, ACTOR_EN_DS2N, ALLOCTYPE_NORMAL, "En_Ds2n") +/* 0x1C4 */ DEFINE_ACTOR(En_Fsn, ACTOR_EN_FSN, ALLOCTYPE_NORMAL, "En_Fsn") +/* 0x1C5 */ DEFINE_ACTOR(En_Shn, ACTOR_EN_SHN, ALLOCTYPE_NORMAL, "En_Shn") +/* 0x1C6 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1C6) +/* 0x1C7 */ DEFINE_ACTOR(En_Stop_heishi, ACTOR_EN_STOP_HEISHI, ALLOCTYPE_NORMAL, "En_Stop_heishi") +/* 0x1C8 */ DEFINE_ACTOR(Obj_Bigicicle, ACTOR_OBJ_BIGICICLE, ALLOCTYPE_NORMAL, "Obj_Bigicicle") +/* 0x1C9 */ DEFINE_ACTOR(En_Lift_Nuts, ACTOR_EN_LIFT_NUTS, ALLOCTYPE_NORMAL, "En_Lift_Nuts") +/* 0x1CA */ DEFINE_ACTOR(En_Tk, ACTOR_EN_TK, ALLOCTYPE_NORMAL, "En_Tk") +/* 0x1CB */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1CB) +/* 0x1CC */ DEFINE_ACTOR(Bg_Market_Step, ACTOR_BG_MARKET_STEP, ALLOCTYPE_NORMAL, "Bg_Market_Step") +/* 0x1CD */ DEFINE_ACTOR(Obj_Lupygamelift, ACTOR_OBJ_LUPYGAMELIFT, ALLOCTYPE_NORMAL, "Obj_Lupygamelift") +/* 0x1CE */ DEFINE_ACTOR(En_Test7, ACTOR_EN_TEST7, ALLOCTYPE_NORMAL, "En_Test7") +/* 0x1CF */ DEFINE_ACTOR(Obj_Lightblock, ACTOR_OBJ_LIGHTBLOCK, ALLOCTYPE_NORMAL, "Obj_Lightblock") +/* 0x1D0 */ DEFINE_ACTOR(Mir_Ray2, ACTOR_MIR_RAY2, ALLOCTYPE_NORMAL, "Mir_Ray2") +/* 0x1D1 */ DEFINE_ACTOR(En_Wdhand, ACTOR_EN_WDHAND, ALLOCTYPE_NORMAL, "En_Wdhand") +/* 0x1D2 */ DEFINE_ACTOR(En_Gamelupy, ACTOR_EN_GAMELUPY, ALLOCTYPE_NORMAL, "En_Gamelupy") +/* 0x1D3 */ DEFINE_ACTOR(Bg_Danpei_Movebg, ACTOR_BG_DANPEI_MOVEBG, ALLOCTYPE_NORMAL, "Bg_Danpei_Movebg") +/* 0x1D4 */ DEFINE_ACTOR(En_Snowwd, ACTOR_EN_SNOWWD, ALLOCTYPE_NORMAL, "En_Snowwd") +/* 0x1D5 */ DEFINE_ACTOR(En_Pm, ACTOR_EN_PM, ALLOCTYPE_NORMAL, "En_Pm") +/* 0x1D6 */ DEFINE_ACTOR(En_Gakufu, ACTOR_EN_GAKUFU, ALLOCTYPE_NORMAL, "En_Gakufu") +/* 0x1D7 */ DEFINE_ACTOR(Elf_Msg4, ACTOR_ELF_MSG4, ALLOCTYPE_NORMAL, "Elf_Msg4") +/* 0x1D8 */ DEFINE_ACTOR(Elf_Msg5, ACTOR_ELF_MSG5, ALLOCTYPE_NORMAL, "Elf_Msg5") +/* 0x1D9 */ DEFINE_ACTOR(En_Col_Man, ACTOR_EN_COL_MAN, ALLOCTYPE_NORMAL, "En_Col_Man") +/* 0x1DA */ DEFINE_ACTOR(En_Talk_Gibud, ACTOR_EN_TALK_GIBUD, ALLOCTYPE_NORMAL, "En_Talk_Gibud") +/* 0x1DB */ DEFINE_ACTOR(En_Giant, ACTOR_EN_GIANT, ALLOCTYPE_NORMAL, "En_Giant") +/* 0x1DC */ DEFINE_ACTOR(Obj_Snowball, ACTOR_OBJ_SNOWBALL, ALLOCTYPE_NORMAL, "Obj_Snowball") +/* 0x1DD */ DEFINE_ACTOR(Boss_Hakugin, ACTOR_BOSS_HAKUGIN, ALLOCTYPE_NORMAL, "Boss_Hakugin") +/* 0x1DE */ DEFINE_ACTOR(En_Gb2, ACTOR_EN_GB2, ALLOCTYPE_NORMAL, "En_Gb2") +/* 0x1DF */ DEFINE_ACTOR(En_Onpuman, ACTOR_EN_ONPUMAN, ALLOCTYPE_NORMAL, "En_Onpuman") +/* 0x1E0 */ DEFINE_ACTOR(Bg_Tobira01, ACTOR_BG_TOBIRA01, ALLOCTYPE_NORMAL, "Bg_Tobira01") +/* 0x1E1 */ DEFINE_ACTOR(En_Tag_Obj, ACTOR_EN_TAG_OBJ, ALLOCTYPE_NORMAL, "En_Tag_Obj") +/* 0x1E2 */ DEFINE_ACTOR(Obj_Dhouse, ACTOR_OBJ_DHOUSE, ALLOCTYPE_NORMAL, "Obj_Dhouse") +/* 0x1E3 */ DEFINE_ACTOR(Obj_Hakaisi, ACTOR_OBJ_HAKAISI, ALLOCTYPE_NORMAL, "Obj_Hakaisi") +/* 0x1E4 */ DEFINE_ACTOR(Bg_Hakugin_Switch, ACTOR_BG_HAKUGIN_SWITCH, ALLOCTYPE_NORMAL, "Bg_Hakugin_Switch") +/* 0x1E5 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_1E5) +/* 0x1E6 */ DEFINE_ACTOR(En_Snowman, ACTOR_EN_SNOWMAN, ALLOCTYPE_NORMAL, "En_Snowman") +/* 0x1E7 */ DEFINE_ACTOR(TG_Sw, ACTOR_TG_SW, ALLOCTYPE_NORMAL, "TG_Sw") +/* 0x1E8 */ DEFINE_ACTOR(En_Po_Sisters, ACTOR_EN_PO_SISTERS, ALLOCTYPE_NORMAL, "En_Po_Sisters") +/* 0x1E9 */ DEFINE_ACTOR(En_Pp, ACTOR_EN_PP, ALLOCTYPE_NORMAL, "En_Pp") +/* 0x1EA */ DEFINE_ACTOR(En_Hakurock, ACTOR_EN_HAKUROCK, ALLOCTYPE_NORMAL, "En_Hakurock") +/* 0x1EB */ DEFINE_ACTOR(En_Hanabi, ACTOR_EN_HANABI, ALLOCTYPE_NORMAL, "En_Hanabi") +/* 0x1EC */ DEFINE_ACTOR(Obj_Dowsing, ACTOR_OBJ_DOWSING, ALLOCTYPE_NORMAL, "Obj_Dowsing") +/* 0x1ED */ DEFINE_ACTOR(Obj_Wind, ACTOR_OBJ_WIND, ALLOCTYPE_NORMAL, "Obj_Wind") +/* 0x1EE */ DEFINE_ACTOR(En_Racedog, ACTOR_EN_RACEDOG, ALLOCTYPE_NORMAL, "En_Racedog") +/* 0x1EF */ DEFINE_ACTOR(En_Kendo_Js, ACTOR_EN_KENDO_JS, ALLOCTYPE_NORMAL, "En_Kendo_Js") +/* 0x1F0 */ DEFINE_ACTOR(Bg_Botihasira, ACTOR_BG_BOTIHASIRA, ALLOCTYPE_NORMAL, "Bg_Botihasira") +/* 0x1F1 */ DEFINE_ACTOR(En_Fish2, ACTOR_EN_FISH2, ALLOCTYPE_NORMAL, "En_Fish2") +/* 0x1F2 */ DEFINE_ACTOR(En_Pst, ACTOR_EN_PST, ALLOCTYPE_NORMAL, "En_Pst") +/* 0x1F3 */ DEFINE_ACTOR(En_Poh, ACTOR_EN_POH, ALLOCTYPE_NORMAL, "En_Poh") +/* 0x1F4 */ DEFINE_ACTOR(Obj_Spidertent, ACTOR_OBJ_SPIDERTENT, ALLOCTYPE_NORMAL, "Obj_Spidertent") +/* 0x1F5 */ DEFINE_ACTOR(En_Zoraegg, ACTOR_EN_ZORAEGG, ALLOCTYPE_NORMAL, "En_Zoraegg") +/* 0x1F6 */ DEFINE_ACTOR(En_Kbt, ACTOR_EN_KBT, ALLOCTYPE_NORMAL, "En_Kbt") +/* 0x1F7 */ DEFINE_ACTOR(En_Gg, ACTOR_EN_GG, ALLOCTYPE_NORMAL, "En_Gg") +/* 0x1F8 */ DEFINE_ACTOR(En_Maruta, ACTOR_EN_MARUTA, ALLOCTYPE_NORMAL, "En_Maruta") +/* 0x1F9 */ DEFINE_ACTOR(Obj_Snowball2, ACTOR_OBJ_SNOWBALL2, ALLOCTYPE_NORMAL, "Obj_Snowball2") +/* 0x1FA */ DEFINE_ACTOR(En_Gg2, ACTOR_EN_GG2, ALLOCTYPE_NORMAL, "En_Gg2") +/* 0x1FB */ DEFINE_ACTOR(Obj_Ghaka, ACTOR_OBJ_GHAKA, ALLOCTYPE_NORMAL, "Obj_Ghaka") +/* 0x1FC */ DEFINE_ACTOR(En_Dnp, ACTOR_EN_DNP, ALLOCTYPE_NORMAL, "En_Dnp") +/* 0x1FD */ DEFINE_ACTOR(En_Dai, ACTOR_EN_DAI, ALLOCTYPE_NORMAL, "En_Dai") +/* 0x1FE */ DEFINE_ACTOR(Bg_Goron_Oyu, ACTOR_BG_GORON_OYU, ALLOCTYPE_NORMAL, "Bg_Goron_Oyu") +/* 0x1FF */ DEFINE_ACTOR(En_Kgy, ACTOR_EN_KGY, ALLOCTYPE_NORMAL, "En_Kgy") +/* 0x200 */ DEFINE_ACTOR(En_Invadepoh, ACTOR_EN_INVADEPOH, ALLOCTYPE_NORMAL, "En_Invadepoh") +/* 0x201 */ DEFINE_ACTOR(En_Gk, ACTOR_EN_GK, ALLOCTYPE_NORMAL, "En_Gk") +/* 0x202 */ DEFINE_ACTOR(En_An, ACTOR_EN_AN, ALLOCTYPE_NORMAL, "En_An") +/* 0x203 */ DEFINE_ACTOR_UNSET(ACTOR_UNSET_203) +/* 0x204 */ DEFINE_ACTOR(En_Bee, ACTOR_EN_BEE, ALLOCTYPE_NORMAL, "En_Bee") +/* 0x205 */ DEFINE_ACTOR(En_Ot, ACTOR_EN_OT, ALLOCTYPE_NORMAL, "En_Ot") +/* 0x206 */ DEFINE_ACTOR(En_Dragon, ACTOR_EN_DRAGON, ALLOCTYPE_NORMAL, "En_Dragon") +/* 0x207 */ DEFINE_ACTOR(Obj_Dora, ACTOR_OBJ_DORA, ALLOCTYPE_NORMAL, "Obj_Dora") +/* 0x208 */ DEFINE_ACTOR(En_Bigpo, ACTOR_EN_BIGPO, ALLOCTYPE_NORMAL, "En_Bigpo") +/* 0x209 */ DEFINE_ACTOR(Obj_Kendo_Kanban, ACTOR_OBJ_KENDO_KANBAN, ALLOCTYPE_NORMAL, "Obj_Kendo_Kanban") +/* 0x20A */ DEFINE_ACTOR(Obj_Hariko, ACTOR_OBJ_HARIKO, ALLOCTYPE_NORMAL, "Obj_Hariko") +/* 0x20B */ DEFINE_ACTOR(En_Sth, ACTOR_EN_STH, ALLOCTYPE_NORMAL, "En_Sth") +/* 0x20C */ DEFINE_ACTOR(Bg_Sinkai_Kabe, ACTOR_BG_SINKAI_KABE, ALLOCTYPE_NORMAL, "Bg_Sinkai_Kabe") +/* 0x20D */ DEFINE_ACTOR(Bg_Haka_Curtain, ACTOR_BG_HAKA_CURTAIN, ALLOCTYPE_NORMAL, "Bg_Haka_Curtain") +/* 0x20E */ DEFINE_ACTOR(Bg_Kin2_Bombwall, ACTOR_BG_KIN2_BOMBWALL, ALLOCTYPE_NORMAL, "Bg_Kin2_Bombwall") +/* 0x20F */ DEFINE_ACTOR(Bg_Kin2_Fence, ACTOR_BG_KIN2_FENCE, ALLOCTYPE_NORMAL, "Bg_Kin2_Fence") +/* 0x210 */ DEFINE_ACTOR(Bg_Kin2_Picture, ACTOR_BG_KIN2_PICTURE, ALLOCTYPE_NORMAL, "Bg_Kin2_Picture") +/* 0x211 */ DEFINE_ACTOR(Bg_Kin2_Shelf, ACTOR_BG_KIN2_SHELF, ALLOCTYPE_NORMAL, "Bg_Kin2_Shelf") +/* 0x212 */ DEFINE_ACTOR(En_Rail_Skb, ACTOR_EN_RAIL_SKB, ALLOCTYPE_NORMAL, "En_Rail_Skb") +/* 0x213 */ DEFINE_ACTOR(En_Jg, ACTOR_EN_JG, ALLOCTYPE_NORMAL, "En_Jg") +/* 0x214 */ DEFINE_ACTOR(En_Tru_Mt, ACTOR_EN_TRU_MT, ALLOCTYPE_NORMAL, "En_Tru_Mt") +/* 0x215 */ DEFINE_ACTOR(Obj_Um, ACTOR_OBJ_UM, ALLOCTYPE_NORMAL, "Obj_Um") +/* 0x216 */ DEFINE_ACTOR(En_Neo_Reeba, ACTOR_EN_NEO_REEBA, ALLOCTYPE_NORMAL, "En_Neo_Reeba") +/* 0x217 */ DEFINE_ACTOR(Bg_Mbar_Chair, ACTOR_BG_MBAR_CHAIR, ALLOCTYPE_NORMAL, "Bg_Mbar_Chair") +/* 0x218 */ DEFINE_ACTOR(Bg_Ikana_Block, ACTOR_BG_IKANA_BLOCK, ALLOCTYPE_NORMAL, "Bg_Ikana_Block") +/* 0x219 */ DEFINE_ACTOR(Bg_Ikana_Mirror, ACTOR_BG_IKANA_MIRROR, ALLOCTYPE_NORMAL, "Bg_Ikana_Mirror") +/* 0x21A */ DEFINE_ACTOR(Bg_Ikana_Rotaryroom, ACTOR_BG_IKANA_ROTARYROOM, ALLOCTYPE_NORMAL, "Bg_Ikana_Rotaryroom") +/* 0x21B */ DEFINE_ACTOR(Bg_Dblue_Balance, ACTOR_BG_DBLUE_BALANCE, ALLOCTYPE_NORMAL, "Bg_Dblue_Balance") +/* 0x21C */ DEFINE_ACTOR(Bg_Dblue_Waterfall, ACTOR_BG_DBLUE_WATERFALL, ALLOCTYPE_NORMAL, "Bg_Dblue_Waterfall") +/* 0x21D */ DEFINE_ACTOR(En_Kaizoku, ACTOR_EN_KAIZOKU, ALLOCTYPE_NORMAL, "En_Kaizoku") +/* 0x21E */ DEFINE_ACTOR(En_Ge2, ACTOR_EN_GE2, ALLOCTYPE_NORMAL, "En_Ge2") +/* 0x21F */ DEFINE_ACTOR(En_Ma_Yts, ACTOR_EN_MA_YTS, ALLOCTYPE_NORMAL, "En_Ma_Yts") +/* 0x220 */ DEFINE_ACTOR(En_Ma_Yto, ACTOR_EN_MA_YTO, ALLOCTYPE_NORMAL, "En_Ma_Yto") +/* 0x221 */ DEFINE_ACTOR(Obj_Tokei_Turret, ACTOR_OBJ_TOKEI_TURRET, ALLOCTYPE_NORMAL, "Obj_Tokei_Turret") +/* 0x222 */ DEFINE_ACTOR(Bg_Dblue_Elevator, ACTOR_BG_DBLUE_ELEVATOR, ALLOCTYPE_NORMAL, "Bg_Dblue_Elevator") +/* 0x223 */ DEFINE_ACTOR(Obj_Warpstone, ACTOR_OBJ_WARPSTONE, ALLOCTYPE_NORMAL, "Obj_Warpstone") +/* 0x224 */ DEFINE_ACTOR(En_Zog, ACTOR_EN_ZOG, ALLOCTYPE_NORMAL, "En_Zog") +/* 0x225 */ DEFINE_ACTOR(Obj_Rotlift, ACTOR_OBJ_ROTLIFT, ALLOCTYPE_NORMAL, "Obj_Rotlift") +/* 0x226 */ DEFINE_ACTOR(Obj_Jg_Gakki, ACTOR_OBJ_JG_GAKKI, ALLOCTYPE_NORMAL, "Obj_Jg_Gakki") +/* 0x227 */ DEFINE_ACTOR(Bg_Inibs_Movebg, ACTOR_BG_INIBS_MOVEBG, ALLOCTYPE_NORMAL, "Bg_Inibs_Movebg") +/* 0x228 */ DEFINE_ACTOR(En_Zot, ACTOR_EN_ZOT, ALLOCTYPE_NORMAL, "En_Zot") +/* 0x229 */ DEFINE_ACTOR(Obj_Tree, ACTOR_OBJ_TREE, ALLOCTYPE_NORMAL, "Obj_Tree") +/* 0x22A */ DEFINE_ACTOR(Obj_Y2lift, ACTOR_OBJ_Y2LIFT, ALLOCTYPE_NORMAL, "Obj_Y2lift") +/* 0x22B */ DEFINE_ACTOR(Obj_Y2shutter, ACTOR_OBJ_Y2SHUTTER, ALLOCTYPE_NORMAL, "Obj_Y2shutter") +/* 0x22C */ DEFINE_ACTOR(Obj_Boat, ACTOR_OBJ_BOAT, ALLOCTYPE_NORMAL, "Obj_Boat") +/* 0x22D */ DEFINE_ACTOR(Obj_Taru, ACTOR_OBJ_TARU, ALLOCTYPE_NORMAL, "Obj_Taru") +/* 0x22E */ DEFINE_ACTOR(Obj_Hunsui, ACTOR_OBJ_HUNSUI, ALLOCTYPE_NORMAL, "Obj_Hunsui") +/* 0x22F */ DEFINE_ACTOR(En_Jc_Mato, ACTOR_EN_JC_MATO, ALLOCTYPE_NORMAL, "En_Jc_Mato") +/* 0x230 */ DEFINE_ACTOR(Mir_Ray3, ACTOR_MIR_RAY3, ALLOCTYPE_NORMAL, "Mir_Ray3") +/* 0x231 */ DEFINE_ACTOR(En_Zob, ACTOR_EN_ZOB, ALLOCTYPE_NORMAL, "En_Zob") +/* 0x232 */ DEFINE_ACTOR(Elf_Msg6, ACTOR_ELF_MSG6, ALLOCTYPE_NORMAL, "Elf_Msg6") +/* 0x233 */ DEFINE_ACTOR(Obj_Nozoki, ACTOR_OBJ_NOZOKI, ALLOCTYPE_NORMAL, "Obj_Nozoki") +/* 0x234 */ DEFINE_ACTOR(En_Toto, ACTOR_EN_TOTO, ALLOCTYPE_NORMAL, "En_Toto") +/* 0x235 */ DEFINE_ACTOR(En_Railgibud, ACTOR_EN_RAILGIBUD, ALLOCTYPE_NORMAL, "En_Railgibud") +/* 0x236 */ DEFINE_ACTOR(En_Baba, ACTOR_EN_BABA, ALLOCTYPE_NORMAL, "En_Baba") +/* 0x237 */ DEFINE_ACTOR(En_Suttari, ACTOR_EN_SUTTARI, ALLOCTYPE_NORMAL, "En_Suttari") +/* 0x238 */ DEFINE_ACTOR(En_Zod, ACTOR_EN_ZOD, ALLOCTYPE_NORMAL, "En_Zod") +/* 0x239 */ DEFINE_ACTOR(En_Kujiya, ACTOR_EN_KUJIYA, ALLOCTYPE_NORMAL, "En_Kujiya") +/* 0x23A */ DEFINE_ACTOR(En_Geg, ACTOR_EN_GEG, ALLOCTYPE_NORMAL, "En_Geg") +/* 0x23B */ DEFINE_ACTOR(Obj_Kinoko, ACTOR_OBJ_KINOKO, ALLOCTYPE_NORMAL, "Obj_Kinoko") +/* 0x23C */ DEFINE_ACTOR(Obj_Yasi, ACTOR_OBJ_YASI, ALLOCTYPE_NORMAL, "Obj_Yasi") +/* 0x23D */ DEFINE_ACTOR(En_Tanron1, ACTOR_EN_TANRON1, ALLOCTYPE_NORMAL, "En_Tanron1") +/* 0x23E */ DEFINE_ACTOR(En_Tanron2, ACTOR_EN_TANRON2, ALLOCTYPE_NORMAL, "En_Tanron2") +/* 0x23F */ DEFINE_ACTOR(En_Tanron3, ACTOR_EN_TANRON3, ALLOCTYPE_NORMAL, "En_Tanron3") +/* 0x240 */ DEFINE_ACTOR(Obj_Chan, ACTOR_OBJ_CHAN, ALLOCTYPE_NORMAL, "Obj_Chan") +/* 0x241 */ DEFINE_ACTOR(En_Zos, ACTOR_EN_ZOS, ALLOCTYPE_NORMAL, "En_Zos") +/* 0x242 */ DEFINE_ACTOR(En_S_Goro, ACTOR_EN_S_GORO, ALLOCTYPE_NORMAL, "En_S_Goro") +/* 0x243 */ DEFINE_ACTOR(En_Nb, ACTOR_EN_NB, ALLOCTYPE_NORMAL, "En_Nb") +/* 0x244 */ DEFINE_ACTOR(En_Ja, ACTOR_EN_JA, ALLOCTYPE_NORMAL, "En_Ja") +/* 0x245 */ DEFINE_ACTOR(Bg_F40_Block, ACTOR_BG_F40_BLOCK, ALLOCTYPE_NORMAL, "Bg_F40_Block") +/* 0x246 */ DEFINE_ACTOR(Bg_F40_Switch, ACTOR_BG_F40_SWITCH, ALLOCTYPE_NORMAL, "Bg_F40_Switch") +/* 0x247 */ DEFINE_ACTOR(En_Po_Composer, ACTOR_EN_PO_COMPOSER, ALLOCTYPE_NORMAL, "En_Po_Composer") +/* 0x248 */ DEFINE_ACTOR(En_Guruguru, ACTOR_EN_GURUGURU, ALLOCTYPE_NORMAL, "En_Guruguru") +/* 0x249 */ DEFINE_ACTOR(Oceff_Wipe5, ACTOR_OCEFF_WIPE5, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe5") +/* 0x24A */ DEFINE_ACTOR(En_Stone_heishi, ACTOR_EN_STONE_HEISHI, ALLOCTYPE_NORMAL, "En_Stone_heishi") +/* 0x24B */ DEFINE_ACTOR(Oceff_Wipe6, ACTOR_OCEFF_WIPE6, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe6") +/* 0x24C */ DEFINE_ACTOR(En_Scopenuts, ACTOR_EN_SCOPENUTS, ALLOCTYPE_NORMAL, "En_Scopenuts") +/* 0x24D */ DEFINE_ACTOR(En_Scopecrow, ACTOR_EN_SCOPECROW, ALLOCTYPE_NORMAL, "En_Scopecrow") +/* 0x24E */ DEFINE_ACTOR(Oceff_Wipe7, ACTOR_OCEFF_WIPE7, ALLOCTYPE_ABSOLUTE, "Oceff_Wipe7") +/* 0x24F */ DEFINE_ACTOR(Eff_Kamejima_Wave, ACTOR_EFF_KAMEJIMA_WAVE, ALLOCTYPE_NORMAL, "Eff_Kamejima_Wave") +/* 0x250 */ DEFINE_ACTOR(En_Hg, ACTOR_EN_HG, ALLOCTYPE_NORMAL, "En_Hg") +/* 0x251 */ DEFINE_ACTOR(En_Hgo, ACTOR_EN_HGO, ALLOCTYPE_NORMAL, "En_Hgo") +/* 0x252 */ DEFINE_ACTOR(En_Zov, ACTOR_EN_ZOV, ALLOCTYPE_NORMAL, "En_Zov") +/* 0x253 */ DEFINE_ACTOR(En_Ah, ACTOR_EN_AH, ALLOCTYPE_NORMAL, "En_Ah") +/* 0x254 */ DEFINE_ACTOR(Obj_Hgdoor, ACTOR_OBJ_HGDOOR, ALLOCTYPE_NORMAL, "Obj_Hgdoor") +/* 0x255 */ DEFINE_ACTOR(Bg_Ikana_Bombwall, ACTOR_BG_IKANA_BOMBWALL, ALLOCTYPE_NORMAL, "Bg_Ikana_Bombwall") +/* 0x256 */ DEFINE_ACTOR(Bg_Ikana_Ray, ACTOR_BG_IKANA_RAY, ALLOCTYPE_NORMAL, "Bg_Ikana_Ray") +/* 0x257 */ DEFINE_ACTOR(Bg_Ikana_Shutter, ACTOR_BG_IKANA_SHUTTER, ALLOCTYPE_NORMAL, "Bg_Ikana_Shutter") +/* 0x258 */ DEFINE_ACTOR(Bg_Haka_Bombwall, ACTOR_BG_HAKA_BOMBWALL, ALLOCTYPE_NORMAL, "Bg_Haka_Bombwall") +/* 0x259 */ DEFINE_ACTOR(Bg_Haka_Tomb, ACTOR_BG_HAKA_TOMB, ALLOCTYPE_NORMAL, "Bg_Haka_Tomb") +/* 0x25A */ DEFINE_ACTOR(En_Sc_Ruppe, ACTOR_EN_SC_RUPPE, ALLOCTYPE_NORMAL, "En_Sc_Ruppe") +/* 0x25B */ DEFINE_ACTOR(Bg_Iknv_Doukutu, ACTOR_BG_IKNV_DOUKUTU, ALLOCTYPE_NORMAL, "Bg_Iknv_Doukutu") +/* 0x25C */ DEFINE_ACTOR(Bg_Iknv_Obj, ACTOR_BG_IKNV_OBJ, ALLOCTYPE_NORMAL, "Bg_Iknv_Obj") +/* 0x25D */ DEFINE_ACTOR(En_Pamera, ACTOR_EN_PAMERA, ALLOCTYPE_NORMAL, "En_Pamera") +/* 0x25E */ DEFINE_ACTOR(Obj_HsStump, ACTOR_OBJ_HSSTUMP, ALLOCTYPE_NORMAL, "Obj_HsStump") +/* 0x25F */ DEFINE_ACTOR(En_Hidden_Nuts, ACTOR_EN_HIDDEN_NUTS, ALLOCTYPE_NORMAL, "En_Hidden_Nuts") +/* 0x260 */ DEFINE_ACTOR(En_Zow, ACTOR_EN_ZOW, ALLOCTYPE_NORMAL, "En_Zow") +/* 0x261 */ DEFINE_ACTOR(En_Talk, ACTOR_EN_TALK, ALLOCTYPE_NORMAL, "En_Talk") +/* 0x262 */ DEFINE_ACTOR(En_Al, ACTOR_EN_AL, ALLOCTYPE_NORMAL, "En_Al") +/* 0x263 */ DEFINE_ACTOR(En_Tab, ACTOR_EN_TAB, ALLOCTYPE_NORMAL, "En_Tab") +/* 0x264 */ DEFINE_ACTOR(En_Nimotsu, ACTOR_EN_NIMOTSU, ALLOCTYPE_NORMAL, "En_Nimotsu") +/* 0x265 */ DEFINE_ACTOR(En_Hit_Tag, ACTOR_EN_HIT_TAG, ALLOCTYPE_NORMAL, "En_Hit_Tag") +/* 0x266 */ DEFINE_ACTOR(En_Ruppecrow, ACTOR_EN_RUPPECROW, ALLOCTYPE_NORMAL, "En_Ruppecrow") +/* 0x267 */ DEFINE_ACTOR(En_Tanron4, ACTOR_EN_TANRON4, ALLOCTYPE_NORMAL, "En_Tanron4") +/* 0x268 */ DEFINE_ACTOR(En_Tanron5, ACTOR_EN_TANRON5, ALLOCTYPE_NORMAL, "En_Tanron5") +/* 0x269 */ DEFINE_ACTOR(En_Tanron6, ACTOR_EN_TANRON6, ALLOCTYPE_NORMAL, "En_Tanron6") +/* 0x26A */ DEFINE_ACTOR(En_Daiku2, ACTOR_EN_DAIKU2, ALLOCTYPE_NORMAL, "En_Daiku2") +/* 0x26B */ DEFINE_ACTOR(En_Muto, ACTOR_EN_MUTO, ALLOCTYPE_NORMAL, "En_Muto") +/* 0x26C */ DEFINE_ACTOR(En_Baisen, ACTOR_EN_BAISEN, ALLOCTYPE_NORMAL, "En_Baisen") +/* 0x26D */ DEFINE_ACTOR(En_Heishi, ACTOR_EN_HEISHI, ALLOCTYPE_NORMAL, "En_Heishi") +/* 0x26E */ DEFINE_ACTOR(En_Demo_heishi, ACTOR_EN_DEMO_HEISHI, ALLOCTYPE_NORMAL, "En_Demo_heishi") +/* 0x26F */ DEFINE_ACTOR(En_Dt, ACTOR_EN_DT, ALLOCTYPE_NORMAL, "En_Dt") +/* 0x270 */ DEFINE_ACTOR(En_Cha, ACTOR_EN_CHA, ALLOCTYPE_NORMAL, "En_Cha") +/* 0x271 */ DEFINE_ACTOR(Obj_Dinner, ACTOR_OBJ_DINNER, ALLOCTYPE_NORMAL, "Obj_Dinner") +/* 0x272 */ DEFINE_ACTOR(Eff_Lastday, ACTOR_EFF_LASTDAY, ALLOCTYPE_NORMAL, "Eff_Lastday") +/* 0x273 */ DEFINE_ACTOR(Bg_Ikana_Dharma, ACTOR_BG_IKANA_DHARMA, ALLOCTYPE_NORMAL, "Bg_Ikana_Dharma") +/* 0x274 */ DEFINE_ACTOR(En_Akindonuts, ACTOR_EN_AKINDONUTS, ALLOCTYPE_NORMAL, "En_Akindonuts") +/* 0x275 */ DEFINE_ACTOR(Eff_Stk, ACTOR_EFF_STK, ALLOCTYPE_NORMAL, "Eff_Stk") +/* 0x276 */ DEFINE_ACTOR(En_Ig, ACTOR_EN_IG, ALLOCTYPE_NORMAL, "En_Ig") +/* 0x277 */ DEFINE_ACTOR(En_Rg, ACTOR_EN_RG, ALLOCTYPE_NORMAL, "En_Rg") +/* 0x278 */ DEFINE_ACTOR(En_Osk, ACTOR_EN_OSK, ALLOCTYPE_NORMAL, "En_Osk") +/* 0x279 */ DEFINE_ACTOR(En_Sth2, ACTOR_EN_STH2, ALLOCTYPE_NORMAL, "En_Sth2") +/* 0x27A */ DEFINE_ACTOR(En_Yb, ACTOR_EN_YB, ALLOCTYPE_NORMAL, "En_Yb") +/* 0x27B */ DEFINE_ACTOR(En_Rz, ACTOR_EN_RZ, ALLOCTYPE_NORMAL, "En_Rz") +/* 0x27C */ DEFINE_ACTOR(En_Scopecoin, ACTOR_EN_SCOPECOIN, ALLOCTYPE_NORMAL, "En_Scopecoin") +/* 0x27D */ DEFINE_ACTOR(En_Bjt, ACTOR_EN_BJT, ALLOCTYPE_NORMAL, "En_Bjt") +/* 0x27E */ DEFINE_ACTOR(En_Bomjima, ACTOR_EN_BOMJIMA, ALLOCTYPE_NORMAL, "En_Bomjima") +/* 0x27F */ DEFINE_ACTOR(En_Bomjimb, ACTOR_EN_BOMJIMB, ALLOCTYPE_NORMAL, "En_Bomjimb") +/* 0x280 */ DEFINE_ACTOR(En_Bombers, ACTOR_EN_BOMBERS, ALLOCTYPE_NORMAL, "En_Bombers") +/* 0x281 */ DEFINE_ACTOR(En_Bombers2, ACTOR_EN_BOMBERS2, ALLOCTYPE_NORMAL, "En_Bombers2") +/* 0x282 */ DEFINE_ACTOR(En_Bombal, ACTOR_EN_BOMBAL, ALLOCTYPE_NORMAL, "En_Bombal") +/* 0x283 */ DEFINE_ACTOR(Obj_Moon_Stone, ACTOR_OBJ_MOON_STONE, ALLOCTYPE_NORMAL, "Obj_Moon_Stone") +/* 0x284 */ DEFINE_ACTOR(Obj_Mu_Pict, ACTOR_OBJ_MU_PICT, ALLOCTYPE_NORMAL, "Obj_Mu_Pict") +/* 0x285 */ DEFINE_ACTOR(Bg_Ikninside, ACTOR_BG_IKNINSIDE, ALLOCTYPE_NORMAL, "Bg_Ikninside") +/* 0x286 */ DEFINE_ACTOR(Eff_Zoraband, ACTOR_EFF_ZORABAND, ALLOCTYPE_NORMAL, "Eff_Zoraband") +/* 0x287 */ DEFINE_ACTOR(Obj_Kepn_Koya, ACTOR_OBJ_KEPN_KOYA, ALLOCTYPE_NORMAL, "Obj_Kepn_Koya") +/* 0x288 */ DEFINE_ACTOR(Obj_Usiyane, ACTOR_OBJ_USIYANE, ALLOCTYPE_NORMAL, "Obj_Usiyane") +/* 0x289 */ DEFINE_ACTOR(En_Nnh, ACTOR_EN_NNH, ALLOCTYPE_NORMAL, "En_Nnh") +/* 0x28A */ DEFINE_ACTOR(Obj_Kzsaku, ACTOR_OBJ_KZSAKU, ALLOCTYPE_NORMAL, "Obj_Kzsaku") +/* 0x28B */ DEFINE_ACTOR(Obj_Milk_Bin, ACTOR_OBJ_MILK_BIN, ALLOCTYPE_NORMAL, "Obj_Milk_Bin") +/* 0x28C */ DEFINE_ACTOR(En_Kitan, ACTOR_EN_KITAN, ALLOCTYPE_NORMAL, "En_Kitan") +/* 0x28D */ DEFINE_ACTOR(Bg_Astr_Bombwall, ACTOR_BG_ASTR_BOMBWALL, ALLOCTYPE_NORMAL, "Bg_Astr_Bombwall") +/* 0x28E */ DEFINE_ACTOR(Bg_Iknin_Susceil, ACTOR_BG_IKNIN_SUSCEIL, ALLOCTYPE_NORMAL, "Bg_Iknin_Susceil") +/* 0x28F */ DEFINE_ACTOR(En_Bsb, ACTOR_EN_BSB, ALLOCTYPE_NORMAL, "En_Bsb") +/* 0x290 */ DEFINE_ACTOR(En_Recepgirl, ACTOR_EN_RECEPGIRL, ALLOCTYPE_NORMAL, "En_Recepgirl") +/* 0x291 */ DEFINE_ACTOR(En_Thiefbird, ACTOR_EN_THIEFBIRD, ALLOCTYPE_NORMAL, "En_Thiefbird") +/* 0x292 */ DEFINE_ACTOR(En_Jgame_Tsn, ACTOR_EN_JGAME_TSN, ALLOCTYPE_NORMAL, "En_Jgame_Tsn") +/* 0x293 */ DEFINE_ACTOR(Obj_Jgame_Light, ACTOR_OBJ_JGAME_LIGHT, ALLOCTYPE_NORMAL, "Obj_Jgame_Light") +/* 0x294 */ DEFINE_ACTOR(Obj_Yado, ACTOR_OBJ_YADO, ALLOCTYPE_NORMAL, "Obj_Yado") +/* 0x295 */ DEFINE_ACTOR(Demo_Syoten, ACTOR_DEMO_SYOTEN, ALLOCTYPE_NORMAL, "Demo_Syoten") +/* 0x296 */ DEFINE_ACTOR(Demo_Moonend, ACTOR_DEMO_MOONEND, ALLOCTYPE_NORMAL, "Demo_Moonend") +/* 0x297 */ DEFINE_ACTOR(Bg_Lbfshot, ACTOR_BG_LBFSHOT, ALLOCTYPE_NORMAL, "Bg_Lbfshot") +/* 0x298 */ DEFINE_ACTOR(Bg_Last_Bwall, ACTOR_BG_LAST_BWALL, ALLOCTYPE_NORMAL, "Bg_Last_Bwall") +/* 0x299 */ DEFINE_ACTOR(En_And, ACTOR_EN_AND, ALLOCTYPE_NORMAL, "En_And") +/* 0x29A */ DEFINE_ACTOR(En_Invadepoh_Demo, ACTOR_EN_INVADEPOH_DEMO, ALLOCTYPE_NORMAL, "En_Invadepoh_Demo") +/* 0x29B */ DEFINE_ACTOR(Obj_Danpeilift, ACTOR_OBJ_DANPEILIFT, ALLOCTYPE_NORMAL, "Obj_Danpeilift") +/* 0x29C */ DEFINE_ACTOR(En_Fall2, ACTOR_EN_FALL2, ALLOCTYPE_NORMAL, "En_Fall2") +/* 0x29D */ DEFINE_ACTOR(Dm_Al, ACTOR_DM_AL, ALLOCTYPE_NORMAL, "Dm_Al") +/* 0x29E */ DEFINE_ACTOR(Dm_An, ACTOR_DM_AN, ALLOCTYPE_NORMAL, "Dm_An") +/* 0x29F */ DEFINE_ACTOR(Dm_Ah, ACTOR_DM_AH, ALLOCTYPE_NORMAL, "Dm_Ah") +/* 0x2A0 */ DEFINE_ACTOR(Dm_Nb, ACTOR_DM_NB, ALLOCTYPE_NORMAL, "Dm_Nb") +/* 0x2A1 */ DEFINE_ACTOR(En_Drs, ACTOR_EN_DRS, ALLOCTYPE_NORMAL, "En_Drs") +/* 0x2A2 */ DEFINE_ACTOR(En_Ending_Hero, ACTOR_EN_ENDING_HERO, ALLOCTYPE_NORMAL, "En_Ending_Hero") +/* 0x2A3 */ DEFINE_ACTOR(Dm_Bal, ACTOR_DM_BAL, ALLOCTYPE_NORMAL, "Dm_Bal") +/* 0x2A4 */ DEFINE_ACTOR(En_Paper, ACTOR_EN_PAPER, ALLOCTYPE_NORMAL, "En_Paper") +/* 0x2A5 */ DEFINE_ACTOR(En_Hint_Skb, ACTOR_EN_HINT_SKB, ALLOCTYPE_NORMAL, "En_Hint_Skb") +/* 0x2A6 */ DEFINE_ACTOR(Dm_Tag, ACTOR_DM_TAG, ALLOCTYPE_NORMAL, "Dm_Tag") +/* 0x2A7 */ DEFINE_ACTOR(En_Bh, ACTOR_EN_BH, ALLOCTYPE_NORMAL, "En_Bh") +/* 0x2A8 */ DEFINE_ACTOR(En_Ending_Hero2, ACTOR_EN_ENDING_HERO2, ALLOCTYPE_NORMAL, "En_Ending_Hero2") +/* 0x2A9 */ DEFINE_ACTOR(En_Ending_Hero3, ACTOR_EN_ENDING_HERO3, ALLOCTYPE_NORMAL, "En_Ending_Hero3") +/* 0x2AA */ DEFINE_ACTOR(En_Ending_Hero4, ACTOR_EN_ENDING_HERO4, ALLOCTYPE_NORMAL, "En_Ending_Hero4") +/* 0x2AB */ DEFINE_ACTOR(En_Ending_Hero5, ACTOR_EN_ENDING_HERO5, ALLOCTYPE_NORMAL, "En_Ending_Hero5") +/* 0x2AC */ DEFINE_ACTOR(En_Ending_Hero6, ACTOR_EN_ENDING_HERO6, ALLOCTYPE_NORMAL, "En_Ending_Hero6") +/* 0x2AD */ DEFINE_ACTOR(Dm_Gm, ACTOR_DM_GM, ALLOCTYPE_NORMAL, "Dm_Gm") +/* 0x2AE */ DEFINE_ACTOR(Obj_Swprize, ACTOR_OBJ_SWPRIZE, ALLOCTYPE_NORMAL, "Obj_Swprize") +/* 0x2AF */ DEFINE_ACTOR(En_Invisible_Ruppe, ACTOR_EN_INVISIBLE_RUPPE, ALLOCTYPE_NORMAL, "En_Invisible_Ruppe") +/* 0x2B0 */ DEFINE_ACTOR(Obj_Ending, ACTOR_OBJ_ENDING, ALLOCTYPE_NORMAL, "Obj_Ending") +/* 0x2B1 */ DEFINE_ACTOR(En_Rsn, ACTOR_EN_RSN, ALLOCTYPE_NORMAL, "En_Rsn") diff --git a/include/variables.h b/include/variables.h index 88758c50bc..5221ebe945 100644 --- a/include/variables.h +++ b/include/variables.h @@ -358,7 +358,6 @@ extern u16 viRetrace; extern DmaEntry dmadata[1568]; // extern UNK_TYPE1 D_80186028; extern u64 aspMainTextStart[]; -extern ActorInit En_A_Obj_InitVars; extern ColliderCylinderInit enAObjCylinderInit; extern InitChainEntry enAObjInitVar; extern Gfx* enAObjDisplayLists[2]; diff --git a/include/z64actor.h b/include/z64actor.h index f1c33783a7..9a6515ae80 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -422,699 +422,19 @@ typedef enum { /* 32 */ ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE } ActorDrawDamageEffectType; -typedef enum { - /* 0x000 */ ACTOR_PLAYER, - /* 0x001 */ ACTOR_EN_TEST, - /* 0x002 */ ACTOR_EN_GIRLA, - /* 0x003 */ ACTOR_EN_PART, - /* 0x004 */ ACTOR_EN_LIGHT, - /* 0x005 */ ACTOR_EN_DOOR, - /* 0x006 */ ACTOR_EN_BOX, - /* 0x007 */ ACTOR_EN_PAMETFROG, - /* 0x008 */ ACTOR_EN_OKUTA, - /* 0x009 */ ACTOR_EN_BOM, - /* 0x00A */ ACTOR_EN_WALLMAS, - /* 0x00B */ ACTOR_EN_DODONGO, - /* 0x00C */ ACTOR_EN_FIREFLY, - /* 0x00D */ ACTOR_EN_HORSE, - /* 0x00E */ ACTOR_EN_ITEM00, - /* 0x00F */ ACTOR_EN_ARROW, - /* 0x010 */ ACTOR_EN_ELF, - /* 0x011 */ ACTOR_EN_NIW, - /* 0x012 */ ACTOR_EN_TITE, - /* 0x013 */ ACTOR_UNSET_13, - /* 0x014 */ ACTOR_EN_PEEHAT, - /* 0x015 */ ACTOR_EN_BUTTE, - /* 0x016 */ ACTOR_EN_INSECT, - /* 0x017 */ ACTOR_EN_FISH, - /* 0x018 */ ACTOR_EN_HOLL, - /* 0x019 */ ACTOR_EN_DINOFOS, - /* 0x01A */ ACTOR_EN_HATA, - /* 0x01B */ ACTOR_EN_ZL1, - /* 0x01C */ ACTOR_EN_VIEWER, - /* 0x01D */ ACTOR_EN_BUBBLE, - /* 0x01E */ ACTOR_DOOR_SHUTTER, - /* 0x01F */ ACTOR_UNSET_1F, - /* 0x020 */ ACTOR_EN_BOOM, - /* 0x021 */ ACTOR_EN_TORCH2, - /* 0x022 */ ACTOR_EN_MINIFROG, - /* 0x023 */ ACTOR_UNSET_23, - /* 0x024 */ ACTOR_EN_ST, - /* 0x025 */ ACTOR_UNSET_25, - /* 0x026 */ ACTOR_EN_A_OBJ, - /* 0x027 */ ACTOR_OBJ_WTURN, - /* 0x028 */ ACTOR_EN_RIVER_SOUND, - /* 0x029 */ ACTOR_UNSET_29, - /* 0x02A */ ACTOR_EN_OSSAN, - /* 0x02B */ ACTOR_UNSET_2B, - /* 0x02C */ ACTOR_UNSET_2C, - /* 0x02D */ ACTOR_EN_FAMOS, - /* 0x02E */ ACTOR_UNSET_2E, - /* 0x02F */ ACTOR_EN_BOMBF, - /* 0x030 */ ACTOR_UNSET_30, - /* 0x031 */ ACTOR_UNSET_31, - /* 0x032 */ ACTOR_EN_AM, - /* 0x033 */ ACTOR_EN_DEKUBABA, - /* 0x034 */ ACTOR_EN_M_FIRE1, - /* 0x035 */ ACTOR_EN_M_THUNDER, - /* 0x036 */ ACTOR_BG_BREAKWALL, - /* 0x037 */ ACTOR_UNSET_37, - /* 0x038 */ ACTOR_DOOR_WARP1, - /* 0x039 */ ACTOR_OBJ_SYOKUDAI, - /* 0x03A */ ACTOR_ITEM_B_HEART, - /* 0x03B */ ACTOR_EN_DEKUNUTS, - /* 0x03C */ ACTOR_EN_BBFALL, - /* 0x03D */ ACTOR_ARMS_HOOK, - /* 0x03E */ ACTOR_EN_BB, - /* 0x03F */ ACTOR_BG_KEIKOKU_SPR, - /* 0x040 */ ACTOR_UNSET_40, - /* 0x041 */ ACTOR_EN_WOOD02, - /* 0x042 */ ACTOR_UNSET_42, - /* 0x043 */ ACTOR_EN_DEATH, - /* 0x044 */ ACTOR_EN_MINIDEATH, - /* 0x045 */ ACTOR_UNSET_45, - /* 0x046 */ ACTOR_UNSET_46, - /* 0x047 */ ACTOR_EN_VM, - /* 0x048 */ ACTOR_DEMO_EFFECT, - /* 0x049 */ ACTOR_DEMO_KANKYO, - /* 0x04A */ ACTOR_EN_FLOORMAS, - /* 0x04B */ ACTOR_UNSET_4B, - /* 0x04C */ ACTOR_EN_RD, - /* 0x04D */ ACTOR_BG_F40_FLIFT, - /* 0x04E */ ACTOR_UNSET_4E, - /* 0x04F */ ACTOR_OBJ_MURE, - /* 0x050 */ ACTOR_EN_SW, - /* 0x051 */ ACTOR_OBJECT_KANKYO, - /* 0x052 */ ACTOR_UNSET_52, - /* 0x053 */ ACTOR_UNSET_53, - /* 0x054 */ ACTOR_EN_HORSE_LINK_CHILD, - /* 0x055 */ ACTOR_DOOR_ANA, - /* 0x056 */ ACTOR_UNSET_56, - /* 0x057 */ ACTOR_UNSET_57, - /* 0x058 */ ACTOR_UNSET_58, - /* 0x059 */ ACTOR_UNSET_59, - /* 0x05A */ ACTOR_UNSET_5A, - /* 0x05B */ ACTOR_EN_ENCOUNT1, - /* 0x05C */ ACTOR_DEMO_TRE_LGT, - /* 0x05D */ ACTOR_UNSET_5D, - /* 0x05E */ ACTOR_UNSET_5E, - /* 0x05F */ ACTOR_EN_ENCOUNT2, - /* 0x060 */ ACTOR_EN_FIRE_ROCK, - /* 0x061 */ ACTOR_BG_CTOWER_ROT, - /* 0x062 */ ACTOR_MIR_RAY, - /* 0x063 */ ACTOR_UNSET_63, - /* 0x064 */ ACTOR_EN_SB, - /* 0x065 */ ACTOR_EN_BIGSLIME, - /* 0x066 */ ACTOR_EN_KAREBABA, - /* 0x067 */ ACTOR_EN_IN, - /* 0x068 */ ACTOR_UNSET_68, - /* 0x069 */ ACTOR_EN_RU, - /* 0x06A */ ACTOR_EN_BOM_CHU, - /* 0x06B */ ACTOR_EN_HORSE_GAME_CHECK, - /* 0x06C */ ACTOR_EN_RR, - /* 0x06D */ ACTOR_UNSET_6D, - /* 0x06E */ ACTOR_UNSET_6E, - /* 0x06F */ ACTOR_UNSET_6F, - /* 0x070 */ ACTOR_UNSET_70, - /* 0x071 */ ACTOR_UNSET_71, - /* 0x072 */ ACTOR_UNSET_72, - /* 0x073 */ ACTOR_EN_FR, - /* 0x074 */ ACTOR_UNSET_74, - /* 0x075 */ ACTOR_UNSET_75, - /* 0x076 */ ACTOR_UNSET_76, - /* 0x077 */ ACTOR_UNSET_77, - /* 0x078 */ ACTOR_UNSET_78, - /* 0x079 */ ACTOR_EN_FISHING, - /* 0x07A */ ACTOR_OBJ_OSHIHIKI, - /* 0x07B */ ACTOR_EFF_DUST, - /* 0x07C */ ACTOR_BG_UMAJUMP, - /* 0x07D */ ACTOR_ARROW_FIRE, - /* 0x07E */ ACTOR_ARROW_ICE, - /* 0x07F */ ACTOR_ARROW_LIGHT, - /* 0x080 */ ACTOR_ITEM_ETCETERA, - /* 0x081 */ ACTOR_OBJ_KIBAKO, - /* 0x082 */ ACTOR_OBJ_TSUBO, - /* 0x083 */ ACTOR_UNSET_83, - /* 0x084 */ ACTOR_EN_IK, - /* 0x085 */ ACTOR_UNSET_85, - /* 0x086 */ ACTOR_UNSET_86, - /* 0x087 */ ACTOR_UNSET_87, - /* 0x088 */ ACTOR_UNSET_88, - /* 0x089 */ ACTOR_DEMO_SHD, - /* 0x08A */ ACTOR_EN_DNS, - /* 0x08B */ ACTOR_ELF_MSG, - /* 0x08C */ ACTOR_EN_HONOTRAP, - /* 0x08D */ ACTOR_EN_TUBO_TRAP, - /* 0x08E */ ACTOR_OBJ_ICE_POLY, - /* 0x08F */ ACTOR_EN_FZ, - /* 0x090 */ ACTOR_EN_KUSA, - /* 0x091 */ ACTOR_OBJ_BEAN, - /* 0x092 */ ACTOR_OBJ_BOMBIWA, - /* 0x093 */ ACTOR_OBJ_SWITCH, - /* 0x094 */ ACTOR_UNSET_94, - /* 0x095 */ ACTOR_OBJ_LIFT, - /* 0x096 */ ACTOR_OBJ_HSBLOCK, - /* 0x097 */ ACTOR_EN_OKARINA_TAG, - /* 0x098 */ ACTOR_UNSET_98, - /* 0x099 */ ACTOR_EN_GOROIWA, - /* 0x09A */ ACTOR_UNSET_9A, - /* 0x09B */ ACTOR_UNSET_9B, - /* 0x09C */ ACTOR_EN_DAIKU, - /* 0x09D */ ACTOR_EN_NWC, - /* 0x09E */ ACTOR_ITEM_INBOX, - /* 0x09F */ ACTOR_EN_GE1, - /* 0x0A0 */ ACTOR_OBJ_BLOCKSTOP, - /* 0x0A1 */ ACTOR_EN_SDA, - /* 0x0A2 */ ACTOR_EN_CLEAR_TAG, - /* 0x0A3 */ ACTOR_UNSET_A3, - /* 0x0A4 */ ACTOR_EN_GM, - /* 0x0A5 */ ACTOR_EN_MS, - /* 0x0A6 */ ACTOR_EN_HS, - /* 0x0A7 */ ACTOR_BG_INGATE, - /* 0x0A8 */ ACTOR_EN_KANBAN, - /* 0x0A9 */ ACTOR_UNSET_A9, - /* 0x0AA */ ACTOR_EN_ATTACK_NIW, - /* 0x0AB */ ACTOR_UNSET_AB, - /* 0x0AC */ ACTOR_UNSET_AC, - /* 0x0AD */ ACTOR_UNSET_AD, - /* 0x0AE */ ACTOR_EN_MK, - /* 0x0AF */ ACTOR_EN_OWL, - /* 0x0B0 */ ACTOR_EN_ISHI, - /* 0x0B1 */ ACTOR_OBJ_HANA, - /* 0x0B2 */ ACTOR_OBJ_LIGHTSWITCH, - /* 0x0B3 */ ACTOR_OBJ_MURE2, - /* 0x0B4 */ ACTOR_UNSET_B4, - /* 0x0B5 */ ACTOR_EN_FU, - /* 0x0B6 */ ACTOR_UNSET_B6, - /* 0x0B7 */ ACTOR_UNSET_B7, - /* 0x0B8 */ ACTOR_EN_STREAM, - /* 0x0B9 */ ACTOR_EN_MM, - /* 0x0BA */ ACTOR_UNSET_BA, - /* 0x0BB */ ACTOR_UNSET_BB, - /* 0x0BC */ ACTOR_EN_WEATHER_TAG, - /* 0x0BD */ ACTOR_EN_ANI, - /* 0x0BE */ ACTOR_UNSET_BE, - /* 0x0BF */ ACTOR_EN_JS, - /* 0x0C0 */ ACTOR_UNSET_C0, - /* 0x0C1 */ ACTOR_UNSET_C1, - /* 0x0C2 */ ACTOR_UNSET_C2, - /* 0x0C3 */ ACTOR_UNSET_C3, - /* 0x0C4 */ ACTOR_EN_OKARINA_EFFECT, - /* 0x0C5 */ ACTOR_EN_MAG, - /* 0x0C6 */ ACTOR_ELF_MSG2, - /* 0x0C7 */ ACTOR_BG_F40_SWLIFT, - /* 0x0C8 */ ACTOR_UNSET_C8, - /* 0x0C9 */ ACTOR_UNSET_C9, - /* 0x0CA */ ACTOR_EN_KAKASI, - /* 0x0CB */ ACTOR_OBJ_MAKEOSHIHIKI, - /* 0x0CC */ ACTOR_OCEFF_SPOT, - /* 0x0CD */ ACTOR_UNSET_CD, - /* 0x0CE */ ACTOR_EN_TORCH, - /* 0x0CF */ ACTOR_UNSET_CF, - /* 0x0D0 */ ACTOR_SHOT_SUN, - /* 0x0D1 */ ACTOR_UNSET_D1, - /* 0x0D2 */ ACTOR_UNSET_D2, - /* 0x0D3 */ ACTOR_OBJ_ROOMTIMER, - /* 0x0D4 */ ACTOR_EN_SSH, - /* 0x0D5 */ ACTOR_UNSET_D5, - /* 0x0D6 */ ACTOR_OCEFF_WIPE, - /* 0x0D7 */ ACTOR_OCEFF_STORM, - /* 0x0D8 */ ACTOR_OBJ_DEMO, - /* 0x0D9 */ ACTOR_EN_MINISLIME, - /* 0x0DA */ ACTOR_EN_NUTSBALL, - /* 0x0DB */ ACTOR_UNSET_DB, - /* 0x0DC */ ACTOR_UNSET_DC, - /* 0x0DD */ ACTOR_UNSET_DD, - /* 0x0DE */ ACTOR_UNSET_DE, - /* 0x0DF */ ACTOR_OCEFF_WIPE2, - /* 0x0E0 */ ACTOR_OCEFF_WIPE3, - /* 0x0E1 */ ACTOR_UNSET_E1, - /* 0x0E2 */ ACTOR_EN_DG, - /* 0x0E3 */ ACTOR_EN_SI, - /* 0x0E4 */ ACTOR_OBJ_COMB, - /* 0x0E5 */ ACTOR_OBJ_KIBAKO2, - /* 0x0E6 */ ACTOR_UNSET_E6, - /* 0x0E7 */ ACTOR_EN_HS2, - /* 0x0E8 */ ACTOR_OBJ_MURE3, - /* 0x0E9 */ ACTOR_EN_TG, - /* 0x0EA */ ACTOR_UNSET_EA, - /* 0x0EB */ ACTOR_UNSET_EB, - /* 0x0EC */ ACTOR_EN_WF, - /* 0x0ED */ ACTOR_EN_SKB, - /* 0x0EE */ ACTOR_UNSET_EE, - /* 0x0EF */ ACTOR_EN_GS, - /* 0x0F0 */ ACTOR_OBJ_SOUND, - /* 0x0F1 */ ACTOR_EN_CROW, - /* 0x0F2 */ ACTOR_UNSET_F2, - /* 0x0F3 */ ACTOR_EN_COW, - /* 0x0F4 */ ACTOR_UNSET_F4, - /* 0x0F5 */ ACTOR_UNSET_F5, - /* 0x0F6 */ ACTOR_OCEFF_WIPE4, - /* 0x0F7 */ ACTOR_UNSET_F7, - /* 0x0F8 */ ACTOR_EN_ZO, - /* 0x0F9 */ ACTOR_OBJ_MAKEKINSUTA, - /* 0x0FA */ ACTOR_EN_GE3, - /* 0x0FB */ ACTOR_UNSET_FB, - /* 0x0FC */ ACTOR_OBJ_HAMISHI, - /* 0x0FD */ ACTOR_EN_ZL4, - /* 0x0FE */ ACTOR_EN_MM2, - /* 0x0FF */ ACTOR_UNSET_FF, - /* 0x100 */ ACTOR_DOOR_SPIRAL, - /* 0x101 */ ACTOR_UNSET_101, - /* 0x102 */ ACTOR_OBJ_PZLBLOCK, - /* 0x103 */ ACTOR_OBJ_TOGE, - /* 0x104 */ ACTOR_UNSET_104, - /* 0x105 */ ACTOR_OBJ_ARMOS, - /* 0x106 */ ACTOR_OBJ_BOYO, - /* 0x107 */ ACTOR_UNSET_107, - /* 0x108 */ ACTOR_UNSET_108, - /* 0x109 */ ACTOR_EN_GRASSHOPPER, - /* 0x10A */ ACTOR_UNSET_10A, - /* 0x10B */ ACTOR_OBJ_GRASS, - /* 0x10C */ ACTOR_OBJ_GRASS_CARRY, - /* 0x10D */ ACTOR_OBJ_GRASS_UNIT, - /* 0x10E */ ACTOR_UNSET_10E, - /* 0x10F */ ACTOR_UNSET_10F, - /* 0x110 */ ACTOR_BG_FIRE_WALL, - /* 0x111 */ ACTOR_EN_BU, - /* 0x112 */ ACTOR_EN_ENCOUNT3, - /* 0x113 */ ACTOR_EN_JSO, - /* 0x114 */ ACTOR_OBJ_CHIKUWA, - /* 0x115 */ ACTOR_EN_KNIGHT, - /* 0x116 */ ACTOR_EN_WARP_TAG, - /* 0x117 */ ACTOR_EN_AOB_01, - /* 0x118 */ ACTOR_EN_BOJ_01, - /* 0x119 */ ACTOR_EN_BOJ_02, - /* 0x11A */ ACTOR_EN_BOJ_03, - /* 0x11B */ ACTOR_EN_ENCOUNT4, - /* 0x11C */ ACTOR_EN_BOM_BOWL_MAN, - /* 0x11D */ ACTOR_EN_SYATEKI_MAN, - /* 0x11E */ ACTOR_UNSET_11E, - /* 0x11F */ ACTOR_BG_ICICLE, - /* 0x120 */ ACTOR_EN_SYATEKI_CROW, - /* 0x121 */ ACTOR_EN_BOJ_04, - /* 0x122 */ ACTOR_EN_CNE_01, - /* 0x123 */ ACTOR_EN_BBA_01, - /* 0x124 */ ACTOR_EN_BJI_01, - /* 0x125 */ ACTOR_BG_SPDWEB, - /* 0x126 */ ACTOR_UNSET_126, - /* 0x127 */ ACTOR_UNSET_127, - /* 0x128 */ ACTOR_EN_MT_TAG, - /* 0x129 */ ACTOR_BOSS_01, - /* 0x12A */ ACTOR_BOSS_02, - /* 0x12B */ ACTOR_BOSS_03, - /* 0x12C */ ACTOR_BOSS_04, - /* 0x12D */ ACTOR_BOSS_05, - /* 0x12E */ ACTOR_BOSS_06, - /* 0x12F */ ACTOR_BOSS_07, - /* 0x130 */ ACTOR_BG_DY_YOSEIZO, - /* 0x131 */ ACTOR_UNSET_131, - /* 0x132 */ ACTOR_EN_BOJ_05, - /* 0x133 */ ACTOR_UNSET_133, - /* 0x134 */ ACTOR_UNSET_134, - /* 0x135 */ ACTOR_EN_SOB1, - /* 0x136 */ ACTOR_UNSET_136, - /* 0x137 */ ACTOR_UNSET_137, - /* 0x138 */ ACTOR_EN_GO, - /* 0x139 */ ACTOR_UNSET_139, - /* 0x13A */ ACTOR_EN_RAF, - /* 0x13B */ ACTOR_OBJ_FUNEN, - /* 0x13C */ ACTOR_OBJ_RAILLIFT, - /* 0x13D */ ACTOR_BG_NUMA_HANA, - /* 0x13E */ ACTOR_OBJ_FLOWERPOT, - /* 0x13F */ ACTOR_OBJ_SPINYROLL, - /* 0x140 */ ACTOR_DM_HINA, - /* 0x141 */ ACTOR_EN_SYATEKI_WF, - /* 0x142 */ ACTOR_OBJ_SKATEBLOCK, - /* 0x143 */ ACTOR_OBJ_ICEBLOCK, - /* 0x144 */ ACTOR_EN_BIGPAMET, - /* 0x145 */ ACTOR_EN_SYATEKI_DEKUNUTS, - /* 0x146 */ ACTOR_ELF_MSG3, - /* 0x147 */ ACTOR_EN_FG, - /* 0x148 */ ACTOR_DM_RAVINE, - /* 0x149 */ ACTOR_DM_SA, - /* 0x14A */ ACTOR_EN_SLIME, - /* 0x14B */ ACTOR_EN_PR, - /* 0x14C */ ACTOR_OBJ_TOUDAI, - /* 0x14D */ ACTOR_OBJ_ENTOTU, - /* 0x14E */ ACTOR_OBJ_BELL, - /* 0x14F */ ACTOR_EN_SYATEKI_OKUTA, - /* 0x150 */ ACTOR_UNSET_150, - /* 0x151 */ ACTOR_OBJ_SHUTTER, - /* 0x152 */ ACTOR_DM_ZL, - /* 0x153 */ ACTOR_EN_ELFGRP, - /* 0x154 */ ACTOR_DM_TSG, - /* 0x155 */ ACTOR_EN_BAGUO, - /* 0x156 */ ACTOR_OBJ_VSPINYROLL, - /* 0x157 */ ACTOR_OBJ_SMORK, - /* 0x158 */ ACTOR_EN_TEST2, - /* 0x159 */ ACTOR_EN_TEST3, - /* 0x15A */ ACTOR_EN_TEST4, - /* 0x15B */ ACTOR_EN_BAT, - /* 0x15C */ ACTOR_EN_SEKIHI, - /* 0x15D */ ACTOR_EN_WIZ, - /* 0x15E */ ACTOR_EN_WIZ_BROCK, - /* 0x15F */ ACTOR_EN_WIZ_FIRE, - /* 0x160 */ ACTOR_EFF_CHANGE, - /* 0x161 */ ACTOR_DM_STATUE, - /* 0x162 */ ACTOR_OBJ_FIRESHIELD, - /* 0x163 */ ACTOR_BG_LADDER, - /* 0x164 */ ACTOR_EN_MKK, - /* 0x165 */ ACTOR_DEMO_GETITEM, - /* 0x166 */ ACTOR_UNSET_166, - /* 0x167 */ ACTOR_EN_DNB, - /* 0x168 */ ACTOR_EN_DNH, - /* 0x169 */ ACTOR_EN_DNK, - /* 0x16A */ ACTOR_EN_DNQ, - /* 0x16B */ ACTOR_UNSET_16B, - /* 0x16C */ ACTOR_BG_KEIKOKU_SAKU, - /* 0x16D */ ACTOR_OBJ_HUGEBOMBIWA, - /* 0x16E */ ACTOR_EN_FIREFLY2, - /* 0x16F */ ACTOR_EN_RAT, - /* 0x170 */ ACTOR_EN_WATER_EFFECT, - /* 0x171 */ ACTOR_EN_KUSA2, - /* 0x172 */ ACTOR_BG_SPOUT_FIRE, - /* 0x173 */ ACTOR_UNSET_173, - /* 0x174 */ ACTOR_BG_DBLUE_MOVEBG, - /* 0x175 */ ACTOR_EN_DY_EXTRA, - /* 0x176 */ ACTOR_EN_BAL, - /* 0x177 */ ACTOR_EN_GINKO_MAN, - /* 0x178 */ ACTOR_EN_WARP_UZU, - /* 0x179 */ ACTOR_OBJ_DRIFTICE, - /* 0x17A */ ACTOR_EN_LOOK_NUTS, - /* 0x17B */ ACTOR_EN_MUSHI2, - /* 0x17C */ ACTOR_EN_FALL, - /* 0x17D */ ACTOR_EN_MM3, - /* 0x17E */ ACTOR_BG_CRACE_MOVEBG, - /* 0x17F */ ACTOR_EN_DNO, - /* 0x180 */ ACTOR_EN_PR2, - /* 0x181 */ ACTOR_EN_PRZ, - /* 0x182 */ ACTOR_EN_JSO2, - /* 0x183 */ ACTOR_OBJ_ETCETERA, - /* 0x184 */ ACTOR_EN_EGOL, - /* 0x185 */ ACTOR_OBJ_MINE, - /* 0x186 */ ACTOR_OBJ_PURIFY, - /* 0x187 */ ACTOR_EN_TRU, - /* 0x188 */ ACTOR_EN_TRT, - /* 0x189 */ ACTOR_UNSET_189, - /* 0x18A */ ACTOR_UNSET_18A, - /* 0x18B */ ACTOR_EN_TEST5, - /* 0x18C */ ACTOR_EN_TEST6, - /* 0x18D */ ACTOR_EN_AZ, - /* 0x18E */ ACTOR_EN_ESTONE, - /* 0x18F */ ACTOR_BG_HAKUGIN_POST, - /* 0x190 */ ACTOR_DM_OPSTAGE, - /* 0x191 */ ACTOR_DM_STK, - /* 0x192 */ ACTOR_DM_CHAR00, - /* 0x193 */ ACTOR_DM_CHAR01, - /* 0x194 */ ACTOR_DM_CHAR02, - /* 0x195 */ ACTOR_DM_CHAR03, - /* 0x196 */ ACTOR_DM_CHAR04, - /* 0x197 */ ACTOR_DM_CHAR05, - /* 0x198 */ ACTOR_DM_CHAR06, - /* 0x199 */ ACTOR_DM_CHAR07, - /* 0x19A */ ACTOR_DM_CHAR08, - /* 0x19B */ ACTOR_DM_CHAR09, - /* 0x19C */ ACTOR_OBJ_TOKEIDAI, - /* 0x19D */ ACTOR_UNSET_19D, - /* 0x19E */ ACTOR_EN_MNK, - /* 0x19F */ ACTOR_EN_EGBLOCK, - /* 0x1A0 */ ACTOR_EN_GUARD_NUTS, - /* 0x1A1 */ ACTOR_BG_HAKUGIN_BOMBWALL, - /* 0x1A2 */ ACTOR_OBJ_TOKEI_TOBIRA, - /* 0x1A3 */ ACTOR_BG_HAKUGIN_ELVPOLE, - /* 0x1A4 */ ACTOR_EN_MA4, - /* 0x1A5 */ ACTOR_EN_TWIG, - /* 0x1A6 */ ACTOR_EN_PO_FUSEN, - /* 0x1A7 */ ACTOR_EN_DOOR_ETC, - /* 0x1A8 */ ACTOR_EN_BIGOKUTA, - /* 0x1A9 */ ACTOR_BG_ICEFLOE, - /* 0x1AA */ ACTOR_OBJ_OCARINALIFT, - /* 0x1AB */ ACTOR_EN_TIME_TAG, - /* 0x1AC */ ACTOR_BG_OPEN_SHUTTER, - /* 0x1AD */ ACTOR_BG_OPEN_SPOT, - /* 0x1AE */ ACTOR_BG_FU_KAITEN, - /* 0x1AF */ ACTOR_OBJ_AQUA, - /* 0x1B0 */ ACTOR_EN_ELFORG, - /* 0x1B1 */ ACTOR_EN_ELFBUB, - /* 0x1B2 */ ACTOR_UNSET_1B2, - /* 0x1B3 */ ACTOR_EN_FU_MATO, - /* 0x1B4 */ ACTOR_EN_FU_KAGO, - /* 0x1B5 */ ACTOR_EN_OSN, - /* 0x1B6 */ ACTOR_BG_CTOWER_GEAR, - /* 0x1B7 */ ACTOR_EN_TRT2, - /* 0x1B8 */ ACTOR_OBJ_TOKEI_STEP, - /* 0x1B9 */ ACTOR_BG_LOTUS, - /* 0x1BA */ ACTOR_EN_KAME, - /* 0x1BB */ ACTOR_OBJ_TAKARAYA_WALL, - /* 0x1BC */ ACTOR_BG_FU_MIZU, - /* 0x1BD */ ACTOR_EN_SELLNUTS, - /* 0x1BE */ ACTOR_BG_DKJAIL_IVY, - /* 0x1BF */ ACTOR_UNSET_1BF, - /* 0x1C0 */ ACTOR_OBJ_VISIBLOCK, - /* 0x1C1 */ ACTOR_EN_TAKARAYA, - /* 0x1C2 */ ACTOR_EN_TSN, - /* 0x1C3 */ ACTOR_EN_DS2N, - /* 0x1C4 */ ACTOR_EN_FSN, - /* 0x1C5 */ ACTOR_EN_SHN, - /* 0x1C6 */ ACTOR_UNSET_1C6, - /* 0x1C7 */ ACTOR_EN_STOP_HEISHI, - /* 0x1C8 */ ACTOR_OBJ_BIGICICLE, - /* 0x1C9 */ ACTOR_EN_LIFT_NUTS, - /* 0x1CA */ ACTOR_EN_TK, - /* 0x1CB */ ACTOR_UNSET_1CB, - /* 0x1CC */ ACTOR_BG_MARKET_STEP, - /* 0x1CD */ ACTOR_OBJ_LUPYGAMELIFT, - /* 0x1CE */ ACTOR_EN_TEST7, - /* 0x1CF */ ACTOR_OBJ_LIGHTBLOCK, - /* 0x1D0 */ ACTOR_MIR_RAY2, - /* 0x1D1 */ ACTOR_EN_WDHAND, - /* 0x1D2 */ ACTOR_EN_GAMELUPY, - /* 0x1D3 */ ACTOR_BG_DANPEI_MOVEBG, - /* 0x1D4 */ ACTOR_EN_SNOWWD, - /* 0x1D5 */ ACTOR_EN_PM, - /* 0x1D6 */ ACTOR_EN_GAKUFU, - /* 0x1D7 */ ACTOR_ELF_MSG4, - /* 0x1D8 */ ACTOR_ELF_MSG5, - /* 0x1D9 */ ACTOR_EN_COL_MAN, - /* 0x1DA */ ACTOR_EN_TALK_GIBUD, - /* 0x1DB */ ACTOR_EN_GIANT, - /* 0x1DC */ ACTOR_OBJ_SNOWBALL, - /* 0x1DD */ ACTOR_BOSS_HAKUGIN, - /* 0x1DE */ ACTOR_EN_GB2, - /* 0x1DF */ ACTOR_EN_ONPUMAN, - /* 0x1E0 */ ACTOR_BG_TOBIRA01, - /* 0x1E1 */ ACTOR_EN_TAG_OBJ, - /* 0x1E2 */ ACTOR_OBJ_DHOUSE, - /* 0x1E3 */ ACTOR_OBJ_HAKAISI, - /* 0x1E4 */ ACTOR_BG_HAKUGIN_SWITCH, - /* 0x1E5 */ ACTOR_UNSET_1E5, - /* 0x1E6 */ ACTOR_EN_SNOWMAN, - /* 0x1E7 */ ACTOR_TG_SW, - /* 0x1E8 */ ACTOR_EN_PO_SISTERS, - /* 0x1E9 */ ACTOR_EN_PP, - /* 0x1EA */ ACTOR_EN_HAKUROCK, - /* 0x1EB */ ACTOR_EN_HANABI, - /* 0x1EC */ ACTOR_OBJ_DOWSING, - /* 0x1ED */ ACTOR_OBJ_WIND, - /* 0x1EE */ ACTOR_EN_RACEDOG, - /* 0x1EF */ ACTOR_EN_KENDO_JS, - /* 0x1F0 */ ACTOR_BG_BOTIHASIRA, - /* 0x1F1 */ ACTOR_EN_FISH2, - /* 0x1F2 */ ACTOR_EN_PST, - /* 0x1F3 */ ACTOR_EN_POH, - /* 0x1F4 */ ACTOR_OBJ_SPIDERTENT, - /* 0x1F5 */ ACTOR_EN_ZORAEGG, - /* 0x1F6 */ ACTOR_EN_KBT, - /* 0x1F7 */ ACTOR_EN_GG, - /* 0x1F8 */ ACTOR_EN_MARUTA, - /* 0x1F9 */ ACTOR_OBJ_SNOWBALL2, - /* 0x1FA */ ACTOR_EN_GG2, - /* 0x1FB */ ACTOR_OBJ_GHAKA, - /* 0x1FC */ ACTOR_EN_DNP, - /* 0x1FD */ ACTOR_EN_DAI, - /* 0x1FE */ ACTOR_BG_GORON_OYU, - /* 0x1FF */ ACTOR_EN_KGY, - /* 0x200 */ ACTOR_EN_INVADEPOH, - /* 0x201 */ ACTOR_EN_GK, - /* 0x202 */ ACTOR_EN_AN, - /* 0x203 */ ACTOR_UNSET_203, - /* 0x204 */ ACTOR_EN_BEE, - /* 0x205 */ ACTOR_EN_OT, - /* 0x206 */ ACTOR_EN_DRAGON, - /* 0x207 */ ACTOR_OBJ_DORA, - /* 0x208 */ ACTOR_EN_BIGPO, - /* 0x209 */ ACTOR_OBJ_KENDO_KANBAN, - /* 0x20A */ ACTOR_OBJ_HARIKO, - /* 0x20B */ ACTOR_EN_STH, - /* 0x20C */ ACTOR_BG_SINKAI_KABE, - /* 0x20D */ ACTOR_BG_HAKA_CURTAIN, - /* 0x20E */ ACTOR_BG_KIN2_BOMBWALL, - /* 0x20F */ ACTOR_BG_KIN2_FENCE, - /* 0x210 */ ACTOR_BG_KIN2_PICTURE, - /* 0x211 */ ACTOR_BG_KIN2_SHELF, - /* 0x212 */ ACTOR_EN_RAIL_SKB, - /* 0x213 */ ACTOR_EN_JG, - /* 0x214 */ ACTOR_EN_TRU_MT, - /* 0x215 */ ACTOR_OBJ_UM, - /* 0x216 */ ACTOR_EN_NEO_REEBA, - /* 0x217 */ ACTOR_BG_MBAR_CHAIR, - /* 0x218 */ ACTOR_BG_IKANA_BLOCK, - /* 0x219 */ ACTOR_BG_IKANA_MIRROR, - /* 0x21A */ ACTOR_BG_IKANA_ROTARYROOM, - /* 0x21B */ ACTOR_BG_DBLUE_BALANCE, - /* 0x21C */ ACTOR_BG_DBLUE_WATERFALL, - /* 0x21D */ ACTOR_EN_KAIZOKU, - /* 0x21E */ ACTOR_EN_GE2, - /* 0x21F */ ACTOR_EN_MA_YTS, - /* 0x220 */ ACTOR_EN_MA_YTO, - /* 0x221 */ ACTOR_OBJ_TOKEI_TURRET, - /* 0x222 */ ACTOR_BG_DBLUE_ELEVATOR, - /* 0x223 */ ACTOR_OBJ_WARPSTONE, - /* 0x224 */ ACTOR_EN_ZOG, - /* 0x225 */ ACTOR_OBJ_ROTLIFT, - /* 0x226 */ ACTOR_OBJ_JG_GAKKI, - /* 0x227 */ ACTOR_BG_INIBS_MOVEBG, - /* 0x228 */ ACTOR_EN_ZOT, - /* 0x229 */ ACTOR_OBJ_TREE, - /* 0x22A */ ACTOR_OBJ_Y2LIFT, - /* 0x22B */ ACTOR_OBJ_Y2SHUTTER, - /* 0x22C */ ACTOR_OBJ_BOAT, - /* 0x22D */ ACTOR_OBJ_TARU, - /* 0x22E */ ACTOR_OBJ_HUNSUI, - /* 0x22F */ ACTOR_EN_JC_MATO, - /* 0x230 */ ACTOR_MIR_RAY3, - /* 0x231 */ ACTOR_EN_ZOB, - /* 0x232 */ ACTOR_ELF_MSG6, - /* 0x233 */ ACTOR_OBJ_NOZOKI, - /* 0x234 */ ACTOR_EN_TOTO, - /* 0x235 */ ACTOR_EN_RAILGIBUD, - /* 0x236 */ ACTOR_EN_BABA, - /* 0x237 */ ACTOR_EN_SUTTARI, - /* 0x238 */ ACTOR_EN_ZOD, - /* 0x239 */ ACTOR_EN_KUJIYA, - /* 0x23A */ ACTOR_EN_GEG, - /* 0x23B */ ACTOR_OBJ_KINOKO, - /* 0x23C */ ACTOR_OBJ_YASI, - /* 0x23D */ ACTOR_EN_TANRON1, - /* 0x23E */ ACTOR_EN_TANRON2, - /* 0x23F */ ACTOR_EN_TANRON3, - /* 0x240 */ ACTOR_OBJ_CHAN, - /* 0x241 */ ACTOR_EN_ZOS, - /* 0x242 */ ACTOR_EN_S_GORO, - /* 0x243 */ ACTOR_EN_NB, - /* 0x244 */ ACTOR_EN_JA, - /* 0x245 */ ACTOR_BG_F40_BLOCK, - /* 0x246 */ ACTOR_BG_F40_SWITCH, - /* 0x247 */ ACTOR_EN_PO_COMPOSER, - /* 0x248 */ ACTOR_EN_GURUGURU, - /* 0x249 */ ACTOR_OCEFF_WIPE5, - /* 0x24A */ ACTOR_EN_STONE_HEISHI, - /* 0x24B */ ACTOR_OCEFF_WIPE6, - /* 0x24C */ ACTOR_EN_SCOPENUTS, - /* 0x24D */ ACTOR_EN_SCOPECROW, - /* 0x24E */ ACTOR_OCEFF_WIPE7, - /* 0x24F */ ACTOR_EFF_KAMEJIMA_WAVE, - /* 0x250 */ ACTOR_EN_HG, - /* 0x251 */ ACTOR_EN_HGO, - /* 0x252 */ ACTOR_EN_ZOV, - /* 0x253 */ ACTOR_EN_AH, - /* 0x254 */ ACTOR_OBJ_HGDOOR, - /* 0x255 */ ACTOR_BG_IKANA_BOMBWALL, - /* 0x256 */ ACTOR_BG_IKANA_RAY, - /* 0x257 */ ACTOR_BG_IKANA_SHUTTER, - /* 0x258 */ ACTOR_BG_HAKA_BOMBWALL, - /* 0x259 */ ACTOR_BG_HAKA_TOMB, - /* 0x25A */ ACTOR_EN_SC_RUPPE, - /* 0x25B */ ACTOR_BG_IKNV_DOUKUTU, - /* 0x25C */ ACTOR_BG_IKNV_OBJ, - /* 0x25D */ ACTOR_EN_PAMERA, - /* 0x25E */ ACTOR_OBJ_HSSTUMP, - /* 0x25F */ ACTOR_EN_HIDDEN_NUTS, - /* 0x260 */ ACTOR_EN_ZOW, - /* 0x261 */ ACTOR_EN_TALK, - /* 0x262 */ ACTOR_EN_AL, - /* 0x263 */ ACTOR_EN_TAB, - /* 0x264 */ ACTOR_EN_NIMOTSU, - /* 0x265 */ ACTOR_EN_HIT_TAG, - /* 0x266 */ ACTOR_EN_RUPPECROW, - /* 0x267 */ ACTOR_EN_TANRON4, - /* 0x268 */ ACTOR_EN_TANRON5, - /* 0x269 */ ACTOR_EN_TANRON6, - /* 0x26A */ ACTOR_EN_DAIKU2, - /* 0x26B */ ACTOR_EN_MUTO, - /* 0x26C */ ACTOR_EN_BAISEN, - /* 0x26D */ ACTOR_EN_HEISHI, - /* 0x26E */ ACTOR_EN_DEMO_HEISHI, - /* 0x26F */ ACTOR_EN_DT, - /* 0x270 */ ACTOR_EN_CHA, - /* 0x271 */ ACTOR_OBJ_DINNER, - /* 0x272 */ ACTOR_EFF_LASTDAY, - /* 0x273 */ ACTOR_BG_IKANA_DHARMA, - /* 0x274 */ ACTOR_EN_AKINDONUTS, - /* 0x275 */ ACTOR_EFF_STK, - /* 0x276 */ ACTOR_EN_IG, - /* 0x277 */ ACTOR_EN_RG, - /* 0x278 */ ACTOR_EN_OSK, - /* 0x279 */ ACTOR_EN_STH2, - /* 0x27A */ ACTOR_EN_YB, - /* 0x27B */ ACTOR_EN_RZ, - /* 0x27C */ ACTOR_EN_SCOPECOIN, - /* 0x27D */ ACTOR_EN_BJT, - /* 0x27E */ ACTOR_EN_BOMJIMA, - /* 0x27F */ ACTOR_EN_BOMJIMB, - /* 0x280 */ ACTOR_EN_BOMBERS, - /* 0x281 */ ACTOR_EN_BOMBERS2, - /* 0x282 */ ACTOR_EN_BOMBAL, - /* 0x283 */ ACTOR_OBJ_MOON_STONE, - /* 0x284 */ ACTOR_OBJ_MU_PICT, - /* 0x285 */ ACTOR_BG_IKNINSIDE, - /* 0x286 */ ACTOR_EFF_ZORABAND, - /* 0x287 */ ACTOR_OBJ_KEPN_KOYA, - /* 0x288 */ ACTOR_OBJ_USIYANE, - /* 0x289 */ ACTOR_EN_NNH, - /* 0x28A */ ACTOR_OBJ_KZSAKU, - /* 0x28B */ ACTOR_OBJ_MILK_BIN, - /* 0x28C */ ACTOR_EN_KITAN, - /* 0x28D */ ACTOR_BG_ASTR_BOMBWALL, - /* 0x28E */ ACTOR_BG_IKNIN_SUSCEIL, - /* 0x28F */ ACTOR_EN_BSB, - /* 0x290 */ ACTOR_EN_RECEPGIRL, - /* 0x291 */ ACTOR_EN_THIEFBIRD, - /* 0x292 */ ACTOR_EN_JGAME_TSN, - /* 0x293 */ ACTOR_OBJ_JGAME_LIGHT, - /* 0x294 */ ACTOR_OBJ_YADO, - /* 0x295 */ ACTOR_DEMO_SYOTEN, - /* 0x296 */ ACTOR_DEMO_MOONEND, - /* 0x297 */ ACTOR_BG_LBFSHOT, - /* 0x298 */ ACTOR_BG_LAST_BWALL, - /* 0x299 */ ACTOR_EN_AND, - /* 0x29A */ ACTOR_EN_INVADEPOH_DEMO, - /* 0x29B */ ACTOR_OBJ_DANPEILIFT, - /* 0x29C */ ACTOR_EN_FALL2, - /* 0x29D */ ACTOR_DM_AL, - /* 0x29E */ ACTOR_DM_AN, - /* 0x29F */ ACTOR_DM_AH, - /* 0x2A0 */ ACTOR_DM_NB, - /* 0x2A1 */ ACTOR_EN_DRS, - /* 0x2A2 */ ACTOR_EN_ENDING_HERO, - /* 0x2A3 */ ACTOR_DM_BAL, - /* 0x2A4 */ ACTOR_EN_PAPER, - /* 0x2A5 */ ACTOR_EN_HINT_SKB, - /* 0x2A6 */ ACTOR_DM_TAG, - /* 0x2A7 */ ACTOR_EN_BH, - /* 0x2A8 */ ACTOR_EN_ENDING_HERO2, - /* 0x2A9 */ ACTOR_EN_ENDING_HERO3, - /* 0x2AA */ ACTOR_EN_ENDING_HERO4, - /* 0x2AB */ ACTOR_EN_ENDING_HERO5, - /* 0x2AC */ ACTOR_EN_ENDING_HERO6, - /* 0x2AD */ ACTOR_DM_GM, - /* 0x2AE */ ACTOR_OBJ_SWPRIZE, - /* 0x2AF */ ACTOR_EN_INVISIBLE_RUPPE, - /* 0x2B0 */ ACTOR_OBJ_ENDING, - /* 0x2B1 */ ACTOR_EN_RSN, + +#define DEFINE_ACTOR(_name, enumValue, _allocType, _debugName) enumValue, +#define DEFINE_ACTOR_INTERNAL(_name, enumValue, _allocType, _debugName) enumValue, +#define DEFINE_ACTOR_UNSET(enumValue) enumValue, + +typedef enum ActorId { + #include "tables/actor_table.h" /* 0x2B2 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX" -} ActorID; +} ActorId; + +#undef DEFINE_ACTOR +#undef DEFINE_ACTOR_INTERNAL +#undef DEFINE_ACTOR_UNSET typedef enum { /* 0 */ DOORLOCK_NORMAL, diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 77b6546ffd..02b7a8b5df 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -1,711 +1,41 @@ #include "global.h" -#include "initvars.h" -#define ACTOR_OVERLAY(name, allocType) \ - { \ - SEGMENT_ROM_START(ovl_##name), SEGMENT_ROM_END(ovl_##name), SEGMENT_START(ovl_##name), \ - SEGMENT_END(ovl_##name), NULL, &name##_InitVars, NULL, allocType, 0 \ - } +// Init Vars declarations (also used in the table below) +#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName) extern ActorInit name##_InitVars; +#define DEFINE_ACTOR_INTERNAL(name, _enumValue, _allocType, _debugName) extern ActorInit name##_InitVars; +#define DEFINE_ACTOR_UNSET(_enumValue) -#define ACTOR_OVERLAY_INTERNAL(name, allocType) \ - { 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 } +#include "tables/actor_table.h" -#define ACTOR_OVERLAY_UNSET \ - { 0 } +#undef DEFINE_ACTOR +#undef DEFINE_ACTOR_INTERNAL +#undef DEFINE_ACTOR_UNSET + +// Actor Overlay Table definition +#define DEFINE_ACTOR(name, _enumValue, allocType, _debugName) \ + { SEGMENT_ROM_START(ovl_##name), \ + SEGMENT_ROM_END(ovl_##name), \ + SEGMENT_START(ovl_##name), \ + SEGMENT_END(ovl_##name), \ + NULL, \ + &name##_InitVars, \ + NULL, \ + allocType, \ + 0 }, + +#define DEFINE_ACTOR_INTERNAL(name, _enumValue, allocType, _debugName) \ + { 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 }, + +#define DEFINE_ACTOR_UNSET(_enumValue) { 0 }, ActorOverlay gActorOverlayTable[] = { - ACTOR_OVERLAY_INTERNAL(Player, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_GirlA, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Part, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Light, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Door, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Box, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pametfrog, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Okuta, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bom, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Wallmas, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dodongo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Firefly, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Horse, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_INTERNAL(En_Item00, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Arrow, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Elf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Niw, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tite, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Peehat, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Butte, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Insect, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fish, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Holl, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Dinofos, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hata, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zl1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Viewer, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bubble, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Door_Shutter, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Boom, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Torch2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Minifrog, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_St, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_INTERNAL(En_A_Obj, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Wturn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_River_Sound, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Ossan, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Famos, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Bombf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Am, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dekubaba, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_M_Fire1, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_M_Thunder, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(Bg_Breakwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Door_Warp1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Syokudai, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Item_B_Heart, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dekunuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bbfall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Arms_Hook, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Bb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Keikoku_Spr, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Wood02, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Death, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Minideath, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Vm, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Effect, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Kankyo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Floormas, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Rd, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_F40_Flift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Mure, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sw, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Object_Kankyo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Horse_Link_Child, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Door_Ana, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Encount1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Tre_Lgt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Encount2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fire_Rock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ctower_Rot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Mir_Ray, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Sb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bigslime, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Karebaba, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_In, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Ru, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bom_Chu, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY(En_Horse_Game_Check, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rr, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Fr, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Fishing, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Oshihiki, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Eff_Dust, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Umajump, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Arrow_Fire, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Arrow_Ice, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Arrow_Light, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Item_Etcetera, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kibako, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tsubo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Ik, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Demo_Shd, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dns, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Honotrap, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tubo_Trap, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Ice_Poly, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fz, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kusa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Bean, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Bombiwa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Switch, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Lift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hsblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Okarina_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Goroiwa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Daiku, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Nwc, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Item_Inbox, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ge1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Blockstop, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sda, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Clear_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Gm, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ms, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hs, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ingate, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kanban, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Attack_Niw, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Mk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Owl, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hana, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Lightswitch, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Mure2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Fu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Stream, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mm, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Weather_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ani, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Js, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Okarina_Effect, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_F40_Swlift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Kakasi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Makeoshihiki, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Oceff_Spot, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Torch, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Shot_Sun, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Roomtimer, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ssh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Oceff_Wipe, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Oceff_Storm, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Obj_Demo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Minislime, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Nutsball, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Oceff_Wipe2, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Oceff_Wipe3, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Dg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Si, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Comb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kibako2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Hs2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Mure3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Wf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Skb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Gs, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Sound, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Crow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Cow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Oceff_Wipe4, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Zo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Makekinsuta, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ge3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Hamishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zl4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mm2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Door_Spiral, ALLOCTYPE_PERMANENT), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Pzlblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Toge, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Armos, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Boyo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Grasshopper, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Grass, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Grass_Carry, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Grass_Unit, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Bg_Fire_Wall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Encount3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Jso, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Chikuwa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Knight, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Warp_tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Aob_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Boj_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Boj_02, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Boj_03, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Encount4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bom_Bowl_Man, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Syateki_Man, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Bg_Icicle, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Syateki_Crow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Boj_04, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Cne_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bba_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bji_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Spdweb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Mt_tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_02, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_03, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_04, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_05, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_06, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_07, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Dy_Yoseizo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Boj_05, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Sob1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Go, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Raf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Funen, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Raillift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Numa_Hana, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Flowerpot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Spinyroll, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Hina, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Syateki_Wf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Skateblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Iceblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bigpamet, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Syateki_Dekunuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Ravine, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Sa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Slime, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pr, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Toudai, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Entotu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Bell, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Syateki_Okuta, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Shutter, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Zl, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Elfgrp, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Tsg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Baguo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Vspinyroll, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Smork, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bat, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sekihi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Wiz, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Wiz_Brock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Wiz_Fire, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Eff_Change, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Statue, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Fireshield, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ladder, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mkk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Getitem, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Dnb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dnh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dnk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dnq, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Bg_Keikoku_Saku, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hugebombiwa, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Firefly2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rat, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Water_Effect, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kusa2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Spout_Fire, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Bg_Dblue_Movebg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dy_Extra, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bal, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ginko_Man, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Warp_Uzu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Driftice, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Look_Nuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mushi2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Mm3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Crace_Movebg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dno, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pr2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Prz, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Jso2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Etcetera, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Egol, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Mine, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Purify, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tru, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Trt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Test5, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test6, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Az, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Estone, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Hakugin_Post, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Opstage, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Stk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char00, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char02, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char03, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char04, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char05, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char06, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char07, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char08, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Char09, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tokeidai, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Mnk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Egblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Guard_Nuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Hakugin_Bombwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tokei_Tobira, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Hakugin_Elvpole, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ma4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Twig, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Po_Fusen, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Door_Etc, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bigokuta, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Icefloe, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Ocarinalift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Time_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Open_Shutter, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Open_Spot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Fu_Kaiten, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Aqua, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Elforg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Elfbub, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Fu_Mato, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fu_Kago, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Osn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ctower_Gear, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Trt2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tokei_Step, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Lotus, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kame, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Takaraya_Wall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Fu_Mizu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sellnuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Dkjail_Ivy, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Obj_Visiblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Takaraya, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tsn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ds2n, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fsn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Shn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Stop_heishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Bigicicle, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Lift_Nuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(Bg_Market_Step, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Lupygamelift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Test7, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Lightblock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Mir_Ray2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Wdhand, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gamelupy, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Danpei_Movebg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Snowwd, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pm, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gakufu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg5, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Col_Man, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Talk_Gibud, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Giant, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Snowball, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Boss_Hakugin, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gb2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Onpuman, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Tobira01, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tag_Obj, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Dhouse, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hakaisi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Hakugin_Switch, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Snowman, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(TG_Sw, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Po_Sisters, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pp, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hakurock, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hanabi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Dowsing, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Wind, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Racedog, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kendo_Js, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Botihasira, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fish2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pst, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Poh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Spidertent, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zoraegg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kbt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Maruta, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Snowball2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gg2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Ghaka, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dnp, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dai, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Goron_Oyu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kgy, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Invadepoh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Gk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_An, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY_UNSET, - ACTOR_OVERLAY(En_Bee, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dragon, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Dora, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bigpo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kendo_Kanban, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hariko, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sth, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Sinkai_Kabe, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Haka_Curtain, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Kin2_Bombwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Kin2_Fence, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Kin2_Picture, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Kin2_Shelf, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rail_Skb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Jg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tru_Mt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Um, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Neo_Reeba, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Mbar_Chair, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Block, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Mirror, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Rotaryroom, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Dblue_Balance, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Dblue_Waterfall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kaizoku, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ge2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ma_Yts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ma_Yto, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tokei_Turret, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Dblue_Elevator, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Warpstone, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zog, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Rotlift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Jg_Gakki, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Inibs_Movebg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Tree, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Y2lift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Y2shutter, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Boat, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Taru, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hunsui, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Jc_Mato, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Mir_Ray3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zob, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Elf_Msg6, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Nozoki, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Toto, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Railgibud, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Baba, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Suttari, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zod, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kujiya, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Geg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kinoko, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Yasi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron1, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Chan, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zos, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_S_Goro, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Nb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ja, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_F40_Block, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_F40_Switch, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Po_Composer, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Guruguru, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Oceff_Wipe5, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(En_Stone_heishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Oceff_Wipe6, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(En_Scopenuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Scopecrow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Oceff_Wipe7, ALLOCTYPE_ABSOLUTE), - ACTOR_OVERLAY(Eff_Kamejima_Wave, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hgo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zov, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ah, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Hgdoor, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Bombwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Ray, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Shutter, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Haka_Bombwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Haka_Tomb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sc_Ruppe, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Iknv_Doukutu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Iknv_Obj, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Pamera, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_HsStump, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hidden_Nuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Zow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Talk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Al, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tab, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Nimotsu, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hit_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ruppecrow, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron5, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Tanron6, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Daiku2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Muto, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Baisen, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Heishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Demo_heishi, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Dt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Cha, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Dinner, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Eff_Lastday, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikana_Dharma, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Akindonuts, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Eff_Stk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ig, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rg, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Osk, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Sth2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Yb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rz, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Scopecoin, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bjt, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bomjima, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bomjimb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bombers, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bombers2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bombal, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Moon_Stone, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Mu_Pict, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Ikninside, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Eff_Zoraband, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kepn_Koya, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Usiyane, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Nnh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Kzsaku, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Milk_Bin, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Kitan, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Astr_Bombwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Iknin_Susceil, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bsb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Recepgirl, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Thiefbird, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Jgame_Tsn, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Jgame_Light, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Yado, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Syoten, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Demo_Moonend, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Lbfshot, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Bg_Last_Bwall, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_And, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Invadepoh_Demo, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Danpeilift, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Fall2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Al, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_An, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Ah, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Nb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Drs, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Bal, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Paper, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Hint_Skb, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Tag, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Bh, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero2, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero3, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero4, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero5, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Ending_Hero6, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Dm_Gm, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Swprize, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Invisible_Ruppe, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(Obj_Ending, ALLOCTYPE_NORMAL), - ACTOR_OVERLAY(En_Rsn, ALLOCTYPE_NORMAL), +#include "tables/actor_table.h" }; +#undef DEFINE_ACTOR +#undef DEFINE_ACTOR_INTERNAL +#undef DEFINE_ACTOR_UNSET + s32 gMaxActorId = 0; FaultClient D_801ED930; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 969368e26e..944e650a00 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -23,7 +23,7 @@ void EnItem00_DrawSprite(EnItem00* this, PlayState* play); void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play); void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play); -const ActorInit En_Item00_InitVars = { +ActorInit En_Item00_InitVars = { ACTOR_EN_ITEM00, ACTORCAT_MISC, FLAGS, diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index 8cd8207b70..a4ceeba955 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -14,7 +14,7 @@ void PlayerCall_Destroy(Actor* thisx, PlayState* play); void PlayerCall_Update(Actor* thisx, PlayState* play); void PlayerCall_Draw(Actor* thisx, PlayState* play); -const ActorInit Player_InitVars = { +ActorInit Player_InitVars = { ACTOR_PLAYER, ACTORCAT_PLAYER, FLAGS, 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 8d0b2e2d8e..5cdc8d1814 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -20,7 +20,7 @@ void ArmsHook_Draw(Actor* thisx, PlayState* play); void ArmsHook_Wait(ArmsHook* this, PlayState* play); void ArmsHook_Shoot(ArmsHook* this, PlayState* play); -const ActorInit Arms_Hook_InitVars = { +ActorInit Arms_Hook_InitVars = { ACTOR_ARMS_HOOK, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index 95208ba4f7..31b675f419 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -20,6 +20,4 @@ typedef struct ArmsHook { /* 0x20C */ ArmsHookActionFunc actionFunc; } ArmsHook; // size = 0x210 -extern const ActorInit Arms_Hook_InitVars; - #endif // Z_ARMS_HOOK_H diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index cef5b04658..41a3f25eca 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -21,7 +21,7 @@ void FireArrow_Fly(ArrowFire* this, PlayState* play); #include "overlays/ovl_Arrow_fire/ovl_Arrow_Fire.c" -const ActorInit Arrow_Fire_InitVars = { +ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h index ce43cc5ed9..1d0c09dcb0 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -21,6 +21,4 @@ typedef struct ArrowFire { } ArrowFire; // size = 0x264 -extern const ActorInit Arrow_Fire_InitVars; - #endif // Z_ARROW_FIRE_H diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 7db4c35d32..5c5cd0c872 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -23,7 +23,7 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play); s32 unused; // Needed for bss -const ActorInit Arrow_Ice_InitVars = { +ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h index a90cfe0aeb..bf7a1ae513 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -18,6 +18,4 @@ typedef struct ArrowIce { /* 0x160 */ ArrowIceActionFunc actionFunc; } ArrowIce; // size = 0x164 -extern const ActorInit Arrow_Ice_InitVars; - #endif // Z_ARROW_ICE_H diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 7ff828b2d8..b7918b5b46 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -21,7 +21,7 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play); #include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" -const ActorInit Arrow_Light_InitVars = { +ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h index bf58b1e402..0f42435cab 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -19,6 +19,4 @@ typedef struct ArrowLight { } ArrowLight; // size = 0x164 -extern const ActorInit Arrow_Light_InitVars; - #endif // Z_ARROW_LIGHT_H diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index 29692839e8..dcf37d848e 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -23,7 +23,7 @@ void func_80C0A418(BgAstrBombwall* this, PlayState* play); void func_80C0A458(BgAstrBombwall* this, PlayState* play); void func_80C0A4BC(BgAstrBombwall* this, PlayState* play); -const ActorInit Bg_Astr_Bombwall_InitVars = { +ActorInit Bg_Astr_Bombwall_InitVars = { ACTOR_BG_ASTR_BOMBWALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h index 58b60b9445..4f42a8b3c3 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h @@ -15,6 +15,4 @@ typedef struct BgAstrBombwall { /* 0x180 */ ColliderTrisElement colliderElements[2]; /* 0x238 */ s16 cutscenes[1]; } BgAstrBombwall; -extern const ActorInit Bg_Astr_Bombwall_InitVars; - #endif // Z_BG_ASTR_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index dfa31a6a0c..a5168eb240 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -18,7 +18,7 @@ void BgBotihasira_Draw(Actor* thisx, PlayState* play); void BgBotihasira_DoNothing(BgBotihasira* this, PlayState* play); -const ActorInit Bg_Botihasira_InitVars = { +ActorInit Bg_Botihasira_InitVars = { ACTOR_BG_BOTIHASIRA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h index 529b5a904f..6cb290f659 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h @@ -13,6 +13,4 @@ typedef struct BgBotihasira { /* 0x160 */ ColliderCylinder collider; } BgBotihasira; // size = 0x1AC -extern const ActorInit Bg_Botihasira_InitVars; - #endif // Z_BG_BOTIHASIRA_H diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index ec9daab781..25f6d0a885 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -45,7 +45,7 @@ void func_808B7B54(Actor* thisx, PlayState* play); void func_808B7D34(Actor* thisx, PlayState* play); void BgBreakwall_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Breakwall_InitVars = { +ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(BgBreakwall), (ActorFunc)BgBreakwall_Init, (ActorFunc)NULL, (ActorFunc)BgBreakwall_Update, (ActorFunc)NULL, diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index 77c1b88089..bcdda23272 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -26,6 +26,4 @@ typedef struct BgBreakwall { /* 0x160 */ BgBreakwallActionFunc actionFunc; } BgBreakwall; // size = 0x164 -extern const ActorInit Bg_Breakwall_InitVars; - #endif // Z_BG_BREAKWALL_H diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index b3ebc982ed..da899ac26f 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -41,7 +41,7 @@ typedef enum { u8 sIsLoaded[32]; -const ActorInit Bg_Crace_Movebg_InitVars = { +ActorInit Bg_Crace_Movebg_InitVars = { ACTOR_BG_CRACE_MOVEBG, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h index fb24b10d39..8f3b1aabeb 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h @@ -38,6 +38,4 @@ typedef struct BgCraceMovebg { /* 0x188 */ Vec3f prevPlayerPos; } BgCraceMovebg; // size = 0x194 -extern const ActorInit Bg_Crace_Movebg_InitVars; - #endif // Z_BG_CRACE_MOVEBG_H 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 4922b4a6e2..68b2d77d2e 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 @@ -19,7 +19,7 @@ void BgCtowerGear_Draw(Actor* thisx, PlayState* play); void BgCtowerGear_UpdateOrgan(Actor* thisx, PlayState* play); void BgCtowerGear_DrawOrgan(Actor* thisx, PlayState* play); -const ActorInit Bg_Ctower_Gear_InitVars = { +ActorInit Bg_Ctower_Gear_InitVars = { ACTOR_BG_CTOWER_GEAR, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h index 952a13c4a9..afea1bf0d6 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h @@ -19,6 +19,4 @@ typedef struct BgCtowerGear { /* 0x000 */ DynaPolyActor dyna; } BgCtowerGear; // size = 0x15C -extern const ActorInit Bg_Ctower_Gear_InitVars; - #endif // Z_BG_CTOWER_GEAR_H 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 2ca48b346e..85dcb0aca7 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 @@ -21,7 +21,7 @@ void BgCtowerRot_DoorDoNothing(BgCtowerRot* this, PlayState* play); void BgCtowerRot_DoorIdle(BgCtowerRot* this, PlayState* play); void BgCtowerRot_SetupDoorClose(BgCtowerRot* this, PlayState* play); -const ActorInit Bg_Ctower_Rot_InitVars = { +ActorInit Bg_Ctower_Rot_InitVars = { ACTOR_BG_CTOWER_ROT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h index e8b83fa226..52a905ed56 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h @@ -21,6 +21,4 @@ typedef struct BgCtowerRot { /* 0x164 */ f32 timer; } BgCtowerRot; // size = 0x168 -extern const ActorInit Bg_Ctower_Rot_InitVars; - #endif // Z_BG_CTOWER_ROT_H diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index a998936ec5..a5d01fe657 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -15,7 +15,7 @@ void BgDanpeiMovebg_Destroy(Actor* thisx, PlayState* play); void BgDanpeiMovebg_Update(Actor* thisx, PlayState* play); #if 0 -const ActorInit Bg_Danpei_Movebg_InitVars = { +ActorInit Bg_Danpei_Movebg_InitVars = { ACTOR_BG_DANPEI_MOVEBG, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h index 1bdf179338..c99bb813fa 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h @@ -15,6 +15,4 @@ typedef struct BgDanpeiMovebg { /* 0x1CE */ char unk_1CE[0xA]; } BgDanpeiMovebg; // size = 0x1D8 -extern const ActorInit Bg_Danpei_Movebg_InitVars; - #endif // Z_BG_DANPEI_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index d7e1bef1f8..c962cf8efd 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -30,7 +30,7 @@ void func_80B83758(Actor* thisx, PlayState* play); AnimatedMaterial* D_80B83C70; AnimatedMaterial* D_80B83C74; -const ActorInit Bg_Dblue_Balance_InitVars = { +ActorInit Bg_Dblue_Balance_InitVars = { ACTOR_BG_DBLUE_BALANCE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h index 098f967703..f2200e96fe 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h @@ -44,6 +44,4 @@ typedef struct BgDblueBalance { /* 0x228 */ f32 unk_228; } BgDblueBalance; // size = 0x22C -extern const ActorInit Bg_Dblue_Balance_InitVars; - #endif // Z_BG_DBLUE_BALANCE_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index a945160f0a..a1d724b29e 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -16,7 +16,7 @@ void BgDblueElevator_Update(Actor* thisx, PlayState* play); void BgDblueElevator_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Bg_Dblue_Elevator_InitVars = { +ActorInit Bg_Dblue_Elevator_InitVars = { ACTOR_BG_DBLUE_ELEVATOR, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h index db6cba5b46..89a18dd0ca 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h @@ -14,6 +14,4 @@ typedef struct BgDblueElevator { /* 0x160 */ char unk_160[0x10]; } BgDblueElevator; // size = 0x170 -extern const ActorInit Bg_Dblue_Elevator_InitVars; - #endif // Z_BG_DBLUE_ELEVATOR_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index 203b404a89..31c0c387df 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -45,7 +45,7 @@ u8 D_80A2B870[][2] = { { 0x03, 0x03 }, { 0x03, 0x05 }, { 0x03, 0x01 }, { 0x03, 0x06 }, { 0x03, 0x02 }, { 0x03, 0x04 }, { 0x03, 0x00 }, }; -const ActorInit Bg_Dblue_Movebg_InitVars = { +ActorInit Bg_Dblue_Movebg_InitVars = { ACTOR_BG_DBLUE_MOVEBG, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h index 6b5351c2c2..8fc0165858 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h @@ -55,6 +55,4 @@ typedef struct BgDblueMovebg { /* 0x310 */ UNK_TYPE1 unk310[0x60]; } BgDblueMovebg; // size = 0x370 -extern const ActorInit Bg_Dblue_Movebg_InitVars; - #endif // Z_BG_DBLUE_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index a2fa18103d..b4c97fddef 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -25,7 +25,7 @@ void func_80B84BCC(BgDblueWaterfall* this, PlayState* play); void func_80B84EF0(BgDblueWaterfall* this, PlayState* play); void func_80B84F20(BgDblueWaterfall* this, PlayState* play); -const ActorInit Bg_Dblue_Waterfall_InitVars = { +ActorInit Bg_Dblue_Waterfall_InitVars = { ACTOR_BG_DBLUE_WATERFALL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h index c02b826195..5ab64495e2 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h @@ -28,6 +28,4 @@ typedef struct BgDblueWaterfall { /* 0x1A8 */ f32 unk_1A8; } BgDblueWaterfall; // size = 0x1AC -extern const ActorInit Bg_Dblue_Waterfall_InitVars; - #endif // Z_BG_DBLUE_WATERFALL_H diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index 87adddbde1..6ec845e2c2 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -24,7 +24,7 @@ void BgDkjailIvy_BeginCutscene(BgDkjailIvy* this, PlayState* play); void BgDkjailIvy_SetupFadeOut(BgDkjailIvy* this); void BgDkjailIvy_FadeOut(BgDkjailIvy* this, PlayState* play); -const ActorInit Bg_Dkjail_Ivy_InitVars = { +ActorInit Bg_Dkjail_Ivy_InitVars = { ACTOR_BG_DKJAIL_IVY, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h index edf87d662e..4835b7a0be 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h @@ -17,6 +17,4 @@ typedef struct BgDkjailIvy { /* 0x1AD */ u8 alpha; } BgDkjailIvy; // size = 0x1B0 -extern const ActorInit Bg_Dkjail_Ivy_InitVars; - #endif // Z_BG_DKJAIL_IVY_H diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index b1bdc822c8..332e4e5430 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -26,7 +26,7 @@ void func_80A0B8CC(BgDyYoseizo* this, PlayState* play); void func_80A0BB08(BgDyYoseizo* this, PlayState* play); #if 0 -const ActorInit Bg_Dy_Yoseizo_InitVars = { +ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index 5d9d847490..bd06cdb384 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -13,6 +13,4 @@ typedef struct BgDyYoseizo { /* 0x0148 */ char unk_148[0x33BC]; } BgDyYoseizo; // size = 0x3504 -extern const ActorInit Bg_Dy_Yoseizo_InitVars; - #endif // Z_BG_DY_YOSEIZO_H diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 4d2a8632ec..71aa958dc7 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -26,7 +26,7 @@ void func_80BC44F4(BgF40Block* this, PlayState* play); void func_80BC4530(BgF40Block* this, PlayState* play); void func_80BC457C(BgF40Block* this, PlayState* play); -const ActorInit Bg_F40_Block_InitVars = { +ActorInit Bg_F40_Block_InitVars = { ACTOR_BG_F40_BLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h index df21bf9336..37a5c360e1 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h @@ -19,6 +19,4 @@ typedef struct BgF40Block { /* 0x16C */ BgF40BlockActionFunc actionFunc; } BgF40Block; // size = 0x170 -extern const ActorInit Bg_F40_Block_InitVars; - #endif // Z_BG_F40_BLOCK_H diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index 3974b2fc53..4ae6a8ed7d 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -19,7 +19,7 @@ void BgF40Flift_Draw(Actor* thisx, PlayState* play); void func_808D75F0(BgF40Flift* this, PlayState* play); void func_808D7714(BgF40Flift* this, PlayState* play); -const ActorInit Bg_F40_Flift_InitVars = { +ActorInit Bg_F40_Flift_InitVars = { ACTOR_BG_F40_FLIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h index 95b2e9073a..4bdb16e3ec 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h @@ -13,6 +13,4 @@ typedef struct BgF40Flift { /* 0x160 */ s32 timer; } BgF40Flift; // size = 0x164 -extern const ActorInit Bg_F40_Flift_InitVars; - #endif // Z_BG_F40_FLIFT_H diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 7838dadb75..3a7916e7d3 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -24,7 +24,7 @@ void BgF40Switch_Press(BgF40Switch* this, PlayState* play); void BgF40Switch_WaitToPress(BgF40Switch* this, PlayState* play); void BgF40Switch_IdleUnpressed(BgF40Switch* this, PlayState* play); -const ActorInit Bg_F40_Switch_InitVars = { +ActorInit Bg_F40_Switch_InitVars = { ACTOR_BG_F40_SWITCH, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h index b0fe89341a..cfa8c54623 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h @@ -20,6 +20,4 @@ typedef struct BgF40Switch { /* 0x164 */ BgF40SwitchActionFunc actionFunc; } BgF40Switch; // size = 0x168 -extern const ActorInit Bg_F40_Switch_InitVars; - #endif // Z_BG_F40_SWITCH_H diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 16b39cdd3c..97fd3f068e 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -16,7 +16,7 @@ void BgF40Swlift_Update(Actor* thisx, PlayState* play); void BgF40Swlift_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Bg_F40_Swlift_InitVars = { +ActorInit Bg_F40_Swlift_InitVars = { ACTOR_BG_F40_SWLIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h index 48a369e305..a687fc642a 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h @@ -10,6 +10,4 @@ typedef struct BgF40Swlift { /* 0x144 */ char unk_144[0x1C]; } BgF40Swlift; // size = 0x160 -extern const ActorInit Bg_F40_Swlift_InitVars; - #endif // Z_BG_F40_SWLIFT_H diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index 0d47e0d5a3..63563f5f00 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -21,7 +21,7 @@ void func_809AC638(BgFireWall* this, PlayState* play); void func_809AC68C(BgFireWall* this, PlayState* play); void func_809AC6C0(BgFireWall* this, PlayState* play); -const ActorInit Bg_Fire_Wall_InitVars = { +ActorInit Bg_Fire_Wall_InitVars = { ACTOR_BG_FIRE_WALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h index 018e9f5f12..3c8eb19826 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h @@ -21,6 +21,4 @@ typedef struct BgFireWall { /* 0x164 */ ColliderCylinder collider; } BgFireWall; // size = 0x1B0 -extern const ActorInit Bg_Fire_Wall_InitVars; - #endif // Z_BG_FIRE_WALL_H 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 a98025524c..40a981a6ec 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 @@ -16,7 +16,7 @@ void BgFuKaiten_Destroy(Actor* thisx, PlayState* play); void BgFuKaiten_Update(Actor* thisx, PlayState* play); void BgFuKaiten_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Fu_Kaiten_InitVars = { +ActorInit Bg_Fu_Kaiten_InitVars = { ACTOR_BG_FU_KAITEN, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h index 6937fbf534..b09083519a 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h @@ -15,6 +15,4 @@ typedef struct BgFuKaiten { /* 0x16C */ s16 bounce; } BgFuKaiten; // size = 0x170 -extern const ActorInit Bg_Fu_Kaiten_InitVars; - #endif // Z_BG_FU_KAITEN_H diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index c485927ce0..5cb3372387 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -16,7 +16,7 @@ void BgFuMizu_Destroy(Actor* thisx, PlayState* play); void BgFuMizu_Update(Actor* thisx, PlayState* play); void BgFuMizu_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Fu_Mizu_InitVars = { +ActorInit Bg_Fu_Mizu_InitVars = { ACTOR_BG_FU_MIZU, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h index 89b1df3236..d17f64638b 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h @@ -11,6 +11,4 @@ typedef struct BgFuMizu { /* 0x160 */ s16 unk_160; } BgFuMizu; // size = 0x164 -extern const ActorInit Bg_Fu_Mizu_InitVars; - #endif // Z_BG_FU_MIZU_H 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 fbae48df28..cfd9003ec3 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 @@ -23,7 +23,7 @@ void BgGoronOyu_UpdateWaterBoxInfo(BgGoronOyu* this, PlayState* play); void BgGoronOyu_SpawnEffects(BgGoronOyu* this, PlayState* play); void func_80B40160(BgGoronOyu* this, PlayState* play); -const ActorInit Bg_Goron_Oyu_InitVars = { +ActorInit Bg_Goron_Oyu_InitVars = { ACTOR_BG_GORON_OYU, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 79dd09935b..07a42fce83 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -24,7 +24,7 @@ void BgHakaBombwall_PlayCutscene(BgHakaBombwall* this, PlayState* play); void BgHakaBombwall_SetupEndCutscene(BgHakaBombwall* this); void BgHakaBombwall_EndCutscene(BgHakaBombwall* this, PlayState* play); -const ActorInit Bg_Haka_Bombwall_InitVars = { +ActorInit Bg_Haka_Bombwall_InitVars = { ACTOR_BG_HAKA_BOMBWALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h index 6a37e36254..9e5bd1c43f 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h @@ -16,6 +16,4 @@ typedef struct BgHakaBombwall { /* 0x1AC */ s8 csTimer; } BgHakaBombwall; // size = 0x1B0 -extern const ActorInit Bg_Haka_Bombwall_InitVars; - #endif // Z_BG_HAKA_BOMBWALL_H 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 cc90ccd947..412ea3a395 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 @@ -26,7 +26,7 @@ void func_80B6DD9C(BgHakaCurtain* this, PlayState* play); void func_80B6DEA8(BgHakaCurtain* this, PlayState* play); void func_80B6DE80(BgHakaCurtain* this); -const ActorInit Bg_Haka_Curtain_InitVars = { +ActorInit Bg_Haka_Curtain_InitVars = { ACTOR_BG_HAKA_CURTAIN, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h index 4b5e564b28..ab5ec0e89e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h @@ -12,6 +12,4 @@ typedef struct BgHakaCurtain { /* 0x15C */ BgHakaCurtainActionFunc actionFunc; } BgHakaCurtain; // size = 0x160 -extern const ActorInit Bg_Haka_Curtain_InitVars; - #endif // Z_BG_HAKA_CURTAIN_H 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 8d48168a6a..a8d63c309f 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 @@ -23,7 +23,7 @@ void func_80BD6768(BgHakaTomb* this, PlayState* play); void BgHakaTomb_SetupDoNothing(BgHakaTomb* this); void BgHakaTomb_DoNothing(BgHakaTomb* this, PlayState* play); -const ActorInit Bg_Haka_Tomb_InitVars = { +ActorInit Bg_Haka_Tomb_InitVars = { ACTOR_BG_HAKA_TOMB, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h index c1cefddc8b..3c607e0e25 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h @@ -13,6 +13,4 @@ typedef struct BgHakaTomb { /* 0x160 */ s16 cutscenes[1]; } BgHakaTomb; // size = 0x164 -extern const ActorInit Bg_Haka_Tomb_InitVars; - #endif // Z_BG_HAKA_TOMB_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 3a603868fb..bde3c85407 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -26,7 +26,7 @@ void func_80ABCCE4(BgHakuginBombwall* this, PlayState* play); void func_80ABCD98(BgHakuginBombwall* this, PlayState* play); void func_80ABCE60(BgHakuginBombwall* this, PlayState* play); -const ActorInit Bg_Hakugin_Bombwall_InitVars = { +ActorInit Bg_Hakugin_Bombwall_InitVars = { ACTOR_BG_HAKUGIN_BOMBWALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h index f849b356f1..24b04139e0 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h @@ -19,6 +19,4 @@ typedef struct BgHakuginBombwall { /* 0x1AC */ s32 unk_1AC; } BgHakuginBombwall; // size = 0x1B0 -extern const ActorInit Bg_Hakugin_Bombwall_InitVars; - #endif // Z_BG_HAKUGIN_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 8100c62056..0b8d2490b5 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -18,7 +18,7 @@ void BgHakuginElvpole_Draw(Actor* thisx, PlayState* play); void func_80ABD92C(BgHakuginElvpole* this, PlayState* play); -const ActorInit Bg_Hakugin_Elvpole_InitVars = { +ActorInit Bg_Hakugin_Elvpole_InitVars = { ACTOR_BG_HAKUGIN_ELVPOLE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h index b8316a4e65..ace71e7b30 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h @@ -17,6 +17,4 @@ typedef struct BgHakuginElvpole { /* 0x164 */ BgHakuginElvpoleActionFunc actionFunc; } BgHakuginElvpole; // size = 0x168 -extern const ActorInit Bg_Hakugin_Elvpole_InitVars; - #endif // Z_BG_HAKUGIN_ELVPOLE_H 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 309e243556..7f77b66453 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 @@ -39,7 +39,7 @@ void func_80A9D61C(Actor* thisx, PlayState* play); BgHakuginPostColliders D_80A9DDC0; BgHakuginPostUnkStruct D_80A9E028; -const ActorInit Bg_Hakugin_Post_InitVars = { +ActorInit Bg_Hakugin_Post_InitVars = { ACTOR_BG_HAKUGIN_POST, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h index 8e702a0063..5a23fa070b 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h @@ -70,6 +70,4 @@ typedef struct BgHakuginPost { /* 0x186 */ s16 unk_186; } BgHakuginPost; // size = 0x188 -extern const ActorInit Bg_Hakugin_Post_InitVars; - #endif // Z_BG_HAKUGIN_POST_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 0498dc2ee5..aa22dd8af8 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -38,7 +38,7 @@ void func_80B165E0(BgHakuginSwitch* this, PlayState* play); u32 D_80B16AF0; -const ActorInit Bg_Hakugin_Switch_InitVars = { +ActorInit Bg_Hakugin_Switch_InitVars = { ACTOR_BG_HAKUGIN_SWITCH, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h index 74757f8369..164220b29e 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h @@ -32,6 +32,4 @@ typedef struct BgHakuginSwitch { /* 0x1C8 */ f32 unk_1C8; } BgHakuginSwitch; // size = 0x1CC -extern const ActorInit Bg_Hakugin_Switch_InitVars; - #endif // Z_BG_HAKUGIN_SWITCH_H diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index ecdd861aa0..265490e52b 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -23,7 +23,7 @@ void func_80AC4D2C(BgIcefloe* this, PlayState* play); void func_80AC4C34(BgIcefloe* this, PlayState* play); void func_80AC4CF0(BgIcefloe* this); -const ActorInit Bg_Icefloe_InitVars = { +ActorInit Bg_Icefloe_InitVars = { ACTOR_BG_ICEFLOE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h index 91c007d262..0278089cf9 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h @@ -13,6 +13,4 @@ typedef struct BgIcefloe { /* 0x160 */ s32 timer; } BgIcefloe; // size = 0x164 -extern const ActorInit Bg_Icefloe_InitVars; - #endif // Z_BG_ICEFLOE_H 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 6c9fa12de6..7432136529 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = { { 13, 120, 0, { 0, 0, 0 } }, }; -const ActorInit Bg_Icicle_InitVars = { +ActorInit Bg_Icicle_InitVars = { ACTOR_BG_ICICLE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h index 20450f9299..b8f432458c 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h @@ -23,6 +23,4 @@ typedef struct BgIcicle { /* 0x164 */ ColliderCylinder collider; } BgIcicle; // size = 0x1B0 -extern const ActorInit Bg_Icicle_InitVars; - #endif // Z_BG_ICICLE_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 689dcd76c3..9d249314a5 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -25,7 +25,7 @@ void func_80B7F360(BgIkanaBlock* this); void func_80B7F398(BgIkanaBlock* this, PlayState* play); void func_80B7F564(Actor* thisx, PlayState* play); -const ActorInit Bg_Ikana_Block_InitVars = { +ActorInit Bg_Ikana_Block_InitVars = { ACTOR_BG_IKANA_BLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h index 5c5281911d..416a1c2dc1 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h @@ -24,6 +24,4 @@ typedef struct BgIkanaBlock { /* 0x17F */ s8 unk_17F; } BgIkanaBlock; // size = 0x180 -extern const ActorInit Bg_Ikana_Block_InitVars; - #endif // Z_BG_IKANA_BLOCK_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index 3144b599c2..7dbe579a07 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -25,7 +25,7 @@ void func_80BD503C(BgIkanaBombwall* this, PlayState* play); void func_80BD5118(BgIkanaBombwall* this); void func_80BD5134(BgIkanaBombwall* this, PlayState* play); -const ActorInit Bg_Ikana_Bombwall_InitVars = { +ActorInit Bg_Ikana_Bombwall_InitVars = { ACTOR_BG_IKANA_BOMBWALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h index da11bcfea4..e9ff850ada 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h @@ -17,6 +17,4 @@ typedef struct BgIkanaBombwall { /* 0x1AC */ s8 unk_1AC; } BgIkanaBombwall; // size = 0x1B0 -extern const ActorInit Bg_Ikana_Bombwall_InitVars; - #endif // Z_BG_IKANA_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index 35727c0c16..678080ae16 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -24,7 +24,7 @@ void BgIkanaDharma_StartCutscene(BgIkanaDharma* this, PlayState* play); void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this); void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, PlayState* play); -const ActorInit Bg_Ikana_Dharma_InitVars = { +ActorInit Bg_Ikana_Dharma_InitVars = { ACTOR_BG_IKANA_DHARMA, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h index 4642a43694..ac1bcadf0e 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h @@ -19,6 +19,4 @@ typedef struct BgIkanaDharma { /* 0x1AC */ s8 cutsceneFramesRemaining; } BgIkanaDharma; // size = 0x1B0 -extern const ActorInit Bg_Ikana_Dharma_InitVars; - #endif // Z_BG_IKANA_DHARMA_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index 11734b2843..c7e61cad77 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -26,7 +26,7 @@ void BgIkanaMirror_Wait(BgIkanaMirror* this, PlayState* play); void BgIkanaMirror_SetupEmitLight(BgIkanaMirror* this); void BgIkanaMirror_EmitLight(BgIkanaMirror* this, PlayState* play); -const ActorInit Bg_Ikana_Mirror_InitVars = { +ActorInit Bg_Ikana_Mirror_InitVars = { ACTOR_BG_IKANA_MIRROR, ACTORCAT_PROP, FLAGS, 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 f4d9648172..6a08ba1014 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 @@ -21,7 +21,7 @@ void BgIkanaRay_UpdateCheckForActivation(BgIkanaRay* this, PlayState* play); void BgIkanaRay_SetActivated(BgIkanaRay* this); void BgIkanaRay_UpdateActivated(BgIkanaRay* this, PlayState* play); -const ActorInit Bg_Ikana_Ray_InitVars = { +ActorInit Bg_Ikana_Ray_InitVars = { ACTOR_BG_IKANA_RAY, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h index 9aa4f89d4a..79d406fde3 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h @@ -16,6 +16,4 @@ typedef struct BgIkanaRay { /* 0x194 */ BgIkanaRayActionFunc actionFunc; } BgIkanaRay; // size = 0x198 -extern const ActorInit Bg_Ikana_Ray_InitVars; - #endif // Z_BG_IKANA_RAY_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index fb29ca2bba..a979ac08ec 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -34,7 +34,7 @@ void func_80B81BA0(Actor* thisx, PlayState* play); void func_80B81DAC(BgIkanaRotaryroom* this); void func_80B81DC8(Actor* thisx, PlayState* play); -const ActorInit Bg_Ikana_Rotaryroom_InitVars = { +ActorInit Bg_Ikana_Rotaryroom_InitVars = { ACTOR_BG_IKANA_ROTARYROOM, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h index 89021fa541..4184220e01 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h @@ -49,6 +49,4 @@ typedef struct BgIkanaRotaryroom { /* 0x584 */ s16 unk_584; } BgIkanaRotaryroom; // size = 0x588 -extern const ActorInit Bg_Ikana_Rotaryroom_InitVars; - #endif // Z_BG_IKANA_ROTARYROOM_H 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 b3da7b2bf8..a7ba89cdc6 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 @@ -36,7 +36,7 @@ void func_80BD5BD8(BgIkanaShutter* this, PlayState* play); void BgIkanaShutter_SetupDoNothing(BgIkanaShutter* this); void BgIkanaShutter_DoNothing(BgIkanaShutter* this, PlayState* play); -const ActorInit Bg_Ikana_Shutter_InitVars = { +ActorInit Bg_Ikana_Shutter_InitVars = { ACTOR_BG_IKANA_SHUTTER, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h index 1d39f3593a..0943346006 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h @@ -12,6 +12,4 @@ typedef struct BgIkanaShutter { /* 0x15C */ BgIkanaShutterActionFunc actionFunc; } BgIkanaShutter; // size = 0x160 -extern const ActorInit Bg_Ikana_Shutter_InitVars; - #endif // Z_BG_IKANA_SHUTTER_H 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 61e022b629..f9a9fcc379 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 @@ -29,7 +29,7 @@ void func_80C0AD44(BgIkninSusceil* this); void func_80C0AD64(BgIkninSusceil* this, PlayState* play); void func_80C0AE5C(BgIkninSusceil* this, PlayState* play); -const ActorInit Bg_Iknin_Susceil_InitVars = { +ActorInit Bg_Iknin_Susceil_InitVars = { ACTOR_BG_IKNIN_SUSCEIL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h index 8fc32bd068..2fa153ac0a 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h @@ -19,6 +19,4 @@ typedef struct BgIkninSusceil { /* 0x16A */ UNK_TYPE2 unk16A; } BgIkninSusceil; // size = 0x16C -extern const ActorInit Bg_Iknin_Susceil_InitVars; - #endif // Z_BG_IKNIN_SUSCEIL_H diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index c911eeea94..6016b2e443 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -18,7 +18,7 @@ void BgIkninside_Draw(Actor* thisx, PlayState* play); void func_80C072D0(BgIkninside* this, PlayState* play); -const ActorInit Bg_Ikninside_InitVars = { +ActorInit Bg_Ikninside_InitVars = { ACTOR_BG_IKNINSIDE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index e5a5dbc916..9d11c6a6fc 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -27,7 +27,7 @@ void func_80BD7820(Actor* thisx, PlayState* play); void func_80BD78C4(Actor* thisx, PlayState* play); void func_80BD7538(Actor* thisx, PlayState* play); -const ActorInit Bg_Iknv_Doukutu_InitVars = { +ActorInit Bg_Iknv_Doukutu_InitVars = { ACTOR_BG_IKNV_DOUKUTU, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h index d9c4f78ada..f363938697 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h @@ -23,6 +23,4 @@ typedef struct BgIknvDoukutu { /* 0x164 */ BgIknvDoukutuActionFunc actionFunc; } BgIknvDoukutu;// size = 0x168 -extern const ActorInit Bg_Iknv_Doukutu_InitVars; - #endif // Z_BG_IKNV_DOUKUTU_H 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 59fd2f340d..4add85012a 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 @@ -21,7 +21,7 @@ void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, PlayState* play); void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, PlayState* play); void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, PlayState* play); -const ActorInit Bg_Iknv_Obj_InitVars = { +ActorInit Bg_Iknv_Obj_InitVars = { ACTOR_BG_IKNV_OBJ, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h index 333b9d59e3..a5c01165d5 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h @@ -22,6 +22,4 @@ typedef enum { /* 2 */ IKNV_OBJ_SAKON_DOOR, // door to Sakon's Hideout } BgIknvObjType; -extern const ActorInit Bg_Iknv_Obj_InitVars; - #endif // Z_BG_IKNV_OBJ_H diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index cdbd18e7fc..911eb92435 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -26,7 +26,7 @@ void func_809542A0(BgIngate* this, PlayState* play); void func_80954340(BgIngate* this, PlayState* play); void func_809543D4(BgIngate* this, PlayState* play); -const ActorInit Bg_Ingate_InitVars = { +ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index b38ce2eeb4..cc0befd194 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -26,6 +26,4 @@ typedef struct BgIngate { /* 0x18C */ s32 timePathElapsedTime; } BgIngate; // size = 0x190 -extern const ActorInit Bg_Ingate_InitVars; - #endif // Z_BG_INGATE_H 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 68c432c5f4..1b1deb6c28 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 @@ -15,7 +15,7 @@ void BgInibsMovebg_Init(Actor* thisx, PlayState* play); void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play); void BgInibsMovebg_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Inibs_Movebg_InitVars = { +ActorInit Bg_Inibs_Movebg_InitVars = { ACTOR_BG_INIBS_MOVEBG, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h index 629a5cd036..03ea34fc9e 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h @@ -14,6 +14,4 @@ typedef struct BgInibsMovebg { /* 0x164 */ AnimatedMaterial* sandTexAnim; } BgInibsMovebg; // size = 0x168 -extern const ActorInit Bg_Inibs_Movebg_InitVars; - #endif // Z_BG_INIBS_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 63ef9d3699..12bfc0f3c2 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -20,7 +20,7 @@ void func_80A5389C(BgKeikokuSaku* this, PlayState* play); void func_80A538E0(BgKeikokuSaku* this, PlayState* play); void func_80A53994(BgKeikokuSaku* this, PlayState* play); -const ActorInit Bg_Keikoku_Saku_InitVars = { +ActorInit Bg_Keikoku_Saku_InitVars = { ACTOR_BG_KEIKOKU_SAKU, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h index c39994d779..6a3bad9c87 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h @@ -16,6 +16,4 @@ typedef struct BgKeikokuSaku { /* 0x162 */ s16 timer; } BgKeikokuSaku; // Size = 0x164 -extern const ActorInit Bg_Keikoku_Saku_InitVars; - #endif // Z_BG_KEIKOKU_SAKU_H 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 f54564e2df..8afd5d7307 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 @@ -16,7 +16,7 @@ void BgKeikokuSpr_Destroy(Actor* thisx, PlayState* play); void BgKeikokuSpr_Update(Actor* thisx, PlayState* play); void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Keikoku_Spr_InitVars = { +ActorInit Bg_Keikoku_Spr_InitVars = { ACTOR_BG_KEIKOKU_SPR, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h index ca72665b8e..9686a44a1b 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h @@ -9,6 +9,4 @@ typedef struct BgKeikokuSpr { /* 0x000 */ Actor actor; } BgKeikokuSpr; // size = 0x144 -extern const ActorInit Bg_Keikoku_Spr_InitVars; - #endif // Z_BG_KEIKOKU_SPR_H 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 34aba7769f..dfb22deee0 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 @@ -27,7 +27,7 @@ void BgKin2Fence_RaiseFence(BgKin2Fence* this, PlayState* play); void BgKin2Fence_SetupDoNothing(BgKin2Fence* this); void BgKin2Fence_DoNothing(BgKin2Fence* this, PlayState* play); -const ActorInit Bg_Kin2_Fence_InitVars = { +ActorInit Bg_Kin2_Fence_InitVars = { ACTOR_BG_KIN2_FENCE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h index 00d08b85f9..98bb51243d 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h @@ -17,6 +17,4 @@ typedef struct BgKin2Fence { /* 0x282 */ s8 waitBeforeOpenTimer; } BgKin2Fence; // size = 0x284 -extern const ActorInit Bg_Kin2_Fence_InitVars; - #endif // Z_BG_KIN2_FENCE_H diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 39c72a108d..5892376ba1 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -27,7 +27,7 @@ void BgKin2Picture_Fall(BgKin2Picture* this, PlayState* play); void BgKin2Picture_SetupDoNothing(BgKin2Picture* this); void BgKin2Picture_DoNothing(BgKin2Picture* this, PlayState* play); -const ActorInit Bg_Kin2_Picture_InitVars = { +ActorInit Bg_Kin2_Picture_InitVars = { ACTOR_BG_KIN2_PICTURE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index dde66e6204..6c30347ef4 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -23,7 +23,7 @@ void func_80B70230(BgKin2Shelf* this, PlayState* play); void func_80B70498(BgKin2Shelf* this); void func_80B704B4(BgKin2Shelf* this, PlayState* play); -const ActorInit Bg_Kin2_Shelf_InitVars = { +ActorInit Bg_Kin2_Shelf_InitVars = { ACTOR_BG_KIN2_SHELF, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h index ce88b25e0b..bd5180c345 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h @@ -19,6 +19,4 @@ typedef struct BgKin2Shelf { /* 0x167 */ s8 unk_167; } BgKin2Shelf; // size = 0x168 -extern const ActorInit Bg_Kin2_Shelf_InitVars; - #endif // Z_BG_KIN2_SHELF_H 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 12a6030461..f766fef784 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -20,7 +20,7 @@ void BgLadder_StartCutscene(BgLadder* this, PlayState* play); void BgLadder_FadeIn(BgLadder* this, PlayState* play); void BgLadder_DoNothing(BgLadder* this, PlayState* play); -const ActorInit Bg_Ladder_InitVars = { +ActorInit Bg_Ladder_InitVars = { ACTOR_BG_LADDER, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h index c53a803521..e4cd15c153 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h @@ -24,6 +24,4 @@ typedef enum { /* 3 */ LADDER_SIZE_24RUNG, } BgLadderSize; -extern const ActorInit Bg_Ladder_InitVars; - #endif // Z_BG_LADDER_H diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index 65157403d9..d704adf861 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -37,7 +37,7 @@ void func_80C18884(BgLastBwall* this, PlayState* play); void func_80C188C4(BgLastBwall* this, PlayState* play); void BgLastBwall_DoNothing(BgLastBwall* this, PlayState* play); -const ActorInit Bg_Last_Bwall_InitVars = { +ActorInit Bg_Last_Bwall_InitVars = { ACTOR_BG_LAST_BWALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h index d24b8ba421..3fafc71ea5 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h @@ -25,6 +25,4 @@ typedef struct BgLastBwall { /* 0x23A */ s16 cutscenes[1]; } BgLastBwall; // size = 0x23C -extern const ActorInit Bg_Last_Bwall_InitVars; - #endif // Z_BG_LAST_BWALL_H 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 35d61af5e9..75e7b9e328 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -15,7 +15,7 @@ void BgLbfshot_Init(Actor* thisx, PlayState* play); void BgLbfshot_Destroy(Actor* thisx, PlayState* play); void BgLbfshot_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Lbfshot_InitVars = { +ActorInit Bg_Lbfshot_InitVars = { ACTOR_BG_LBFSHOT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h index 069bfa0489..2874a2d139 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h @@ -10,6 +10,4 @@ typedef struct BgLbfshot { /* 0x15C */ UNK_TYPE1 pad15C[0x4]; } BgLbfshot; // size = 0x160 -extern const ActorInit Bg_Lbfshot_InitVars; - #endif // Z_BG_LBFSHOT_H 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 72a38b21b3..20be54a2f3 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -20,7 +20,7 @@ void BgLotus_Wait(BgLotus* this, PlayState* play); void BgLotus_Sink(BgLotus* this, PlayState* play); void BgLotus_WaitToAppear(BgLotus* this, PlayState* play); -const ActorInit Bg_Lotus_InitVars = { +ActorInit Bg_Lotus_InitVars = { ACTOR_BG_LOTUS, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h index a4d8f2ebbc..540c21b0e0 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h @@ -16,6 +16,4 @@ typedef struct BgLotus { /* 0x168 */ s16 timer2; } BgLotus; // size = 0x16C -extern const ActorInit Bg_Lotus_InitVars; - #endif // Z_BG_LOTUS_H 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 f2f5ef8703..44d797b8ea 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 @@ -14,7 +14,7 @@ void BgMarketStep_Init(Actor* thisx, PlayState* play); void BgMarketStep_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Market_Step_InitVars = { +ActorInit Bg_Market_Step_InitVars = { ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS, OBJECT_MARKET_OBJ, sizeof(BgMarketStep), (ActorFunc)BgMarketStep_Init, (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)BgMarketStep_Draw, diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h index c779b227ac..9a957b7422 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h @@ -11,6 +11,4 @@ typedef struct BgMarketStep { /* 0x000 */ Actor actor; } BgMarketStep; // size = 0x144 -extern const ActorInit Bg_Market_Step_InitVars; - #endif // Z_BG_MARKET_STEP_H 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 f81e536110..305c3084ed 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 @@ -16,7 +16,7 @@ void BgMbarChair_Destroy(Actor* thisx, PlayState* play); void BgMbarChair_Update(Actor* thisx, PlayState* play); void BgMbarChair_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Mbar_Chair_InitVars = { +ActorInit Bg_Mbar_Chair_InitVars = { ACTOR_BG_MBAR_CHAIR, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h index ee4854d073..0d93264647 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h @@ -9,6 +9,4 @@ typedef struct BgMbarChair { /* 0x000 */ DynaPolyActor dyna; } BgMbarChair; // size = 0x15C -extern const ActorInit Bg_Mbar_Chair_InitVars; - #endif // Z_BG_MBAR_CHAIR_H diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 1605d6bc0e..2a5d449296 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -30,7 +30,7 @@ void BgNumaHana_RaiseFlower(BgNumaHana* this, PlayState* play); void BgNumaHana_SetupOpenedIdle(BgNumaHana* this); void BgNumaHana_OpenedIdle(BgNumaHana* this, PlayState* play); -const ActorInit Bg_Numa_Hana_InitVars = { +ActorInit Bg_Numa_Hana_InitVars = { ACTOR_BG_NUMA_HANA, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h index e715b5c09d..fd71577cd8 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h @@ -40,6 +40,4 @@ typedef struct BgNumaHana { /* 0x33E */ s16 transitionTimer; } BgNumaHana; // size = 0x340 -extern const ActorInit Bg_Numa_Hana_InitVars; - #endif // Z_BG_NUMA_HANA_H diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index 6504ec00e2..1b45578c1d 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -27,7 +27,7 @@ typedef enum { /* 0x2 */ BGOPENSHUTTER_DOOR_CLOSED, } BGOpenShutterDoorState; -const ActorInit Bg_Open_Shutter_InitVars = { +ActorInit Bg_Open_Shutter_InitVars = { ACTOR_BG_OPEN_SHUTTER, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h index fdf2791e13..f6c6067d4b 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h @@ -16,6 +16,4 @@ typedef struct BgOpenShutter { /* 0x164 */ s32 unk_164; } BgOpenShutter; // size = 0x168 -extern const ActorInit Bg_Open_Shutter_InitVars; - #endif // Z_BG_OPEN_SHUTTER_H diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index 0f800f97ba..dbe935b3fc 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -16,7 +16,7 @@ void BgOpenSpot_Destroy(Actor* thisx, PlayState* play); void BgOpenSpot_Update(Actor* thisx, PlayState* play); void BgOpenSpot_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Open_Spot_InitVars = { +ActorInit Bg_Open_Spot_InitVars = { ACTOR_BG_OPEN_SPOT, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h index 3a2b92125c..0cc4d55b9c 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h @@ -10,6 +10,4 @@ typedef struct BgOpenSpot { /* 0x144 */ AnimatedMaterial* texScrolls; } BgOpenSpot; // size = 0x148 -extern const ActorInit Bg_Open_Spot_InitVars; - #endif // Z_BG_OPEN_SPOT_H diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index 77490aef1f..8edd322baa 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -24,7 +24,7 @@ void BgSinkaiKabe_Update(Actor* thisx, PlayState* play); void BgSinkaiKabe_WaitForPlayer(BgSinkaiKabe* this, PlayState* play); -const ActorInit Bg_Sinkai_Kabe_InitVars = { +ActorInit Bg_Sinkai_Kabe_InitVars = { ACTOR_BG_SINKAI_KABE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h index bc39da0ee1..abb341797b 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h @@ -17,6 +17,4 @@ typedef struct BgSinkaiKabe { /* 0x16C */ s32 pythonIndex; } BgSinkaiKabe; // size = 0x170 -extern const ActorInit Bg_Sinkai_Kabe_InitVars; - #endif // Z_BG_SINKAI_KABE_H diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 2a7096de92..d8885a829d 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -24,7 +24,7 @@ void func_809CEBC0(BgSpdweb* this, PlayState* play); void func_809CEE74(BgSpdweb* this); void func_809CEEAC(BgSpdweb* this, PlayState* play); -const ActorInit Bg_Spdweb_InitVars = { +ActorInit Bg_Spdweb_InitVars = { ACTOR_BG_SPDWEB, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h index 64a6fd34b0..c57353ce0e 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h @@ -24,6 +24,4 @@ typedef struct BgSpdweb { /* 0x2F8 */ Vec3s* unk_2F8; } BgSpdweb; // size = 0x2FC -extern const ActorInit Bg_Spdweb_InitVars; - #endif // Z_BG_SPDWEB_H diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index 055598c002..fdf56d87cc 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -22,7 +22,7 @@ void func_80A60CDC(BgSpoutFire* this, PlayState* play); void func_80A60D10(BgSpoutFire* this, PlayState* play); void func_80A60E08(BgSpoutFire* this, PlayState* play); -const ActorInit Bg_Spout_Fire_InitVars = { +ActorInit Bg_Spout_Fire_InitVars = { ACTOR_BG_SPOUT_FIRE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h index 808b720617..5cbf36a054 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h @@ -15,6 +15,4 @@ typedef struct BgSpoutFire { /* 0x14C */ ColliderCylinder collider; } BgSpoutFire; // size = 0x198 -extern const ActorInit Bg_Spout_Fire_InitVars; - #endif // Z_BG_SPOUT_FIRE_H 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 b2b1807016..a4256de8f4 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -16,7 +16,7 @@ void BgTobira01_Destroy(Actor* thisx, PlayState* play); void BgTobira01_Update(Actor* thisx, PlayState* play); void BgTobira01_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Tobira01_InitVars = { +ActorInit Bg_Tobira01_InitVars = { ACTOR_BG_TOBIRA01, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h index 559ea6351d..14a5e1b8e1 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h @@ -17,6 +17,4 @@ typedef struct BgTobira01 { /* 0x16C */ s32 unk_16C; // unused besides being set to 0 } BgTobira01; // size = 0x170 -extern const ActorInit Bg_Tobira01_InitVars; - #endif // Z_BG_TOBIRA01_H diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 614738b9ff..479239f055 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -18,7 +18,7 @@ void BgUmajump_Draw(Actor* thisx, PlayState* play); void func_8091A5A0(Actor* thisx, PlayState* play); -const ActorInit Bg_Umajump_InitVars = { +ActorInit Bg_Umajump_InitVars = { ACTOR_BG_UMAJUMP, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h index 733bf77da3..62aaf6cb71 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h @@ -30,6 +30,4 @@ typedef struct BgUmajump { /* 0x168 */ Actor* horse; } BgUmajump; // size = 0x16C -extern const ActorInit Bg_Umajump_InitVars; - #endif // Z_BG_UMAJUMP_H diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 40800569fc..8d13ab6d32 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -234,7 +234,7 @@ static ColliderCylinderInit D_809D7CA0 = { { 8, 15, 10, { 0, 0, 0 } }, }; -const ActorInit Boss_01_InitVars = { +ActorInit Boss_01_InitVars = { ACTOR_BOSS_01, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.h b/src/overlays/actors/ovl_Boss_01/z_boss_01.h index 3d874a01fd..37c8d4b006 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.h +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.h @@ -14,6 +14,4 @@ typedef struct Boss01 { /* 0x468 */ char unk_468[0x674]; } Boss01; // size = 0xADC -extern const ActorInit Boss_01_InitVars; - #endif // Z_BOSS_01_H 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 896bf99ae2..8ab8b2651e 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -112,7 +112,7 @@ static DamageTable sRedTwinmoldDamageTable = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit Boss_02_InitVars = { +ActorInit Boss_02_InitVars = { ACTOR_BOSS_02, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.h b/src/overlays/actors/ovl_Boss_02/z_boss_02.h index 17028912b7..e7efc1199b 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.h +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.h @@ -108,6 +108,4 @@ typedef struct Boss02 { /* 0x1D7E */ s16 unk_1D7E; } Boss02; // size = 0x1D80 -extern const ActorInit Boss_02_InitVars; - #endif // Z_BOSS_02_H diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index e4d397f225..a4c58e71dd 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -278,7 +278,7 @@ Actor* Boss03_FindActorDblueMovebg(PlayState* play) { /* Start of Gyorg's Init and actionFuncs section */ -const ActorInit Boss_03_InitVars = { +ActorInit Boss_03_InitVars = { ACTOR_BOSS_03, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index d5098b78bc..26965b2573 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -62,7 +62,7 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit Boss_04_InitVars = { +ActorInit Boss_04_InitVars = { ACTOR_BOSS_04, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.h b/src/overlays/actors/ovl_Boss_04/z_boss_04.h index c0944ce82d..6aa1535970 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.h +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.h @@ -76,6 +76,4 @@ typedef struct Boss04 { /* 0x74A */ u8 unk_74A; } Boss04; // size = 0x74C -extern const ActorInit Boss_04_InitVars; - #endif // Z_BOSS_04_H diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 7b40069d7b..3143700799 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -147,7 +147,7 @@ static DamageTable D_809F1C20 = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit Boss_05_InitVars = { +ActorInit Boss_05_InitVars = { ACTOR_BOSS_05, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.h b/src/overlays/actors/ovl_Boss_05/z_boss_05.h index 7a3f295070..8f46476eae 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.h +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.h @@ -14,6 +14,4 @@ typedef struct Boss05 { /* 0x174 */ char unk_174[0x394]; } Boss05; // size = 0x508 -extern const ActorInit Boss_05_InitVars; - #endif // Z_BOSS_05_H diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index cd3c57f9d4..c6cedef2b5 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -69,7 +69,7 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(0, 0xF), }; -const ActorInit Boss_06_InitVars = { +ActorInit Boss_06_InitVars = { ACTOR_BOSS_06, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.h b/src/overlays/actors/ovl_Boss_06/z_boss_06.h index 39d2f900af..f7b4d3ec05 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.h +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.h @@ -50,6 +50,4 @@ typedef struct Boss06 { /* 0xA2C */ f32 unk_A2C; } Boss06; // size = 0xA30 -extern const ActorInit Boss_06_InitVars; - #endif // Z_BOSS_06_H diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index 923c838fc9..824c70fa22 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -234,7 +234,7 @@ static DamageTable D_80A07A00 = { /* Powder Keg */ DMG_ENTRY(2, 0xB), }; -const ActorInit Boss_07_InitVars = { +ActorInit Boss_07_InitVars = { ACTOR_BOSS_07, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.h b/src/overlays/actors/ovl_Boss_07/z_boss_07.h index f8a4d4d91a..d17e3b1723 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.h +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.h @@ -13,6 +13,4 @@ typedef struct Boss07 { /* 0x0148 */ char unk_148[0xAAD8]; } Boss07; // size = 0xAC20 -extern const ActorInit Boss_07_InitVars; - #endif // Z_BOSS_07_H diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index efb46a8928..d9a7cb348a 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -34,7 +34,7 @@ void func_80B0A638(BossHakugin* this, PlayState* play); void func_80B0A8C4(BossHakugin* this, PlayState* play); #if 0 -const ActorInit Boss_Hakugin_InitVars = { +ActorInit Boss_Hakugin_InitVars = { ACTOR_BOSS_HAKUGIN, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h index 4b82270210..10a01989a3 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h @@ -36,6 +36,4 @@ typedef struct BossHakugin { /* 0x3734 */ char unk_3734[0xDC]; } BossHakugin; // size = 0x3810 -extern const ActorInit Boss_Hakugin_InitVars; - #endif // Z_BOSS_HAKUGIN_H diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index c9bd00e3f9..279a4f0d0c 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -25,7 +25,7 @@ void func_808CDDE0(DemoEffect* this, PlayState* play); void func_808CDFF8(Actor* thisx, PlayState* play); void func_808CE078(Actor* thisx, PlayState* play2); -const ActorInit Demo_Effect_InitVars = { +ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index 985e2c30c5..9901a31898 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -34,6 +34,4 @@ typedef struct DemoEffect { /* 0x178 */ DemoEffectActionFunc actionFunc; } DemoEffect; // size = 0x17C -extern const ActorInit Demo_Effect_InitVars; - #endif // Z_DEMO_EFFECT_H diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 188ca5b87a..aa37e7b855 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -18,7 +18,7 @@ void func_80A4FB10(DemoGetitem* this, PlayState* play); void func_80A4FB68(DemoGetitem* this, PlayState* play2); void DemoGetitem_Draw(Actor* thisx, PlayState* play); -const ActorInit Demo_Getitem_InitVars = { +ActorInit Demo_Getitem_InitVars = { ACTOR_DEMO_GETITEM, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h index acc2c0312d..91c7dc97e9 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h @@ -17,6 +17,4 @@ typedef struct DemoGetitem { /* 0x14C */ DemoGetitemActionFunc actionFunc; } DemoGetitem; // size = 0x150 -extern const ActorInit Demo_Getitem_InitVars; - #endif // Z_DEMO_GETITEM_H 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 be3a0ee47e..8b396cad90 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -22,7 +22,7 @@ void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, PlayState* play); static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at once static s16 sLostWoodsSkyFishParticleNum = 0; -const ActorInit Demo_Kankyo_InitVars = { +ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index f6f05d0a6d..971adb3bd2 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -48,6 +48,4 @@ typedef enum { /* 3 */ DEMO_KANKYO_STATE_DISABLED, } DemoKankyoStateType; -extern const ActorInit Demo_Kankyo_InitVars; - #endif // Z_DEMO_KANKYO_H diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index c051ccf494..76a4230f55 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -16,7 +16,7 @@ void DemoMoonend_Update(Actor* thisx, PlayState* play); void DemoMoonend_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Demo_Moonend_InitVars = { +ActorInit Demo_Moonend_InitVars = { ACTOR_DEMO_MOONEND, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h index 212e93d841..d36dcb284f 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h @@ -13,6 +13,4 @@ typedef struct DemoMoonend { /* 0x2E0 */ DemoMoonendActionFunc actionFunc; } DemoMoonend; // size = 0x2E4 -extern const ActorInit Demo_Moonend_InitVars; - #endif // Z_DEMO_MOONEND_H diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 0078f8959a..f5e20a5096 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -15,7 +15,7 @@ void DemoShd_Destroy(Actor* thisx, PlayState* play); void DemoShd_Update(Actor* thisx, PlayState* play); void DemoShd_Draw(Actor* thisx, PlayState* play); -const ActorInit Demo_Shd_InitVars = { +ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index 4e375a2436..05707f073c 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -10,6 +10,4 @@ typedef struct DemoShd { /* 0x0144 */ char unk_0144[0x118C]; } DemoShd; // size = 0x12D0 -extern const ActorInit Demo_Shd_InitVars; - #endif // Z_DEMO_SHD_H diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index b3a79895eb..853d91cb98 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -25,7 +25,7 @@ void func_80C17008(DemoSyoten* this, PlayState* play); void func_80C173B4(Actor* thisx, PlayState* play); void func_80C17690(Actor* thisx, PlayState* play); -const ActorInit Demo_Syoten_InitVars = { +ActorInit Demo_Syoten_InitVars = { ACTOR_DEMO_SYOTEN, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h index b0a00f2a68..7b60ae951e 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h @@ -37,6 +37,4 @@ typedef struct DemoSyoten { /* 0x3F4 */ DemoSyotenActionFunc actionFunc; } DemoSyoten; // size = 0x3F8 -extern const ActorInit Demo_Syoten_InitVars; - #endif // Z_DEMO_SYOTEN_H diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 646e437c39..b2b8e0077b 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -35,7 +35,7 @@ static DemoTreLgtInfo D_808E1490[2] = { { 1.0f, 136.0f, 220.0f, 50.0f }, }; -const ActorInit Demo_Tre_Lgt_InitVars = { +ActorInit Demo_Tre_Lgt_InitVars = { ACTOR_DEMO_TRE_LGT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h index 83a210b8c5..e6d5d568ca 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -18,6 +18,4 @@ typedef struct DemoTreLgt { /* 0x174 */ s32 animationType; } DemoTreLgt; // size = 0x178 -extern const ActorInit Demo_Tre_Lgt_InitVars; - #endif // Z_DEMO_TRE_LGT_H diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index 58d27d448b..047d17b902 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -15,7 +15,7 @@ void DmAh_Destroy(Actor* thisx, PlayState* play); void DmAh_Update(Actor* thisx, PlayState* play); void DmAh_Draw(Actor* thisx, PlayState* play); -const ActorInit Dm_Ah_InitVars = { +ActorInit Dm_Ah_InitVars = { ACTOR_DM_AH, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h index dc9a437ed4..df179c6f6e 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h @@ -33,6 +33,4 @@ typedef struct DmAh { /* 0x29C */ s32 unk_29C; } DmAh; // size = 0x2A0 -extern const ActorInit Dm_Ah_InitVars; - #endif // Z_DM_AH_H diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index 6c7a1be690..f817137318 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -15,7 +15,7 @@ void DmAl_Destroy(Actor* thisx, PlayState* play); void DmAl_Update(Actor* thisx, PlayState* play); void DmAl_Draw(Actor* thisx, PlayState* play); -const ActorInit Dm_Al_InitVars = { +ActorInit Dm_Al_InitVars = { ACTOR_EN_AL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h index 8f89a4448b..57e462de15 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h @@ -21,6 +21,9 @@ typedef struct DmAl { /* 0x45C */ s32 unk_45C; } DmAl; // size = 0x460 -extern const ActorInit Dm_Al_InitVars; +typedef enum { + /* 0x0 */ MADAME_AROMA_ANIMATION_0, + /* 0x1 */ MADAME_AROMA_ANIMATION_1 +} DmAlAnimations; #endif // Z_DM_AL_H diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index 592800e9d9..d536425b01 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -21,7 +21,7 @@ void func_80C1CAB0(DmAn* this, PlayState* play); void func_80C1CC80(DmAn* this, PlayState* play); void func_80C1D0B0(Actor* thisx, PlayState* play); -const ActorInit Dm_An_InitVars = { +ActorInit Dm_An_InitVars = { ACTOR_DM_AN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.h b/src/overlays/actors/ovl_Dm_An/z_dm_an.h index 2282fee9c0..2001a8ba6f 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.h +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.h @@ -36,6 +36,4 @@ typedef struct DmAn { /* 0x2D4 */ s32 unk_2D4; } DmAn; // size = 0x2D8 -extern const ActorInit Dm_An_InitVars; - #endif // Z_DM_AN_H diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index 04dd13ca45..f6d08515ec 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -18,7 +18,7 @@ void DmBal_Draw(Actor* thisx, PlayState* play); void func_80C1EAC4(DmBal* this); void func_80C1EAD8(DmBal* this, PlayState* play); -const ActorInit Dm_Bal_InitVars = { +ActorInit Dm_Bal_InitVars = { ACTOR_DM_BAL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h index bda05149f2..7b38356538 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h @@ -23,6 +23,4 @@ typedef struct DmBal { /* 0x33A */ s16 unk_33A; } DmBal; /* size = 0x33C */ -extern const ActorInit Dm_Bal_InitVars; - #endif // Z_DM_BAL_H diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 7e61b13de2..95aef1835c 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -20,7 +20,7 @@ void DmChar00_Draw(Actor* thisx, PlayState* play2); void func_80AA67F8(DmChar00* this, PlayState* play); void func_80AA695C(DmChar00* this, PlayState* play); -const ActorInit Dm_Char00_InitVars = { +ActorInit Dm_Char00_InitVars = { ACTOR_DM_CHAR00, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h index 1df0df06db..62ee0cb406 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h @@ -28,6 +28,4 @@ typedef struct DmChar00 { /* 0x262 */ u16 unk_262; } DmChar00; // size = 0x264 -extern const ActorInit Dm_Char00_InitVars; - #endif // Z_DM_CHAR00_H diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 75dbacc54b..fb68b17c67 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -35,7 +35,7 @@ s16 D_80AAAE26; #include "overlays/ovl_Dm_Char01/ovl_Dm_Char01.c" -const ActorInit Dm_Char01_InitVars = { +ActorInit Dm_Char01_InitVars = { ACTOR_DM_CHAR01, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h index 677a2b59b7..6f29531a04 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h @@ -28,6 +28,4 @@ typedef struct DmChar01 { /* 0x34D */ u8 unk_34D; } DmChar01; // size = 0x350 -extern const ActorInit Dm_Char01_InitVars; - #endif // Z_DM_CHAR01_H diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index 1031a3bb6e..b618281c2d 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -18,7 +18,7 @@ void DmChar02_Draw(Actor* thisx, PlayState* play); void DmChar02_PerformCutsceneActions(DmChar02* this, PlayState* play); -const ActorInit Dm_Char02_InitVars = { +ActorInit Dm_Char02_InitVars = { ACTOR_DM_CHAR02, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h index 6979894965..7a97225545 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h @@ -18,6 +18,4 @@ typedef struct DmChar02 { /* 0x2F0 */ u32 unk_2F0; } DmChar02; // size = 0x2F4 -extern const ActorInit Dm_Char02_InitVars; - #endif // Z_DM_CHAR02_H diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index d755cc7ff9..be8ce93f13 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -20,7 +20,7 @@ void func_80AAB644(DmChar03* this, PlayState* play); void DmChar03_DoNothing(DmChar03* this, PlayState* play); void func_80AABA84(PlayState* play, DmChar03* this); -const ActorInit Dm_Char03_InitVars = { +ActorInit Dm_Char03_InitVars = { ACTOR_DM_CHAR03, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h index f736220c8f..5b4a2e6213 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h @@ -17,6 +17,4 @@ typedef struct DmChar03 { /* 0x190 */ Vec3f offset; } DmChar03; // size = 0x19C -extern const ActorInit Dm_Char03_InitVars; - #endif // Z_DM_CHAR03_H diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index f7b4b47e84..12165ed899 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -18,7 +18,7 @@ void DmChar04_Draw(Actor* thisx, PlayState* play); void func_80AABE34(DmChar04* this, PlayState* play); -const ActorInit Dm_Char04_InitVars = { +ActorInit Dm_Char04_InitVars = { ACTOR_DM_CHAR04, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h index 42c4a8501d..0f0fcb6a15 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h @@ -20,6 +20,4 @@ typedef struct DmChar04 { /* 0x262 */ u16 timer; } DmChar04; // size = 0x264 -extern const ActorInit Dm_Char04_InitVars; - #endif // Z_DM_CHAR04_H diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 5a7caebc81..7e368b9e3c 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -35,7 +35,7 @@ void func_80AADF54(PlayState* play, DmChar05* this); void func_80AAE030(PlayState* play, DmChar05* this); void func_80AAE114(PlayState* play, DmChar05* this); -const ActorInit Dm_Char05_InitVars = { +ActorInit Dm_Char05_InitVars = { ACTOR_DM_CHAR05, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h index 212cdb03e1..3bff39f6a0 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h @@ -42,6 +42,4 @@ typedef struct DmChar05 { /* 0x1B4 */ u8 unk_1B4; } DmChar05; // size = 0x1B8 -extern const ActorInit Dm_Char05_InitVars; - #endif // Z_DM_CHAR05_H diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index a419ed5aa9..4013293fb3 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -18,7 +18,7 @@ void DmChar06_Draw(Actor* thisx, PlayState* play); void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc); void func_80AAE6F0(DmChar06* this, PlayState* play); -const ActorInit Dm_Char06_InitVars = { +ActorInit Dm_Char06_InitVars = { ACTOR_DM_CHAR06, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h index c6b83b4ff1..fd08c83ff5 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h @@ -16,6 +16,4 @@ typedef struct DmChar06 { /* 0x2A0 */ u8 alpha; } DmChar06; // size = 0x2A4 -extern const ActorInit Dm_Char06_InitVars; - #endif // Z_DM_CHAR06_H 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 7058500a95..844be223e9 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -18,7 +18,7 @@ void DmChar07_Draw(Actor* thisx, PlayState* play); void DmChar07_DoNothing(DmChar07* this, PlayState* play); -const ActorInit Dm_Char07_InitVars = { +ActorInit Dm_Char07_InitVars = { ACTOR_DM_CHAR07, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h index 8d35283476..ce54f1be13 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h @@ -32,6 +32,4 @@ typedef struct DmChar07 { /* 0x2BA */ u8 isStage; } DmChar07; // size = 0x2BC -extern const ActorInit Dm_Char07_InitVars; - #endif // Z_DM_CHAR07_H diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 94d15be601..46bee748cf 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -51,7 +51,7 @@ typedef enum { /* 6 */ TURTLE_ANIM_YAWN, } TurtleAnimation; -const ActorInit Dm_Char08_InitVars = { +ActorInit Dm_Char08_InitVars = { ACTOR_DM_CHAR08, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h index 2cdbb52c7d..f339bceaa1 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h @@ -40,6 +40,4 @@ typedef struct DmChar08 { /* 0x209 */ u8 dynapolyInitialized; } DmChar08; // size = 0x20C -extern const ActorInit Dm_Char08_InitVars; - #endif // Z_DM_CHAR08_H diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 0bb112b437..654bc6c07c 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -18,7 +18,7 @@ void DmChar09_Draw(Actor* thisx, PlayState* play); void DmChar09_DoNothing(DmChar09* this, PlayState* play); void func_80AB2268(DmChar09* this, PlayState* play); -const ActorInit Dm_Char09_InitVars = { +ActorInit Dm_Char09_InitVars = { ACTOR_DM_CHAR09, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h index ce01f164ae..dffe65975b 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h @@ -34,6 +34,4 @@ typedef struct DmChar09 { /* 0x22F */ u8 unk_22F; } DmChar09; // size = 0x230 -extern const ActorInit Dm_Char09_InitVars; - #endif // Z_DM_CHAR09_H diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index 1ed25ede25..5321abc922 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -21,7 +21,7 @@ void func_80C24A00(DmGm* this, PlayState* play); void func_80C24BD0(DmGm* this, PlayState* play); void func_80C25000(Actor* thisx, PlayState* play); -const ActorInit Dm_Gm_InitVars = { +ActorInit Dm_Gm_InitVars = { ACTOR_DM_GM, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h index b7e45a3a1f..54db8d30fb 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h @@ -36,6 +36,4 @@ typedef struct DmGm { /* 0x2D4 */ s32 unk_2D4; } DmGm; // size = 0x2D8 -extern const ActorInit Dm_Gm_InitVars; - #endif // Z_DM_GM_H diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index 07c2d2bdd9..a2a2589fb1 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -21,7 +21,7 @@ void func_80A1F5AC(DmHina* this, PlayState* play); void func_80A1F63C(DmHina* this, PlayState* play); #if 0 -const ActorInit Dm_Hina_InitVars = { +ActorInit Dm_Hina_InitVars = { ACTOR_DM_HINA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h index 02d12ee7d4..21c9e55dcd 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h @@ -16,6 +16,4 @@ typedef struct DmHina { /* 0x160 */ char unk_160[0x24]; } DmHina; // size = 0x184 -extern const ActorInit Dm_Hina_InitVars; - #endif // Z_DM_HINA_H 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 656f609042..98f7bac489 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -15,7 +15,7 @@ void DmNb_Destroy(Actor* thisx, PlayState* play); void DmNb_Update(Actor* thisx, PlayState* play); void DmNb_Draw(Actor* thisx, PlayState* play); -const ActorInit Dm_Nb_InitVars = { +ActorInit Dm_Nb_InitVars = { ACTOR_DM_NB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h index e13032de13..3f35beea0f 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h @@ -20,6 +20,4 @@ typedef struct DmNb { /* 0x1F8 */ s32 unk1F8; } DmNb; // size = 0x1FC -extern const ActorInit Dm_Nb_InitVars; - #endif // Z_DM_NB_H diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index 7a41429714..db76db2787 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -18,7 +18,7 @@ void DmOpstage_Draw(Actor* thisx, PlayState* play); void DmOpstage_FollowCutsceneScript(DmOpstage* this, PlayState* play); -const ActorInit Dm_Opstage_InitVars = { +ActorInit Dm_Opstage_InitVars = { ACTOR_DM_OPSTAGE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h index 073efa1bfe..3d9195413b 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h @@ -24,6 +24,4 @@ typedef struct DmOpstage { /* 0x1A4 */ Vec3f drawOffset; } DmOpstage; // size = 0x1B0 -extern const ActorInit Dm_Opstage_InitVars; - #endif // Z_DM_OPSTAGE_H diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index be25e9ccc2..ba4c3bb008 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -16,7 +16,7 @@ void DmRavine_DoNothing(DmRavine* this, PlayState* play); void DmRavine_Update(Actor* thisx, PlayState* play); void DmRavine_Draw(Actor* thisx, PlayState* play); -const ActorInit Dm_Ravine_InitVars = { +ActorInit Dm_Ravine_InitVars = { ACTOR_DM_RAVINE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h index d634ec5e93..01b9b52af5 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h @@ -20,6 +20,4 @@ typedef struct DmRavine { /* 0x149 */ u8 isActive; } DmRavine; // size = 0x14C -extern const ActorInit Dm_Ravine_InitVars; - #endif // Z_DM_RAVINE_H 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 d9f775f6a2..00abe6e05a 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -18,7 +18,7 @@ void DmSa_Draw(Actor* thisx, PlayState* play); void DmSa_DoNothing(DmSa* this, PlayState* play); -const ActorInit Dm_Sa_InitVars = { +ActorInit Dm_Sa_InitVars = { ACTOR_DM_SA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h index d1d37128b8..3dd827a15c 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h @@ -20,6 +20,4 @@ typedef struct DmSa { /* 0x2F0 */ u32 alpha; } DmSa; // size = 0x2F4 -extern const ActorInit Dm_Sa_InitVars; - #endif // Z_DM_SA_H 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 62c267322f..11f2724de3 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -16,7 +16,7 @@ void DmStatue_Destroy(Actor* thisx, PlayState* play); void DmStatue_Update(Actor* thisx, PlayState* play); void DmStatue_Draw(Actor* thisx, PlayState* play); -const ActorInit Dm_Statue_InitVars = { +ActorInit Dm_Statue_InitVars = { ACTOR_DM_STATUE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h index 1ad123523b..eb06acd01b 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h @@ -10,6 +10,4 @@ typedef struct DmStatue { /* 0x144 */ char unk_144[0x50]; } DmStatue; // size = 0x194 -extern const ActorInit Dm_Statue_InitVars; - #endif // Z_DM_STATUE_H 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 4fa6acb239..6d0fd48a49 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -150,7 +150,7 @@ typedef enum { /* 4 */ SK_DEKU_PIPES_CS_STATE_END } SkullKidDekuPipesCutsceneState; -const ActorInit Dm_Stk_InitVars = { +ActorInit Dm_Stk_InitVars = { ACTOR_DM_STK, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h index ffea612652..f55321ef7c 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h @@ -51,6 +51,4 @@ typedef struct DmStk { /* 0x33B */ u8 shouldDraw; } DmStk; // size = 0x33C -extern const ActorInit Dm_Stk_InitVars; - #endif // Z_DM_STK_H diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index b00eea3f73..d91be440ac 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -18,7 +18,7 @@ void func_80C229AC(DmTag* this, PlayState* play); void func_80C229EC(DmTag* this, PlayState* play); void func_80C229FC(DmTag* this, PlayState* play); -const ActorInit Dm_Tag_InitVars = { +ActorInit Dm_Tag_InitVars = { ACTOR_DM_TAG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h index d68cd38d44..eec741df6d 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h @@ -21,6 +21,4 @@ typedef struct DmTag { /* 0x1A8 */ DmTagMsgEventFunc msgEventCallback; } DmTag; // size = 0x1AC -extern const ActorInit Dm_Tag_InitVars; - #endif // Z_DM_TAG_H diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index ab0aca40ef..7dec0540e5 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -16,7 +16,7 @@ void DmTsg_Update(Actor* thisx, PlayState* play); void DmTsg_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Dm_Tsg_InitVars = { +ActorInit Dm_Tsg_InitVars = { ACTOR_DM_TSG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h index e1263ef2d4..e8e62b6c27 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h @@ -10,6 +10,4 @@ typedef struct DmTsg { /* 0x144 */ char unk_144[0x7DC]; } DmTsg; // size = 0x920 -extern const ActorInit Dm_Tsg_InitVars; - #endif // Z_DM_TSG_H diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index 47706cb9fa..a671fe3f26 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -17,7 +17,7 @@ void DmZl_Draw(Actor* thisx, PlayState* play); void DmZl_DoNothing(DmZl* this, PlayState* play); -const ActorInit Dm_Zl_InitVars = { +ActorInit Dm_Zl_InitVars = { ACTOR_DM_ZL, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h index c267d9ae94..cae6ce74e8 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h @@ -26,6 +26,4 @@ typedef struct DmZl { /* 0x2BC */ UNK_TYPE1 pad2BC[0x18]; // unused by DmZl } DmZl; // size = 0x2D4 -extern const ActorInit Dm_Zl_InitVars; - #endif // Z_DM_ZL_H 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 92f99462cc..8ae44b9090 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -20,7 +20,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play); void DoorAna_WaitOpen(DoorAna* this, PlayState* play); void DoorAna_GrabLink(DoorAna* this, PlayState* play); -const ActorInit Door_Ana_InitVars = { +ActorInit Door_Ana_InitVars = { ACTOR_DOOR_ANA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h index 980d0140f9..8e016824d8 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -13,8 +13,6 @@ typedef struct DoorAna { /* 0x190 */ DoorAnaActionFunc actionFunc; } DoorAna; // size = 0x194 -extern const ActorInit Door_Ana_InitVars; - #define DOORANA_TYPE_BITMASK 0x300 #define DOORANA_TYPE_VISIBLE 0x000 #define DOORANA_TYPE_HIDDEN_STORMS 0x100 // Incomplete, leftover from OoT diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index ba7bac6c53..116b07a6cd 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -40,7 +40,7 @@ void func_808A1B48(DoorShutter* this, PlayState* play); void func_808A1C50(DoorShutter* this, PlayState* play); void DoorShutter_Draw(Actor* thisx, PlayState* play); -const ActorInit Door_Shutter_InitVars = { +ActorInit Door_Shutter_InitVars = { ACTOR_DOOR_SHUTTER, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h index e0d5653e26..c64d3d523c 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -28,6 +28,4 @@ typedef struct DoorShutter { /* 0x016C */ DoorShutterActionFunc actionFunc; } DoorShutter; // size = 0x170 -extern const ActorInit Door_Shutter_InitVars; - #endif // Z_DOOR_SHUTTER_H 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 e80fc9908e..5f00314873 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -67,7 +67,7 @@ void DoorSpiral_WaitForObject(DoorSpiral* this, PlayState* play); void DoorSpiral_Wait(DoorSpiral* this, PlayState* play); void DoorSpiral_PlayerClimb(DoorSpiral* this, PlayState* play); -const ActorInit Door_Spiral_InitVars = { +ActorInit Door_Spiral_InitVars = { ACTOR_DOOR_SPIRAL, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h index f12b79d84e..0f3e32a39e 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h @@ -23,6 +23,4 @@ typedef struct DoorSpiral { /* 0x14C */ DoorSpiralActionFunc actionFunc; } DoorSpiral; // size = 0x150 -extern const ActorInit Door_Spiral_InitVars; - #endif // Z_DOOR_SPIRAL_H 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 2d384ccf6b..707150e333 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -49,7 +49,7 @@ void func_808BB8D4(DoorWarp1* this, PlayState* play, s32 arg2); static s16 D_808BC000; static f32 D_808BC004; -const ActorInit Door_Warp1_InitVars = { +ActorInit Door_Warp1_InitVars = { ACTOR_DOOR_WARP1, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index c57f610a08..076999e576 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -56,6 +56,4 @@ typedef struct DoorWarp1 { /* 0x208 */ u8 unk_208; } DoorWarp1; // size = 0x20C -extern const ActorInit Door_Warp1_InitVars; - #endif // Z_DOOR_WARP1_H diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index 71aab6f0b6..cad0ec0955 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -18,7 +18,7 @@ void EffChange_Draw(Actor* thisx, PlayState* play); void EffChange_SetColors(EffChange* this, s32 arg1); void func_80A4C5CC(EffChange* this, PlayState* play); -const ActorInit Eff_Change_InitVars = { +ActorInit Eff_Change_InitVars = { ACTOR_EFF_CHANGE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h index aed7e534a8..194ae3ee23 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h @@ -21,6 +21,4 @@ typedef struct EffChange { /* 0x1C8 */ EffChangeActionFunc actionFunc; } EffChange; // size = 0x1CC -extern const ActorInit Eff_Change_InitVars; - #endif // Z_EFF_CHANGE_H 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 3004930d7b..2833477e4a 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -24,7 +24,7 @@ void func_80919230(EffDust* this, PlayState* play); void func_80919768(Actor* thisx, PlayState* play2); void func_809199FC(Actor* thisx, PlayState* play2); -const ActorInit Eff_Dust_InitVars = { +ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index d73b5ce0ea..38b724865f 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -30,6 +30,4 @@ typedef enum { /* 0x5 */ EFF_DUST_TYPE_5 } EffDustType; -extern const ActorInit Eff_Dust_InitVars; - #endif // Z_EFF_DUST_H diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index 9af2564508..75ff275a14 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -23,7 +23,7 @@ void func_80BCEBC0(EffKamejimaWave* this, PlayState* play); void func_80BCED34(EffKamejimaWave* this, PlayState* play); void EffKamejimaWave_SetVtxAlpha(u8 alpha); -const ActorInit Eff_Kamejima_Wave_InitVars = { +ActorInit Eff_Kamejima_Wave_InitVars = { ACTOR_EFF_KAMEJIMA_WAVE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h index 9b4713034c..c79537363f 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h @@ -21,6 +21,4 @@ typedef enum params { /* 0x1 */ EFFKAMEJIMAWAVE_PARAMS_1 } EffKamejimaWaveParams; -extern const ActorInit Eff_Kamejima_Wave_InitVars; - #endif // Z_EFF_KAMEJIMA_WAVE_H diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 773e881ed4..0041f1e99c 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -28,7 +28,7 @@ typedef enum EffLastDayAction { /* 0x3 */ EFFLASTDAY_ACTION_3 } EffLastDayAction; -const ActorInit Eff_Lastday_InitVars = { +ActorInit Eff_Lastday_InitVars = { ACTOR_EFF_LASTDAY, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h index d1f81a184d..89266d7443 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h @@ -26,6 +26,4 @@ typedef enum EffLastDayParams { /* 0x3 */ EFFLASTDAY_PARAMS_3 } EffLastDayParams; -extern const ActorInit Eff_Lastday_InitVars; - #endif // Z_EFF_LASTDAY_H diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 7784171392..4d66cc8276 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -16,7 +16,7 @@ void EffStk_Update(Actor* thisx, PlayState* play); void EffStk_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Eff_Stk_InitVars = { +ActorInit Eff_Stk_InitVars = { ACTOR_EFF_STK, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h index 9c8d5946ee..4b2b84783c 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h @@ -13,6 +13,4 @@ typedef struct EffStk { /* 0x14C */ EffStkActionFunc actionFunc; } EffStk; // size = 0x150 -extern const ActorInit Eff_Stk_InitVars; - #endif // Z_EFF_STK_H diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index b566e5c622..842ae4b9ec 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -18,7 +18,7 @@ void EffZoraband_Draw(Actor* thisx, PlayState* play2); void EffZoraband_MikauFadeOut(EffZoraband* this, PlayState* play); -const ActorInit Eff_Zoraband_InitVars = { +ActorInit Eff_Zoraband_InitVars = { ACTOR_EFF_ZORABAND, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h index 2ecaf71876..4fdb977d88 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h @@ -16,6 +16,4 @@ typedef struct EffZoraband { /* 0x148 */ EffZorabandActionFunc actionFunc; } EffZoraband; // size = 0x14C -extern const ActorInit Eff_Zoraband_InitVars; - #endif // Z_EFF_ZORABAND_H diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 46ef861b97..3d7df7c278 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -18,7 +18,7 @@ void ElfMsg_Update(Actor* thisx, PlayState* play); void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc); void func_8092E284(ElfMsg* this, PlayState* play); -const ActorInit Elf_Msg_InitVars = { +ActorInit Elf_Msg_InitVars = { ACTOR_ELF_MSG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h index f335f01584..51a3ddda3d 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h @@ -16,6 +16,4 @@ typedef struct ElfMsg { /* 0x144 */ ElfMsgActionFunc actionFunc; } ElfMsg; // size = 0x148 -extern const ActorInit Elf_Msg_InitVars; - #endif // Z_ELF_MSG_H diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 35b83bd6fc..a29b226b0f 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -18,7 +18,7 @@ s32 func_8096EE50(ElfMsg2* this); void func_8096EF98(ElfMsg2* this, PlayState* play); void func_8096EFD0(ElfMsg2* this, PlayState* play); -const ActorInit Elf_Msg2_InitVars = { +ActorInit Elf_Msg2_InitVars = { ACTOR_ELF_MSG2, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h index e8b48dfd78..4d9583d207 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h @@ -15,6 +15,4 @@ typedef struct ElfMsg2 { /* 0x144 */ ElfMsg2ActionFunc actionFunc; } ElfMsg2; // size = 0x148 -extern const ActorInit Elf_Msg2_InitVars; - #endif // Z_ELF_MSG2_H diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index 2e0f27d691..da6b291804 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -17,7 +17,7 @@ void ElfMsg3_Update(Actor* thisx, PlayState* play); void func_80A2CF7C(ElfMsg3* this, PlayState* play); -const ActorInit Elf_Msg3_InitVars = { +ActorInit Elf_Msg3_InitVars = { ACTOR_ELF_MSG3, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h index cb71166e8d..615cde1eb5 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h @@ -16,6 +16,4 @@ typedef struct ElfMsg3 { /* 0x144 */ ElfMsg3ActionFunc actionFunc; } ElfMsg3; // size = 0x148 -extern const ActorInit Elf_Msg3_InitVars; - #endif // Z_ELF_MSG3_H diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index f44265d555..7fbf402fa8 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -22,7 +22,7 @@ s32 func_80AFD380(ElfMsg4* this, PlayState* play); s32 ElfMsg4_GetTextId(ElfMsg4* this); s32 func_80AFD5E0(ElfMsg4* this); -const ActorInit Elf_Msg4_InitVars = { +ActorInit Elf_Msg4_InitVars = { ACTOR_ELF_MSG4, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h index f3d523ba4b..e9ccbc9062 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h @@ -17,6 +17,4 @@ typedef struct ElfMsg4 { /* 0x148 */ ElfMsg4ActionFunc actionFunc; } ElfMsg4; // size = 0x14C -extern const ActorInit Elf_Msg4_InitVars; - #endif // Z_ELF_MSG4_H diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index 5bf6687664..db97a0f744 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -17,7 +17,7 @@ void ElfMsg5_Update(Actor* thisx, PlayState* play); void func_80AFDB38(ElfMsg5* this, PlayState* play); s32 func_80AFD990(ElfMsg5* this, PlayState* play); -const ActorInit Elf_Msg5_InitVars = { +ActorInit Elf_Msg5_InitVars = { ACTOR_ELF_MSG5, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h index af25894345..36daecca1e 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h @@ -15,6 +15,4 @@ typedef struct ElfMsg5 { /* 0x144 */ ElfMsg5ActionFunc actionFunc; } ElfMsg5; // size = 0x148 -extern const ActorInit Elf_Msg5_InitVars; - #endif // Z_ELF_MSG5_H diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 4bb598a0ea..e69806ac7b 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -23,7 +23,7 @@ void func_80BA2048(ElfMsg6* this, PlayState* play); void func_80BA215C(ElfMsg6* this, PlayState* play); void func_80BA21C4(ElfMsg6* this, PlayState* play); -const ActorInit Elf_Msg6_InitVars = { +ActorInit Elf_Msg6_InitVars = { ACTOR_ELF_MSG6, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h index cd33b350b4..8e9a5d0ed3 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h @@ -16,6 +16,4 @@ typedef struct ElfMsg6 { /* 0x144 */ ElfMsg6ActionFunc actionFunc; } ElfMsg6; // size = 0x148 -extern const ActorInit Elf_Msg6_InitVars; - #endif // Z_ELF_MSG6_H diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index 7d992caa61..2c0cb4ce33 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -47,7 +47,7 @@ s32 D_80BD3DF8[] = { 0x00330100, 0x050E28FE, 0x0C100E28, -0x03F3F000 }; s32 D_80BD3E08[] = { 0x0E28FD0C, 0x0F29540C, 0x10000000 }; -const ActorInit En_Ah_InitVars = { +ActorInit En_Ah_InitVars = { ACTOR_EN_AH, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.h b/src/overlays/actors/ovl_En_Ah/z_en_ah.h index 78872a270d..d361a8358a 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.h +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.h @@ -38,6 +38,4 @@ typedef struct EnAh { /* 0x300 */ s32 unk_300; } EnAh; // size = 0x304 -extern const ActorInit En_Ah_InitVars; - #endif // Z_EN_AH_H diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 14db58193a..e0c19903d8 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -31,7 +31,7 @@ void func_80BEF9F0(EnAkindonuts* this, PlayState* play); void func_80BEFAF0(EnAkindonuts* this, PlayState* play); void func_80BEFD74(EnAkindonuts* this, PlayState* play); -const ActorInit En_Akindonuts_InitVars = { +ActorInit En_Akindonuts_InitVars = { ACTOR_EN_AKINDONUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h index ec0446f95a..72c932d0c0 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h @@ -50,6 +50,4 @@ typedef struct EnAkindonuts { /* 0x368 */ s16 unk_368; } EnAkindonuts; // size = 0x36C -extern const ActorInit En_Akindonuts_InitVars; - #endif // Z_EN_AKINDONUTS_H diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index efad503178..7cb0d7d540 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -85,7 +85,7 @@ s32 D_80BDFF24[] = { 0x11390411, 0x390819FF, 0xB10E2B3C, 0x2D00080C, 0x19FFA700, }; -const ActorInit En_Al_InitVars = { +ActorInit En_Al_InitVars = { ACTOR_EN_AL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.h b/src/overlays/actors/ovl_En_Al/z_en_al.h index 4a92743df9..77e1011bfa 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.h +++ b/src/overlays/actors/ovl_En_Al/z_en_al.h @@ -45,6 +45,4 @@ typedef struct EnAl { /* 0x4FC */ UNK_TYPE1 unk4FC[4]; } EnAl; // size = 0x500 -extern const ActorInit En_Al_InitVars; - #endif // Z_EN_AL_H diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index bc30c333e1..f76ebc4f3f 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -37,7 +37,7 @@ void func_808B0894(EnAm* this, PlayState* play); void func_808B0B4C(EnAm* this, PlayState* play); void EnAm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx); -const ActorInit En_Am_InitVars = { +ActorInit En_Am_InitVars = { ACTOR_EN_AM, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index 79d3a81bdd..e482e2cba4 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -27,6 +27,4 @@ typedef struct EnAm { /* 0x334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile } EnAm; // size = 0x380 -extern const ActorInit En_Am_InitVars; - #endif // Z_EN_AM_H diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 33638774e0..6b85ffc53b 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -19,7 +19,7 @@ void func_80B578F8(EnAn* this, PlayState* play); void func_80B57A44(EnAn* this, PlayState* play); #if 0 -const ActorInit En_An_InitVars = { +ActorInit En_An_InitVars = { ACTOR_EN_AN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h index c4d2dd5aef..7f1a119300 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.h +++ b/src/overlays/actors/ovl_En_An/z_en_an.h @@ -14,6 +14,4 @@ typedef struct EnAn { /* 0x18C */ char unk_18C[0x23C]; } EnAn; // size = 0x3C8 -extern const ActorInit En_An_InitVars; - #endif // Z_EN_AN_H diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 04c4619080..5c888ba452 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -18,7 +18,7 @@ void EnAnd_Draw(Actor* thisx, PlayState* play); void func_80C18C50(EnAnd* this, PlayState* play); #if 0 -const ActorInit En_And_InitVars = { +ActorInit En_And_InitVars = { ACTOR_EN_AND, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_And/z_en_and.h b/src/overlays/actors/ovl_En_And/z_en_and.h index 0ebd1a743c..a0610a408c 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.h +++ b/src/overlays/actors/ovl_En_And/z_en_and.h @@ -14,6 +14,4 @@ typedef struct EnAnd { /* 0x18C */ char unk_18C[0x188]; } EnAnd; // size = 0x314 -extern const ActorInit En_And_InitVars; - #endif // Z_EN_AND_H diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index ec464815ee..ec98213bbc 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -40,7 +40,7 @@ void EnAni_IdleInPain(EnAni* this, PlayState* play); void EnAni_Talk(EnAni* this, PlayState* play); void EnAni_IdleStanding(EnAni* this, PlayState* play); -const ActorInit En_Ani_InitVars = { +ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, ACTORCAT_NPC, FLAGS, 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 6024689c74..6af60b84d7 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 @@ -32,7 +32,7 @@ void func_809C2C9C(EnAob01* this, PlayState* play); void func_809C2D0C(EnAob01* this, PlayState* play); s32 func_809C2EC4(EnAob01* this, PlayState* play); -const ActorInit En_Aob_01_InitVars = { +ActorInit En_Aob_01_InitVars = { ACTOR_EN_AOB_01, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h index 7414f18900..2507b1728e 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h @@ -42,6 +42,4 @@ typedef struct EnAob01 { /* 0x440 */ s16 unk_440; } EnAob01; // size = 0x444 -extern const ActorInit En_Aob_01_InitVars; - #endif // Z_EN_AOB_01_H diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 5f627e2d47..dd6f503efc 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -22,7 +22,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play); void func_8088B630(EnArrow* this, PlayState* play); void func_8088B6B0(EnArrow* this, PlayState* play); -const ActorInit En_Arrow_InitVars = { +ActorInit En_Arrow_InitVars = { ACTOR_EN_ARROW, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index fadf7fbf25..d16dbd380f 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -53,6 +53,4 @@ typedef struct EnArrow { /* 0x274 */ EnArrowActionFunc actionFunc; } EnArrow; // size = 0x278 -extern const ActorInit En_Arrow_InitVars; - #endif // Z_EN_ARROW_H diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 532eebd34d..b4501ffa08 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -20,7 +20,7 @@ void EnAttackNiw_EnterViewFromOffscreen(EnAttackNiw* this, PlayState* play); void EnAttackNiw_AimAtPlayer(EnAttackNiw* this, PlayState* play); void EnAttackNiw_FlyAway(EnAttackNiw* this, PlayState* play); -const ActorInit En_Attack_Niw_InitVars = { +ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h index a1e29d6278..f49778d9a7 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -54,8 +54,6 @@ typedef struct EnAttackNiw { /* 0x2DC */ f32 targetHeight; // never set, but sent to Actor_SetFocus } EnAttackNiw; // size = 0x2E0 -extern const ActorInit En_Attack_Niw_InitVars; - #define ATTACK_NIW_REGULAR 0 // spawned by EnNiw diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 2bb0a6afce..f5a0281527 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -92,7 +92,7 @@ static AnimationSpeedInfo sAnimationInfo[] = { { &gBeaverIdleFaceRightAnim, 1.0f, ANIMMODE_LOOP, -5.0f }, }; -const ActorInit En_Az_InitVars = { +ActorInit En_Az_InitVars = { ACTOR_EN_AZ, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.h b/src/overlays/actors/ovl_En_Az/z_en_az.h index ffe094a932..2a219eb24e 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.h +++ b/src/overlays/actors/ovl_En_Az/z_en_az.h @@ -51,6 +51,4 @@ typedef struct EnAz { /* 0x3D6 */ s16 unk_3D6; } EnAz; // size = 0x3D8 -extern const ActorInit En_Az_InitVars; - #endif // Z_EN_AZ_H diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index abd69adc81..00e63c7d61 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -50,7 +50,7 @@ typedef enum { /* 2 */ BOMB_SHOP_LADY_SCH_FOLLOW_TIME_PATH } BombShopLadyScheduleResult; -const ActorInit En_Baba_InitVars = { +ActorInit En_Baba_InitVars = { ACTOR_EN_BABA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h index 2335dcb70f..7da0ed054f 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h @@ -58,6 +58,4 @@ typedef struct EnBaba { /* 0x43C */ s32 timePathHasReachedEnd; } EnBaba; // size = 0x440 -extern const ActorInit En_Baba_InitVars; - #endif // Z_EN_BABA_H diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index a4bf9c5650..9017e0f89a 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -41,7 +41,7 @@ typedef enum { /* 0x1 */ NEJIRON_DIRECTION_LEFT } NejironRollDirection; -const ActorInit En_Baguo_InitVars = { +ActorInit En_Baguo_InitVars = { ACTOR_EN_BAGUO, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h index 6c98eeaeb0..d6eb2173c9 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h @@ -44,6 +44,4 @@ typedef struct EnBaguo { /* 0x23C */ NejironEffect effects[EN_BAGUO_EFFECT_COUNT]; } EnBaguo; // size = 0x8CC -extern const ActorInit En_Baguo_InitVars; - #endif // Z_EN_BAGUO_H 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 db30813eac..5716c27d5b 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -23,7 +23,7 @@ void func_80BE895C(EnBaisen* this, PlayState* play); void func_80BE8AAC(EnBaisen* this, PlayState* play); void func_80BE89D8(EnBaisen* this, PlayState* play); -const ActorInit En_Baisen_InitVars = { +ActorInit En_Baisen_InitVars = { ACTOR_EN_BAISEN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h index 3fb45f70a7..4c0ced24f5 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h @@ -32,6 +32,4 @@ typedef struct EnBaisen { /* 0x2B0 */ ColliderCylinder collider; } EnBaisen; // size = 0x2FC -extern const ActorInit En_Baisen_InitVars; - #endif // Z_EN_BAISEN_H diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index dec839006a..779373a9dc 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -16,7 +16,7 @@ void EnBal_Update(Actor* thisx, PlayState* play); void EnBal_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Bal_InitVars = { +ActorInit En_Bal_InitVars = { ACTOR_EN_BAL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.h b/src/overlays/actors/ovl_En_Bal/z_en_bal.h index 7f64293dbc..a64ef195d4 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.h +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.h @@ -15,6 +15,4 @@ typedef struct EnBal { /* 0x190 */ char unk_190[0x224]; } EnBal; // size = 0x3B4 -extern const ActorInit En_Bal_InitVars; - #endif // Z_EN_BAL_H diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index 96e780dcc7..cee109c700 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -28,7 +28,7 @@ void EnBat_DiveAttack(EnBat* this, PlayState* play); void EnBat_Die(EnBat* this, PlayState* play); void EnBat_Stunned(EnBat* this, PlayState* play); -const ActorInit En_Bat_InitVars = { +ActorInit En_Bat_InitVars = { ACTOR_EN_BAT, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.h b/src/overlays/actors/ovl_En_Bat/z_en_bat.h index 4f4ada8102..479cfa24d8 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.h +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.h @@ -40,6 +40,4 @@ typedef struct EnBat { /* 0x184 */ ColliderSphere collider; } EnBat; // size = 0x1DC -extern const ActorInit En_Bat_InitVars; - #endif // Z_EN_BAT_H diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index a66c28a893..c5657e3858 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -35,7 +35,7 @@ typedef enum { /* 1 */ BB_BODY_PART_DRAW_STATUS_DEAD, } EnBbBodyPartDrawStatus; -const ActorInit En_Bb_InitVars = { +ActorInit En_Bb_InitVars = { ACTOR_EN_BB, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h index e6171065a8..c852397d46 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -37,6 +37,4 @@ typedef struct EnBb { /* 0x2F4 */ ColliderSphere collider; } EnBb; // size = 0x34C -extern const ActorInit En_Bb_InitVars; - #endif // Z_EN_BB_H diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 2e5efb11e1..067a4da8b3 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -28,7 +28,7 @@ void EnBba01_Walk(EnHy* this, PlayState* play); void EnBba01_FaceFoward(EnHy* this, PlayState* play); void EnBba01_Talk(EnHy* this, PlayState* play); -const ActorInit En_Bba_01_InitVars = { +ActorInit En_Bba_01_InitVars = { ACTOR_EN_BBA_01, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h index c9030f1125..7160594d89 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h @@ -14,6 +14,4 @@ typedef struct EnBba01 { /* 0x3EC */ UNK_TYPE1 unk_3EC[0x230]; } EnBba01; // size = 0x61C -extern const ActorInit En_Bba_01_InitVars; - #endif // Z_EN_BBA_01_H diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index 24300222d7..1dfc74a222 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -35,7 +35,7 @@ typedef enum { /* 1 */ BBFALL_BODY_PART_DRAW_STATUS_DEAD, } EnBbfallBodyPartDrawStatus; -const ActorInit En_Bbfall_InitVars = { +ActorInit En_Bbfall_InitVars = { ACTOR_EN_BBFALL, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h index e835015e19..19c643ea72 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h @@ -33,6 +33,4 @@ typedef struct EnBbfall { /* 0x3A4 */ ColliderJntSphElement colliderElements[3]; } EnBbfall; // size = 0x464 -extern const ActorInit En_Bbfall_InitVars; - #endif // Z_EN_BBFALL_H diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index 0745c55eae..cf8c5f68a4 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -22,7 +22,7 @@ void EnBee_Attack(EnBee* this, PlayState* play); s32 sNumLoadedBees = 0; -const ActorInit En_Bee_InitVars = { +ActorInit En_Bee_InitVars = { ACTOR_EN_BEE, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.h b/src/overlays/actors/ovl_En_Bee/z_en_bee.h index 851a0a2162..09d9ef9317 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.h +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.h @@ -31,6 +31,4 @@ typedef struct EnBee { /* 0x23C */ ColliderCylinder collider; } EnBee; // size = 0x288 -extern const ActorInit En_Bee_InitVars; - #endif // Z_EN_BEE_H diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index b18bedfc94..2aff9891d3 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -17,7 +17,7 @@ void EnBh_Draw(Actor* thisx, PlayState* play); void func_80C22DEC(EnBh* this, PlayState* play); -const ActorInit En_Bh_InitVars = { +ActorInit En_Bh_InitVars = { ACTOR_EN_BH, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.h b/src/overlays/actors/ovl_En_Bh/z_en_bh.h index b5e8a7c0c9..a3c88fb589 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.h +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.h @@ -22,6 +22,4 @@ typedef struct EnBh { /* 0x1E8 */ EnBhActionFunc actionFunc; } EnBh; // size = 0x1EC -extern const ActorInit En_Bh_InitVars; - #endif // Z_EN_BH_H diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 4232e19aed..3792c09c76 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -30,7 +30,7 @@ void EnBigokuta_PlayDeathCutscene(EnBigokuta* this, PlayState* play); void EnBigokuta_SetupDeathEffects(EnBigokuta* this); void EnBigokuta_PlayDeathEffects(EnBigokuta* this, PlayState* play); -const ActorInit En_Bigokuta_InitVars = { +ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h index fdb9d561db..6bcfa79fbe 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -31,6 +31,4 @@ typedef struct EnBigokuta { /* 0x3AC */ ColliderCylinder bodyCollider; } EnBigokuta; // size = 0x3F8 -extern const ActorInit En_Bigokuta_InitVars; - #endif // Z_EN_BIGOKUTA_H diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index c3cdf829fe..2c27a18013 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -46,7 +46,7 @@ void func_80A28A28(EnBigpamet* this); void func_80A28D80(EnBigpamet* this); void func_80A28ED4(EnBigpamet* this); -const ActorInit En_Bigpamet_InitVars = { +ActorInit En_Bigpamet_InitVars = { ACTOR_EN_BIGPAMET, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h index 07d3265c0c..bb9d292809 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h @@ -40,6 +40,4 @@ typedef struct EnBigpamet { /* 0x2FC */ EnBigpametStruct unk_2FC[20]; } EnBigpamet; // size = 0x5CC -extern const ActorInit En_Bigpamet_InitVars; - #endif // Z_EN_BIGPAMET_H diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 8c22c064f9..63c77b6257 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -82,9 +82,7 @@ void EnBigpo_DrawLantern(Actor* thisx, PlayState* play); void EnBigpo_DrawCircleFlames(Actor* thisx, PlayState* play); void EnBigpo_RevealedFire(Actor* thisx, PlayState* play); -extern const ActorInit En_Bigpo_InitVars; - -const ActorInit En_Bigpo_InitVars = { +ActorInit En_Bigpo_InitVars = { ACTOR_EN_BIGPO, ACTORCAT_ENEMY, FLAGS, 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 ef508ac485..5dc33095a1 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -211,7 +211,7 @@ static EnBigslimeTri sBigslimeTri[BIGSLIME_NUM_FACES] = { { 142, 126, 127 }, { 130, 111, 145 }, }; -const ActorInit En_Bigslime_InitVars = { +ActorInit En_Bigslime_InitVars = { ACTOR_EN_BIGSLIME, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h index c66dd78507..52a29013cf 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h @@ -125,6 +125,4 @@ typedef struct EnBigslime { /* 0x0A54 */ EnBigslimeIceShardEffect iceShardEffect[BIGSLIME_NUM_ICE_SHARD]; // 312 = 162 (bigslime) + 10 * 15 (minislime) } EnBigslime; // size = 0x3634 -extern const ActorInit En_Bigslime_InitVars; - #endif // Z_EN_BIGSLIME_H 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 962bb22316..41bd948949 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 @@ -29,7 +29,7 @@ void func_809CD77C(EnBji01* this, PlayState* play); s32 EnBji01_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); void EnBji01_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx); -const ActorInit En_Bji_01_InitVars = { +ActorInit En_Bji_01_InitVars = { ACTOR_EN_BJI_01, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h index 8ab601e1b4..29afaf5333 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h @@ -35,6 +35,4 @@ typedef struct EnBji01 { /* 0x2B0 */ ObjMoonStone* moonsTear; } EnBji01; // size = 0x2B4 -extern const ActorInit En_Bji_01_InitVars; - #endif // Z_EN_BJI_01_H diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index fe97117f9d..a8bcfdc883 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -46,7 +46,7 @@ static u8 sMsgEventScript[] = { 0x10, 0x2C, 0x29, 0x49, 0x0C, 0x2F, 0x00, 0x00, 0x0C, 0x2D, 0x00, 0x0D, 0x12, 0x10, 0x2D, 0x00, 0x0D, 0x12, 0x10, }; -const ActorInit En_Bjt_InitVars = { +ActorInit En_Bjt_InitVars = { ACTOR_EN_BJT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h index f26be4d223..9ce5adf0e9 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h @@ -32,6 +32,4 @@ typedef struct EnBjt { } EnBjt; // size = 0x25C -extern const ActorInit En_Bjt_InitVars; - #endif // Z_EN_BJT_H diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index 29510c9d79..bd4b0e499e 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -15,7 +15,7 @@ void EnBoj01_Destroy(Actor* thisx, PlayState* play); void EnBoj01_Update(Actor* thisx, PlayState* play); void EnBoj01_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Boj_01_InitVars = { +ActorInit En_Boj_01_InitVars = { ACTOR_EN_BOJ_01, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h index cfee748df9..78f4968c2d 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h @@ -10,6 +10,4 @@ typedef struct EnBoj01 { /* 0x144 */ char unk_144[0x1D0]; } EnBoj01; // size = 0x314 -extern const ActorInit En_Boj_01_InitVars; - #endif // Z_EN_BOJ_01_H diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index d68f44bd52..89f6ba0cb6 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -15,7 +15,7 @@ void EnBoj02_Destroy(Actor* thisx, PlayState* play); void EnBoj02_Update(Actor* thisx, PlayState* play); void EnBoj02_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Boj_02_InitVars = { +ActorInit En_Boj_02_InitVars = { ACTOR_EN_BOJ_02, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h index 1ef9785efb..c27d05d381 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h @@ -10,6 +10,4 @@ typedef struct EnBoj02 { /* 0x144 */ char unk_144[0x4D8]; } EnBoj02; // size = 0x61C -extern const ActorInit En_Boj_02_InitVars; - #endif // Z_EN_BOJ_02_H diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 46477ec337..0c55b79a6b 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -15,7 +15,7 @@ void EnBoj03_Destroy(Actor* thisx, PlayState* play); void EnBoj03_Update(Actor* thisx, PlayState* play); void EnBoj03_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Boj_03_InitVars = { +ActorInit En_Boj_03_InitVars = { ACTOR_EN_BOJ_03, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h index eac4fc691c..12776093de 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h @@ -10,6 +10,4 @@ typedef struct EnBoj03 { /* 0x144 */ char unk_144[0x4D8]; } EnBoj03; // size = 0x61C -extern const ActorInit En_Boj_03_InitVars; - #endif // Z_EN_BOJ_03_H diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index 2e080483d0..7fe308520b 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -15,7 +15,7 @@ void EnBoj04_Destroy(Actor* thisx, PlayState* play); void EnBoj04_Update(Actor* thisx, PlayState* play); void EnBoj04_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Boj_04_InitVars = { +ActorInit En_Boj_04_InitVars = { ACTOR_EN_BOJ_04, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h index 9681073e8d..4b05014fba 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h @@ -10,6 +10,4 @@ typedef struct EnBoj04 { /* 0x144 */ char unk_144[0x4D8]; } EnBoj04; // size = 0x61C -extern const ActorInit En_Boj_04_InitVars; - #endif // Z_EN_BOJ_04_H diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index 3b1508b7b1..da6816840a 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -15,7 +15,7 @@ void EnBoj05_Destroy(Actor* thisx, PlayState* play); void EnBoj05_Update(Actor* thisx, PlayState* play); void EnBoj05_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Boj_05_InitVars = { +ActorInit En_Boj_05_InitVars = { ACTOR_EN_BOJ_05, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h index bed1ad78eb..b2e5e7c7e5 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h @@ -10,6 +10,4 @@ typedef struct EnBoj05 { /* 0x144 */ char unk_144[0x4D8]; } EnBoj05; // size = 0x61C -extern const ActorInit En_Boj_05_InitVars; - #endif // Z_EN_BOJ_05_H diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 9eba18afcb..42baf77bff 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -32,7 +32,7 @@ typedef struct { static PowderKegFuseSegment sPowderKegFuseSegments[16]; -const ActorInit En_Bom_InitVars = { +ActorInit En_Bom_InitVars = { ACTOR_EN_BOM, ACTORCAT_EXPLOSIVES, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h index fe8eaadf1d..23218a1831 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h @@ -31,6 +31,4 @@ typedef struct EnBom { /* 0x200 */ EnBomActionFunc actionFunc; } EnBom; // size = 0x204 -extern const ActorInit En_Bom_InitVars; - #endif // Z_EN_BOM_H diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 795bc422d5..9dc36ff6cf 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -37,7 +37,7 @@ s32 D_809C6100 = 0; s32 D_809C6104 = 0; -const ActorInit En_Bom_Bowl_Man_InitVars = { +ActorInit En_Bom_Bowl_Man_InitVars = { ACTOR_EN_BOM_BOWL_MAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index 5f630e4e6e..fc911dd041 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -57,6 +57,4 @@ typedef struct EnBomBowlMan { /* 0x02F8 */ s32 unk_2F8; } EnBomBowlMan; // size = 0x2FC -extern const ActorInit En_Bom_Bowl_Man_InitVars; - #endif // Z_EN_BOM_BOWL_MAN_H diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 717c582a6d..cbcc402117 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -25,7 +25,7 @@ void EnBomChu_Move(EnBomChu* this, PlayState* play); void EnBomChu_Explode(EnBomChu* this, PlayState* play); void EnBomChu_WaitForDeath(EnBomChu* this, PlayState* play); -const ActorInit En_Bom_Chu_InitVars = { +ActorInit En_Bom_Chu_InitVars = { ACTOR_EN_BOM_CHU, ACTORCAT_EXPLOSIVES, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h index 35998aeac4..686bbb384d 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h @@ -25,6 +25,4 @@ typedef struct EnBomChu { /* 0x188 */ ColliderSphere collider; } EnBomChu; // size = 0x1E0 -extern const ActorInit En_Bom_Chu_InitVars; - #endif // Z_EN_BOM_CHU_H diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 49e1f22e6e..91e7fbd4ce 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -25,7 +25,7 @@ void EnBombal_InitEffects(EnBombal* this, Vec3f* pos, s16 fadeDelay); void EnBombal_UpdateEffects(EnBombal* this, PlayState* play); void EnBombal_DrawEffects(EnBombal*, PlayState*); -const ActorInit En_Bombal_InitVars = { +ActorInit En_Bombal_InitVars = { ACTOR_EN_BOMBAL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h index a678fe1d8c..7c72f3eea5 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h @@ -30,6 +30,4 @@ typedef struct EnBombal { /* 0x1A4 */ EnBombalEffect effects[200]; } EnBombal; // size = 0x2A44 -extern const ActorInit En_Bombal_InitVars; - #endif // Z_EN_BOMBAL_H diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 1fb8c0cf59..1d4d646f86 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -25,7 +25,7 @@ void func_80C042F8(EnBombers* this); void func_80C04354(EnBombers* this, PlayState* play); void func_80C043C8(EnBombers* this, PlayState* play); -const ActorInit En_Bombers_InitVars = { +ActorInit En_Bombers_InitVars = { ACTOR_EN_BOMBERS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h index 538b0d8b56..85c5ecdb31 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h @@ -50,6 +50,4 @@ typedef struct EnBombers { /* 0x2C8 */ ColliderCylinder collider; } EnBombers; // size = 0x314 -extern const ActorInit En_Bombers_InitVars; - #endif // Z_EN_BOMBERS_H diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index a381509e05..632ff3b671 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -23,7 +23,7 @@ void EnBombers2_ChangeAnim(EnBombers2* this, s32 animIndex, f32 playSpeed); void func_80C04D00(EnBombers2* this); void func_80C050B8(EnBombers2* this, PlayState* play); -const ActorInit En_Bombers2_InitVars = { +ActorInit En_Bombers2_InitVars = { ACTOR_EN_BOMBERS2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h index 0a62fd7042..4a79e6615f 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h @@ -41,6 +41,4 @@ typedef struct EnBombers2 { /* 0x2D0 */ ColliderCylinder collider; } EnBombers2; // size = 0x31C -extern const ActorInit En_Bombers2_InitVars; - #endif // Z_EN_BOMBERS2_H diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 4f17e74c89..fd5ce0bf6f 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -24,7 +24,7 @@ void func_808AEE3C(EnBombf* this, PlayState* play); void func_808AEF68(EnBombf* this, PlayState* play); void func_808AEFD4(EnBombf* this, PlayState* play); -const ActorInit En_Bombf_InitVars = { +ActorInit En_Bombf_InitVars = { ACTOR_EN_BOMBF, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h index 18a2a32ede..55b7f7bae7 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -26,6 +26,4 @@ typedef struct EnBombf { /* 0x204 */ f32 unk_204; } EnBombf; // size = 0x208 -extern const ActorInit En_Bombf_InitVars; - #endif // Z_EN_BOMBF_H 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 b23c93cd08..a9d81c10bf 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -53,7 +53,7 @@ typedef enum EN_BOMJIMA_ACTION { static s32 D_80C009F0 = 0; static s32 D_80C009F4 = 0; -const ActorInit En_Bomjima_InitVars = { +ActorInit En_Bomjima_InitVars = { ACTOR_EN_BOMJIMA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h index 046e8813c8..6a434be42d 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h @@ -56,6 +56,4 @@ typedef struct EnBomjima { /* 0x2F8 */ ColliderCylinder collider; } EnBomjima; // size = 0x344 -extern const ActorInit En_Bomjima_InitVars; - #endif // Z_EN_BOMJIMA_H 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 4258b23977..0e3a6f431f 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -40,7 +40,7 @@ void func_80C02DAC(EnBomjimb* this, PlayState* play); static Actor* D_80C03170 = NULL; -const ActorInit En_Bomjimb_InitVars = { +ActorInit En_Bomjimb_InitVars = { ACTOR_EN_BOMJIMB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h index 8b73ef9727..f411f21a26 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h @@ -61,6 +61,4 @@ typedef struct EnBomjimb { /* 0x2E8 */ ColliderCylinder collider; } EnBomjimb; // size = 0x334 -extern const ActorInit En_Bomjimb_InitVars; - #endif // Z_EN_BOMJIMB_H diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index ee8ea02e08..33af85b3e5 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -19,7 +19,7 @@ void EnBoom_Draw(Actor* thisx, PlayState* play); void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc); void func_808A2918(EnBoom* this, PlayState* play); -const ActorInit En_Boom_InitVars = { +ActorInit En_Boom_InitVars = { ACTOR_EN_BOOM, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 45e3618ed1..e5e3fa2b34 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -21,6 +21,4 @@ typedef struct EnBoom { /* 0x1F0 */ EnBoomActionFunc actionFunc; } EnBoom; // size = 0x1F4 -extern const ActorInit En_Boom_InitVars; - #endif // Z_EN_BOOM_H diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index bc33adc0ca..0c345aa508 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -56,7 +56,7 @@ void EnBox_Open(EnBox* this, PlayState* play); void func_80867FBC(func_80867BDC_a0* arg0, PlayState* play, s32 arg2); void func_80867FE4(func_80867BDC_a0* arg0, PlayState* play); -const ActorInit En_Box_InitVars = { +ActorInit En_Box_InitVars = { ACTOR_EN_BOX, ACTORCAT_CHEST, FLAGS, diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index cd164c9248..432025f14c 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -66,7 +66,5 @@ typedef struct EnBox { /* 0x220 */ s32 collectableFlag; } EnBox; // size = 0x224 -extern const ActorInit En_Box_InitVars; - #endif // Z_EN_BOX_H diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 4ad558a0a0..6c6e832c80 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -112,7 +112,7 @@ static DamageTable D_80C0F9E0 = { /* Powder Keg */ DMG_ENTRY(1, 0xD), }; -const ActorInit En_Bsb_InitVars = { +ActorInit En_Bsb_InitVars = { ACTOR_EN_BSB, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h index 38ec4078fe..d2f67c008e 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h @@ -14,6 +14,4 @@ typedef struct EnBsb { /* 0x0288 */ char unk_288[0xED0]; } EnBsb; // size = 0x1158 -extern const ActorInit En_Bsb_InitVars; - #endif // Z_EN_BSB_H diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index fb8c119da7..043f1ebb78 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -17,7 +17,7 @@ void EnBu_Draw(Actor* thisx, PlayState* play); void EnBu_DoNothing(EnBu* this, PlayState* play); -const ActorInit En_Bu_InitVars = { +ActorInit En_Bu_InitVars = { ACTOR_EN_BU, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.h b/src/overlays/actors/ovl_En_Bu/z_en_bu.h index 0f828477ca..05149742f0 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.h +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.h @@ -14,6 +14,4 @@ typedef struct EnBu { /* 0x18C */ Gfx* displayListPtr; } EnBu; // size = 0x190 -extern const ActorInit En_Bu_InitVars; - #endif // Z_EN_BU_H diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 799a1fb269..cbf9e9f3ca 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -19,7 +19,7 @@ void EnBubble_Wait(EnBubble* this, PlayState* play); void EnBubble_Pop(EnBubble* this, PlayState* play); void EnBubble_Regrow(EnBubble* this, PlayState* play); -const ActorInit En_Bubble_InitVars = { +ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h index 7affed807f..86e2358b40 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -32,6 +32,4 @@ typedef struct EnBubble { /* 0x254 */ f32 yVelocity; } EnBubble; // size = 0x258 -extern const ActorInit En_Bubble_InitVars; - #endif // Z_EN_BUBBLE_H diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 0a636be0d7..17c7e58025 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -53,7 +53,7 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -const ActorInit En_Butte_InitVars = { +ActorInit En_Butte_InitVars = { ACTOR_EN_BUTTE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h index 2d7a6a0bc6..4bcaf440c3 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -33,6 +33,4 @@ typedef struct EnButte { /* 0x25C */ f32 unk_25C; } EnButte; // size = 0x260 -extern const ActorInit En_Butte_InitVars; - #endif // Z_EN_BUTTE_H 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 0fb85a7562..edf68582fe 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -18,7 +18,7 @@ void EnCha_Draw(Actor* thisx, PlayState* play); void EnCha_Idle(EnCha* this, PlayState* play); -const ActorInit En_Cha_InitVars = { +ActorInit En_Cha_InitVars = { ACTOR_EN_CHA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.h b/src/overlays/actors/ovl_En_Cha/z_en_cha.h index b3cfe7312b..845ebc1636 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.h +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.h @@ -13,6 +13,4 @@ typedef struct EnCha { /* 0x190 */ EnChaActionFunc actionFunc; } EnCha; // size = 0x194 -extern const ActorInit En_Cha_InitVars; - #endif // Z_EN_CHA_H 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 e7ee1afb63..40bc4aeb6b 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 @@ -31,7 +31,7 @@ void EnClearTag_Draw(Actor* thisx, PlayState* play); void EnClearTag_UpdateEffects(EnClearTag* this, PlayState* play); void EnClearTag_DrawEffects(Actor* thisx, PlayState* play); -const ActorInit En_Clear_Tag_InitVars = { +ActorInit En_Clear_Tag_InitVars = { ACTOR_EN_CLEAR_TAG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h index c14cc36fdd..677fcc6984 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h @@ -41,6 +41,4 @@ typedef struct EnClearTag { /* 0x2E78 */ Vec3f subCamAt; } EnClearTag; // size = 0x2E84 -extern const ActorInit En_Clear_Tag_InitVars; - #endif // Z_EN_CLEAR_TAG_H diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 4a86843404..ed34831504 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -20,7 +20,7 @@ void EnCne01_Walk(EnHy* this, PlayState* play); void EnCne01_FaceForward(EnHy* this, PlayState* play); void EnCne01_Talk(EnHy* this, PlayState* play); -const ActorInit En_Cne_01_InitVars = { +ActorInit En_Cne_01_InitVars = { ACTOR_EN_CNE_01, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h index 0b9e1e08b8..2530257607 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h @@ -14,6 +14,4 @@ typedef struct EnCne01 { /* 0x3EC */ UNK_TYPE1 unk_3EC[0x230]; } EnCne01; // size = 0x61C -extern const ActorInit En_Cne_01_InitVars; - #endif // Z_EN_CNE_01_H 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 26540f16ec..7170ebdc8a 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 @@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = { { 10, 11, 1, { 0, 0, 0 } }, }; -const ActorInit En_Col_Man_InitVars = { +ActorInit En_Col_Man_InitVars = { ACTOR_EN_COL_MAN, ACTORCAT_MISC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h index 1e8f540dc7..977bf24733 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h @@ -24,6 +24,4 @@ typedef enum { /* 4 */ EN_COL_MAN_GAMEPLAY_BOMB, } EnColManType; -extern const ActorInit En_Col_Man_InitVars; - #endif // Z_EN_COL_MAN_H 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 18758bcc98..778a358a8c 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -27,7 +27,7 @@ void EnCow_DoTail(EnCow* this, PlayState* play); void EnCow_UpdateTail(Actor* thisx, PlayState* play); void EnCow_DrawTail(Actor* thisx, PlayState* play); -const ActorInit En_Cow_InitVars = { +ActorInit En_Cow_InitVars = { ACTOR_EN_COW, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h index 1fd6a36a9a..3c73b747fb 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -32,6 +32,4 @@ typedef struct EnCow { /* 0x0274 */ EnCowActionFunc actionFunc; } EnCow; // size = 0x278 -extern const ActorInit En_Cow_InitVars; - #endif // Z_EN_COW_H diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 2cf35e7a4d..b9e1071feb 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -27,7 +27,7 @@ void EnCrow_SetupRespawn(EnCrow* this); void EnCrow_TurnAway(EnCrow* this, PlayState* play); void EnCrow_Respawn(EnCrow* this, PlayState* play); -const ActorInit En_Crow_InitVars = { +ActorInit En_Crow_InitVars = { ACTOR_EN_CROW, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h index 86ffba903f..527f822f6c 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -31,6 +31,4 @@ typedef struct EnCrow { /* 0x298 */ f32 drawDmgEffScale; } EnCrow; // size = 0x29C -extern const ActorInit En_Crow_InitVars; - #endif // Z_EN_CROW_H 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 5537d28c23..7b758ca74d 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -19,7 +19,7 @@ void EnDai_Draw(Actor* thisx, PlayState* play); void func_80B3F00C(EnDai* this, PlayState* play); void func_80B3EF90(EnDai* this, PlayState* play); -const ActorInit En_Dai_InitVars = { +ActorInit En_Dai_InitVars = { ACTOR_EN_DAI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.h b/src/overlays/actors/ovl_En_Dai/z_en_dai.h index 0b0316d05f..4dc059c399 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.h +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.h @@ -46,6 +46,4 @@ typedef struct EnDai { /* 0xA70 */ s32 unk_A70; } EnDai; // size = 0xA74 -extern const ActorInit En_Dai_InitVars; - #endif // Z_EN_DAI_H 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 70bde87540..d9039ad594 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -21,7 +21,7 @@ void func_80943BC0(EnDaiku* this); void func_80943BDC(EnDaiku* this, PlayState* play); void func_809438F8(EnDaiku* this, PlayState* play); -const ActorInit En_Daiku_InitVars = { +ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index 4f93b3ea15..fa161e9fd5 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -45,6 +45,4 @@ typedef struct EnDaiku { /* 0x29C */ ColliderCylinder collider; } EnDaiku; // size = 0x2E8 -extern const ActorInit En_Daiku_InitVars; - #endif // Z_EN_DAIKU_H 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 53474f514b..7119436592 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -32,7 +32,7 @@ void func_80BE71D8(EnDaiku2* this, PlayState* play); void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5); void func_80BE7718(EnDaiku2* this, PlayState* play); -const ActorInit En_Daiku2_InitVars = { +ActorInit En_Daiku2_InitVars = { ACTOR_EN_DAIKU2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h index dab4096c04..f13b896119 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h @@ -53,6 +53,4 @@ typedef struct EnDaiku2 { /* 0xD7C */ ColliderCylinder collider; } EnDaiku2; // size = 0xDC8 -extern const ActorInit En_Daiku2_InitVars; - #endif // Z_EN_DAIKU2_H diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index b0f03af7cb..dd05c2d483 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -38,7 +38,7 @@ void func_808C7D34(EnDeath* this, PlayState* play); void func_808C7DCC(EnDeath* this, PlayState* play); #if 0 -const ActorInit En_Death_InitVars = { +ActorInit En_Death_InitVars = { ACTOR_EN_DEATH, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.h b/src/overlays/actors/ovl_En_Death/z_en_death.h index bc4e326bb2..16863cf836 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.h +++ b/src/overlays/actors/ovl_En_Death/z_en_death.h @@ -14,6 +14,4 @@ typedef struct EnDeath { /* 0x18C */ char unk_18C[0x7AC]; } EnDeath; // size = 0x938 -extern const ActorInit En_Death_InitVars; - #endif // Z_EN_DEATH_H diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index d05ac10039..93d4952670 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -32,7 +32,7 @@ void func_808B3DA8(EnDekubaba* this, PlayState* play); void func_808B3EE8(EnDekubaba* this, PlayState* play); #if 0 -const ActorInit En_Dekubaba_InitVars = { +ActorInit En_Dekubaba_InitVars = { ACTOR_EN_DEKUBABA, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index 923f336aa4..848f056bf9 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -14,6 +14,4 @@ typedef struct EnDekubaba { /* 0x18C */ char unk_18C[0x290]; } EnDekubaba; // size = 0x41C -extern const ActorInit En_Dekubaba_InitVars; - #endif // Z_EN_DEKUBABA_H 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 990a7328e3..6bc0fd8d19 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -39,7 +39,7 @@ void func_808BE4D4(EnDekunuts* this, PlayState* play); void func_808BE680(EnDekunuts* this); void func_808BE6C4(EnDekunuts* this, PlayState* play); -const ActorInit En_Dekunuts_InitVars = { +ActorInit En_Dekunuts_InitVars = { ACTOR_EN_DEKUNUTS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h index 596369c62a..c6672b06e4 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -36,6 +36,4 @@ typedef struct EnDekunuts { /* 0x27C */ ColliderCylinder collider; } EnDekunuts; // size = 0x2C8 -extern const ActorInit En_Dekunuts_InitVars; - #endif // Z_EN_DEKUNUTS_H diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 47e11a2e8d..2a4eb1553a 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -30,7 +30,7 @@ typedef enum { /* 4 */ DEMOHEISHI_ANIM_STAND_UP } EnDemoheishiAnimation; -const ActorInit En_Demo_heishi_InitVars = { +ActorInit En_Demo_heishi_InitVars = { ACTOR_EN_DEMO_HEISHI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h index c14fa53269..181198e0f9 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h @@ -28,6 +28,4 @@ typedef struct EnDemoheishi { /* 0x274 */ ColliderCylinder colliderCylinder; } EnDemoheishi; //size = 0x2C0 -extern const ActorInit En_Demo_heishi_InitVars; - #endif // Z_EN_DEMO_HEISHI_H 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 d8bb2b095a..bd2c1e6030 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -36,7 +36,7 @@ void EnDg_Thrown(EnDg* this, PlayState* play); void EnDg_SetupTalk(EnDg* this, PlayState* play); void EnDg_Talk(EnDg* this, PlayState* play); -const ActorInit En_Dg_InitVars = { +ActorInit En_Dg_InitVars = { ACTOR_EN_DG, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.h b/src/overlays/actors/ovl_En_Dg/z_en_dg.h index 2b2bdd7cb4..62c01a011b 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.h +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.h @@ -65,6 +65,4 @@ typedef struct EnDg { /* 0x294 */ Vec3f curRot; } EnDg; // size = 0x2A0 -extern const ActorInit En_Dg_InitVars; - #endif // Z_EN_DG_H 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 94d0204f22..e2ad9433c5 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -57,7 +57,7 @@ void func_8089C398(EnDinofos* this); void func_8089C164(EnDinofos* this); void func_8089C244(EnDinofos* this); -const ActorInit En_Dinofos_InitVars = { +ActorInit En_Dinofos_InitVars = { ACTOR_EN_DINOFOS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h index fcdf48c320..4284d55952 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h @@ -39,6 +39,4 @@ typedef struct EnDinofos { /* 0x5C4 */ ColliderQuad colliderQuad; } EnDinofos; // size = 0x644 -extern const ActorInit En_Dinofos_InitVars; - #endif // Z_EN_DINOFOS_H 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 b9bc34d99b..615383a27a 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -21,7 +21,7 @@ s32 func_80A507C0(EnDnbUnkStruct* arg0, Vec3f arg1, Vec3f arg2, u8 arg3, f32 arg s32 func_80A5086C(EnDnbUnkStruct* arg0); s32 func_80A50950(EnDnbUnkStruct* arg0, PlayState* play2); -const ActorInit En_Dnb_InitVars = { +ActorInit En_Dnb_InitVars = { ACTOR_EN_DNB, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h index 17ee19abef..aa17663bf9 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h @@ -41,6 +41,4 @@ typedef struct EnDnb { /* 0x0D38 */ EnDnbUnkStruct unk_0D38[256]; } EnDnb; // size = 0x3538 -extern const ActorInit En_Dnb_InitVars; - #endif // Z_EN_DNB_H diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index f1b78f25da..9413b046ce 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -19,7 +19,7 @@ void func_80A50F38(EnDnh* this, PlayState* play); void func_80A50F9C(EnDnh* this, PlayState* play); #if 0 -const ActorInit En_Dnh_InitVars = { +ActorInit En_Dnh_InitVars = { ACTOR_EN_DNH, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h index e26b9a7c02..c2331d7771 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h @@ -13,6 +13,4 @@ typedef struct EnDnh { /* 0x148 */ char unk_148[0x74]; } EnDnh; // size = 0x1BC -extern const ActorInit En_Dnh_InitVars; - #endif // Z_EN_DNH_H 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 75537bf86b..ee035f06b1 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -24,7 +24,7 @@ void func_80A52134(EnDnk* this, PlayState* play); static s16 D_80A521A0 = 0; -const ActorInit En_Dnk_InitVars = { +ActorInit En_Dnk_InitVars = { ACTOR_EN_DNK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h index 9b69135489..f0665f1b5b 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h @@ -40,6 +40,4 @@ typedef struct EnDnk { /* 0x2A2 */ s16 unk_2A2; } EnDnk; // size = 0x2A4 -extern const ActorInit En_Dnk_InitVars; - #endif // Z_EN_DNK_H 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 0c2aa8369d..3c97b83775 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -89,7 +89,7 @@ static AnimationSpeedInfo sAnimations[] = { { &gDekuButlerGrieveAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, }; -const ActorInit En_Dno_InitVars = { +ActorInit En_Dno_InitVars = { ACTOR_EN_DNO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.h b/src/overlays/actors/ovl_En_Dno/z_en_dno.h index db07a969b8..470c82ee8d 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.h +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.h @@ -50,6 +50,4 @@ typedef struct EnDno { /* 0x468 */ u8 unk_468; } EnDno; // size = 0x46C -extern const ActorInit En_Dno_InitVars; - #endif // Z_EN_DNO_H 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 dea49a276b..32f149ddd7 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -25,7 +25,7 @@ void func_80B3D338(EnDnp* this, PlayState* play); void func_80B3D3F8(EnDnp* this, PlayState* play); void func_80B3D558(EnDnp* this, PlayState* play); -const ActorInit En_Dnp_InitVars = { +ActorInit En_Dnp_InitVars = { ACTOR_EN_DNP, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h index e76180afe5..f44110a85c 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h @@ -38,6 +38,4 @@ typedef struct EnDnp { /* 0x340 */ s32 unk_340; } EnDnp; // size = 0x344 -extern const ActorInit En_Dnp_InitVars; - #endif // Z_EN_DNP_H 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 dc1fd182ca..6ae6c665ce 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -25,7 +25,7 @@ static s32 D_80A53400[] = { 0x0C0E089D, 0x0C0F089E, 0x0C111202, 0x100E089F, 0x0C100000, 0x0E08A10C, 0x0F08A20C, 0x10000000, }; -const ActorInit En_Dnq_InitVars = { +ActorInit En_Dnq_InitVars = { ACTOR_EN_DNQ, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h index 3b3e5d042e..5afb8bdf80 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h @@ -35,6 +35,4 @@ typedef struct EnDnq { /* 0x3A4 */ s32 unk_3A4; } EnDnq; // size = 0x3A8 -extern const ActorInit En_Dnq_InitVars; - #endif // Z_EN_DNQ_H 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 38942387f4..05189cadf4 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -39,7 +39,7 @@ static s32 D_8092DCB0[] = { 0x0E08330C, 0x09000015, 0x1C014016, 0x10000000, 0x0E082E0C, 0x10000000, }; -const ActorInit En_Dns_InitVars = { +ActorInit En_Dns_InitVars = { ACTOR_EN_DNS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index 3a382c192c..b54e49a6a2 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -57,6 +57,4 @@ typedef struct EnDns { /* 0x2FC */ s32 unk_2FC; } EnDns; // size = 0x300 -extern const ActorInit En_Dns_InitVars; - #endif // Z_EN_DNS_H 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 bba07ce4bb..d1ec4ea701 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -35,7 +35,7 @@ void func_808786C8(EnDodongo* this, PlayState* play); void func_80878724(EnDodongo* this); void func_808787B0(EnDodongo* this, PlayState* play); -const ActorInit En_Dodongo_InitVars = { +ActorInit En_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index a196b1f8c0..3cc80b0d1e 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -36,6 +36,4 @@ typedef struct EnDodongo { /* 0x754 */ ColliderJntSphElement collider3Elements[3]; } EnDodongo; // size = 0x814 -extern const ActorInit En_Dodongo_InitVars; - #endif // Z_EN_DODONGO_H diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 34f0266f44..6230bd0668 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -277,7 +277,7 @@ u8* D_8086778C[] = { D_80867734, D_8086773C, D_80867744, D_8086775C, D_80867778, D_8086777C, D_80867780, D_80867784, }; -const ActorInit En_Door_InitVars = { +ActorInit En_Door_InitVars = { ACTOR_EN_DOOR, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index 359f34cd2c..bea44a1226 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -26,6 +26,4 @@ typedef struct EnDoor { /* 0x1C8 */ EnDoorActionFunc actionFunc; } EnDoor; -extern const ActorInit En_Door_InitVars; - #endif // Z_EN_DOOR_H diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 61dd4921dc..8959dde7ac 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -20,7 +20,7 @@ void func_80AC21A0(EnDoorEtc* this, PlayState* play); void func_80AC2354(EnDoorEtc* this, PlayState* play); void EnDoorEtc_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Door_Etc_InitVars = { +ActorInit En_Door_Etc_InitVars = { ACTOR_EN_DOOR_ETC, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h index cbcdf2f54f..49ca83f2aa 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h @@ -22,6 +22,4 @@ typedef struct EnDoorEtc { /* 0x1F8 */ EnDoorEtcActionFunc actionFunc; } EnDoorEtc; // size = 0x1FC -extern const ActorInit En_Door_Etc_InitVars; - #endif // Z_EN_DOOR_ETC_H diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 2621ed1d84..ea54d8fdb2 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -50,7 +50,7 @@ typedef enum { static s32 sNumPythonsDead = 0; -const ActorInit En_Dragon_InitVars = { +ActorInit En_Dragon_InitVars = { ACTOR_EN_DRAGON, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h index 321d0ad950..cb2ab94903 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h @@ -61,6 +61,4 @@ typedef struct EnDragon { /* 0x2FC */ ColliderJntSphElement colliderElements[8]; } EnDragon; // size = 0x4FC -extern const ActorInit En_Dragon_InitVars; - #endif // Z_EN_DRAGON_H diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 5ecab4fd48..75d493b412 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -17,7 +17,7 @@ void EnDrs_Draw(Actor* thisx, PlayState* play); void EnDrs_Idle(EnDrs* this, PlayState* play); -const ActorInit En_Drs_InitVars = { +ActorInit En_Drs_InitVars = { ACTOR_EN_DRS, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.h b/src/overlays/actors/ovl_En_Drs/z_en_drs.h index d86121efb1..d811ae7809 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.h +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.h @@ -19,6 +19,4 @@ typedef struct EnDrs { /* 0x208 */ s8 moonMaskObjBankIndex; } EnDrs; // size = 0x20C */ -extern const ActorInit En_Drs_InitVars; - #endif // Z_EN_DRS_H diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 7e517ce092..67dff9c41f 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -20,7 +20,7 @@ void EnDs2n_Draw(Actor* thisx, PlayState* play); void EnDs2n_Idle(EnDs2n* this, PlayState* play); -const ActorInit En_Ds2n_InitVars = { +ActorInit En_Ds2n_InitVars = { ACTOR_EN_DS2N, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h index c7155ed740..f2a6c07257 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h @@ -22,6 +22,4 @@ typedef struct EnDs2n { } EnDs2n; // size = 0x234 -extern const ActorInit En_Ds2n_InitVars; - #endif // Z_EN_DS2N_H diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index d4b809027e..0ac7dcb4bb 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -16,7 +16,7 @@ void EnDt_Update(Actor* thisx, PlayState* play); void EnDt_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Dt_InitVars = { +ActorInit En_Dt_InitVars = { ACTOR_EN_DT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.h b/src/overlays/actors/ovl_En_Dt/z_en_dt.h index 78b0987891..6afbf8cd22 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.h +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.h @@ -14,6 +14,4 @@ typedef struct EnDt { /* 0x240 */ char unk_240[0xA0]; } EnDt; // size = 0x2E0 -extern const ActorInit En_Dt_InitVars; - #endif // Z_EN_DT_H 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 343112f49b..dfd97196a9 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 @@ -19,7 +19,7 @@ void EnDyExtra_Draw(Actor* thisx, PlayState* play); void func_80A61334(EnDyExtra* this, PlayState* play); void func_80A613C8(EnDyExtra* this, PlayState* play); -const ActorInit En_Dy_Extra_InitVars = { +ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h index 6d5d93ec43..0e5d8614b7 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -19,6 +19,4 @@ typedef struct EnDyExtra { /* 0x160 */ Vec3f unk160; } EnDyExtra; // size = 0x16C -extern const ActorInit En_Dy_Extra_InitVars; - #endif // Z_EN_DY_EXTRA_H diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index 4607e29091..2a1a976f5e 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -16,7 +16,7 @@ void EnEgblock_Update(Actor* thisx, PlayState* play); void EnEgblock_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Egblock_InitVars = { +ActorInit En_Egblock_InitVars = { ACTOR_EN_EGBLOCK, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h index d1222a5ebf..88abf1efea 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h @@ -14,6 +14,4 @@ typedef struct EnEgblock { /* 0x1A4 */ char unk_1A4[0xC10]; } EnEgblock; // size = 0xDB4 -extern const ActorInit En_Egblock_InitVars; - #endif // Z_EN_EGBLOCK_H diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 373d06583f..6b81852491 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -107,7 +107,7 @@ static DamageTable D_80A80DAC = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit En_Egol_InitVars = { +ActorInit En_Egol_InitVars = { ACTOR_EN_EGOL, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.h b/src/overlays/actors/ovl_En_Egol/z_en_egol.h index 9e00971529..bfcc532310 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.h +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.h @@ -14,6 +14,4 @@ typedef struct EnEgol { /* 0x02AC */ char unk_2AC[0x1BC4]; } EnEgol; // size = 0x1E70 -extern const ActorInit En_Egol_InitVars; - #endif // Z_EN_EGOL_H 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 27f619816d..6d21e23e56 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -33,7 +33,7 @@ void func_8088F5F4(EnElf* this, PlayState* play, s32 sparkleLife); void func_8089010C(Actor* thisx, PlayState* play); void func_808908D0(Vec3f* vec, PlayState* play, u32 action); -const ActorInit En_Elf_InitVars = { +ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index 64d53744f0..680d59158c 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -60,6 +60,4 @@ typedef enum { /* 0x07 */ ENELF_TYPE_7 } FairyType; -extern const ActorInit En_Elf_InitVars; - #endif // Z_EN_ELF_H 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 07dafa54ff..12026b8b9f 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -20,7 +20,7 @@ void EnElfbub_Draw(Actor* thisx, PlayState* play2); void EnElfbub_Pop(EnElfbub* this, PlayState* play); void EnElfbub_Idle(EnElfbub* this, PlayState* play); -const ActorInit En_Elfbub_InitVars = { +ActorInit En_Elfbub_InitVars = { ACTOR_EN_ELFBUB, ACTORCAT_MISC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h index cab77c8a41..50c6bd672d 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h @@ -21,6 +21,4 @@ typedef struct EnElfbub { /* 0x1A0 */ EnElfbubActionFunc actionFunc; } EnElfbub; // size = 0x1A4 -extern const ActorInit En_Elfbub_InitVars; - #endif // Z_EN_ELFBUB_H diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index 1792f4de44..b90d3978fd 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -33,7 +33,7 @@ void func_80A3A77C(EnElfgrp* this, PlayState* play); void func_80A3A7FC(EnElfgrp* this, PlayState* play); void func_80A3A8F8(EnElfgrp* this, PlayState* play); -const ActorInit En_Elfgrp_InitVars = { +ActorInit En_Elfgrp_InitVars = { ACTOR_EN_ELFGRP, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h index 8536b806e7..975b08c2c5 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h @@ -28,6 +28,4 @@ typedef struct EnElfgrp { /* 0x14C */ EnElfgrpActionFunc actionFunc; } EnElfgrp; // size = 0x150 -extern const ActorInit En_Elfgrp_InitVars; - #endif // Z_EN_ELFGRP_H diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index c13709930d..60c5b3364d 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -22,7 +22,7 @@ void EnElforg_FreeFloating(EnElforg* this, PlayState* play); void EnElforg_SetupTrappedByEnemy(EnElforg* this, PlayState* play); void EnElforg_HiddenByCollider(EnElforg* this, PlayState* play); -const ActorInit En_Elforg_InitVars = { +ActorInit En_Elforg_InitVars = { ACTOR_EN_ELFORG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h index 5de48e955a..798982b09a 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h @@ -55,6 +55,4 @@ typedef struct EnElforg { /* 0x22C */ EnElforgActionFunc actionFunc; } EnElforg; // size = 0x230 -extern const ActorInit En_Elforg_InitVars; - #endif // Z_EN_ELFORG_H diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 3198f14022..2e6a44b64d 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -15,7 +15,7 @@ void EnEncount1_Update(Actor* thisx, PlayState* play); void func_808E0954(EnEncount1* this, PlayState* play); -const ActorInit En_Encount1_InitVars = { +ActorInit En_Encount1_InitVars = { ACTOR_EN_ENCOUNT1, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index 8906d523ef..52e0fb30c3 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -34,6 +34,4 @@ typedef struct EnEncount1 { /* 0x160 */ f32 unk_160; } EnEncount1; // size = 0x164 -extern const ActorInit En_Encount1_InitVars; - #endif // Z_EN_ENCOUNT1_H 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 cded227d10..656ec7936f 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -25,7 +25,7 @@ void EnEncount2_InitEffects(EnEncount2* this, Vec3f* pos, s16 fadeDelay); void EnEncount2_UpdateEffects(EnEncount2* this, PlayState* play); void EnEncount2_DrawEffects(EnEncount2* this, PlayState* play); -const ActorInit En_Encount2_InitVars = { +ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h index 9927653e2d..0a9cb13943 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -35,6 +35,4 @@ typedef struct EnEncount2 { #define ENCOUNT2_GET_SWITCH_FLAG(thisx) ((thisx)->params & 0x7F) -extern const ActorInit En_Encount2_InitVars; - #endif // Z_EN_ENCOUNT2_H diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index ead07b294c..869d8681e2 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -20,7 +20,7 @@ void func_809AD194(EnEncount3* this, PlayState* play); void func_809AD1EC(EnEncount3* this, PlayState* play); #if 0 -const ActorInit En_Encount3_InitVars = { +ActorInit En_Encount3_InitVars = { ACTOR_EN_ENCOUNT3, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h index 2b0bb59d8e..9ebc87303b 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h @@ -13,6 +13,4 @@ typedef struct EnEncount3 { /* 0x148 */ char unk_148[0x84]; } EnEncount3; // size = 0x1CC -extern const ActorInit En_Encount3_InitVars; - #endif // Z_EN_ENCOUNT3_H diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index a244d6d0af..69fa6bf09c 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -21,7 +21,7 @@ void func_809C4598(EnEncount4* this, PlayState* play); void func_809C464C(EnEncount4* this, PlayState* play); #if 0 -const ActorInit En_Encount4_InitVars = { +ActorInit En_Encount4_InitVars = { ACTOR_EN_ENCOUNT4, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h index 499da9663c..63df20f656 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h @@ -17,6 +17,4 @@ typedef struct EnEncount4 { /* 0x0152 */ char unk_152[0x6]; } EnEncount4; // size = 0x158 -extern const ActorInit En_Encount4_InitVars; - #endif // Z_EN_ENCOUNT4_H 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 946c19c99a..6cdf54d701 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 @@ -19,7 +19,7 @@ void EnEndingHero_Draw(Actor* thisx, PlayState* play); void func_80C1E748(EnEndingHero* this); void func_80C1E764(EnEndingHero* this, PlayState* play); -const ActorInit En_Ending_Hero_InitVars = { +ActorInit En_Ending_Hero_InitVars = { ACTOR_EN_ENDING_HERO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h index 098f2ffe06..6049e34495 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h @@ -18,6 +18,4 @@ typedef struct EnEndingHero { /* 0x244 */ u16 unk244; } EnEndingHero; // size = 0x248 -extern const ActorInit En_Ending_Hero_InitVars; - #endif // Z_EN_ENDING_HERO_H 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 f33c9d6826..2650ad1565 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 @@ -19,7 +19,7 @@ void EnEndingHero2_Draw(Actor* thisx, PlayState* play); void func_80C232E8(EnEndingHero2* this); void func_80C23304(EnEndingHero2* this, PlayState* play); -const ActorInit En_Ending_Hero2_InitVars = { +ActorInit En_Ending_Hero2_InitVars = { ACTOR_EN_ENDING_HERO2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h index 80ee813fa0..2ad3b49141 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h @@ -16,6 +16,4 @@ typedef struct EnEndingHero2 { /* 0x27C */ u16 unk27C; } EnEndingHero2; // size = 0x280 -extern const ActorInit En_Ending_Hero2_InitVars; - #endif // Z_EN_ENDING_HERO2_H 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 6cd6de0f9a..8dcc12199b 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 @@ -19,7 +19,7 @@ void EnEndingHero3_Draw(Actor* thisx, PlayState* play); void func_80C23518(EnEndingHero3* this); void func_80C23534(EnEndingHero3* this, PlayState* play); -const ActorInit En_Ending_Hero3_InitVars = { +ActorInit En_Ending_Hero3_InitVars = { ACTOR_EN_ENDING_HERO3, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h index 2a30f1d9c3..0887df1ab1 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h @@ -16,6 +16,4 @@ typedef struct EnEndingHero3 { /* 0x258 */ u16 unk258; } EnEndingHero3; // size = 0x25C -extern const ActorInit En_Ending_Hero3_InitVars; - #endif // Z_EN_ENDING_HERO3_H 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 716237321c..333bbc9180 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 @@ -19,7 +19,7 @@ void EnEndingHero4_Draw(Actor* thisx, PlayState* play); void func_80C23748(EnEndingHero4* this); void func_80C23764(EnEndingHero4* this, PlayState* play); -const ActorInit En_Ending_Hero4_InitVars = { +ActorInit En_Ending_Hero4_InitVars = { ACTOR_EN_ENDING_HERO4, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h index 2f050f2df4..4cada4183f 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h @@ -16,6 +16,4 @@ typedef struct EnEndingHero4 { /* 0x258 */ u16 unk258; } EnEndingHero4; // size = 0x25C -extern const ActorInit En_Ending_Hero4_InitVars; - #endif // Z_EN_ENDING_HERO4_H 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 4d87fe0ede..ee62798f18 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 @@ -19,7 +19,7 @@ void EnEndingHero5_Draw(Actor* thisx, PlayState* play); void func_80C23980(EnEndingHero5* this); void func_80C2399C(EnEndingHero5* this, PlayState* play); -const ActorInit En_Ending_Hero5_InitVars = { +ActorInit En_Ending_Hero5_InitVars = { ACTOR_EN_ENDING_HERO5, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h index 4b26b03dbf..9e3dab09e7 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h @@ -17,6 +17,4 @@ typedef struct EnEndingHero5 { /* 0x25C */ s32 unk25C; } EnEndingHero5; // size = 0x260 -extern const ActorInit En_Ending_Hero5_InitVars; - #endif // Z_EN_ENDING_HERO5_H 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 d6da2f9787..8f19fe9f8c 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 @@ -24,7 +24,7 @@ void EnEndingHero6_InitSkelAnime(EnEndingHero6* this, s32 npcIndex); void EnEndingHero6_SetupIdle(EnEndingHero6* this); void EnEndingHero6_Idle(EnEndingHero6* this, PlayState* play); -const ActorInit En_Ending_Hero6_InitVars = { +ActorInit En_Ending_Hero6_InitVars = { ACTOR_EN_ENDING_HERO6, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h index f30d09a7a2..76af1d67f5 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h @@ -23,6 +23,4 @@ typedef struct EnEndingHero6 { /* 0x290 */ s16 isIdle; } EnEndingHero6; // size = 0x294 -extern const ActorInit En_Ending_Hero6_InitVars; - #endif // Z_EN_ENDING_HERO6_H diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 006166e4bc..67a3042ee1 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -19,7 +19,7 @@ void func_80A9A1DC(EnEstone* this, PlayState* play); void func_80A9A4B0(EnEstone* this, PlayState* play); #if 0 -const ActorInit En_Estone_InitVars = { +ActorInit En_Estone_InitVars = { ACTOR_EN_ESTONE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.h b/src/overlays/actors/ovl_En_Estone/z_en_estone.h index b265bf4de8..8e4fa075db 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.h +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.h @@ -13,6 +13,4 @@ typedef struct EnEstone { /* 0x0148 */ char unk_148[0x2C2C]; } EnEstone; // size = 0x2D74 -extern const ActorInit En_Estone_InitVars; - #endif // Z_EN_ESTONE_H 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 82f6838bcc..aaf3958cbd 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -62,7 +62,7 @@ typedef struct { EnFallDebrisEffect debrisEffects[EN_FALL_DEBRIS_EFFECT_COUNT]; -const ActorInit En_Fall_InitVars = { +ActorInit En_Fall_InitVars = { ACTOR_EN_FALL, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.h b/src/overlays/actors/ovl_En_Fall/z_en_fall.h index 21746b6832..c9eaaf44f9 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.h +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.h @@ -50,6 +50,4 @@ typedef struct EnFall { /* 0x160 */ EnFallActionFunc actionFunc; } EnFall; // size = 0x164 -extern const ActorInit En_Fall_InitVars; - #endif // Z_EN_FALL_H diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index 58ab4e5916..e2eaefe264 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -21,7 +21,7 @@ void func_80C1B9D4(EnFall2* this, PlayState* play); void func_80C1B8F0(EnFall2* this); void func_80C1B9D4(EnFall2* this, PlayState* play); -const ActorInit En_Fall2_InitVars = { +ActorInit En_Fall2_InitVars = { ACTOR_EN_FALL2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h index 5ac33b27de..41f0644983 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h @@ -20,6 +20,4 @@ typedef struct EnFall2 { /* 0x2E8 */ EnFall2ActionFunc actionFunc; } EnFall2; // size = 0x2EC -extern const ActorInit En_Fall2_InitVars; - #endif // Z_EN_FALL2_H diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 4f8f1928f0..27dcabc23c 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -51,7 +51,7 @@ void EnFamos_SetupDeathFade(EnFamos* this); void EnFamos_DeathFade(EnFamos* this, PlayState* play); void EnFamos_DrawDebris(EnFamos* this, PlayState* play); -const ActorInit En_Famos_InitVars = { +ActorInit En_Famos_InitVars = { ACTOR_EN_FAMOS, ACTORCAT_ENEMY, FLAGS, 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 cacc2e728f..6a4c357d9b 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -24,7 +24,7 @@ void EnFg_AddDust(EnFgEffectDust* dustEffect, Vec3f* worldPos); void EnFg_UpdateDust(EnFgEffectDust* dustEffect); void EnFg_DrawDust(PlayState* play, EnFgEffectDust* dustEffect); -const ActorInit En_Fg_InitVars = { +ActorInit En_Fg_InitVars = { ACTOR_EN_FG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index da1c945597..90801ef444 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -15,7 +15,7 @@ void EnFireRock_Destroy(Actor* thisx, PlayState* play); void EnFireRock_Update(Actor* thisx, PlayState* play); void EnFireRock_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Fire_Rock_InitVars = { +ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h index 84c437ac10..e2b32aaf9f 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h @@ -10,6 +10,4 @@ typedef struct EnFireRock { /* 0x144 */ char unk_144[0x94]; } EnFireRock; // size = 0x1D8 -extern const ActorInit En_Fire_Rock_InitVars; - #endif // Z_EN_FIRE_ROCK_H 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 8a9c2ac554..5cdcd99feb 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -44,7 +44,7 @@ typedef enum { /* 2 */ KEESE_AURA_ICE } KeeseAuraType; -const ActorInit En_Firefly_InitVars = { +ActorInit En_Firefly_InitVars = { ACTOR_EN_FIREFLY, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index ffb295e6a3..6ac9fb008f 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -38,6 +38,4 @@ typedef struct EnFirefly { /* 0x31C */ ColliderSphere collider; } EnFirefly; // size = 0x374 -extern const ActorInit En_Firefly_InitVars; - #endif // Z_EN_FIREFLY_H diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index b3b446ef3f..6c105caa2c 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -15,7 +15,7 @@ void EnFirefly2_Destroy(Actor* thisx, PlayState* play); void EnFirefly2_Update(Actor* thisx, PlayState* play); void EnFirefly2_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Firefly2_InitVars = { +ActorInit En_Firefly2_InitVars = { ACTOR_EN_FIREFLY2, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h index c60f26ae21..b1e8179e11 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h @@ -10,6 +10,4 @@ typedef struct EnFirefly2 { /* 0x144 */ char unk_144[0x228]; } EnFirefly2; // size = 0x36C -extern const ActorInit En_Firefly2_InitVars; - #endif // Z_EN_FIREFLY2_H diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index dc0b527316..5f9bbb2daa 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -68,7 +68,7 @@ static Color_RGB8 D_8091FA94[] = { { 215, 97, 7 }, }; -const ActorInit En_Fish_InitVars = { +ActorInit En_Fish_InitVars = { ACTOR_EN_FISH, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h index 4596c79b17..528eeb40c9 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -48,6 +48,4 @@ typedef struct EnFish { /* 0x279 */ s8 unk_279; } EnFish; // size = 0x27C -extern const ActorInit En_Fish_InitVars; - #endif // Z_EN_FISH_H 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 97ce121270..fc469da817 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -49,7 +49,7 @@ static s32 D_80B2B2EC = 0; static s32 D_80B2B2F0 = 0; static Actor* D_80B2B2F4 = NULL; -const ActorInit En_Fish2_InitVars = { +ActorInit En_Fish2_InitVars = { ACTOR_EN_FISH2, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h index 67dfa98f77..49941d67ed 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h @@ -60,6 +60,4 @@ typedef struct EnFish2 { /* 0x03F8 */ EnFish2UnkStruct unk_3F8[200]; } EnFish2; // size = 0x2018 -extern const ActorInit En_Fish2_InitVars; - #endif // Z_EN_FISH2_H diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index db1dadbda3..62ffba4d0d 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -201,7 +201,7 @@ s16 D_80917272; u8 D_80917274; Vec3f D_80917278; -const ActorInit En_Fishing_InitVars = { +ActorInit En_Fishing_InitVars = { ACTOR_EN_FISHING, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h index 5af536dbb0..a3dcb3a95b 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h @@ -61,6 +61,4 @@ typedef struct EnFishing { /* 0x248 */ ColliderJntSphElement colliderElements[12]; } EnFishing; // size = 0x548 -extern const ActorInit En_Fishing_InitVars; - #endif // Z_EN_FISHING_H 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 b8a0d96999..4fd3c46d88 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -59,7 +59,7 @@ void func_808D2D30(EnFloormas* this, PlayState* play); void func_808D2DC0(EnFloormas* this, PlayState* play); void func_808D3754(Actor* thisx, PlayState* play); -const ActorInit En_Floormas_InitVars = { +ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index c4500973ff..002f9e67ca 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -36,6 +36,4 @@ typedef struct EnFloormas { /* 0x354 */ ColliderCylinder collider; } EnFloormas; // size = 0x3A0 -extern const ActorInit En_Floormas_InitVars; - #endif // Z_EN_FLOORMAS_H diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 5ca2e8c22a..0b645b3029 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -14,7 +14,7 @@ void EnFr_Init(Actor* thisx, PlayState* play); void EnFr_Destroy(Actor* thisx, PlayState* play); void EnFr_Update(Actor* thisx, PlayState* play); -const ActorInit En_Fr_InitVars = { +ActorInit En_Fr_InitVars = { ACTOR_EN_FR, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index f0de1936db..27682ce404 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -12,6 +12,4 @@ typedef struct EnFr { /* 0x000 */ Actor actor; } EnFr; // size = 0x144 -extern const ActorInit En_Fr_InitVars; - #endif // Z_EN_FR_H 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 0cc5fb0269..ec85119e87 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -69,7 +69,7 @@ typedef enum { /* 13 */ FSN_ANIM_MAX } FsnAnimation; -const ActorInit En_Fsn_InitVars = { +ActorInit En_Fsn_InitVars = { ACTOR_EN_FSN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h index 6bf337be73..35b654c3db 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h @@ -68,6 +68,4 @@ typedef struct EnFsn { /* 0x44E */ u16 flags; } EnFsn; // size = 0x450 -extern const ActorInit En_Fsn_InitVars; - #endif // Z_EN_FSN_H 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 f02a04aeec..8b035faed0 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -55,7 +55,7 @@ void func_80964694(EnFu* this, EnFuUnkStruct* ptr, Vec3f* arg2, s32 len); void func_809647EC(PlayState* play, EnFuUnkStruct* ptr, s32 len); void func_80964950(PlayState* play, EnFuUnkStruct* ptr, s32 len); -const ActorInit En_Fu_InitVars = { +ActorInit En_Fu_InitVars = { ACTOR_EN_FU, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h index e35c961e73..44f769a8c4 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -52,6 +52,4 @@ typedef struct EnFu { /* 0x552 */ u16 unk_552; } EnFu; // size = 0x554 -extern const ActorInit En_Fu_InitVars; - #endif // Z_EN_FU_H diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index 1a51d0ec7f..b232210f50 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -28,7 +28,7 @@ void func_80AD0028(EnFuKago* this, PlayState* play); void func_80AD0274(EnFuKago* this); void func_80AD0288(EnFuKago* this, PlayState* play); -const ActorInit En_Fu_Kago_InitVars = { +ActorInit En_Fu_Kago_InitVars = { ACTOR_EN_FU_KAGO, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h index 909e7b24d8..48bd69a27a 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h @@ -27,6 +27,4 @@ typedef struct EnFuKago { /* 0x33C */ s16 unk_33C; } EnFuKago; // size = 0x340 -extern const ActorInit En_Fu_Kago_InitVars; - #endif // Z_EN_FU_KAGO_H diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index f4055c113d..6f9706a2ba 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -27,7 +27,7 @@ void func_80ACECFC(EnFuMato* this, PlayState* play); void func_80ACEFC4(EnFuMato* this); void func_80ACEFD8(EnFuMato* this, PlayState* play); -const ActorInit En_Fu_Mato_InitVars = { +ActorInit En_Fu_Mato_InitVars = { ACTOR_EN_FU_MATO, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h index d24ac91d56..2065784d76 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h @@ -34,6 +34,4 @@ typedef struct EnFuMato { /* 0x30A */ s16 unk_30A; } EnFuMato; // size = 0x30C -extern const ActorInit En_Fu_Mato_InitVars; - #endif // Z_EN_FU_MATO_H diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 9f2281b60c..04ae61b721 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -49,7 +49,7 @@ void func_809340BC(EnFz* this, Vec3f* a, Vec3f* b, Vec3f* c, f32 arg4, f32 arg5, void func_80934178(EnFz* this, PlayState* play); void func_80934464(EnFz* this, PlayState* play); -const ActorInit En_Fz_InitVars = { +ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h index 58d1fb6d46..539560c880 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -70,6 +70,4 @@ typedef struct EnFz { /* 0xBD9 */ u8 unk_BD9; } EnFz; /* size = 0xBDC */ -extern const ActorInit En_Fz_InitVars; - #endif // Z_EN_FZ_H diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 9b4836637c..f6a2270154 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -25,7 +25,7 @@ void EnGakufu_GiveReward(EnGakufu* this, PlayState* play); void EnGakufu_PlayRewardCutscene(EnGakufu* this, PlayState* play); void EnGakufu_WaitForSong(EnGakufu* this, PlayState* play); -const ActorInit En_Gakufu_InitVars = { +ActorInit En_Gakufu_InitVars = { ACTOR_EN_GAKUFU, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h index c9db31b75f..04d9c71590 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h @@ -21,6 +21,4 @@ typedef struct EnGakufu { /* 0x150 */ EnGakufuActionFunc actionFunc; } EnGakufu; // size = 0x154 -extern const ActorInit En_Gakufu_InitVars; - #endif // Z_EN_GAKUFU_H diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index c8b2c7ee3a..40c3d5c05f 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -23,7 +23,7 @@ void func_80AF6944(EnGamelupy* this); void func_80AF6994(EnGamelupy* this); void func_80AF6A38(EnGamelupy* this); -const ActorInit En_Gamelupy_InitVars = { +ActorInit En_Gamelupy_InitVars = { ACTOR_EN_GAMELUPY, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h index 4ee6a5b117..5d45f31681 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h @@ -18,6 +18,4 @@ typedef struct EnGamelupy { /* 0x1A0 */ s16 unk_1A0; } EnGamelupy; // size = 0x1A4 -extern const ActorInit En_Gamelupy_InitVars; - #endif // Z_EN_GAMELUPY_H diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 0c7a74793e..6effae85ce 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -36,7 +36,7 @@ void func_80B111AC(EnGb2* this, PlayState* play); void func_80B11268(EnGb2* this, PlayState* play); void func_80B11344(EnGb2* this, PlayState* play); -const ActorInit En_Gb2_InitVars = { +ActorInit En_Gb2_InitVars = { ACTOR_EN_GB2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h index cb53ada3b6..ec3b379a15 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h @@ -38,6 +38,4 @@ typedef struct EnGb2 { /* 0x290 */ s16 unk_290; } EnGb2; // size = 0x294 -extern const ActorInit En_Gb2_InitVars; - #endif // Z_EN_GB2_H diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index b5aaf2cdec..cbc8511b73 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -15,7 +15,7 @@ void EnGe1_Destroy(Actor* thisx, PlayState* play); void EnGe1_Update(Actor* thisx, PlayState* play); void EnGe1_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Ge1_InitVars = { +ActorInit En_Ge1_InitVars = { ACTOR_EN_GE1, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h index ae6cc601ea..5388a1186a 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -40,6 +40,4 @@ typedef struct EnGe1 { /* 0x2C8 */ EnGe1ActionFunc actionFunc; } EnGe1; // size = 0x2CC -extern const ActorInit En_Ge1_InitVars; - #endif // Z_EN_GE1_H diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index c05db47fdb..4659c4aa95 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -27,7 +27,7 @@ void func_80B8C644(EnGe2* this, PlayState* play); void func_80B8C9B8(EnGe2* this, PlayState* play); #if 0 -const ActorInit En_Ge2_InitVars = { +ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h index f0d97869df..0558166db6 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -13,6 +13,4 @@ typedef struct EnGe2 { /* 0x308 */ EnGe2ActionFunc actionFunc; } EnGe2; // size = 0x30C -extern const ActorInit En_Ge2_InitVars; - #endif // Z_EN_GE2_H diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 50e4ed613f..1f680e9e88 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -16,7 +16,7 @@ void EnGe3_Update(Actor* thisx, PlayState* play); void EnGe3_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Ge3_InitVars = { +ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index 10912aae08..909ed7599c 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -13,6 +13,4 @@ typedef struct EnGe3 { /* 0x31C */ EnGe3ActionFunc actionFunc; } EnGe3; // size = 0x320 -extern const ActorInit En_Ge3_InitVars; - #endif // Z_EN_GE3_H 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 de6d5e70ed..f88aab9503 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -37,7 +37,7 @@ void func_80BB32AC(EnGeg* this, PlayState* play); void func_80BB3318(EnGeg* this, PlayState* play); void func_80BB347C(EnGeg* this, PlayState* play); -const ActorInit En_Geg_InitVars = { +ActorInit En_Geg_InitVars = { ACTOR_EN_GEG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.h b/src/overlays/actors/ovl_En_Geg/z_en_geg.h index 4a20068bd7..ea29fd6cfd 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.h +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.h @@ -46,6 +46,4 @@ typedef struct EnGeg { /* 0x4E4 */ Vec3f unk_4E4; } EnGeg; // size = 0x4F0 -extern const ActorInit En_Geg_InitVars; - #endif // Z_EN_GEG_H diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index 8693e2fe53..8b2f8d0910 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -26,7 +26,7 @@ void func_80B359DC(EnGg* this, PlayState* play); void func_80B363E8(EnGgStruct* ptr, PlayState* play, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3); void func_80B364D4(EnGgStruct* ptr, PlayState* play); -const ActorInit En_Gg_InitVars = { +ActorInit En_Gg_InitVars = { ACTOR_EN_GG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.h b/src/overlays/actors/ovl_En_Gg/z_en_gg.h index 421168e995..cb9f9e7cb8 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.h +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h @@ -57,6 +57,4 @@ typedef struct EnGg { /* 0x344 */ EnGgStruct unk_344; } EnGg; // size = 0x390 -extern const ActorInit En_Gg_InitVars; - #endif // Z_EN_GG_H diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index 623e28836c..acec19c762 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -27,7 +27,7 @@ void func_80B3B5D4(EnGg2* this, PlayState* play); s32 func_80B3B648(EnGg2* this, Path* path, s32 arg2_); f32 func_80B3B7E4(Path* path, s32 arg1, Vec3f* arg2, Vec3s* arg3); -const ActorInit En_Gg2_InitVars = { +ActorInit En_Gg2_InitVars = { ACTOR_EN_GG2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h index 21c1f84417..f913107751 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h @@ -35,6 +35,4 @@ typedef struct EnGg2 { /* 0x304 */ Vec3f unk_304; } EnGg2; // size = 0x310 -extern const ActorInit En_Gg2_InitVars; - #endif // Z_EN_GG2_H diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index 50aadad377..d44306b09f 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -72,7 +72,7 @@ typedef enum { /* 15 */ GIANT_CS_ACTION_HOLDING_UP_MOON_IN_CLOCK_TOWER } GiantCsActionIndex; -const ActorInit En_Giant_InitVars = { +ActorInit En_Giant_InitVars = { ACTOR_EN_GIANT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.h b/src/overlays/actors/ovl_En_Giant/z_en_giant.h index 3b2cac192c..9ce182a98d 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.h +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.h @@ -58,6 +58,4 @@ typedef struct EnGiant { /* 0x298 */ EnGiantActionFunc actionFunc; } EnGiant; // size = 0x29C -extern const ActorInit En_Giant_InitVars; - #endif // Z_EN_GIANT_H 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 758d3eae0e..fa555bc3a3 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 @@ -30,7 +30,7 @@ void EnGinkoMan_Stamp(EnGinkoMan* this, PlayState* play); void EnGinkoMan_Dialogue(EnGinkoMan* this, PlayState* play); void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, PlayState* play); -const ActorInit En_Ginko_Man_InitVars = { +ActorInit En_Ginko_Man_InitVars = { ACTOR_EN_GINKO_MAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h index 808ea7c2f6..b8a19d0f37 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h @@ -24,8 +24,6 @@ typedef struct EnGinkoMan { /* 0x264 */ s16 animTimer; } EnGinkoMan; // size = 0x268 -extern const ActorInit En_Ginko_Man_InitVars; - #define GINKOMAN_CHOICE_DEPOSIT 0 #define GINKOMAN_CHOICE_WITHDRAWL 1 #define GINKOMAN_CHOICE_CANCEL 2 diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 477809c4df..0c6ad8a416 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -51,7 +51,7 @@ void EnGirlA_BuyShieldMirror(PlayState* play, EnGirlA* this); void EnGirlA_BuyFanfare(PlayState* play, EnGirlA* this); -const ActorInit En_GirlA_InitVars = { +ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index cb48f591d4..f61b50b5a2 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -107,8 +107,6 @@ typedef enum { /* 0x2B */ SI_MAX } EnGirlAShopItemId; -extern const ActorInit En_GirlA_InitVars; - /* * Shopkeeper Common Defines */ diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 242412a160..627c8d3695 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -33,7 +33,7 @@ void func_80B5253C(EnGk* this, PlayState* play); void func_80B525E0(EnGk* this, PlayState* play); void func_80B52654(EnGk* this, PlayState* play); -const ActorInit En_Gk_InitVars = { +ActorInit En_Gk_InitVars = { ACTOR_EN_GK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.h b/src/overlays/actors/ovl_En_Gk/z_en_gk.h index 61610d684d..bebe6c6c94 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.h +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h @@ -56,6 +56,4 @@ typedef struct EnGk { /* 0x354 */ f32 unk_354; } EnGk; // size = 0x358 -extern const ActorInit En_Gk_InitVars; - #endif // Z_EN_GK_H 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 8b8456bde1..b64edb3ae7 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -155,7 +155,7 @@ static s32 D_80951C2C[] = { 0x0E295A2D, 0x000A0C10 }; static s32 D_80951C34[] = { 0x0E29622D, 0x000A0C10 }; -const ActorInit En_Gm_InitVars = { +ActorInit En_Gm_InitVars = { ACTOR_EN_GM, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h index 0f74de16b4..3bed5335a0 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -76,6 +76,4 @@ typedef struct EnGm { /* 0x400 */ s32 unk_400; } EnGm; // size = 0x404 -extern const ActorInit En_Gm_InitVars; - #endif // Z_EN_GM_H 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 80e9276946..86b0b1b41c 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -78,7 +78,7 @@ static s32 D_80A163EC[4] = { 0x100060E, 0xE040C12, 0x100E0E05, 0xC121000 }; static s32 D_80A163FC[4] = { 0x100060E, 0xE060C12, 0x100E0E07, 0xC121000 }; static s32 D_80A1640C[2] = { 0xE023A0C, 0x12100000 }; -const ActorInit En_Go_InitVars = { +ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index 0278a70df3..fd4876430a 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -101,6 +101,4 @@ typedef struct EnGo { /* 0x3F8 */ EnGoStruct unk_3F8[32]; } EnGo; // size = 0xB78 -extern const ActorInit En_Go_InitVars; - #endif // Z_EN_GO_H 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 31103b11c0..98d27f735c 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -33,7 +33,7 @@ void func_80941FA4(EnGoroiwa* this, PlayState* play); void func_80942084(EnGoroiwa* this); void func_809420F0(EnGoroiwa* this, PlayState* play); -const ActorInit En_Goroiwa_InitVars = { +ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h index fc4f66f51f..e672355e52 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -81,6 +81,4 @@ typedef struct EnGoroiwa { /* 0x248 */ s32 unk_248; } EnGoroiwa; // size = 0x24C -extern const ActorInit En_Goroiwa_InitVars; - #endif // Z_EN_GOROIWA_H diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 3644291392..cedd5c8942 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -137,7 +137,7 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(1, EN_GRASSHOPPER_DMGEFF_HOOK), }; -const ActorInit En_Grasshopper_InitVars = { +ActorInit En_Grasshopper_InitVars = { ACTOR_EN_GRASSHOPPER, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h index d414e4100c..8056253f63 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h @@ -75,6 +75,4 @@ typedef struct EnGrasshopper { /* 0x0570 */ EnGrasshopperEffect effects[EN_GRASSHOPPER_EFFECT_COUNT]; } EnGrasshopper; // size = 0x1870 -extern const ActorInit En_Grasshopper_InitVars; - #endif // Z_EN_GRASSHOPPER_H 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 fb9ed510cd..5bd3826c77 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -37,7 +37,7 @@ s32 func_809995A4(EnGs* this, PlayState* play); void func_80999A8C(EnGs* this, PlayState* play); void func_80999AC0(EnGs* this); -const ActorInit En_Gs_InitVars = { +ActorInit En_Gs_InitVars = { ACTOR_EN_GS, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h index eed8d75f9c..51e899fccd 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h @@ -57,6 +57,4 @@ typedef struct EnGs { /* 0x21E */ s16 unk_21E; } EnGs; // size = 0x220 -extern const ActorInit En_Gs_InitVars; - #endif // Z_EN_GS_H diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index a08d0835f2..b1d7ed4228 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -25,7 +25,7 @@ void EnGuardNuts_Burrow(EnGuardNuts* this, PlayState* play); void EnGuardNuts_SetupUnburrow(EnGuardNuts* this, PlayState* play); void EnGuardNuts_Unburrow(EnGuardNuts* this, PlayState* play); -const ActorInit En_Guard_Nuts_InitVars = { +ActorInit En_Guard_Nuts_InitVars = { ACTOR_EN_GUARD_NUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h index 6f45691ada..8cbe26f035 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h @@ -29,6 +29,4 @@ typedef struct EnGuardNuts { /* 0x244 */ ColliderCylinder collider; } EnGuardNuts; // size = 0x290 -extern const ActorInit En_Guard_Nuts_InitVars; - #endif // Z_EN_GUARD_NUTS_H 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 2386347800..342415fec5 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -27,7 +27,7 @@ void func_80BC7520(EnGuruguru* this, PlayState* play); extern ColliderCylinderInit D_80BC79A0; -const ActorInit En_Guruguru_InitVars = { +ActorInit En_Guruguru_InitVars = { ACTOR_EN_GURUGURU, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h index 0262cd41d7..0158e3ddcd 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h @@ -30,6 +30,4 @@ typedef struct EnGuruguru { /* 0x278 */ ColliderCylinder collider; } EnGuruguru; // size = 0x2C4 -extern const ActorInit En_Guruguru_InitVars; - #endif // Z_EN_GURUGURU_H 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 272ea909ef..86a1be0277 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -32,7 +32,7 @@ void func_80B22750(EnHakurock* this, PlayState* play); void func_80B228F4(Actor* thisx, PlayState* play); void EnHakurock_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Hakurock_InitVars = { +ActorInit En_Hakurock_InitVars = { ACTOR_EN_HAKUROCK, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h index 93931e9f33..4934c7fc82 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h @@ -22,6 +22,4 @@ typedef struct EnHakurock { /* 0x14C */ ColliderCylinder collider; } EnHakurock; // size = 0x198 -extern const ActorInit En_Hakurock_InitVars; - #endif // Z_EN_HAKUROCK_H diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 200f7cba82..507bf9deb9 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -21,7 +21,7 @@ void func_80B23910(EnHanabi* this, PlayState* play); void func_80B23934(EnHanabi* this, PlayState* play); void EnHanabi_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Hanabi_InitVars = { +ActorInit En_Hanabi_InitVars = { ACTOR_EN_HANABI, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h index a219ab2baf..4c0c2e2164 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h @@ -32,6 +32,4 @@ typedef struct EnHanabi { /* 0x4654 */ EnHanabiActionFunc actionFunc; } EnHanabi; // size = 0x4658 -extern const ActorInit En_Hanabi_InitVars; - #endif // Z_EN_HANABI_H diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 5eb2292fc1..4a01b663ef 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -16,7 +16,7 @@ void EnHata_Destroy(Actor* thisx, PlayState* play); void EnHata_Update(Actor* thisx, PlayState* play2); void EnHata_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Hata_InitVars = { +ActorInit En_Hata_InitVars = { ACTOR_EN_HATA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h index fc96f302af..155460f600 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -17,6 +17,4 @@ typedef struct EnHata { /* 0x2A4 */ Vec3f unk_2A4; } EnHata; /* size = 0x2B0 */ -extern const ActorInit En_Hata_InitVars; - #endif // Z_EN_HATA_H diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 2831e53171..c7fc4eea86 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -28,7 +28,7 @@ typedef enum { /* 4 */ HEISHI_ANIM_STAND_UP } EnHeishiAnimation; -const ActorInit En_Heishi_InitVars = { +ActorInit En_Heishi_InitVars = { ACTOR_EN_HEISHI, ACTORCAT_NPC, FLAGS, 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 05311e64bb..127ea54afd 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -30,7 +30,7 @@ void func_80BCF95C(EnHg* this, PlayState* play); s32 EnHg_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); void EnHg_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx); -const ActorInit En_Hg_InitVars = { +ActorInit En_Hg_InitVars = { ACTOR_EN_HG, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.h b/src/overlays/actors/ovl_En_Hg/z_en_hg.h index c81d61d49e..eff7dbf9af 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.h +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.h @@ -23,6 +23,4 @@ typedef struct EnHg { /* 0x310 */ u16 cutscenes[4]; } EnHg; // size = 0x318 -extern const ActorInit En_Hg_InitVars; - #endif // Z_EN_HG_H diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index 53e4e91c34..add718bdc4 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -27,7 +27,7 @@ s32 func_80BD0898(EnHgo* this, PlayState* play); s32 EnHgo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); void EnHgo_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* pos, Actor* thisx); -const ActorInit En_Hgo_InitVars = { +ActorInit En_Hgo_InitVars = { ACTOR_EN_HGO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h index 34e4ebdc48..c9b0b53e1a 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h @@ -27,6 +27,4 @@ typedef struct EnHgo { /* 0x316 */ u16 unk_316; } EnHgo; // size = 0x318 -extern const ActorInit En_Hgo_InitVars; - #endif // Z_EN_HGO_H diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index 2a209b86b5..d8df99887b 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -31,7 +31,7 @@ void func_80BDBB48(EnHiddenNuts* this, PlayState* play); void func_80BDBE70(EnHiddenNuts* this, PlayState* play); void func_80BDBED4(EnHiddenNuts* this, PlayState* play); -const ActorInit En_Hidden_Nuts_InitVars = { +ActorInit En_Hidden_Nuts_InitVars = { ACTOR_EN_HIDDEN_NUTS, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h index a8edd1d75d..e40a89193e 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h @@ -33,6 +33,4 @@ typedef struct EnHiddenNuts { /* 0x234 */ ColliderCylinder collider; } EnHiddenNuts; // size = 0x280 -extern const ActorInit En_Hidden_Nuts_InitVars; - #endif // Z_EN_HIDDEN_NUTS_H diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 6d02b6c33a..c07bbc5da1 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -39,7 +39,7 @@ s32 func_80C21414(EnHintSkb* this); void func_80C21468(EnHintSkb* this, PlayState* play); void func_80C215E4(PlayState* play, EnHintSkb* this, Vec3f* arg2); -const ActorInit En_Hint_Skb_InitVars = { +ActorInit En_Hint_Skb_InitVars = { ACTOR_EN_HINT_SKB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h index 44fd8c4ef8..22f72084d6 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h @@ -32,6 +32,4 @@ typedef struct EnHintSkb { /* 0x3E9 */ u8 drawDmgEffType; } EnHintSkb; // size = 0x3EC -extern const ActorInit En_Hint_Skb_InitVars; - #endif // Z_EN_HINT_SKB_H diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index cf9421c571..c76d921064 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -16,7 +16,7 @@ void EnHitTag_Update(Actor* thisx, PlayState* play); void EnHitTag_WaitForHit(EnHitTag* this, PlayState* play); -const ActorInit En_Hit_Tag_InitVars = { +ActorInit En_Hit_Tag_InitVars = { ACTOR_EN_HIT_TAG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h index 0a1383e0a0..e2effa0780 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h @@ -15,6 +15,4 @@ typedef struct EnHitTag { /* 0x190 */ EnHitTagActionFunc actionFunc; } EnHitTag; // size = 0x194 -extern const ActorInit En_Hit_Tag_InitVars; - #endif // Z_EN_HIT_TAG_H diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index a3a27f536a..e7615d25fd 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -57,7 +57,7 @@ void EnHoll_TransparentIdle(EnHoll* this, PlayState* play); void EnHoll_VerticalBgCoverIdle(EnHoll* this, PlayState* play); void EnHoll_RoomTransitionIdle(EnHoll* this, PlayState* play); -const ActorInit En_Holl_InitVars = { +ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, ACTORCAT_DOOR, FLAGS, diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h index 39c35220ca..e4d8791bae 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -71,6 +71,4 @@ typedef struct EnHoll { #define EN_HOLL_SCALE_ALPHA(playerDistFromCentralPlane) ((playerDistFromCentralPlane - sTransparencyPlaneDistance) * (255 / (sTranslucencyPlaneDistance - sTransparencyPlaneDistance))) #define EN_HOLL_SCALE_BG_COVER_ALPHA(playerDistFromCentralPlane) ((EN_HOLL_ACTIVATION_PLANE_DISTANCE_VERTICAL - playerDistFromCentralPlane) * (255 / (EN_HOLL_ACTIVATION_PLANE_DISTANCE_VERTICAL - EN_HOLL_LOADING_PLANE_DISTANCE_VERTICAL))) -extern const ActorInit En_Holl_InitVars; - #endif // Z_EN_HOLL_H diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 9f6b6b98a3..d57fb078ba 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -31,7 +31,7 @@ void func_8092F7BC(EnHonotrap* this, PlayState* play); void func_8092F878(EnHonotrap* this, PlayState* play); #if 0 -const ActorInit En_Honotrap_InitVars = { +ActorInit En_Honotrap_InitVars = { ACTOR_EN_HONOTRAP, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h index bf4b08fd74..570269fe2b 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -13,6 +13,4 @@ typedef struct EnHonotrap { /* 0x148 */ char unk_148[0x17C]; } EnHonotrap; // size = 0x2C4 -extern const ActorInit En_Honotrap_InitVars; - #endif // Z_EN_HONOTRAP_H diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 018ed49713..f8fff70fce 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -144,7 +144,7 @@ static SkeletonHeader* sSkeletonHeaders[] = { NULL, NULL, &object_horse_link_child_Skel_00A480, NULL, NULL, }; -const ActorInit En_Horse_InitVars = { +ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 8ea49f0c62..7b2e349e77 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -35,7 +35,7 @@ s32 func_808F99B0(EnHorseGameCheck* this, PlayState* play); s32 func_808F99C4(EnHorseGameCheck* this, PlayState* play); s32 func_808F99D8(EnHorseGameCheck* this, PlayState* play); -const ActorInit En_Horse_Game_Check_InitVars = { +ActorInit En_Horse_Game_Check_InitVars = { ACTOR_EN_HORSE_GAME_CHECK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h index f07aafc1d3..52cdc2b645 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h @@ -55,6 +55,4 @@ typedef struct EnHorseGameCheck { /* 0x180 */ UNK_TYPE1 pad180[0x38]; } EnHorseGameCheck; // size = 0x1B8 -extern const ActorInit En_Horse_Game_Check_InitVars; - #endif // Z_EN_HORSE_GAME_CHECK_H diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index d5b23bdaea..c02558a844 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -26,7 +26,7 @@ void func_808DF620(EnHorseLinkChild* this, PlayState* play); void func_808DF788(EnHorseLinkChild* this); void func_808DF838(EnHorseLinkChild* this, PlayState* play); -const ActorInit En_Horse_Link_Child_InitVars = { +ActorInit En_Horse_Link_Child_InitVars = { ACTOR_EN_HORSE_LINK_CHILD, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h index 660261ca21..62fac6a635 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -23,6 +23,4 @@ typedef struct EnHorseLinkChild { /* 0x298 */ UNK_TYPE1 unk298[4]; } EnHorseLinkChild; // size = 0x29C -extern const ActorInit En_Horse_Link_Child_InitVars; - #endif // Z_EN_HORSE_LINK_CHILD_H diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 5fec475944..cb6e587594 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -23,7 +23,7 @@ void EnHs_SceneTransitToBunnyHoodDialogue(EnHs* this, PlayState* play); void func_80953354(EnHs* this, PlayState* play); void func_8095345C(EnHs* this, PlayState* play); -const ActorInit En_Hs_InitVars = { +ActorInit En_Hs_InitVars = { ACTOR_EN_HS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h index d72c72d158..79f94fd4ba 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -34,6 +34,4 @@ typedef struct EnHs { /* 0x394 */ EnHsActionFunc actionFunc; } EnHs; // size = 0x398 -extern const ActorInit En_Hs_InitVars; - #endif // Z_EN_HS_H diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index a251dd1133..8273d87894 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -17,7 +17,7 @@ void EnHs2_Draw(Actor* thisx, PlayState* play); void EnHs2_DoNothing(EnHs2* this, PlayState* play); -const ActorInit En_Hs2_InitVars = { +ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h index 2c7568235a..69836605d5 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -13,6 +13,4 @@ typedef struct EnHs2 { /* 0x394 */ EnHs2ActionFunc actionFunc; } EnHs2; // size = 0x398 -extern const ActorInit En_Hs2_InitVars; - #endif // Z_EN_HS2_H 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 497f6d9e3f..af614450df 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -89,7 +89,7 @@ static s32 D_80BF33F0[] = { 0x10000000, }; -const ActorInit En_Ig_InitVars = { +ActorInit En_Ig_InitVars = { ACTOR_EN_IG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h index 5ff18dfef2..c3fd0c3fb9 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h @@ -62,6 +62,4 @@ typedef struct EnIg { /* 0x408 */ s32 unk_408; } EnIg; // size = 0x40C -extern const ActorInit En_Ig_InitVars; - #endif // Z_EN_IG_H diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 9fc9e088d6..4188f44c4b 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -74,7 +74,7 @@ static Gfx* sIronKnuckleArmorType[3][3] = { { gIronKnuckleWhiteArmorMaterialDL, gIronKnuckleGoldArmorMaterialDL, gIronKnuckleGoldArmorMaterialDL }, }; -const ActorInit En_Ik_InitVars = { +ActorInit En_Ik_InitVars = { ACTOR_EN_IK, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index a02c4845e7..3489329b1d 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -48,6 +48,4 @@ typedef struct EnIk { /* 0x0550 */ IronKnuckleEffect effects[7]; } EnIk; // size = 0x668 -extern const ActorInit En_Ik_InitVars; - #endif // Z_EN_IK_H 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 5d5cf54399..ba51fb8585 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -22,7 +22,7 @@ void func_808F3690(EnIn* this, PlayState* play); void func_808F5A34(EnIn* this, PlayState* play); s32 func_808F5994(EnIn* this, PlayState* play, Vec3f* arg2, s16 arg3); -const ActorInit En_In_InitVars = { +ActorInit En_In_InitVars = { ACTOR_EN_IN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index 9221c94ce1..dd32ac9c66 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -83,6 +83,4 @@ typedef struct EnIn { /* 0x4C0 */ s32 prevTalkState; } EnIn; // size = 0x4CC -extern const ActorInit En_In_InitVars; - #endif // Z_EN_IN_H diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 78aa53464e..9eae19437c 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -32,7 +32,7 @@ void func_8091B984(EnInsect* this, PlayState* play); s16 D_8091BD60 = 0; -const ActorInit En_Insect_InitVars = { +ActorInit En_Insect_InitVars = { ACTOR_EN_INSECT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h index ae8304caee..ea40254141 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -25,6 +25,4 @@ typedef struct EnInsect { /* 0x316 */ s16 unk_316; } EnInsect; // size = 0x318 -extern const ActorInit En_Insect_InitVars; - #endif // Z_EN_INSECT_H 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 f40475f276..e669102a33 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -178,7 +178,7 @@ void func_80B45B1C(EnInvadePohStruct* s, unkstructInvadepoh4** u); extern s32 D_801BDA9C; -const ActorInit En_Invadepoh_InitVars = { +ActorInit En_Invadepoh_InitVars = { ACTOR_EN_INVADEPOH, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h index cafae5f239..061d9c326f 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h @@ -152,6 +152,4 @@ typedef struct EnInvadepoh { /* 0x3BC */ s8 unk3BC; } EnInvadepoh; // size = 0x3C0 -extern const ActorInit En_Invadepoh_InitVars; - #endif // Z_EN_INVADEPOH_H diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 4391beecd2..6a73eceecb 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -23,7 +23,7 @@ void func_80C19EC0(EnInvadepohDemo* this, PlayState* play); void func_80C19F7C(EnInvadepohDemo* this, PlayState* play); #if 0 -const ActorInit En_Invadepoh_Demo_InitVars = { +ActorInit En_Invadepoh_Demo_InitVars = { ACTOR_EN_INVADEPOH_DEMO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h index 35cbb4da9c..ff13ca6686 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h @@ -13,6 +13,4 @@ typedef struct EnInvadepohDemo { /* 0x148 */ char unk_148[0x180]; } EnInvadepohDemo; // size = 0x2C8 -extern const ActorInit En_Invadepoh_Demo_InitVars; - #endif // Z_EN_INVADEPOH_DEMO_H diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index 581d4d9b10..70f77b18a3 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -18,7 +18,7 @@ void func_80C258A0(EnInvisibleRuppe* this, PlayState* play); void func_80C2590C(EnInvisibleRuppe* this, PlayState* play); void func_80C259E8(EnInvisibleRuppe* this, PlayState* play); -const ActorInit En_Invisible_Ruppe_InitVars = { +ActorInit En_Invisible_Ruppe_InitVars = { ACTOR_EN_INVISIBLE_RUPPE, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h index 49d9bd6ef6..5b6f6ca64f 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h @@ -18,6 +18,4 @@ typedef struct EnInvisibleRuppe { /* 0x194 */ EnInvisibleRuppeActionFunc actionFunc; } EnInvisibleRuppe; // size = 0x198 -extern const ActorInit En_Invisible_Ruppe_InitVars; - #endif // Z_EN_INVISIBLE_RUPPE_H diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 3bc8a860a3..f0d7f380a8 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -44,7 +44,7 @@ static s16 D_8095F690 = 0; static s16 D_8095F694 = 0; -const ActorInit En_Ishi_InitVars = { +ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h index 080abbf4af..65381f638a 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -28,6 +28,4 @@ typedef struct EnIshi { /* 0x197 */ u8 unk_197; } EnIshi; // size = 0x198 -extern const ActorInit En_Ishi_InitVars; - #endif // Z_EN_ISHI_H diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index f615c05feb..2a1e7f725a 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -50,7 +50,7 @@ s32 D_80BC366C[] = { 0x0E29440C, 0x170E2945, 0x0C180E29, 0x460C170E, 0x29470C09, 0x0000180E, 0x293B0C09, 0x00001000, }; -const ActorInit En_Ja_InitVars = { +ActorInit En_Ja_InitVars = { ACTOR_EN_JA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.h b/src/overlays/actors/ovl_En_Ja/z_en_ja.h index e2fd8287f3..00746ec63a 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.h +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.h @@ -60,6 +60,4 @@ typedef struct EnJa { /* 0x374 */ s32 prevTalkState; } EnJa; // size = 0x378 -extern const ActorInit En_Ja_InitVars; - #endif // Z_EN_JA_H 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 fcb5f465b0..181b88e4ff 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 @@ -20,7 +20,7 @@ s32 EnJcMato_CheckForHit(EnJcMato* this, PlayState* play); void EnJcMato_SetupIdle(EnJcMato* this); void EnJcMato_Idle(EnJcMato* this, PlayState* play); -const ActorInit En_Jc_Mato_InitVars = { +ActorInit En_Jc_Mato_InitVars = { ACTOR_EN_JC_MATO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h index 165a768e2c..f2c64c37cc 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h @@ -16,6 +16,4 @@ typedef struct EnJcMato { /* 0x1A4 */ Vec3f pos; } EnJcMato; // size = 0x1B0 -extern const ActorInit En_Jc_Mato_InitVars; - #endif // Z_EN_JC_MATO_H diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index 3b3ce16848..259d58b18f 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -64,7 +64,7 @@ typedef enum { /* 0x3 */ EN_JG_ACTION_LULLABY_INTRO_CS, } EnJgAction; -const ActorInit En_Jg_InitVars = { +ActorInit En_Jg_InitVars = { ACTOR_EN_JG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.h b/src/overlays/actors/ovl_En_Jg/z_en_jg.h index 8564f8ad1d..757a8bd864 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.h +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.h @@ -40,6 +40,4 @@ typedef struct EnJg { /* 0x3D0 */ u8 focusedShrineGoronParam; } EnJg; // size = 0x3D4 -extern const ActorInit En_Jg_InitVars; - #endif // Z_EN_JG_H diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 376d79900a..6f313f0d24 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -36,7 +36,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play); s32 func_80C149B0(PlayState* play, EnJgameTsnStruct* arg1); s32 func_80C14BCC(EnJgameTsn* this, PlayState* play); -const ActorInit En_Jgame_Tsn_InitVars = { +ActorInit En_Jgame_Tsn_InitVars = { ACTOR_EN_JGAME_TSN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h index 5fdf911ccf..c32a51565f 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h @@ -37,6 +37,4 @@ typedef struct EnJgameTsn { /* 0x300 */ u16 unk_300; } EnJgameTsn; // size = 0x304 -extern const ActorInit En_Jgame_Tsn_InitVars; - #endif // Z_EN_JGAME_TSN_H diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index a8a6b5e0bf..fa8cebd06b 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -27,7 +27,7 @@ void func_8096A104(EnJs* this, PlayState* play); void func_8096A38C(EnJs* this, PlayState* play); void func_8096A6F4(EnJs* this, PlayState* play); -const ActorInit En_Js_InitVars = { +ActorInit En_Js_InitVars = { ACTOR_EN_JS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h index 534557e66d..4508e4944d 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.h +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -29,6 +29,4 @@ typedef struct EnJs { /* 0x2C4 */ EnJsActionFunc actionFunc; } EnJs; // size = 0x2C8 -extern const ActorInit En_Js_InitVars; - #endif // Z_EN_JS_H diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 4baeaafa9c..f36629d279 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -69,7 +69,7 @@ static DamageTable D_809B0F48 = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit En_Jso_InitVars = { +ActorInit En_Jso_InitVars = { ACTOR_EN_JSO, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.h b/src/overlays/actors/ovl_En_Jso/z_en_jso.h index e2961c3aec..7f5db07570 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.h +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.h @@ -14,6 +14,4 @@ typedef struct EnJso { /* 0x27C */ char unk_27C[0xD70]; } EnJso; // size = 0xFEC -extern const ActorInit En_Jso_InitVars; - #endif // Z_EN_JSO_H diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 874cac6bd4..b7ad94d936 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -71,7 +71,7 @@ static DamageTable D_80A7B4F0 = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit En_Jso2_InitVars = { +ActorInit En_Jso2_InitVars = { ACTOR_EN_JSO2, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h index 30f7872d55..274aaa284c 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h @@ -14,6 +14,4 @@ typedef struct EnJso2 { /* 0x027C */ char unk_27C[0xE14]; } EnJso2; // size = 0x1090 -extern const ActorInit En_Jso2_InitVars; - #endif // Z_EN_JSO2_H diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index 6e41305766..3057328ce3 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -51,7 +51,7 @@ static DamageTable D_80B8AB3C = { /* Powder Keg */ DMG_ENTRY(1, 0xE), }; -const ActorInit En_Kaizoku_InitVars = { +ActorInit En_Kaizoku_InitVars = { ACTOR_EN_KAIZOKU, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h index 8ef208926a..cc282f19f0 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h @@ -17,6 +17,4 @@ typedef struct EnKaizoku { /* 0x2F6 */ char unk_2F6[0x2FA]; } EnKaizoku; // size = 0x5F0 -extern const ActorInit En_Kaizoku_InitVars; - #endif // Z_EN_KAIZOKU_H 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 2a83231044..4203feb6bd 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -67,7 +67,7 @@ static ColliderCylinderInit D_80971D80 = { { 20, 70, 0, { 0, 0, 0 } }, }; -const ActorInit En_Kakasi_InitVars = { +ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h index 59ef3272ad..c278ef050a 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -40,8 +40,6 @@ typedef struct EnKakasi { /* 0x254 */ ColliderCylinder collider; } EnKakasi; // size = 0x2A0 -extern const ActorInit En_Kakasi_InitVars; - #define ENKAKASI_ABOVE_GROUND_TYPE 2 #define KAKASI_GET_SUMMON_DISTANCE(thisx) (((thisx)->params >> 0x8) & 0xFF) diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index abc8f520d2..6e021186ff 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -41,7 +41,7 @@ void func_80AD8364(EnKame* this); void func_80AD8388(EnKame* this, PlayState* play); void func_80AD8D64(Actor* thisx, PlayState* play); -const ActorInit En_Kame_InitVars = { +ActorInit En_Kame_InitVars = { ACTOR_EN_KAME, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.h b/src/overlays/actors/ovl_En_Kame/z_en_kame.h index 6e0aa371b5..b6ebc3a23a 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.h +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.h @@ -33,6 +33,4 @@ typedef struct EnKame { /* 0x340 */ ColliderCylinder collider; } EnKame; // size = 0x38C -extern const ActorInit En_Kame_InitVars; - #endif // Z_EN_KAME_H diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index b87b3243eb..54df1bcd70 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -17,7 +17,7 @@ void EnKanban_Destroy(Actor* thisx, PlayState* play); void EnKanban_Update(Actor* thisx, PlayState* play); void EnKanban_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Kanban_InitVars = { +ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h index 201364bc02..e54bb3fad9 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h @@ -105,6 +105,4 @@ typedef struct EnKanban { #define ENKANBAN_PIECE ((s16)0xFFDD) #define ENKANBAN_FISHING 0x300 -extern const ActorInit En_Kanban_InitVars; - #endif // Z_EN_KANBAN_H diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 61c1c5b3c4..46ad2c30b7 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -40,7 +40,7 @@ void func_808F238C(EnKarebaba* this); void func_808F241C(EnKarebaba* this, PlayState* play); void func_808F254C(EnKarebaba* this, PlayState* play); -const ActorInit En_Karebaba_InitVars = { +ActorInit En_Karebaba_InitVars = { ACTOR_EN_KAREBABA, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h index 9d41245e69..5063a8dbe6 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -30,6 +30,4 @@ typedef struct EnKarebaba { /* 0x27C */ ColliderCylinder collider2; } EnKarebaba; // size = 0x2C8 -extern const ActorInit En_Karebaba_InitVars; - #endif // Z_EN_KAREBABA_H diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index 78d9032076..d2847a39d0 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -22,7 +22,7 @@ Actor* func_80B3403C(PlayState* play); void func_80B34314(EnKbt* this, PlayState* play); void func_80B34598(EnKbt* this, PlayState* play); -const ActorInit En_Kbt_InitVars = { +ActorInit En_Kbt_InitVars = { ACTOR_EN_KBT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h index dbbb96e768..eb491bf281 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h @@ -23,6 +23,4 @@ typedef struct EnKbt { /* 0x288 */ EnKbtActionFunc actionFunc; } EnKbt; // size = 0x28C -extern const ActorInit En_Kbt_InitVars; - #endif // Z_EN_KBT_H diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index ade18b7076..8a3176badf 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -37,7 +37,7 @@ s32 func_80B278C4(PlayState* play, Vec3f arg1); void func_80B279F0(EnKendoJs* this, PlayState* play, s32 arg2); void func_80B27A90(EnKendoJs* this, PlayState* play); -const ActorInit En_Kendo_Js_InitVars = { +ActorInit En_Kendo_Js_InitVars = { ACTOR_EN_KENDO_JS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h index 2d49058e8f..1992f72347 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h @@ -32,6 +32,4 @@ typedef struct EnKendoJs { /* 0x292 */ u8 unk_292; } EnKendoJs; // size = 0x294 -extern const ActorInit En_Kendo_Js_InitVars; - #endif // Z_EN_KENDO_JS_H 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 67131febe5..62b529b3da 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -31,7 +31,7 @@ void func_80B425A0(EnKgy* this, PlayState* play); void func_80B42714(EnKgy* this, PlayState* play); void func_80B42D28(EnKgy* this, PlayState* play); -const ActorInit En_Kgy_InitVars = { +ActorInit En_Kgy_InitVars = { ACTOR_EN_KGY, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h index ce7deceb4f..d9423783d2 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h @@ -38,6 +38,4 @@ typedef struct EnKgy { /* 0x304 */ EnKgyActionFunc actionFunc; } EnKgy; // size = 0x308 -extern const ActorInit En_Kgy_InitVars; - #endif // Z_EN_KGY_H diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index f928c23935..c9d40c1e73 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -15,7 +15,7 @@ void EnKitan_Destroy(Actor* thisx, PlayState* play); void EnKitan_Update(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Kitan_InitVars = { +ActorInit En_Kitan_InitVars = { ACTOR_EN_KITAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h index 2ef14c942f..9d2ae096b0 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h @@ -13,6 +13,4 @@ typedef struct EnKitan { /* 0x2D8 */ EnKitanActionFunc actionFunc; } EnKitan; // size = 0x2DC -extern const ActorInit En_Kitan_InitVars; - #endif // Z_EN_KITAN_H diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 17d0e37526..0d80d60206 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -193,7 +193,7 @@ static ColliderCylinderInit D_809BDC64 = { { 20, 40, 0, { 0, 0, 0 } }, }; -const ActorInit En_Knight_InitVars = { +ActorInit En_Knight_InitVars = { ACTOR_EN_KNIGHT, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h index 167a966828..2d413fea37 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h @@ -26,6 +26,4 @@ typedef struct EnKnight { /* 0x68C */ char pad68C[0x48]; } EnKnight; // size = 0x6D4 -extern const ActorInit En_Knight_InitVars; - #endif // Z_EN_KNIGHT_H diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index df95a69887..e15d20fc86 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -34,7 +34,7 @@ void EnKujiya_TurnToOpen(EnKujiya* this, PlayState* play); void EnKujiya_SetupTurnToClosed(EnKujiya* this); void EnKujiya_TurnToClosed(EnKujiya* this, PlayState* play); -const ActorInit En_Kujiya_InitVars = { +ActorInit En_Kujiya_InitVars = { ACTOR_EN_KUJIYA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h index 69fad156ed..5d449963b1 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h @@ -14,6 +14,4 @@ typedef struct EnKujiya { /* 0x14A */ s16 textId; } EnKujiya; // size = 0x14C -extern const ActorInit En_Kujiya_InitVars; - #endif // Z_EN_KUJIYA_H diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index fdeab7aeba..5b0e813abd 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -57,7 +57,7 @@ s16 D_80936CDC; s16 D_80936CDE; s16 D_80936CE0; -const ActorInit En_Kusa_InitVars = { +ActorInit En_Kusa_InitVars = { ACTOR_EN_KUSA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h index eca474d5fc..56f55af3e8 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -25,8 +25,6 @@ typedef struct EnKusa { /* 0x198 */ u8 isInWater; } EnKusa; // size = 0x19C -extern const ActorInit En_Kusa_InitVars; - #define KUSA_GET_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0x7F) #define KUSA_GET_RAND_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0xF) #define KUSA_SHOULD_SPAWN_BUGS(thisx) (((thisx)->params >> 0x4) & 1) 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 9d9d430782..4b8c36c2c2 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -53,7 +53,7 @@ s16 D_80A60B0C; s16 D_80A60B0E; s16 D_80A60B10; -const ActorInit En_Kusa2_InitVars = { +ActorInit En_Kusa2_InitVars = { ACTOR_EN_KUSA2, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h index eb8276ac63..f1245dd50e 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h @@ -81,6 +81,4 @@ typedef struct EnKusa2 { /* 0x1D1 */ s8 unk_1D1; } EnKusa2; // size = 0x1D4 -extern const ActorInit En_Kusa2_InitVars; - #endif // Z_EN_KUSA2_H diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index 85e57c550a..172d1e2d77 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -16,7 +16,7 @@ void EnLiftNuts_Update(Actor* thisx, PlayState* play); void EnLiftNuts_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Lift_Nuts_InitVars = { +ActorInit En_Lift_Nuts_InitVars = { ACTOR_EN_LIFT_NUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h index ad6014dd9f..61de8ad4fa 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h @@ -14,6 +14,4 @@ typedef struct EnLiftNuts { /* 0x1D8 */ char unk_1D8[0x180]; } EnLiftNuts; // size = 0x358 -extern const ActorInit En_Lift_Nuts_InitVars; - #endif // Z_EN_LIFT_NUTS_H diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index e50cf0da51..b988fcce32 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -18,7 +18,7 @@ void EnLight_Draw(Actor* thisx, PlayState* play); void func_80865F38(Actor* thisx, PlayState* play); -const ActorInit En_Light_InitVars = { +ActorInit En_Light_InitVars = { ACTOR_EN_LIGHT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h index b17f55fd72..17762d7fa7 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.h +++ b/src/overlays/actors/ovl_En_Light/z_en_light.h @@ -20,6 +20,4 @@ typedef struct EnLight { /* 0x14C */ LightInfo lightInfo; } EnLight; // size = 0x15C -extern const ActorInit En_Light_InitVars; - #endif // Z_EN_LIGHT_H diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 8f9d4232a2..2a667d3ad2 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -24,7 +24,7 @@ void EnLookNuts_RunToPlayer(EnLookNuts* this, PlayState* play); void EnLookNuts_SetupSendPlayerToSpawn(EnLookNuts* this); void EnLookNuts_SendPlayerToSpawn(EnLookNuts* this, PlayState* play); -const ActorInit En_Look_Nuts_InitVars = { +ActorInit En_Look_Nuts_InitVars = { ACTOR_EN_LOOK_NUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h index 9d5a1eb247..b72215ce69 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h @@ -35,6 +35,4 @@ typedef struct EnLookNuts { /* 0x244 */ ColliderCylinder collider; } EnLookNuts; // size = 0x290 -extern const ActorInit En_Look_Nuts_InitVars; - #endif // Z_EN_LOOK_NUTS_H diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index a7c54a7dbe..14a9c4add9 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -14,7 +14,7 @@ void EnMFire1_Init(Actor* thisx, PlayState* play); void EnMFire1_Destroy(Actor* thisx, PlayState* play); void EnMFire1_Update(Actor* thisx, PlayState* play); -const ActorInit En_M_Fire1_InitVars = { +ActorInit En_M_Fire1_InitVars = { ACTOR_EN_M_FIRE1, ACTORCAT_MISC, FLAGS, diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h index fd5504e15f..144e48d4d2 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -11,6 +11,4 @@ typedef struct EnMFire1 { /* 0x190 */ f32 timer; } EnMFire1; // size = 0x194 -extern const ActorInit En_M_Fire1_InitVars; - #endif // Z_EN_M_FIRE1_H diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 585f56088e..a244c3ca81 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -29,7 +29,7 @@ void EnMThunder_UnkType_Attack(EnMThunder* this, PlayState* play); #define ENMTHUNDER_TYPE_MAX 4 -const ActorInit En_M_Thunder_InitVars = { +ActorInit En_M_Thunder_InitVars = { ACTOR_EN_M_THUNDER, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h index 7ac851e920..9842eeb787 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h @@ -37,6 +37,4 @@ typedef struct EnMThunder { /* 0x1C2 */ u8 isCharging; } EnMThunder; // size = 0x1C4 -extern const ActorInit En_M_Thunder_InitVars; - #endif // Z_EN_M_THUNDER_H 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 ae6a89b4d6..c83698e6f8 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -54,7 +54,7 @@ typedef enum { /* 3 */ MA4_STATE_AFTERDESCRIBETHEMCS, } EnMa4State; -const ActorInit En_Ma4_InitVars = { +ActorInit En_Ma4_InitVars = { ACTOR_EN_MA4, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h index 148e2ef30d..3ac405b009 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h @@ -35,6 +35,4 @@ typedef struct EnMa4 { /* 0x33E */ u16 textId; } EnMa4; // size = 0x340 -extern const ActorInit En_Ma4_InitVars; - #endif // Z_EN_MA4_H 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 3c4e52df8a..bd9c39e7d7 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 @@ -69,7 +69,7 @@ s32 EnMaYto_HasSpokenToPlayerToday(void); s32 EnMaYto_HasSpokenToPlayer(void); void EnMaYto_SetTalkedFlag(void); -const ActorInit En_Ma_Yto_InitVars = { +ActorInit En_Ma_Yto_InitVars = { ACTOR_EN_MA_YTO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h index e21b30c296..0955cd8e8b 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h @@ -30,8 +30,6 @@ typedef struct EnMaYto { /* 0x322 */ u16 textId; } EnMaYto; // size = 0x324 -extern const ActorInit En_Ma_Yto_InitVars; - typedef enum { /* 0 */ MA_YTO_TYPE_DEFAULT, // Strokes cow on day 1 /* 1 */ MA_YTO_TYPE_BARN, 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 be771eafe1..ae72324067 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 @@ -29,7 +29,7 @@ void EnMaYts_SetFaceExpression(EnMaYts* this, s16 overrideEyeTexIndex, s16 mouth void EnMaYts_DrawSleeping(Actor* thisx, PlayState* play); -const ActorInit En_Ma_Yts_InitVars = { +ActorInit En_Ma_Yts_InitVars = { ACTOR_EN_MA_YTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h index e34ef3d0ef..eb700d8c28 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h @@ -31,8 +31,6 @@ typedef struct EnMaYts { /* 0x338 */ u16 textId; } EnMaYts; // size = 0x33C -extern const ActorInit En_Ma_Yts_InitVars; - typedef enum { /* 0 */ MA_YTS_TYPE_BARN, /* 1 */ MA_YTS_TYPE_SITTING, diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index b7199cb1db..3a72258cca 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -85,7 +85,7 @@ static s16 sZeldaEffectColorTargetIndex = 0; static s16 sTextAlphaTargetIndex = 0; static s16 sTextAlphaTimer = 20; -const ActorInit En_Mag_InitVars = { +ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index d55d63ccb8..9515abc716 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -47,6 +47,4 @@ typedef struct EnMag { /* 0x11F74 */ UNK_TYPE1 unk11F74[4]; } EnMag; // size = 0x11F78 -extern const ActorInit En_Mag_InitVars; - #endif // Z_EN_MAG_H diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 9bd19d193b..65e3d8b387 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -36,7 +36,7 @@ void func_80B38060(EnMaruta* this, Vec3f* arg1); void func_80B3828C(Vec3f* arg0, Vec3f* arg1, s16 arg2, s16 arg3, s32 arg4); void func_80B382E4(PlayState* play, Vec3f arg1); -const ActorInit En_Maruta_InitVars = { +ActorInit En_Maruta_InitVars = { ACTOR_EN_MARUTA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h index 1af506c587..0216ba3830 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h @@ -27,6 +27,4 @@ typedef struct EnMaruta { /* 0x220 */ s16 unk_220; } EnMaruta; // size = 0x224 -extern const ActorInit En_Maruta_InitVars; - #endif // Z_EN_MARUTA_H diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index fd00011661..d47992114f 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -29,7 +29,7 @@ void func_808CB6D4(EnMinideath* this, PlayState* play); void func_808CB7CC(EnMinideath* this, PlayState* play); #if 0 -const ActorInit En_Minideath_InitVars = { +ActorInit En_Minideath_InitVars = { ACTOR_EN_MINIDEATH, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h index 427bafa1ef..0a08318abd 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h @@ -13,6 +13,4 @@ typedef struct EnMinideath { /* 0x148 */ char unk_148[0x164]; } EnMinideath; // size = 0x2AC -extern const ActorInit En_Minideath_InitVars; - #endif // Z_EN_MINIDEATH_H 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 c162fc4652..07c147690e 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -26,7 +26,7 @@ void EnMinifrog_UpdateMissingFrog(Actor* thisx, PlayState* play); void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play); void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, PlayState* play); -const ActorInit En_Minifrog_InitVars = { +ActorInit En_Minifrog_InitVars = { ACTOR_EN_MINIFROG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h index a71caa6501..9a3801d91c 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h @@ -38,6 +38,4 @@ typedef struct EnMinifrog { /* 0x2B8 */ ColliderCylinder collider; } EnMinifrog; // size = 0x304 -extern const ActorInit En_Minifrog_InitVars; - #endif // Z_EN_MINIFROG_H diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 68bb607821..1ab5f2cc64 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -41,7 +41,7 @@ void EnMinislime_MoveToGekko(EnMinislime* this, PlayState* play); void EnMinislime_SetupGekkoThrow(EnMinislime* this); void EnMinislime_GekkoThrow(EnMinislime* this, PlayState* play); -const ActorInit En_Minislime_InitVars = { +ActorInit En_Minislime_InitVars = { ACTOR_EN_MINISLIME, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h index 28629f464d..77cabe9b6b 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h @@ -50,6 +50,4 @@ typedef struct EnMinislime { /* 0x160 */ ColliderCylinder collider; } EnMinislime; // size = 0x1AC -extern const ActorInit En_Minislime_InitVars; - #endif // Z_EN_MINISLIME_H diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index dc5e755793..c267fb1105 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -23,7 +23,7 @@ void func_80959C94(EnMk* this, PlayState* play); void func_80959D28(EnMk* this, PlayState* play); void func_80959E18(EnMk* this, PlayState* play); -const ActorInit En_Mk_InitVars = { +ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index ed6cd69979..bbf126f4ee 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -21,6 +21,4 @@ typedef struct EnMk { /* 0x280 */ EnMkActionFunc actionFunc; } EnMk; // size = 0x284 -extern const ActorInit En_Mk_InitVars; - #endif // Z_EN_MK_H diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index c209b76843..cbbaffca9d 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -35,7 +35,7 @@ void func_80A4E67C(EnMkk* this); void func_80A4E84C(EnMkk* this); void func_80A4EBBC(EnMkk* this, PlayState* play); -const ActorInit En_Mkk_InitVars = { +ActorInit En_Mkk_InitVars = { ACTOR_EN_MKK, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h index a8e047284b..80efcd5774 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h @@ -29,6 +29,4 @@ typedef struct EnMkk { /* 0x17C */ ColliderSphere collider; } EnMkk; // size = 0x1D4 -extern const ActorInit En_Mkk_InitVars; - #endif // Z_EN_MKK_H 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 54b58686e8..0cd8f1276e 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -21,7 +21,7 @@ void func_80965DB4(EnMm* this, PlayState* play); void func_8096611C(EnMm* this, PlayState* play); void EnMm_SetupAction(EnMm* this, EnMmActionFunc actionFunc); -const ActorInit En_Mm_InitVars = { +ActorInit En_Mm_InitVars = { ACTOR_EN_MM, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index d049bdba08..14c8d11702 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -18,7 +18,7 @@ void EnMm2_Draw(Actor* thisx, PlayState* play); void EnMm2_Reading(EnMm2* this, PlayState* play); void EnMm2_WaitForRead(EnMm2* this, PlayState* play); -const ActorInit En_Mm2_InitVars = { +ActorInit En_Mm2_InitVars = { ACTOR_EN_MM2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h index 1b3dcc0aa5..4f961e1c08 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h @@ -14,6 +14,4 @@ typedef struct EnMm2 { /* 0x18C */ UNK_TYPE1 unk_18C[0x128]; } EnMm2; // size = 0x2B4 -extern const ActorInit En_Mm2_InitVars; - #endif // Z_EN_MM2_H diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index c747c625fb..a611a309e6 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -29,7 +29,7 @@ void func_80A6FEEC(EnMm3* this, PlayState* play); s32 func_80A6FFAC(EnMm3* this, PlayState* play); void func_80A70084(EnMm3* this, PlayState* play); -const ActorInit En_Mm3_InitVars = { +ActorInit En_Mm3_InitVars = { ACTOR_EN_MM3, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h index 1cc1946f54..e6b512723a 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h @@ -30,6 +30,4 @@ typedef struct EnMm3 { /* 0x2B4 */ u16 unk_2B4; } EnMm3; // size = 0x2B8 -extern const ActorInit En_Mm3_InitVars; - #endif // Z_EN_MM3_H diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index 14c235f517..ef064969eb 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -16,7 +16,7 @@ void EnMnk_Update(Actor* thisx, PlayState* play); void EnMnk_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Mnk_InitVars = { +ActorInit En_Mnk_InitVars = { ACTOR_EN_MNK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h index 9baee87f08..e2f739adaf 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h @@ -14,6 +14,4 @@ typedef struct EnMnk { /* 0x3E8 */ EnMnkActionFunc actionFunc; } EnMnk; // size = 0x3EC -extern const ActorInit En_Mnk_InitVars; - #endif // Z_EN_MNK_H 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 01b5c4becc..c3b7ac7275 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -21,7 +21,7 @@ void EnMs_Talk(EnMs* this, PlayState* play); void EnMs_Sell(EnMs* this, PlayState* play); void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play); -const ActorInit En_Ms_InitVars = { +ActorInit En_Ms_InitVars = { ACTOR_EN_MS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h index dcff0cb58d..aa46b820d3 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -16,6 +16,4 @@ typedef struct EnMs { /* 0x1F8 */ ColliderCylinder collider; } EnMs; // size = 0x244 -extern const ActorInit En_Ms_InitVars; - #endif // Z_EN_MS_H diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 757a43ff21..e4178997fd 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -28,7 +28,7 @@ typedef enum { GORON_RACE_CHEAT_TRYING_TO_REACH_GOAL_FROM_BEHIND, } PlayerCheatStatus; -const ActorInit En_Mt_tag_InitVars = { +ActorInit En_Mt_tag_InitVars = { ACTOR_EN_MT_TAG, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h index 34f86048cc..19ebdb8d81 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h @@ -18,6 +18,4 @@ typedef struct EnMttag { /* 0x164 */ s32 shouldRestartRace; } EnMttag; // size = 0x168 -extern const ActorInit En_Mt_tag_InitVars; - #endif // Z_EN_MT_TAG_H 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 02fe166e25..d8e9d68f8e 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -32,7 +32,7 @@ void func_80A6AE7C(EnMushi2* this, PlayState* play); void func_80A6B078(EnMushi2* this); void func_80A6B0D8(EnMushi2* this, PlayState* play); -const ActorInit En_Mushi2_InitVars = { +ActorInit En_Mushi2_InitVars = { ACTOR_EN_MUSHI2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h index 159116928c..1a776a52ad 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h @@ -45,6 +45,4 @@ typedef struct EnMushi2 { /* 0x370 */ s16 unk_370; } EnMushi2; // size = 0x374 -extern const ActorInit En_Mushi2_InitVars; - #endif // Z_EN_MUSHI2_H 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 631913a2fd..03b30a2862 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -24,7 +24,7 @@ void EnMuto_SetupDialogue(EnMuto* this, PlayState* play); void EnMuto_InDialogue(EnMuto* this, PlayState* play); s32 EnMuto_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); -const ActorInit En_Muto_InitVars = { +ActorInit En_Muto_InitVars = { ACTOR_EN_MUTO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.h b/src/overlays/actors/ovl_En_Muto/z_en_muto.h index e05e294920..6ac984c8db 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.h +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.h @@ -30,6 +30,4 @@ typedef struct EnMuto { /* 0x294 */ ColliderCylinder collider; } EnMuto; // size = 0x2E0 -extern const ActorInit En_Muto_InitVars; - #endif // Z_EN_MUTO_H diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 42dee5befe..3d653a6449 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -110,7 +110,7 @@ u8 D_80BC15C8[] = { 0x0E, 0x23, 0x62, 0x2D, 0x00, 0x0E, 0x0C, 0x10, }; -const ActorInit En_Nb_InitVars = { +ActorInit En_Nb_InitVars = { ACTOR_EN_NB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index c9d71ca549..86099a2141 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -36,7 +36,7 @@ void EnNeoReeba_SetupDeathEffects(EnNeoReeba* this); void EnNeoReeba_PlayDeathEffects(EnNeoReeba* this, PlayState* play); void EnNeoReeba_SpawnIce(EnNeoReeba* this, PlayState* play); -const ActorInit En_Neo_Reeba_InitVars = { +ActorInit En_Neo_Reeba_InitVars = { ACTOR_EN_NEO_REEBA, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h index a739d96db7..2cd24c88e8 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h @@ -31,6 +31,4 @@ typedef struct EnNeoReeba { /* 0x310 */ u8 drawEffectType; } EnNeoReeba; // size = 0x314 -extern const ActorInit En_Neo_Reeba_InitVars; - #endif // Z_EN_NEO_REEBA_H diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index 11872a0a17..abaf6c3e07 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -18,7 +18,7 @@ void EnNimotsu_Draw(Actor* thisx, PlayState* play); void EnNimotsu_UpdateCollision(EnNimotsu* this, PlayState* play); -const ActorInit En_Nimotsu_InitVars = { +ActorInit En_Nimotsu_InitVars = { ACTOR_EN_NIMOTSU, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h index e839c9393f..88e4a1f42b 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h @@ -13,6 +13,4 @@ typedef struct EnNimotsu { /* 0x1DA */ s16 timer; } EnNimotsu; // size = 0x1DC -extern const ActorInit En_Nimotsu_InitVars; - #endif // Z_EN_NIMOTSU_H 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 112871c905..1c9212a63a 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -48,7 +48,7 @@ enum EnNiwState { /* 8 */ NIW_STATE_HOPPING, }; -const ActorInit En_Niw_InitVars = { +ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, ACTORCAT_PROP, FLAGS, 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 5597bf9f60..0187e1c88b 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -21,7 +21,7 @@ void EnNnh_WaitForDialogue(EnNnh* this, PlayState* play); void EnNnh_SetupDialogue(EnNnh* this); void EnNnh_Dialogue(EnNnh* this, PlayState* play); -const ActorInit En_Nnh_InitVars = { +ActorInit En_Nnh_InitVars = { ACTOR_EN_NNH, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h index 344ccb3459..bcbf9caebc 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h @@ -13,6 +13,4 @@ typedef struct EnNnh { /* 0x190 */ EnNnhActionFunc actionFunc; } EnNnh; // size = 0x194 -extern const ActorInit En_Nnh_InitVars; - #endif // Z_EN_NNH_H 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 3fa3ac6ecc..d1d57e741f 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -19,7 +19,7 @@ void EnNutsball_Draw(Actor* thisx, PlayState* play); void EnNutsball_InitColliderParams(EnNutsball* this); -const ActorInit En_Nutsball_InitVars = { +ActorInit En_Nutsball_InitVars = { ACTOR_EN_NUTSBALL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h index a8ae31da2f..04e8077279 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -12,6 +12,4 @@ typedef struct EnNutsball { /* 0x148 */ ColliderCylinder collider; } EnNutsball; // size = 0x194 -extern const ActorInit En_Nutsball_InitVars; - #endif // Z_EN_NUTSBALL_H diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index fc9d7606fe..5fcd69fc89 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -41,7 +41,7 @@ enum EnNiwState { /* 4 */ NWC_STATE_RUNNING, // running from the player after failed breman march }; -const ActorInit En_Nwc_InitVars = { +ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h index 8d2d34c6a7..51c017dff4 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -35,6 +35,4 @@ typedef struct EnNwc { /* 0x264 */ EnNwcActionFunc actionFunc; } EnNwc; // size = 0x268 -extern const ActorInit En_Nwc_InitVars; - #endif // Z_EN_NWC_H diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index d21ac4a1a2..2998939822 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -19,7 +19,7 @@ void func_8096B104(EnOkarinaEffect* this, PlayState* play); void func_8096B174(EnOkarinaEffect* this, PlayState* play); void func_8096B1FC(EnOkarinaEffect* this, PlayState* play); -const ActorInit En_Okarina_Effect_InitVars = { +ActorInit En_Okarina_Effect_InitVars = { ACTOR_EN_OKARINA_EFFECT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h index 67fa74b2c9..b633ab3905 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h @@ -14,6 +14,4 @@ typedef struct EnOkarinaEffect { /* 0x148 */ EnOkarinaEffectActionFunc actionFunc; } EnOkarinaEffect; // size = 0x14C -extern const ActorInit En_Okarina_Effect_InitVars; - #endif // Z_EN_OKARINA_EFFECT_H diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 40cb4ba24e..d4d3db017c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -17,7 +17,7 @@ void EnOkarinaTag_Update(Actor* thisx, PlayState* play); void func_8093E518(EnOkarinaTag* this, PlayState* play); void func_8093E68C(EnOkarinaTag* this, PlayState* play); -const ActorInit En_Okarina_Tag_InitVars = { +ActorInit En_Okarina_Tag_InitVars = { ACTOR_EN_OKARINA_TAG, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h index 8dd51805ce..0dd15c1c9c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h @@ -22,6 +22,4 @@ typedef struct EnOkarinaTag { /* 0x158 */ f32 unk158; } EnOkarinaTag; // size = 0x15C -extern const ActorInit En_Okarina_Tag_InitVars; - #endif // Z_EN_OKARINA_TAG_H diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 938696e881..8241c7e5c7 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -28,7 +28,7 @@ void func_8086F57C(EnOkuta* this, PlayState* play); void func_8086F694(EnOkuta* this, PlayState* play); #if 0 -const ActorInit En_Okuta_InitVars = { +ActorInit En_Okuta_InitVars = { ACTOR_EN_OKUTA, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h index c23a4db364..93a68ae380 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -14,6 +14,4 @@ typedef struct EnOkuta { /* 0x18C */ char unk_18C[0x1A8]; } EnOkuta; // size = 0x334 -extern const ActorInit En_Okuta_InitVars; - #endif // Z_EN_OKUTA_H diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index 59b3140bc6..df18de3e73 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -16,7 +16,7 @@ void EnOnpuman_Update(Actor* thisx, PlayState* play); void func_80B121D8(EnOnpuman* this, PlayState* play); -const ActorInit En_Onpuman_InitVars = { +ActorInit En_Onpuman_InitVars = { ACTOR_EN_ONPUMAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h index 88cd1e4df2..581ea35dd7 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h @@ -16,6 +16,4 @@ typedef struct EnOnpuman { /* 0x2A8 */ EnOnpumanActionFunc actionFunc; } EnOnpuman; // size = 0x2AC -extern const ActorInit En_Onpuman_InitVars; - #endif // Z_EN_ONPUMAN_H diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index 0180a2e671..ac3c5ef6b2 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -22,7 +22,7 @@ void func_80BF61EC(EnOsk* this, PlayState* play); void func_80BF656C(EnOsk* this, PlayState* play); void func_80BF6A20(EnOsk* this, PlayState* play); -const ActorInit En_Osk_InitVars = { +ActorInit En_Osk_InitVars = { ACTOR_EN_OSK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.h b/src/overlays/actors/ovl_En_Osk/z_en_osk.h index d8a4be4ce3..0358911d36 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.h +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.h @@ -24,6 +24,4 @@ typedef struct EnOsk { /* 0x260 */ EnOskActionFunc actionFunc; } EnOsk; // size = 0x264 -extern const ActorInit En_Osk_InitVars; - #endif // Z_EN_OSK_H diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 7a17448da4..7098814157 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -16,7 +16,7 @@ void EnOsn_Destroy(Actor* thisx, PlayState* play); void EnOsn_Update(Actor* thisx, PlayState* play); void EnOsn_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Osn_InitVars = { +ActorInit En_Osn_InitVars = { ACTOR_EN_OSN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.h b/src/overlays/actors/ovl_En_Osn/z_en_osn.h index fdc8ed2c76..5d9858bd4d 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.h +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.h @@ -26,8 +26,6 @@ typedef struct EnOsn { /* 0x1FA */ u8 unk_1FA; } EnOsn; // size = 0x1FB -extern const ActorInit En_Osn_InitVars; - #define ENOSN_GET_3(this) ((thisx)->params & 3) #endif // Z_EN_OSN_H 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 80ae68e95d..a17113ff82 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -92,7 +92,7 @@ typedef enum { /* 12 */ ANI_ANIM_MAX } AniAnimation; -const ActorInit En_Ossan_InitVars = { +ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 20d669ea40..a4787cc148 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -72,6 +72,4 @@ typedef enum { /* 1 */ ENOSSAN_PART_TIME_WORKER } EnOssanWorker; -extern const ActorInit En_Ossan_InitVars; - #endif // Z_EN_OSSAN_H 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 ba2a283de7..487960916d 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -63,7 +63,7 @@ static EnOt* D_80B5E880; static EnOt* D_80B5E884; static EnOt* D_80B5E888; -const ActorInit En_Ot_InitVars = { +ActorInit En_Ot_InitVars = { ACTOR_EN_OT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.h b/src/overlays/actors/ovl_En_Ot/z_en_ot.h index 5399e22786..7e8d7f651c 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.h +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.h @@ -64,6 +64,4 @@ typedef struct EnOt { /* 0x74C */ Vec3f unk_74C; } EnOt; // size = 0x758 -extern const ActorInit En_Ot_InitVars; - #endif // Z_EN_OT_H 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 528fd50c22..ab083aff1a 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -48,7 +48,7 @@ typedef enum { /* 0x01 */ OWL_OK } EnOwlMessageChoice; -const ActorInit En_Owl_InitVars = { +ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index 781fd308c7..0338578868 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -56,6 +56,4 @@ typedef struct EnOwl { /* 0x414 */ EnOwlFunc unk_414; } EnOwl; // size = 0x418 -extern const ActorInit En_Owl_InitVars; - #endif // Z_EN_OWL_H 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 1a60e9d083..8c8a6eb570 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -69,7 +69,7 @@ void func_80BDA288(EnPamera* this); void func_80BDA2E0(EnPamera* this, PlayState* play); void func_80BDA344(Actor* thisx, PlayState* play); -const ActorInit En_Pamera_InitVars = { +ActorInit En_Pamera_InitVars = { ACTOR_EN_PAMERA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h index cf5611c4ed..34f18e8153 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h @@ -37,6 +37,4 @@ typedef struct EnPamera { /* 0x326 */ u16 unk_326; } EnPamera; // size = 0x328 -extern const ActorInit En_Pamera_InitVars; - #endif // Z_EN_PAMERA_H diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 805baed5a8..b4670662ca 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -67,7 +67,7 @@ void EnPametfrog_SnapperSpawn(EnPametfrog* this, PlayState* play); void EnPametfrog_SetupTransitionGekkoSnapper(EnPametfrog* this, PlayState* play); void EnPametfrog_TransitionGekkoSnapper(EnPametfrog* this, PlayState* play); -const ActorInit En_Pametfrog_InitVars = { +ActorInit En_Pametfrog_InitVars = { ACTOR_EN_PAMETFROG, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h index 81af171299..9ae2f76df0 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h @@ -49,6 +49,4 @@ typedef struct EnPametfrog { /* 0x3A4 */ ColliderJntSphElement colElement[2]; } EnPametfrog; // size = 0x424 -extern const ActorInit En_Pametfrog_InitVars; - #endif // Z_EN_PAMETFROG_H diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 09ec4ea109..47d97e1c2f 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -23,7 +23,7 @@ void func_80C1F4E8(EnPaper* this); void func_80C1F55C(EnPaper* this, EnPaperStruct* arg1); void func_80C1F6E0(EnPaper* this, EnPaperStruct* arg1); -const ActorInit En_Paper_InitVars = { +ActorInit En_Paper_InitVars = { ACTOR_EN_PAPER, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.h b/src/overlays/actors/ovl_En_Paper/z_en_paper.h index 457229c3d9..5e8450722a 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.h +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.h @@ -24,6 +24,4 @@ typedef struct EnPaper { /* 0xD84 */ s16 timer; } EnPaper; // size = 0xD88 -extern const ActorInit En_Paper_InitVars; - #endif // Z_EN_PAPER_H diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index f995e7c685..527a91b3dd 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -19,7 +19,7 @@ void EnPart_Draw(Actor* thisx, PlayState* play); void func_80865390(EnPart* this, PlayState* play); void func_808654C4(EnPart* this, PlayState* play); -const ActorInit En_Part_InitVars = { +ActorInit En_Part_InitVars = { ACTOR_EN_PART, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index 53a03f281f..662e8574e4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -23,6 +23,4 @@ typedef struct EnPart { /* 0x150 */ Gfx* dList; } EnPart; // size = 0x154 -extern const ActorInit En_Part_InitVars; - #endif // Z_EN_PART_H diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 0e197a8334..3e2fdcface 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -38,7 +38,7 @@ void func_80898594(EnPeehat* this, PlayState* play); void func_80898654(EnPeehat* this); void func_808986A4(EnPeehat* this, PlayState* play); -const ActorInit En_Peehat_InitVars = { +ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index 182dd9175f..248599c63a 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -35,6 +35,4 @@ typedef struct EnPeehat { /* 0x488 */ ColliderTrisElement colliderTriElements[2]; } EnPeehat; // size = 0x540 -extern const ActorInit En_Peehat_InitVars; - #endif // Z_EN_PEEHAT_H 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 fd37fc39db..317a5eee40 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -472,7 +472,7 @@ static UNK_TYPE D_80AFB764[] = { 0x52801210, }; -const ActorInit En_Pm_InitVars = { +ActorInit En_Pm_InitVars = { ACTOR_EN_PM, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h index de7359d936..c7bf76e378 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h @@ -58,6 +58,4 @@ typedef struct EnPm { /* 0x39C */ UNK_TYPE1 unk_39C[0x4]; } EnPm; // size = 0x3A0 -extern const ActorInit En_Pm_InitVars; - #endif // Z_EN_PM_H diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index e18897cf28..6d14ca25a1 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -28,7 +28,7 @@ void func_80BC5830(EnPoComposer* this, PlayState* play); void func_80BC58E0(EnPoComposer* this, PlayState* play); #if 0 -const ActorInit En_Po_Composer_InitVars = { +ActorInit En_Po_Composer_InitVars = { ACTOR_EN_PO_COMPOSER, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h index 3d70aa8a43..a42b5048f7 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h @@ -14,6 +14,4 @@ typedef struct EnPoComposer { /* 0x238 */ char unk_238[0x108]; } EnPoComposer; // size = 0x340 -extern const ActorInit En_Po_Composer_InitVars; - #endif // Z_EN_PO_COMPOSER_H 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 ebd745b1ef..a9fcf95e3f 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 @@ -25,7 +25,7 @@ void EnPoFusen_Idle(EnPoFusen* this, PlayState* play); void EnPoFusen_IdleFuse(EnPoFusen* this, PlayState* play); s32 EnPoFusen_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); -const ActorInit En_Po_Fusen_InitVars = { +ActorInit En_Po_Fusen_InitVars = { ACTOR_EN_PO_FUSEN, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h index 991b0cf9e1..740d659683 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h @@ -30,6 +30,4 @@ typedef struct EnPoFusen { /* 0x270 */ s16 fuse; } EnPoFusen; // size = 0x274 -extern const ActorInit En_Po_Fusen_InitVars; - #endif // Z_EN_PO_FUSEN_H 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 307e160f92..a89a55d9e9 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 @@ -61,7 +61,7 @@ static Color_RGBA8 sPoSisterEnvColors[] = { { 0, 150, 0, 255 }, // Amy }; -const ActorInit En_Po_Sisters_InitVars = { +ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index 368ad9da12..5e549c4d77 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -68,6 +68,4 @@ typedef struct EnPoSisters { /* 0x358 */ MtxF mtxf; } EnPoSisters; // size = 0x398 -extern const ActorInit En_Po_Sisters_InitVars; - #endif // Z_EN_PO_SISTERS_H 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 0d6c1542d6..f1b0f74d46 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -46,7 +46,7 @@ void func_80B2E3F8(EnPoh* this, PlayState* play); void func_80B2F328(Actor* thisx, PlayState* play); void func_80B2F37C(Actor* thisx, PlayState* play); -const ActorInit En_Poh_InitVars = { +ActorInit En_Poh_InitVars = { ACTOR_EN_POH, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index 083b44f3f5..b07be6195a 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -37,6 +37,4 @@ typedef struct EnPoh { /* 0x3D8 */ MtxF unk_3D8; } EnPoh; // size = 0x418 -extern const ActorInit En_Poh_InitVars; - #endif // Z_EN_POH_H diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index 2a9d321b43..fad487e621 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -115,7 +115,7 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(1, EN_PP_DMGEFF_KNOCK_OFF_MASK), }; -const ActorInit En_Pp_InitVars = { +ActorInit En_Pp_InitVars = { ACTOR_EN_PP, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.h b/src/overlays/actors/ovl_En_Pp/z_en_pp.h index d181c08de7..aabbd9e2e6 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.h +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h @@ -80,6 +80,4 @@ typedef struct EnPp { /* 0x5DC */ Vec3f damagedVelocity; } EnPp; // size = 0x5EC -extern const ActorInit En_Pp_InitVars; - #endif // Z_EN_PP_H diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 322749f0da..97fd2c7f5a 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -68,7 +68,7 @@ static DamageTable sDamageTable = { f32 D_80A338C0[PLAYER_FORM_MAX] = { 30.0f, 30.0f, 30.0f, 15.0f, 15.0f }; -const ActorInit En_Pr_InitVars = { +ActorInit En_Pr_InitVars = { ACTOR_EN_PR, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.h b/src/overlays/actors/ovl_En_Pr/z_en_pr.h index 6a5fe8b5a8..dfa3081ca0 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.h +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.h @@ -54,6 +54,4 @@ typedef struct EnPr { /* 0x2FC */ ColliderCylinder collider; } EnPr; // size = 0x348 -extern const ActorInit En_Pr_InitVars; - #endif // Z_EN_PR_H diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index c8faf718d8..0cc6dc1340 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -81,7 +81,7 @@ static ColliderCylinderInit sCylinderInit = { { 17, 32, -10, { 0, 0, 0 } }, }; -const ActorInit En_Pr2_InitVars = { +ActorInit En_Pr2_InitVars = { ACTOR_EN_PR2, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h index df5afef4e4..617a5cc73b 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h @@ -51,6 +51,4 @@ typedef struct EnPr2 { /* 0x27C */ ColliderCylinder collider; } EnPr2; // size = 0x2C8 -extern const ActorInit En_Pr2_InitVars; - #endif // Z_EN_PR2_H diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 5ca54fc8dd..23b7d7fd47 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -82,7 +82,7 @@ static ColliderCylinderInit sCylinderInit = { { 10, 10, 0, { 0, 0, 0 } }, }; -const ActorInit En_Prz_InitVars = { +ActorInit En_Prz_InitVars = { ACTOR_EN_PRZ, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h index 75087c9bce..db91c7c035 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.h +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h @@ -42,6 +42,4 @@ typedef struct EnPrz { /* 0x224 */ ColliderCylinder collider; } EnPrz; // size = 0x270 -extern const ActorInit En_Prz_InitVars; - #endif // Z_EN_PRZ_H diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index 78458e062f..bae89c5c76 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -118,7 +118,7 @@ s32 D_80B2C488[] = { 0x2C27A40C, 0x10000000 }; s32 D_80B2C490[] = { 0x2C27850C, 0x10000000 }; -const ActorInit En_Pst_InitVars = { +ActorInit En_Pst_InitVars = { ACTOR_EN_PST, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.h b/src/overlays/actors/ovl_En_Pst/z_en_pst.h index 1f85a1decd..6051924da1 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.h +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h @@ -36,6 +36,4 @@ typedef struct EnPst { /* 0x21C */ s32 isLetterToKafeiDeposited; } EnPst; // size = 0x220 -extern const ActorInit En_Pst_InitVars; - #endif // Z_EN_PST_H diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index e75096c8fc..261c94adcb 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -69,7 +69,7 @@ typedef struct { s16 textId; // Used to determine the dog's condition } RaceDogInfo; -const ActorInit En_Racedog_InitVars = { +ActorInit En_Racedog_InitVars = { ACTOR_EN_RACEDOG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h index b0b40be64a..9d49ea4c26 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h @@ -51,6 +51,4 @@ typedef struct EnRacedog { /* 0x2C4 */ f32 selectionArrowScale; } EnRacedog; // size = 0x2C8 -extern const ActorInit En_Racedog_InitVars; - #endif // Z_EN_RACEDOG_H diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index 0e7b887180..c442685090 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -67,7 +67,7 @@ typedef enum { /* 3 */ EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW } EnRafPetalScaleType; -const ActorInit En_Raf_InitVars = { +ActorInit En_Raf_InitVars = { ACTOR_EN_RAF, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.h b/src/overlays/actors/ovl_En_Raf/z_en_raf.h index 831346d38c..f4659f48be 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.h +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.h @@ -64,6 +64,4 @@ typedef struct EnRaf { /* 0x41C */ EnRafEffect effects[EN_RAF_EFFECT_COUNT]; } EnRaf; // size = 0xAE4 -extern const ActorInit En_Raf_InitVars; - #endif // Z_EN_RAF_H diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 6cf596ba92..073f2045af 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -50,7 +50,7 @@ void func_80B726B4(EnRailSkb* this, PlayState* play); void func_80B72830(EnRailSkb* this, s16 arg1); s32 func_80B7285C(EnRailSkb* this); -const ActorInit En_Rail_Skb_InitVars = { +ActorInit En_Rail_Skb_InitVars = { ACTOR_EN_RAIL_SKB, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h index 09d3b4c4c9..10c2653c4e 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h @@ -43,6 +43,4 @@ typedef struct EnRailSkb { /* 0x403 */ u8 drawDmgEffType; } EnRailSkb; // size = 0x404 -extern const ActorInit En_Rail_Skb_InitVars; - #endif // Z_EN_RAIL_SKB_H 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 d046d51929..7772127a0c 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -84,7 +84,7 @@ typedef enum { /* 2 */ EN_RAILGIBUD_GRAB_RELEASE, } EnRailgibudGrabState; -const ActorInit En_Railgibud_InitVars = { +ActorInit En_Railgibud_InitVars = { ACTOR_EN_RAILGIBUD, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h index 78655f870b..cf06d19965 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h @@ -55,6 +55,4 @@ typedef struct EnRailgibud { /* 0x405 */ s8 unk_405; // related to player->unk_ADD } EnRailgibud; // size = 0x408 -extern const ActorInit En_Railgibud_InitVars; - #endif // Z_EN_RAILGIBUD_H diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 6759af1832..da0b27e6d1 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -35,7 +35,7 @@ typedef enum { /* -1 */ EN_RAT_HOOKED, } EnRatHookedState; -const ActorInit En_Rat_InitVars = { +ActorInit En_Rat_InitVars = { ACTOR_EN_RAT, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.h b/src/overlays/actors/ovl_En_Rat/z_en_rat.h index 6dd51d10a1..9472e8c31a 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.h +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.h @@ -55,6 +55,4 @@ typedef struct EnRat { /* 0x268 */ ColliderSphere collider; } EnRat; // size = 0x2C0 -extern const ActorInit En_Rat_InitVars; - #endif // Z_EN_RAT_H 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 e334051381..a086375e74 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -97,7 +97,7 @@ typedef enum { /* 4 */ EN_RD_GRAB_END, } EnRdGrabState; -const ActorInit En_Rd_InitVars = { +ActorInit En_Rd_InitVars = { ACTOR_EN_RD, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index 0affac4f12..f5fbf82cba 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -72,6 +72,4 @@ typedef struct EnRd { /* 0x3F1 */ s8 unk_3F1; // related to player->unk_ADD } EnRd; // size = 0x3F4 -extern const ActorInit En_Rd_InitVars; - #endif // Z_EN_RD_H 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 d817d1df46..692bdeef28 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -21,7 +21,7 @@ void EnRecepgirl_Wait(EnRecepgirl* this, PlayState* play); void EnRecepgirl_SetupTalk(EnRecepgirl* this); void EnRecepgirl_Talk(EnRecepgirl* this, PlayState* play); -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h index b6684fc9e7..a0fba9fdca 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h @@ -17,6 +17,4 @@ typedef struct EnRecepgirl { /* 0x2AE */ Vec3s headRot; } EnRecepgirl; // size = 0x2B4 -extern const ActorInit En_Recepgirl_InitVars; - #endif // Z_EN_RECEPGIRL_H diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 18f23576fc..2a357739aa 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -22,7 +22,7 @@ void func_80BF4FC4(EnRg* this, PlayState* play); s32 D_80BF5C10; -const ActorInit En_Rg_InitVars = { +ActorInit En_Rg_InitVars = { ACTOR_EN_RG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.h b/src/overlays/actors/ovl_En_Rg/z_en_rg.h index fe0a000b67..4db0b58e09 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.h +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.h @@ -52,6 +52,4 @@ typedef struct EnRg { /* 0x34C */ EnRgStruct unk_34C[32]; } EnRg; // size = 0xACC -extern const ActorInit En_Rg_InitVars; - #endif // Z_EN_RG_H diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index d7dba74e9e..0fd1007d0d 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -14,7 +14,7 @@ void EnRiverSound_Init(Actor* thisx, PlayState* play); void EnRiverSound_Update(Actor* thisx, PlayState* play); void EnRiverSound_Draw(Actor* thisx, PlayState* play); -const ActorInit En_River_Sound_InitVars = { +ActorInit En_River_Sound_InitVars = { ACTOR_EN_RIVER_SOUND, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h index b8dbcc513c..eff4fbb472 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h @@ -45,6 +45,4 @@ typedef struct EnRiverSound { /* 0x148 */ Vec3s* pathPoints; } EnRiverSound; // size = 0x14C -extern const ActorInit En_River_Sound_InitVars; - #endif // Z_EN_RIVER_SOUND_H 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 e67be51f66..15dd1d1c4f 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -28,7 +28,7 @@ void func_808FB710(EnRr* this, PlayState* play); void func_808FAD1C(EnRr* this, PlayState* play); void func_808FB398(EnRr* this, PlayState* play); -const ActorInit En_Rr_InitVars = { +ActorInit En_Rr_InitVars = { ACTOR_EN_RR, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h index 072e78105d..e996cfb129 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -62,6 +62,4 @@ typedef struct EnRr { /* 0x324 */ EnRrStruct unk_324[5]; } EnRr; // size = 0x3C4 -extern const ActorInit En_Rr_InitVars; - #endif // Z_EN_RR_H 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 d7a4f9170f..4f6dd1dc14 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -18,7 +18,7 @@ void EnRsn_Draw(Actor* thisx, PlayState* play); void func_80C25D84(EnRsn* this, PlayState* play); -const ActorInit En_Rsn_InitVars = { +ActorInit En_Rsn_InitVars = { ACTOR_EN_RSN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h index b540144381..438a49b1e5 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h @@ -16,6 +16,4 @@ typedef struct EnRsn { /* 0x1DE */ Vec3s unk1DE; } EnRsn; // size = 0x1E4 -extern const ActorInit En_Rsn_InitVars; - #endif // Z_EN_RSN_H diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index 1a57cba7bc..042f2e46f8 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -17,7 +17,7 @@ void EnRu_Draw(Actor* thisx, PlayState* play); void EnRu_DoNothing(EnRu* this, PlayState* play); -const ActorInit En_Ru_InitVars = { +ActorInit En_Ru_InitVars = { ACTOR_EN_RU, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.h b/src/overlays/actors/ovl_En_Ru/z_en_ru.h index b1144f88d7..081f3bbd8a 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.h +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h @@ -38,6 +38,4 @@ typedef struct EnRu { /* 0x450 */ s16 blinkTimer; } EnRu; // size = 0x454 -extern const ActorInit En_Ru_InitVars; - #endif // Z_EN_RU_H diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index bfeca23c5f..f77993e5d6 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -40,7 +40,7 @@ void EnRuppecrow_FlyWhileDroppingRupees(EnRuppecrow*, PlayState*); void EnRuppecrow_UpdateSpeed(EnRuppecrow*, PlayState*); void EnRuppecrow_FlyToDespawn(EnRuppecrow*, PlayState*); -const ActorInit En_Ruppecrow_InitVars = { +ActorInit En_Ruppecrow_InitVars = { ACTOR_EN_RUPPECROW, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h index 620e4b9ac7..887cd8c6bb 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h @@ -37,6 +37,4 @@ typedef struct EnRuppecrow { /* 0x2D4 */ Vec3f limbPos[ENRUPPECROW_LIMB_POS_COUNT]; } EnRuppecrow; // size = 0x304 -extern const ActorInit En_Ruppecrow_InitVars; - #endif // Z_EN_RUPPECROW_H diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 902e604190..c53c79234b 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -30,7 +30,7 @@ void func_80BFC7E0(EnRz* this, PlayState* play); void func_80BFC8F8(EnRz* this, PlayState* play); #if 0 -const ActorInit En_Rz_InitVars = { +ActorInit En_Rz_InitVars = { ACTOR_EN_RZ, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.h b/src/overlays/actors/ovl_En_Rz/z_en_rz.h index 5106d14130..299acf7d36 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.h +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.h @@ -13,6 +13,4 @@ typedef struct EnRz { /* 0x430 */ EnRzActionFunc actionFunc; } EnRz; // size = 0x434 -extern const ActorInit En_Rz_InitVars; - #endif // Z_EN_RZ_H diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index 44848ac1d7..e78f1970f4 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -94,7 +94,7 @@ typedef enum EnSGoroAnimation { /* 0xF */ EN_S_GORO_ANIM_IDLE_STAND } EnSGoroAnimation; -const ActorInit En_S_Goro_InitVars = { +ActorInit En_S_Goro_InitVars = { ACTOR_EN_S_GORO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h index 0d7ac9edb9..5777af17be 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h @@ -11,8 +11,6 @@ struct EnSGoro; typedef void (*EnSGoroActionFunc)(struct EnSGoro*, PlayState*); -extern const ActorInit En_S_Goro_InitVars; - typedef struct EnSGoro { /* 0x000 */ Actor actor; /* 0x144 */ Actor* otherGoron; 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 e896007443..868b489230 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -25,7 +25,7 @@ void EnSb_Lunge(EnSb* this, PlayState* play); void EnSb_Bounce(EnSb* this, PlayState* play); void EnSb_ReturnToIdle(EnSb* this, PlayState* play); -const ActorInit En_Sb_InitVars = { +ActorInit En_Sb_InitVars = { ACTOR_EN_SB, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h index f2b3e68e84..b273222269 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -33,6 +33,4 @@ typedef struct EnSb { /* 0x253 */ u8 isDrawn; } EnSb; // size = 0x254 -extern const ActorInit En_Sb_InitVars; - #endif // Z_EN_SB_H diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 7433c501d2..15e8089715 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -23,7 +23,7 @@ typedef struct { /* 0x4 */ s16 amount; } RuppeInfo; -const ActorInit En_Sc_Ruppe_InitVars = { +ActorInit En_Sc_Ruppe_InitVars = { ACTOR_EN_SC_RUPPE, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h index 80d7ed20eb..8ef0f4c56b 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h @@ -26,6 +26,4 @@ typedef enum { /* 5 */ RUPEE_UNUSED, } RupeeType; -extern const ActorInit En_Sc_Ruppe_InitVars; - #endif // Z_EN_SC_RUPPE_H 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 6d95fc917d..d2a9d525ed 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -16,7 +16,7 @@ void EnScopecoin_Destroy(Actor* thisx, PlayState* play); void EnScopecoin_Update(Actor* thisx, PlayState* play); void EnScopecoin_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Scopecoin_InitVars = { +ActorInit En_Scopecoin_InitVars = { ACTOR_EN_SCOPECOIN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h index 8fd9b142c5..4dda736f8f 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h @@ -16,6 +16,4 @@ typedef struct EnScopecoin { /* 0x148 */ s16 rupeeIndex; } EnScopecoin; // size = 0x14C -extern const ActorInit En_Scopecoin_InitVars; - #endif // Z_EN_SCOPECOIN_H diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index 563f375409..bcf7be085d 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -18,7 +18,7 @@ void EnScopecrow_Draw(Actor* thisx, PlayState* play); void func_80BCD590(EnScopecrow* this, PlayState* play); void func_80BCD640(EnScopecrow* this, PlayState* play); -const ActorInit En_Scopecrow_InitVars = { +ActorInit En_Scopecrow_InitVars = { ACTOR_EN_SCOPECROW, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h index 60775383e9..30f002fb59 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h @@ -27,6 +27,4 @@ typedef struct EnScopecrow { /* 0x264 */ s16 unk_264; } EnScopecrow; // size = 0x268 -extern const ActorInit En_Scopecrow_InitVars; - #endif // Z_EN_SCOPECROW_H diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 456983face..a4a344ce74 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -33,7 +33,7 @@ void func_80BCC288(EnScopenuts* this, PlayState* play); s32 func_80BCC2AC(EnScopenuts* this, Path* path, s32 arg2_); f32 func_80BCC448(Path* path, s32 arg1, Vec3f* arg2, Vec3s* arg3); -const ActorInit En_Scopenuts_InitVars = { +ActorInit En_Scopenuts_InitVars = { ACTOR_EN_SCOPENUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h index 3f6f435449..5ea0d15eb1 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h @@ -47,6 +47,4 @@ typedef struct EnScopenuts { /* 0x372 */ s16 unk_372; } EnScopenuts; // size = 0x374 -extern const ActorInit En_Scopenuts_InitVars; - #endif // Z_EN_SCOPENUTS_H diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 19fac24a82..bd453c84c2 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -20,7 +20,7 @@ void func_80947668(u8* shadowTexture, Player* player, PlayState* play); Vec3f D_80947EA0[16]; -const ActorInit En_Sda_InitVars = { +ActorInit En_Sda_InitVars = { ACTOR_EN_SDA, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h index ff17a25382..fd11ad5bce 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h @@ -11,6 +11,4 @@ typedef struct EnSda { /* 0x000 */ Actor actor; } EnSda; // size = 0x144 -extern const ActorInit En_Sda_InitVars; - #endif // Z_EN_SDA_H diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index 89d27e4ec8..5ad105a76a 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -24,7 +24,7 @@ void func_80A44DE8(EnSekihi* this, PlayState* play); void func_80A450B0(EnSekihi* this, PlayState* play); void EnSekihi_DoNothing(EnSekihi* this, PlayState* play); -const ActorInit En_Sekihi_InitVars = { +ActorInit En_Sekihi_InitVars = { ACTOR_EN_SEKIHI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h index e626b616de..fb4ad7e608 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h @@ -26,6 +26,4 @@ typedef enum SekihiType { /* 0x5 */ SEKIHI_TYPE_MAX } SekihiType; -extern const ActorInit En_Sekihi_InitVars; - #endif // Z_EN_SEKIHI_H 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 2de4c88fb3..de8036ef86 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -49,7 +49,7 @@ static u16 D_80ADD938[] = { 0x0615, 0x060F, 0x060F }; static u8 D_80ADD940 = 0; -const ActorInit En_Sellnuts_InitVars = { +ActorInit En_Sellnuts_InitVars = { ACTOR_EN_SELLNUTS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h index 49023ce7f7..b9793a6d3d 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h @@ -46,6 +46,4 @@ typedef struct EnSellnuts { /* 0x374 */ f32 unk_374; } EnSellnuts; // size = 0x378 -extern const ActorInit En_Sellnuts_InitVars; - #endif // Z_EN_SELLNUTS_H diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index 844d659734..9c1af02bf9 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -51,7 +51,7 @@ static UNK_TYPE D_80AE70B8[] = { static UNK_TYPE D_80AE71C4[] = { 0x00374000, 0x1C2C09DB, 0x0C2F0000, 0x0C0F09DC, 0x0C0F09DD, 0x0C0F09DE, 0x0C0F09DF, 0x0C113740, 0x102C09E0, 0x0C2F0000, 0x0C0F09E1, 0x0C0F09E2, 0x0C100000 }; -const ActorInit En_Shn_InitVars = { +ActorInit En_Shn_InitVars = { ACTOR_EN_SHN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.h b/src/overlays/actors/ovl_En_Shn/z_en_shn.h index e373abde2a..bb4740142e 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.h +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.h @@ -43,6 +43,4 @@ typedef struct EnShn { /* 0x2EC */ s32 unk_2EC; } EnShn; // size = 0x2F0 -extern const ActorInit En_Shn_InitVars; - #endif // Z_EN_SHN_H diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index eccfc5f1ef..5f7e111a4b 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -19,7 +19,7 @@ void func_8098CB70(EnSi* this, PlayState* play); void func_8098CBDC(EnSi* this, PlayState* play); #if 0 -const ActorInit En_Si_InitVars = { +ActorInit En_Si_InitVars = { ACTOR_EN_SI, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index 032e1f1161..b401e5e6a5 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -13,6 +13,4 @@ typedef struct EnSi { /* 0x148 */ char unk_148[0x58]; } EnSi; // size = 0x1A0 -extern const ActorInit En_Si_InitVars; - #endif // Z_EN_SI_H 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 de6175674f..4fd9f5f148 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -145,7 +145,7 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; -const ActorInit En_Skb_InitVars = { +ActorInit En_Skb_InitVars = { ACTOR_EN_SKB, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index 0026048380..ebdad3cd88 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -36,6 +36,4 @@ typedef struct EnSkb { /* 0x3E6 */ u8 drawDmgEffType; } EnSkb; // size = 0x3E8 -extern const ActorInit En_Skb_InitVars; - #endif // Z_EN_SKB_H diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index b9660682fc..2b8e5f4c6e 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -33,7 +33,7 @@ void func_80A30C2C(EnSlime* this, PlayState* play); void func_80A30CEC(EnSlime* this, PlayState* play); #if 0 -const ActorInit En_Slime_InitVars = { +ActorInit En_Slime_InitVars = { ACTOR_EN_SLIME, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.h b/src/overlays/actors/ovl_En_Slime/z_en_slime.h index dacbd824c8..0381a592a1 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h @@ -13,6 +13,4 @@ typedef struct EnSlime { /* 0x148 */ char unk_148[0xC0]; } EnSlime; // size = 0x208 -extern const ActorInit En_Slime_InitVars; - #endif // Z_EN_SLIME_H diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 7476e0681f..8bd665bc03 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -61,7 +61,7 @@ typedef enum { /* 3 */ EN_SNOWMAN_COMBINE_STATE_BEING_ABSORBED_OR_DONE, } EnSnowmanCombineState; -const ActorInit En_Snowman_InitVars = { +ActorInit En_Snowman_InitVars = { ACTOR_EN_SNOWMAN, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h index 32a1ae352d..da0c0a30ad 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h @@ -54,6 +54,4 @@ typedef struct EnSnowman { /* 0x32C */ ColliderCylinder collider; } EnSnowman; // size = 0x378 -extern const ActorInit En_Snowman_InitVars; - #endif // Z_EN_SNOWMAN_H diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 7e50201ac4..48a1cfea08 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -18,7 +18,7 @@ void EnSnowwd_Draw(Actor* thisx, PlayState* play); void func_80AF76F0(EnSnowwd* this, PlayState* play); #if 0 -const ActorInit En_Snowwd_InitVars = { +ActorInit En_Snowwd_InitVars = { ACTOR_EN_SNOWWD, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h index 6706de8462..a83e5d05ac 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h @@ -13,6 +13,4 @@ typedef struct EnSnowwd { /* 0x194 */ EnSnowwdActionFunc actionFunc; } EnSnowwd; // size = 0x198 -extern const ActorInit En_Snowwd_InitVars; - #endif // Z_EN_SNOWWD_H 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 58465b8f05..2a3fb4e32d 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -64,7 +64,7 @@ static AnimationInfoS sAnimationInfoBombShopkeeper[] = { { &gBombShopkeeperSitAtCounterLoopAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, }; -const ActorInit En_Sob1_InitVars = { +ActorInit En_Sob1_InitVars = { ACTOR_EN_OSSAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h index 6cb615d6f9..eee86c112d 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h @@ -88,6 +88,4 @@ typedef enum { /* 2 */ ENSOB1_CUTSCENESTATE_PLAYING } EnSob1CutsceneState; -extern const ActorInit En_Sob1_InitVars; - #endif // Z_EN_SOB1_H diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 3f21fcec68..023c6ba5d6 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -25,7 +25,7 @@ void EnSsh_Start(EnSsh* this, PlayState* play); extern AnimationHeader D_06000304; -const ActorInit En_Ssh_InitVars = { +ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h index 72a82e6928..094c63f7e7 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -56,6 +56,4 @@ typedef struct EnSsh { /* 0x5C8 */ s16 blinkTimer; } EnSsh; // size = 0x5CC -extern const ActorInit En_Ssh_InitVars; - #endif // Z_EN_SSH_H diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 4a496c91e7..14e0c1cb52 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -23,7 +23,7 @@ void func_808A6E24(EnSt* this, PlayState* play); void func_808A701C(EnSt* this, PlayState* play); void func_808A7478(Actor* thisx, PlayState* play); -const ActorInit En_St_InitVars = { +ActorInit En_St_InitVars = { ACTOR_EN_ST, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h index d5ca31f2ce..5c63a96644 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -48,6 +48,4 @@ typedef struct EnSt { /* 0x49C */ Vec3s morphTable[30]; } EnSt; // size = 0x550 -extern const ActorInit En_St_InitVars; - #endif // Z_EN_ST_H diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 7bc9b818a8..4ca1caae43 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -27,7 +27,7 @@ void func_80B67DA0(EnSth* this, PlayState* play); void func_80B680A8(Actor* thisx, PlayState* play); void func_80B6849C(Actor* thisx, PlayState* play); -const ActorInit En_Sth_InitVars = { +ActorInit En_Sth_InitVars = { ACTOR_EN_STH, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h index 38d5fcc7fb..857b925053 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -32,6 +32,4 @@ typedef struct EnSth { /* 0x2A0 */ EnSthActionFunc actionFunc; } EnSth; // size = 0x2A4 -extern const ActorInit En_Sth_InitVars; - #endif // Z_EN_STH_H diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 27613eca9a..ac615a8dd8 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -18,7 +18,7 @@ void EnSth2_Draw(Actor* thisx, PlayState* play2); void EnSth2_UpdateSkelAnime(EnSth2* this, PlayState* play); void EnSth2_UpdateActionFunc(Actor* thisx, PlayState* play); -const ActorInit En_Sth2_InitVars = { +ActorInit En_Sth2_InitVars = { ACTOR_EN_STH2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h index 1166c9d298..265332ffd8 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h @@ -18,6 +18,4 @@ typedef struct EnSth2 { /* 0x24C */ EnSth2ActionFunc actionFunc; } EnSth2; // size = 0x250 -extern const ActorInit En_Sth2_InitVars; - #endif // Z_EN_STH2_H diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index 121d73c518..9cc5b5fad0 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -27,7 +27,7 @@ void EnStoneheishi_SetupCheckGivenItem(EnStoneheishi*); void EnStoneheishi_GiveItemReward(EnStoneheishi* this, PlayState* play); void EnStoneheishi_SetupDrinkBottleProcess(EnStoneheishi* this); -const ActorInit En_Stone_heishi_InitVars = { +ActorInit En_Stone_heishi_InitVars = { ACTOR_EN_STONE_HEISHI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h index 7b09d32bb4..715fc71394 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h @@ -28,6 +28,4 @@ typedef struct EnStoneheishi { /* 0x278 */ ColliderCylinder collider; } EnStoneheishi; // size = 0x2C4 -extern const ActorInit En_Stone_heishi_InitVars; - #endif // Z_EN_STONE_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 062422026b..c4d56b70ad 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -20,7 +20,7 @@ void func_80AE7F34(EnStopheishi* this, PlayState* play); void func_80AE85C4(EnStopheishi* this, PlayState* play); #if 0 -const ActorInit En_Stop_heishi_InitVars = { +ActorInit En_Stop_heishi_InitVars = { ACTOR_EN_STOP_HEISHI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h index 5c2b639ef8..8e27f1c363 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h @@ -14,6 +14,4 @@ typedef struct EnStopheishi { /* 0x258 */ char unk_258[0x90]; } EnStopheishi; // size = 0x2E8 -extern const ActorInit En_Stop_heishi_InitVars; - #endif // Z_EN_STOP_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 76a98f9ac3..11e5ce7d60 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -18,7 +18,7 @@ void EnStream_Draw(Actor* thisx, PlayState* play); void EnStream_WaitForPlayer(EnStream* this, PlayState* play); -const ActorInit En_Stream_InitVars = { +ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h index c544be02f7..88856c3dd6 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h @@ -32,6 +32,4 @@ typedef struct EnStream { /* 0x14C */ UNK_TYPE1 unk_14C[0x4]; } EnStream; // size = 0x150 -extern const ActorInit En_Stream_InitVars; - #endif // Z_EN_STREAM_H 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 51b3f0ef61..e8d56b6021 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -38,7 +38,7 @@ void func_80BADE14(EnSuttari* this, PlayState* play); void func_80BADE8C(EnSuttari* this, PlayState* play); void func_80BADF3C(EnSuttari* this, PlayState* play); -const ActorInit En_Suttari_InitVars = { +ActorInit En_Suttari_InitVars = { ACTOR_EN_SUTTARI, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h index 427f74988f..669cf549e6 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h @@ -60,6 +60,4 @@ typedef struct EnSuttari { /* 0x45A */ s16 cutsceneIdx; } EnSuttari; // size = 0x45C -extern const ActorInit En_Suttari_InitVars; - #endif // Z_EN_SUTTARI_H 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 c96b485d43..da5ba5b8d5 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -28,7 +28,7 @@ void func_808DB100(EnSw* this, PlayState* play); void func_808DB25C(EnSw* this, PlayState* play); void func_808DB2E0(EnSw* this, PlayState* play); -const ActorInit En_Sw_InitVars = { +ActorInit En_Sw_InitVars = { ACTOR_EN_SW, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 7bf39b6c2e..4544346a00 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -50,6 +50,4 @@ typedef struct EnSw { /* 0x4A0 */ s32 unk_4A0; } EnSw; // size = 0x4A4 -extern const ActorInit En_Sw_InitVars; - #endif // Z_EN_SW_H diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 3233321c28..1a2f8b685a 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -25,7 +25,7 @@ void EnSyatekiCrow_Dead(EnSyatekiCrow* this, PlayState* play); static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; -const ActorInit En_Syateki_Crow_InitVars = { +ActorInit En_Syateki_Crow_InitVars = { ACTOR_EN_SYATEKI_CROW, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h index f7a8762853..f244b0b60d 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h @@ -32,6 +32,4 @@ typedef struct EnSyatekiCrow { /* 0x25C */ ColliderJntSphElement colliderElements[1]; } EnSyatekiCrow; // size = 0x29C -extern const ActorInit En_Syateki_Crow_InitVars; - #endif // Z_EN_SYATEKI_CROW_H diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index c1af4524a1..601095cfd7 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -39,7 +39,7 @@ typedef enum { /* 1 */ EN_SYATEKI_DEKUNUTS_HEADDRESS_TYPE_FLIPPED_UP, } EnSyatekiDekunutsHeaddressType; -const ActorInit En_Syateki_Dekunuts_InitVars = { +ActorInit En_Syateki_Dekunuts_InitVars = { ACTOR_EN_SYATEKI_DEKUNUTS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h index 51baf398f3..2ceb0b32da 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h @@ -40,6 +40,4 @@ typedef struct EnSyatekiDekunuts { /* 0x26C */ UNK_TYPE1 unk_26C[0x4]; } EnSyatekiDekunuts; // size = 0x270 -extern const ActorInit En_Syateki_Dekunuts_InitVars; - #endif // Z_EN_SYATEKI_DEKUNUTS_H 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 c22f6d478c..c6d04def58 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 @@ -59,7 +59,7 @@ void EnSyatekiMan_Town_EndGame(EnSyatekiMan* this, PlayState* play); #define COLUMN_CENTER 1 #define COLUMN_RIGHT 2 -const ActorInit En_Syateki_Man_InitVars = { +ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h index 30bc1b1ad0..0b637fecfe 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -70,6 +70,4 @@ typedef struct EnSyatekiMan { /* 0x284 */ s16 prevTextId; } EnSyatekiMan; // size = 0x288 -extern const ActorInit En_Syateki_Man_InitVars; - #endif // Z_EN_SYATEKI_MAN_H diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 4e8731c1cf..5358d44cf5 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -28,7 +28,7 @@ void func_80A36504(EnSyatekiOkuta* this, PlayState* play); void func_80A365EC(EnSyatekiOkuta* this, PlayState* play); void func_80A36CB0(EnSyatekiOkuta* this); -const ActorInit En_Syateki_Okuta_InitVars = { +ActorInit En_Syateki_Okuta_InitVars = { ACTOR_EN_SYATEKI_OKUTA, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h index a455765cd7..0527354d06 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h @@ -24,6 +24,4 @@ typedef struct EnSyatekiOkuta { /* 0x2AA */ s16 unk_2AA; } EnSyatekiOkuta; // size = 0x2AC -extern const ActorInit En_Syateki_Okuta_InitVars; - #endif // Z_EN_SYATEKI_OKUTA_H diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 4456a1f219..20871efb29 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -101,7 +101,7 @@ static Vec3f D_80A20EDC = { 0.0f, 20.0f, 0.0f }; static Vec3f D_80A20EE8 = { 0.0f, 0.0f, 0.0f }; -const ActorInit En_Syateki_Wf_InitVars = { +ActorInit En_Syateki_Wf_InitVars = { ACTOR_EN_SYATEKI_WF, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h index 9e01dca3dd..56770952f7 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h @@ -35,6 +35,4 @@ typedef struct EnSyatekiWf { /* 0x3AC */ UNK_TYPE1 unk_3AC[0x20]; } EnSyatekiWf; // size = 0x3CC -extern const ActorInit En_Syateki_Wf_InitVars; - #endif // Z_EN_SYATEKI_WF_H diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 27b9a8db4f..ad1367f061 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -66,7 +66,7 @@ s32 D_80BE1A0C[] = { 0x0C103012, 0x14FFEC06, 0x00920000, 0x1300920C, 0x10300034, 0x0100050E, 0x2B100C10, 0x0E2B110C, 0x10000000, }; -const ActorInit En_Tab_InitVars = { +ActorInit En_Tab_InitVars = { ACTOR_EN_TAB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.h b/src/overlays/actors/ovl_En_Tab/z_en_tab.h index 81ce92006b..6bb0503a77 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.h +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.h @@ -45,6 +45,4 @@ typedef struct EnTab { /* 0x338 */ s32 unk_338; } EnTab; // size = 0x33C -extern const ActorInit En_Tab_InitVars; - #endif // Z_EN_TAB_H diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index 0d39a0db2e..2cc547e9aa 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -34,7 +34,7 @@ static ColliderCylinderInit sUnusedColliderInit = { { 20, 30, 0, { 0, 0, 0 } }, }; -const ActorInit En_Tag_Obj_InitVars = { +ActorInit En_Tag_Obj_InitVars = { ACTOR_EN_TAG_OBJ, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h index a58b2b1d3d..25e7025d82 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h @@ -11,6 +11,4 @@ typedef struct EnTagObj { /* 0x194 */ s32 hasSpawnedSeahorse; } EnTagObj; // size = 0x198 -extern const ActorInit En_Tag_Obj_InitVars; - #endif // Z_EN_TAG_OBJ_H diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 726d97227f..9bc0cd1b93 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -16,7 +16,7 @@ void EnTakaraya_Update(Actor* thisx, PlayState* play); void EnTakaraya_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Takaraya_InitVars = { +ActorInit En_Takaraya_InitVars = { ACTOR_EN_TAKARAYA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h index cc707f0279..cfa37125ed 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h @@ -14,6 +14,4 @@ typedef struct EnTakaraya { /* 0x2AC */ char unk_2AC[0x10]; } EnTakaraya; // size = 0x2BC -extern const ActorInit En_Takaraya_InitVars; - #endif // Z_EN_TAKARAYA_H diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index c5b25233d7..4f9b2a53de 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -16,7 +16,7 @@ void EnTalk_Update(Actor* thisx, PlayState* play); void func_80BDE058(EnTalk* this, PlayState* play); void func_80BDE090(EnTalk* this, PlayState* play); -const ActorInit En_Talk_InitVars = { +ActorInit En_Talk_InitVars = { ACTOR_EN_TALK, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.h b/src/overlays/actors/ovl_En_Talk/z_en_talk.h index 393a457b51..ef2f67798e 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.h +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.h @@ -14,6 +14,4 @@ typedef struct EnTalk { /* 0x144 */ EnTalkActionFunc actionFunc; } EnTalk; // size = 0x148 -extern const ActorInit En_Talk_InitVars; - #endif // Z_EN_TALK_H diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index 77793d9919..ed17ca42c8 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -102,7 +102,7 @@ typedef enum { /* 2 */ EN_TALK_GIBUD_GRAB_RELEASE, } EnTalkGibudGrabState; -const ActorInit En_Talk_Gibud_InitVars = { +ActorInit En_Talk_Gibud_InitVars = { ACTOR_EN_TALK_GIBUD, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h index ba55f9fc3a..4d11e6c157 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h @@ -45,6 +45,4 @@ typedef struct EnTalkGibud { /* 0x3F7 */ s8 unk_3F7; // related to player->unk_ADD } EnTalkGibud; // size = 0x3F8 -extern const ActorInit En_Talk_Gibud_InitVars; - #endif // Z_EN_TALK_GIBUD_H diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index fbc74cb10b..d6089e5b58 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -18,7 +18,7 @@ void EnTanron1_Draw(Actor* thisx, PlayState* play); void func_80BB5318(EnTanron1* this, PlayState* play); void func_80BB5AAC(EnTanron1* this, PlayState* play); -const ActorInit En_Tanron1_InitVars = { +ActorInit En_Tanron1_InitVars = { ACTOR_EN_TANRON1, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h index d8e96537f3..bff1b46bf8 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h @@ -39,6 +39,4 @@ typedef struct EnTanron1 { /* 0x3360 */ Vec3f unk_3360; } EnTanron1; // size = 0x336C -extern const ActorInit En_Tanron1_InitVars; - #endif // Z_EN_TANRON1_H diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index adb221fbf7..1c46247baf 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -30,7 +30,7 @@ Boss04* D_80BB8450; f32 D_80BB8454; EnTanron2* D_80BB8458[82]; -const ActorInit En_Tanron2_InitVars = { +ActorInit En_Tanron2_InitVars = { ACTOR_EN_TANRON2, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h index efbcc31082..3ae619a2d9 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h @@ -28,6 +28,4 @@ typedef struct EnTanron2 { /* 0x1B0 */ ColliderCylinder collider2; } EnTanron2; // size = 0x1FC -extern const ActorInit En_Tanron2_InitVars; - #endif // Z_EN_TANRON2_H 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 a5f1b1e95d..3d831913e9 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -31,7 +31,7 @@ static Vec3f sZeroVec[] = { 0.0f, 0.0f, 0.0f }; static Boss03* sGyorg = NULL; -const ActorInit En_Tanron3_InitVars = { +ActorInit En_Tanron3_InitVars = { ACTOR_EN_TANRON3, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h index 14971d6e8e..8859de6a4b 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h @@ -41,6 +41,4 @@ typedef struct EnTanron3 { /* 0x2F8 */ EnTanron3ActionFunc actionFunc; } EnTanron3; // size = 0x2FC -extern const ActorInit En_Tanron3_InitVars; - #endif // Z_EN_TANRON3_H diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index c67b36940d..b533439312 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -31,7 +31,7 @@ typedef enum { /* 1 */ SEAGULL_TIMER_CHOOSE_TARGET, } SeagullTimers; -const ActorInit En_Tanron4_InitVars = { +ActorInit En_Tanron4_InitVars = { ACTOR_EN_TANRON4, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h index de4874cfc6..36a48c91a6 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h @@ -28,6 +28,4 @@ typedef struct EnTanron4 { #define SEAGULL_CLONE -1 #define SEAGULL_FOLLOW_ACTOR 100 -extern const ActorInit En_Tanron4_InitVars; - #endif // Z_EN_TANRON4_H diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index b40cc101fa..c052c33090 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -23,7 +23,7 @@ void func_80BE5C10(Actor* thisx, PlayState* play); s32 D_80BE5D80 = 0; -const ActorInit En_Tanron5_InitVars = { +ActorInit En_Tanron5_InitVars = { ACTOR_EN_TANRON5, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h index 9f9e470212..d40938bf86 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h @@ -25,6 +25,4 @@ typedef struct EnTanron5 { /* 0x1A1 */ u8 unk_1A1; } EnTanron5; // size = 0x1A4 -extern const ActorInit En_Tanron5_InitVars; - #endif // Z_EN_TANRON5_H diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c index ceac1e116e..4faa072f90 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -18,7 +18,7 @@ void EnTanron6_Draw(Actor* thisx, PlayState* play); void EnTanron6_DoNothing(EnTanron6* this); void func_80BE60D0(EnTanron6* this, PlayState* play); -const ActorInit En_Tanron6_InitVars = { +ActorInit En_Tanron6_InitVars = { ACTOR_EN_TANRON6, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h index fb565a5c82..89d9a4aae2 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h @@ -13,6 +13,4 @@ typedef struct EnTanron6 { /* 0x200 */ EnTanron6ActionFunc actionFunc; } EnTanron6; // size = 0x204 -extern const ActorInit En_Tanron6_InitVars; - #endif // Z_EN_TANRON6_H diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 3d3ac276e3..95fdce4e15 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -16,7 +16,7 @@ void EnTest_Destroy(Actor* thisx, PlayState* play); void EnTest_Update(Actor* thisx, PlayState* play); void EnTest_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Test_InitVars = { +ActorInit En_Test_InitVars = { ACTOR_EN_TEST, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index e01c44c6ab..2b8d62993f 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -28,6 +28,4 @@ typedef struct EnTest { /* 0x20C */ EnTestStruct unk_20C[20]; } EnTest; // size = 0x6BC -extern const ActorInit En_Test_InitVars; - #endif // Z_EN_TEST_H diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index 8303f1493f..257aea2838 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -27,7 +27,7 @@ typedef struct EnTest2ModelInfo { /* 0x8 */ AnimatedMaterial* animMat; } EnTest2ModelInfo; // size = 0xC -const ActorInit En_Test2_InitVars = { +ActorInit En_Test2_InitVars = { ACTOR_EN_TEST2, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.h b/src/overlays/actors/ovl_En_Test2/z_en_test2.h index ccbba11e74..3b03e0cc13 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.h +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.h @@ -15,6 +15,4 @@ typedef enum { /* 0xC */ EN_TEST2_PARAMS_C } EnTest2_Params; -extern const ActorInit En_Test2_InitVars; - #endif // Z_EN_TEST2_H diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index f50fca2e78..a5777e9d43 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -15,7 +15,7 @@ void EnTest3_Destroy(Actor* thisx, PlayState* play); void EnTest3_Update(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Test3_InitVars = { +ActorInit En_Test3_InitVars = { ACTOR_EN_TEST3, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.h b/src/overlays/actors/ovl_En_Test3/z_en_test3.h index 9d902bad19..fbddc77f12 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.h +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.h @@ -14,6 +14,4 @@ typedef struct EnTest3 { /* 0x770 */ char unk_770[0x648]; } EnTest3; // size = 0xDB8 -extern const ActorInit En_Test3_InitVars; - #endif // Z_EN_TEST3_H diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index 03295c989b..0f63745602 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -19,7 +19,7 @@ void EnTest4_Update(Actor* thisx, PlayState* play); void func_80A42AB8(EnTest4* this, PlayState* play); void func_80A42F20(EnTest4* this, PlayState* play); -const ActorInit En_Test4_InitVars = { +ActorInit En_Test4_InitVars = { ACTOR_EN_TEST4, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.h b/src/overlays/actors/ovl_En_Test4/z_en_test4.h index 5f39f9f564..0a372f245b 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.h +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.h @@ -23,6 +23,4 @@ typedef enum { /* 1 */ TEST4_STATE_1 } EnTest4State; -extern const ActorInit En_Test4_InitVars; - #endif // Z_EN_TEST4_H diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 760474b1b0..83451fa022 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -16,7 +16,7 @@ void EnTest5_Update(Actor* thisx, PlayState* play2); void EnTest5_HandleBottleAction(EnTest5* this, PlayState* play); void EnTest5_SetupAction(EnTest5* this, EnTest5ActionFunc actionFunc); -const ActorInit En_Test5_InitVars = { +ActorInit En_Test5_InitVars = { ACTOR_EN_TEST5, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.h b/src/overlays/actors/ovl_En_Test5/z_en_test5.h index bcfcd98e33..8d0c477848 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.h +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.h @@ -17,6 +17,4 @@ typedef struct EnTest5 { /* 0x158 */ EnTest5ActionFunc actionFunc; } EnTest5; // size = 0x15C -extern const ActorInit En_Test5_InitVars; - #endif // Z_EN_TEST5_H diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index bc47e3e522..48f5327ad8 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -42,7 +42,7 @@ void func_80A92950(EnTest6* this, PlayState* play); EnTest6Struct D_80A94910[12]; -const ActorInit En_Test6_InitVars = { +ActorInit En_Test6_InitVars = { ACTOR_EN_TEST6, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.h b/src/overlays/actors/ovl_En_Test6/z_en_test6.h index ad596960ef..ec06afb919 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.h +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h @@ -49,6 +49,4 @@ typedef struct EnTest6 { /* 0x286 */ s16 unk_286; } EnTest6; // size = 0x288 -extern const ActorInit En_Test6_InitVars; - #endif // Z_EN_TEST6_H diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index e5a646191f..7dbbaec930 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -34,7 +34,7 @@ void func_80AF2EC8(EnTest7* this, PlayState* play); void func_80AF2F98(EnTest7* this, PlayState* play); void func_80AF30F4(EnTest7* this, PlayState* play); -const ActorInit En_Test7_InitVars = { +ActorInit En_Test7_InitVars = { ACTOR_EN_TEST7, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.h b/src/overlays/actors/ovl_En_Test7/z_en_test7.h index da6dec94b0..30bf8e73cf 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.h +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.h @@ -62,6 +62,4 @@ typedef struct EnTest7 { /* 0x1E98 */ EnTest7UnkDrawFunc unk_1E98; } EnTest7; // size = 0x1E9C -extern const ActorInit En_Test7_InitVars; - #endif // Z_EN_TEST7_H diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index f4c970ea80..947f97b627 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -21,7 +21,7 @@ void EnTg_UpdateHearts(PlayState* play, EnTgHeartEffect* effect, s32 numEffects) void EnTg_DrawHearts(PlayState* play, EnTgHeartEffect* effect, s32 numEffects); void EnTg_SpawnHeart(EnTg* this, EnTgHeartEffect* effect, Vec3f* heartStartPos, s32 numEffects); -const ActorInit En_Tg_InitVars = { +ActorInit En_Tg_InitVars = { ACTOR_EN_TG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h index 3cdcb57f1d..ca67624c10 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -31,6 +31,4 @@ typedef struct EnTg { /* 0x2F0 */ EnTgHeartEffect effects[10]; } EnTg; // size = 0x548 -extern const ActorInit En_Tg_InitVars; - #endif // Z_EN_TG_H 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 88e88c2df8..54a6805624 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -32,7 +32,7 @@ void func_80C126D8(EnThiefbird* this, PlayState* play); void func_80C12744(EnThiefbird* this); void func_80C127F4(EnThiefbird* this, PlayState* play); -const ActorInit En_Thiefbird_InitVars = { +ActorInit En_Thiefbird_InitVars = { ACTOR_EN_THIEFBIRD, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h index 1bbee73e09..c405552990 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h @@ -43,6 +43,4 @@ typedef struct EnThiefbird { /* 0x3F0 */ EnThiefbirdUnkStruct unk_3F0[40]; } EnThiefbird; // size = 0x990 -extern const ActorInit En_Thiefbird_InitVars; - #endif // Z_EN_THIEFBIRD_H diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index cb13954ede..fa140ba850 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -30,7 +30,7 @@ void func_80ACA724(EnTimeTag* this, PlayState* play); void func_80ACA7C4(EnTimeTag* this, PlayState* play); void func_80ACA840(EnTimeTag* this, PlayState* play); -const ActorInit En_Time_Tag_InitVars = { +ActorInit En_Time_Tag_InitVars = { ACTOR_EN_TIME_TAG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h index 6ee46c1d3f..ed6b611e4d 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h @@ -17,6 +17,4 @@ typedef struct EnTimeTag { /* 0x144 */ EnTimeTagActionFunc actionFunc; } EnTimeTag; // size = 0x148 -extern const ActorInit En_Time_Tag_InitVars; - #endif // Z_EN_TIME_TAG_H 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 dcf841968e..eb005b2246 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -46,7 +46,7 @@ void func_80895CB0(EnTite* this); void func_80895D08(EnTite* this, PlayState* play); void func_80895E28(EnTite* this, PlayState* play); -const ActorInit En_Tite_InitVars = { +ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index 2d3a13a37a..4b87634a37 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -37,6 +37,4 @@ typedef struct EnTite { /* 0x3AC */ ColliderSphere collider; } EnTite; // size = 0x404 -extern const ActorInit En_Tite_InitVars; - #endif // Z_EN_TITE_H 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 9197b9dc70..5ce216affb 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -69,7 +69,7 @@ static u8 D_80AEF800[] = { /* 0xE */ SCHEDULE_CMD_RET_NONE(), }; -const ActorInit En_Tk_InitVars = { +ActorInit En_Tk_InitVars = { ACTOR_EN_TK, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 279cd08100..42a8aa96ad 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -63,6 +63,4 @@ typedef struct EnTk { /* 0x3F0 */ s32 timePathElapsedTime; } EnTk; // size = 0x3F4 -extern const ActorInit En_Tk_InitVars; - #endif // Z_EN_TK_H diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 0dd8222ce1..00335577bc 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -13,7 +13,7 @@ void EnTorch_Init(Actor* thisx, PlayState* play); -const ActorInit En_Torch_InitVars = { +ActorInit En_Torch_InitVars = { ACTOR_EN_TORCH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), (ActorFunc)EnTorch_Init, (ActorFunc)NULL, (ActorFunc)NULL, (ActorFunc)NULL, }; diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h index 87e1d67822..9ebfabb64b 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h @@ -9,6 +9,4 @@ typedef struct EnTorch { /* 0x000 */ Actor actor; } EnTorch; // size = 0x144 -extern const ActorInit En_Torch_InitVars; - #endif // Z_EN_TORCH_H 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 4d02d749ac..83d084951b 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -19,7 +19,7 @@ void EnTorch2_Draw(Actor* thisx, PlayState* play2); void EnTorch2_UpdateIdle(Actor* thisx, PlayState* play); void EnTorch2_UpdateDeath(Actor* thisx, PlayState* play); -const ActorInit En_Torch2_InitVars = { +ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index 744a7975c9..9033b99236 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -29,6 +29,4 @@ typedef enum { /* 4 */ TORCH2_STATE_DYING, } EnTorch2State; -extern const ActorInit En_Torch2_InitVars; - #endif // Z_EN_TORCH2_H 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 51d58a1f55..75878a7b6c 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -50,7 +50,7 @@ s32 func_80BA4B24(EnToto* this, PlayState* play); s32 func_80BA4C0C(EnToto* this, PlayState* play); s32 func_80BA4C44(EnToto* this, PlayState* play); -const ActorInit En_Toto_InitVars = { +ActorInit En_Toto_InitVars = { ACTOR_EN_TOTO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.h b/src/overlays/actors/ovl_En_Toto/z_en_toto.h index 94c80ef4a4..3c95a7dbb5 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.h +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.h @@ -42,6 +42,4 @@ typedef struct EnToto { /* 0x2C8 */ s32 pad2C8; } EnToto; // size = 0x2CC -extern const ActorInit En_Toto_InitVars; - #endif // Z_EN_TOTO_H 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 3795acdb70..3c144bc99c 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -90,7 +90,7 @@ static AnimationInfoS sAnimationInfo[] = { { &gKotakeFlyAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, }; -const ActorInit En_Trt_InitVars = { +ActorInit En_Trt_InitVars = { ACTOR_EN_TRT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.h b/src/overlays/actors/ovl_En_Trt/z_en_trt.h index 9cbf5d51ca..c81032af53 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.h +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.h @@ -64,6 +64,4 @@ typedef enum { /* 3 */ ENTRT_CUTSCENESTATE_PLAYING } EnTrtCutsceneState; -extern const ActorInit En_Trt_InitVars; - #endif // Z_EN_TRT_H diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index f1835edcf7..0dca63bd20 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -52,7 +52,7 @@ static AnimationInfoS sAnimationInfo[] = { { &gKotakeFlyAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, }; -const ActorInit En_Trt2_InitVars = { +ActorInit En_Trt2_InitVars = { ACTOR_EN_TRT2, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h index da5c6fa9c8..44c2565f7e 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h @@ -41,6 +41,4 @@ typedef struct EnTrt2 { /* 0x3DA */ s16 unk_3DA; } EnTrt2; // size = 0x3DC -extern const ActorInit En_Trt2_InitVars; - #endif // Z_EN_TRT2_H 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 5fec69f449..518ca189e6 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -76,7 +76,7 @@ static UNK_TYPE D_80A889A4[] = { 0x550C1000, }; -const ActorInit En_Tru_InitVars = { +ActorInit En_Tru_InitVars = { ACTOR_EN_TRU, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.h b/src/overlays/actors/ovl_En_Tru/z_en_tru.h index 711d5aeb61..48964b555e 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.h +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h @@ -60,6 +60,4 @@ typedef struct EnTru { /* 0x394 */ EnTruUnkStruct unk_394[30]; } EnTru; // size = 0x934 -extern const ActorInit En_Tru_InitVars; - #endif // Z_EN_TRU_H diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index 75d279f9f2..dd199db69b 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -40,7 +40,7 @@ typedef enum { /* 0x10 */ KOUME_MT_ANIM_MAX } KoumeMtAnimation; -const ActorInit En_Tru_Mt_InitVars = { +ActorInit En_Tru_Mt_InitVars = { ACTOR_EN_TRU_MT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h index 54d58326e5..b114804d70 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h @@ -41,6 +41,4 @@ typedef struct EnTruMt { /* 0x3A4 */ u8 unk_3A4; } EnTruMt; // size = 0x3A8 -extern const ActorInit En_Tru_Mt_InitVars; - #endif // Z_EN_TRU_MT_H diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index d671f85ffc..31674a6684 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -29,7 +29,7 @@ void func_80AE0D10(EnTsn* this, PlayState* play); void func_80AE0D78(EnTsn* this, PlayState* play); void func_80AE0F84(Actor* thisx, PlayState* play); -const ActorInit En_Tsn_InitVars = { +ActorInit En_Tsn_InitVars = { ACTOR_EN_TSN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h index 396918fdb4..ff0b6bcbf2 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h @@ -29,6 +29,4 @@ typedef struct EnTsn { /* 0x230 */ s16 unk_230; } EnTsn; // size = 0x234 -extern const ActorInit En_Tsn_InitVars; - #endif // Z_EN_TSN_H 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 c466995a5d..4f7b8b720a 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 @@ -39,7 +39,7 @@ static ColliderCylinderInit sCylinderInit = { { 11, 28, 0, { 0, 0, 0 } }, }; -const ActorInit En_Tubo_Trap_InitVars = { +ActorInit En_Tubo_Trap_InitVars = { ACTOR_EN_TUBO_TRAP, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h index db3b9cbe40..8df1aeb552 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -15,6 +15,4 @@ typedef struct EnTuboTrap { /* 0x158 */ ColliderCylinder collider; } EnTuboTrap; // size = 0x1A4 -extern const ActorInit En_Tubo_Trap_InitVars; - #endif // Z_EN_TUBO_TRAP_H diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index 0331dc24e8..e0c46c7cba 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -25,7 +25,7 @@ void func_80AC0AC8(EnTwig* this, PlayState* play); void func_80AC0CC4(EnTwig* this, PlayState* play); void func_80AC0D2C(EnTwig* this, PlayState* play); -const ActorInit En_Twig_InitVars = { +ActorInit En_Twig_InitVars = { ACTOR_EN_TWIG, ACTORCAT_MISC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.h b/src/overlays/actors/ovl_En_Twig/z_en_twig.h index 3de7f8f4b9..3bdb622094 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.h +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.h @@ -25,6 +25,4 @@ typedef struct EnTwig { /* 0x180 */ Vec3f unk_180; } EnTwig; // size = 0x18C -extern const ActorInit En_Twig_InitVars; - #endif // Z_EN_TWIG_H diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 926f88f700..34551dac90 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -23,7 +23,7 @@ static u8 D_8089F3E0 = 0; static u8 D_8089F3E4 = 0; -const ActorInit En_Viewer_InitVars = { +ActorInit En_Viewer_InitVars = { ACTOR_EN_VIEWER, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h index c4819f7885..1532e7c705 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -27,6 +27,4 @@ typedef enum { /* 0x2 */ ENVIEWER_PARAMS_2 } EnViewerParams; -extern const ActorInit En_Viewer_InitVars; - #endif // Z_EN_VIEWER_H diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index d0062df49d..50109f8879 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -29,7 +29,7 @@ void func_808CCB08(EnVm* this); void func_808CCB50(EnVm* this, PlayState* play); void func_808CCCF0(EnVm* this, PlayState* play); -const ActorInit En_Vm_InitVars = { +ActorInit En_Vm_InitVars = { ACTOR_EN_VM, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h index dd1c36aa21..ca0678d906 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -35,6 +35,4 @@ typedef struct EnVm { /* 0x300 */ ColliderTrisElement colliderTrisElements[1]; } EnVm; // size = 0x35C -extern const ActorInit En_Vm_InitVars; - #endif // Z_EN_VM_H diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index e84d59ec52..1ddcc4add7 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -43,7 +43,7 @@ void EnWallmas_WaitForProximity(EnWallmas* this, PlayState* play); void EnWallmas_WaitForSwitchFlag(EnWallmas* this, PlayState* play); void EnWallmas_Stun(EnWallmas* this, PlayState* play); -const ActorInit En_Wallmas_InitVars = { +ActorInit En_Wallmas_InitVars = { ACTOR_EN_WALLMAS, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index af7c6f18cf..ceb1d18231 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -52,6 +52,4 @@ typedef struct EnWallmas { /* 0x358 */ ColliderCylinder collider; } EnWallmas; // size = 0x3A4 -extern const ActorInit En_Wallmas_InitVars; - #endif // Z_EN_WALLMAS_H 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 34c8db4bbe..32038c4117 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 @@ -21,7 +21,7 @@ void func_80A66278(EnWarpUzu* this, PlayState* play); void func_80A66384(EnWarpUzu* this, PlayState* play); void EnWarpUzu_DoNothing(EnWarpUzu* this, PlayState* play); -const ActorInit En_Warp_Uzu_InitVars = { +ActorInit En_Warp_Uzu_InitVars = { ACTOR_EN_WARP_UZU, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h index a1a7766e6a..6b8bfb3629 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h @@ -13,6 +13,4 @@ typedef struct EnWarpUzu { /* 0x148 */ ColliderCylinder collider; } EnWarpUzu; // size = 0x194 -extern const ActorInit En_Warp_Uzu_InitVars; - #endif // Z_EN_WARP_UZU_H diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 69e9ca3c76..67a1196bcc 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -24,7 +24,7 @@ void EnWarpTag_Unused809C0A20(EnWarptag* this, PlayState* play); void EnWarpTag_RespawnPlayer(EnWarptag* this, PlayState* play); void EnWarpTag_GrottoReturn(EnWarptag* this, PlayState* play); -const ActorInit En_Warp_tag_InitVars = { +ActorInit En_Warp_tag_InitVars = { ACTOR_EN_WARP_TAG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h index ea7eff8ab5..ac76ccb672 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h @@ -18,8 +18,6 @@ typedef struct EnWarptag { /* 0x160 */ EnWarptagActionFunc actionFunc; } EnWarptag; // size = 0x164 -extern const ActorInit En_Warp_tag_InitVars; - // Only two known Variants: // Goron Trial (MOON): 0x03C1 // Deku Playground: 0x83C0 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 af8df0f2c1..5f92164b33 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 @@ -30,7 +30,7 @@ void func_80A5A184(Actor* thisx, PlayState* play2); void func_80A5A534(Actor* thisx, PlayState* play); void func_80A5A6B8(Actor* thisx, PlayState* play2); -const ActorInit En_Water_Effect_InitVars = { +ActorInit En_Water_Effect_InitVars = { ACTOR_EN_WATER_EFFECT, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h index e4fb752dc2..433ebac621 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h @@ -43,6 +43,4 @@ typedef struct EnWaterEffect { /* 0xE38 */ f32 unk_E38; } EnWaterEffect; // size = 0xE3C -extern const ActorInit En_Water_Effect_InitVars; - #endif // Z_EN_WATER_EFFECT_H diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index a4cf5379aa..83cf472919 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -16,7 +16,7 @@ void EnWdhand_Update(Actor* thisx, PlayState* play); void EnWdhand_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Wdhand_InitVars = { +ActorInit En_Wdhand_InitVars = { ACTOR_EN_WDHAND, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h index adf19ce8c2..5eb02fa1a2 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h @@ -14,6 +14,4 @@ typedef struct EnWdhand { /* 0x1EC */ char unk_1EC[0x268]; } EnWdhand; // size = 0x454 -extern const ActorInit En_Wdhand_InitVars; - #endif // Z_EN_WDHAND_H diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 5f71969b29..ebbc71ca30 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -35,7 +35,7 @@ void func_809672DC(EnWeatherTag* this, PlayState* play); void func_809674C8(EnWeatherTag* this, PlayState* play); void func_80967608(EnWeatherTag* this, PlayState* play); -const ActorInit En_Weather_Tag_InitVars = { +ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h index 84aa36b031..b1e7f8f86f 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -19,8 +19,6 @@ typedef struct EnWeatherTag { /* 0x158 */ u16 unk158; // increment/decrement amount for 154 } EnWeatherTag; // size = 0x15C -extern const ActorInit En_Weather_Tag_InitVars; - #define WEATHER_TAG_TYPE(thisx) ((thisx)->params & 0xF) #define WEATHER_TAG_PATHID(thisx) (((thisx)->params >> 4) & 0xF) #define WEATHER_TAG_RANGE100(thisx) ((u8)(((thisx)->params >> 8) & 0xFF) * 100.0f) 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 f3bfabf4b5..bc505ee530 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -55,7 +55,7 @@ void func_80993524(EnWf* this); void func_8099357C(EnWf* this, PlayState* play); s32 func_8099408C(PlayState* play, EnWf* this); -const ActorInit En_Wf_InitVars = { +ActorInit En_Wf_InitVars = { ACTOR_EN_WF, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index 38570dd9e4..c8a0c7af80 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -37,6 +37,4 @@ typedef struct EnWf { /* 0x49C */ ColliderCylinder collider3; } EnWf; // size = 0x4E8 -extern const ActorInit En_Wf_InitVars; - #endif // Z_EN_WF_H diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index 375e298dc9..b8a6235393 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -80,7 +80,7 @@ typedef enum { /* 5 */ EN_WIZ_ANIM_DAMAGE, } EnWizAnimation; -const ActorInit En_Wiz_InitVars = { +ActorInit En_Wiz_InitVars = { ACTOR_EN_WIZ, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h index 3d18abab25..4d35a0f688 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h @@ -77,6 +77,4 @@ typedef struct EnWiz { /* 0x8D0 */ Vec3s ghostJointTables[10][WIZROBE_LIMB_MAX]; } EnWiz; // size = 0xD80 -extern const ActorInit En_Wiz_InitVars; - #endif // Z_EN_WIZ_H diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 634e83efbc..857bb53000 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -21,7 +21,7 @@ void EnWizBrock_UpdateStatus(EnWizBrock* this, PlayState* play); s16 sPlatformIndex = 0; -const ActorInit En_Wiz_Brock_InitVars = { +ActorInit En_Wiz_Brock_InitVars = { ACTOR_EN_WIZ_BROCK, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h index 3b23d08b0f..3df0362edc 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h @@ -25,6 +25,4 @@ typedef struct EnWizBrock { /* 0x1AC */ f32 alpha; } EnWizBrock; // size = 0x1B0 -extern const ActorInit En_Wiz_Brock_InitVars; - #endif // Z_EN_WIZ_BROCK_H diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index bce9f62826..4ed3333fdb 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -37,7 +37,7 @@ typedef enum { static s32 sPoolHitByIceArrow = false; -const ActorInit En_Wiz_Fire_InitVars = { +ActorInit En_Wiz_Fire_InitVars = { ACTOR_EN_WIZ_FIRE, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h index 180192d4c5..90bf472dca 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h @@ -64,6 +64,4 @@ typedef struct EnWizFire { /* 0x0254 */ EnWizFireEffect effects[200]; } EnWizFire; // size = 0x2AF4 -extern const ActorInit En_Wiz_Fire_InitVars; - #endif // Z_EN_WIZ_FIRE_H diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 59fc37ad31..ba63b30212 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -38,7 +38,7 @@ typedef enum { static f32 sSpawnCos; static f32 sSpawnSin; -const ActorInit En_Wood02_InitVars = { +ActorInit En_Wood02_InitVars = { ACTOR_EN_WOOD02, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h index 310d1e5de3..1286074143 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -50,6 +50,4 @@ typedef enum { /* 0x1A */ WOOD_TREE_SPECIAL = 0x1A } WoodType; -extern const ActorInit En_Wood02_InitVars; - #endif // Z_EN_WOOD02_H diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index d96a8f94e1..a55a96afed 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -32,7 +32,7 @@ void EnYb_ActorShadowFunc(Actor* thisx, Lights* mapper, PlayState* play); void EnYb_ChangeAnim(PlayState* play, EnYb* this, s16 animIndex, u8 animMode, f32 morphFrames); s32 EnYb_CanTalk(EnYb* this, PlayState* play); -const ActorInit En_Yb_InitVars = { +ActorInit En_Yb_InitVars = { ACTOR_EN_YB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index d5e6f2e001..e77aace23d 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -15,7 +15,7 @@ void EnZl1_Destroy(Actor* thisx, PlayState* play); void EnZl1_Update(Actor* thisx, PlayState* play); void EnZl1_Draw(Actor* thisx, PlayState* play); -const ActorInit En_Zl1_InitVars = { +ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h index e1b1181912..4138558fbf 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -10,6 +10,4 @@ typedef struct EnZl1 { /* 0x144 */ char unk_144[0xC0]; } EnZl1; // size = 0x204 -extern const ActorInit En_Zl1_InitVars; - #endif // Z_EN_ZL1_H diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 92e0b29252..3dffe0a6f6 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -18,7 +18,7 @@ void EnZl4_Draw(Actor* thisx, PlayState* play); void func_809A1D0C(EnZl4* this, PlayState* play); #if 0 -const ActorInit En_Zl4_InitVars = { +ActorInit En_Zl4_InitVars = { ACTOR_EN_ZL4, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h index eeb2725796..326d2545e4 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h @@ -14,6 +14,4 @@ typedef struct EnZl4 { /* 0x294 */ char unk_294[0x60]; } EnZl4; // size = 0x2F4 -extern const ActorInit En_Zl4_InitVars; - #endif // Z_EN_ZL4_H diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index c4bf8f56dc..74d830be1d 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -19,7 +19,7 @@ void EnZo_FollowPath(EnZo* this, PlayState* play); void EnZo_TreadWater(EnZo* this, PlayState* play); void EnZo_DoNothing(EnZo* this, PlayState* play); -const ActorInit En_Zo_InitVars = { +ActorInit En_Zo_InitVars = { ACTOR_EN_ZO, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index d89e1b53af..cebdd68cff 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -37,7 +37,7 @@ void func_80BA0BB4(EnZob* this, PlayState* play); void func_80BA0C14(EnZob* this, PlayState* play); void func_80BA0CF4(EnZob* this, PlayState* play); -const ActorInit En_Zob_InitVars = { +ActorInit En_Zob_InitVars = { ACTOR_EN_ZOB, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.h b/src/overlays/actors/ovl_En_Zob/z_en_zob.h index cd9ccc9088..25ce14fdc7 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.h +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.h @@ -32,6 +32,4 @@ typedef struct EnZob { /* 0x314 */ EnZobActionFunc actionFunc; } EnZob; // size = 0x318 -extern const ActorInit En_Zob_InitVars; - #endif // Z_EN_ZOB_H diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index d2645b67b7..83a5dda4b9 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -16,7 +16,7 @@ void EnZod_Update(Actor* thisx, PlayState* play); void EnZod_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit En_Zod_InitVars = { +ActorInit En_Zod_InitVars = { ACTOR_EN_ZOD, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.h b/src/overlays/actors/ovl_En_Zod/z_en_zod.h index 2fd9b74004..08cf29f2d4 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.h +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.h @@ -13,6 +13,4 @@ typedef struct EnZod { /* 0x29C */ EnZodActionFunc actionFunc; } EnZod; // size = 0x2A0 -extern const ActorInit En_Zod_InitVars; - #endif // Z_EN_ZOD_H 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 4f1c73473f..4f0a829807 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -33,7 +33,7 @@ void func_80B95240(EnZog* this, PlayState* play); static u8 D_80B95E10; -const ActorInit En_Zog_InitVars = { +ActorInit En_Zog_InitVars = { ACTOR_EN_ZOG, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.h b/src/overlays/actors/ovl_En_Zog/z_en_zog.h index e649c52ab5..9971d77fa3 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.h +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.h @@ -40,6 +40,4 @@ typedef struct EnZog { /* 0x328 */ EnZogActionFunc actionFunc; } EnZog; // size = 0x32C -extern const ActorInit En_Zog_InitVars; - #endif // Z_EN_ZOG_H diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 463f2117eb..f882c97110 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -38,7 +38,7 @@ void func_80B32BB8(EnZoraegg* this, PlayState* play); void func_80B32C34(EnZoraegg* this, PlayState* play); void func_80B32D08(EnZoraegg* this, PlayState* play); -const ActorInit En_Zoraegg_InitVars = { +ActorInit En_Zoraegg_InitVars = { ACTOR_EN_ZORAEGG, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h index b5b19afde8..f36f77c2bc 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h @@ -59,6 +59,4 @@ typedef struct EnZoraegg { /* 0x1F8 */ EnZoraeggActionFunc actionFunc; } EnZoraegg; // size = 0x1FC -extern const ActorInit En_Zoraegg_InitVars; - #endif // Z_EN_ZORAEGG_H diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index 2a2f23bb01..0570d4c6da 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -50,7 +50,7 @@ typedef enum { /* 13 */ EN_ZOS_ANIM_MAX } EnZosAnimation; -const ActorInit En_Zos_InitVars = { +ActorInit En_Zos_InitVars = { ACTOR_EN_ZOS, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.h b/src/overlays/actors/ovl_En_Zos/z_en_zos.h index bf5a9c07b8..e3ede7b28a 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.h +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h @@ -31,6 +31,4 @@ typedef struct EnZos { /* 0x2C0 */ EnZosActionFunc actionFunc; } EnZos; // size = 0x2C4 -extern const ActorInit En_Zos_InitVars; - #endif // Z_EN_ZOS_H 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 90e712a804..f8a9c0bd21 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -32,7 +32,7 @@ void func_80B990A4(EnZot* this, PlayState* play); void func_80B992C0(EnZot* this, PlayState* play); void func_80B99384(EnZot* this, PlayState* play); -const ActorInit En_Zot_InitVars = { +ActorInit En_Zot_InitVars = { ACTOR_EN_ZOT, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.h b/src/overlays/actors/ovl_En_Zot/z_en_zot.h index b72328b202..1bab43ae32 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.h +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.h @@ -29,6 +29,4 @@ typedef struct EnZot { /* 0x2F8 */ EnZotActionFunc actionFunc; } EnZot; // size = 0x2FC -extern const ActorInit En_Zot_InitVars; - #endif // Z_EN_ZOT_H diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index ee7f4cf053..81f81b0521 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -28,7 +28,7 @@ void func_80BD1DB8(EnZov* this, PlayState* play); void func_80BD1F1C(EnZov* this, PlayState* play); s32 EnZov_ValidatePictograph(PlayState* play, Actor* thisx); -const ActorInit En_Zov_InitVars = { +ActorInit En_Zov_InitVars = { ACTOR_EN_ZOV, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h index 25966f9940..a5e217ca34 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.h +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h @@ -36,6 +36,4 @@ typedef struct EnZov { /* 0x330 */ EnZovActionFunc actionFunc; } EnZov; // size = 0x334 -extern const ActorInit En_Zov_InitVars; - #endif // Z_EN_ZOV_H diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 4779fdeddc..2d4bf16059 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -22,7 +22,7 @@ void func_80BDD634(EnZow* this, PlayState* play); void func_80BDD6BC(EnZow* this, PlayState* play); void func_80BDD79C(EnZow* this, PlayState* play); -const ActorInit En_Zow_InitVars = { +ActorInit En_Zow_InitVars = { ACTOR_EN_ZOW, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.h b/src/overlays/actors/ovl_En_Zow/z_en_zow.h index 777a0aa9dc..a9d9156675 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.h +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.h @@ -39,6 +39,4 @@ typedef struct EnZow { /* 0x618 */ EnZowActionFunc actionFunc; } EnZow; // size = 0x61C -extern const ActorInit En_Zow_InitVars; - #endif // Z_EN_ZOW_H 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 afaec44638..c4d72a8f18 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 @@ -18,7 +18,7 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play); void func_808BCF54(ItemBHeart* this, PlayState* play); -const ActorInit Item_B_Heart_InitVars = { +ActorInit Item_B_Heart_InitVars = { ACTOR_ITEM_B_HEART, ACTORCAT_BOSS, FLAGS, diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h index b89e10eddf..f7ff62fa9a 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h @@ -12,6 +12,4 @@ typedef struct ItemBHeart { /* 0x168 */ f32 unk_168; } ItemBHeart; // size = 0x16C -extern const ActorInit Item_B_Heart_InitVars; - #endif // Z_ITEM_B_HEART_H diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 140599f61a..e327dc3f4e 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -20,7 +20,7 @@ void func_809200F8(ItemEtcetera* this, PlayState* play); void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play); void ItemEtcetera_Draw(Actor* thisx, PlayState* play); -const ActorInit Item_Etcetera_InitVars = { +ActorInit Item_Etcetera_InitVars = { ACTOR_ITEM_ETCETERA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h index e33f1e1fb6..4ac893ba56 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -37,6 +37,4 @@ typedef struct ItemEtcetera { /* 0x154 */ ItemEtceteraActionFunc actionFunc; } ItemEtcetera; // size = 0x158 -extern const ActorInit Item_Etcetera_InitVars; - #endif // Z_ITEM_ETCETERA_H diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index d6e9764169..0599e117dc 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -17,7 +17,7 @@ void ItemInbox_Draw(Actor* thisx, PlayState* play); void ItemInbox_Idle(ItemInbox* this, PlayState* play); -const ActorInit Item_Inbox_InitVars = { +ActorInit Item_Inbox_InitVars = { ACTOR_ITEM_INBOX, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h index 0b3247ee75..e6b1adfd68 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -12,6 +12,4 @@ typedef struct ItemInbox { /* 0x144 */ ItemInboxActionFunc actionFunc; } ItemInbox; // size = 0x148 -extern const ActorInit Item_Inbox_InitVars; - #endif // Z_ITEM_INBOX_H diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 92a54e6b09..4880a326eb 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -41,7 +41,7 @@ typedef struct { /* 0x1F */ u8 params; } MirRayDataEntry; // size = 0x20 -const ActorInit Mir_Ray_InitVars = { +ActorInit Mir_Ray_InitVars = { ACTOR_MIR_RAY, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h index 3ba21c444e..cd48cfed19 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -40,6 +40,4 @@ typedef struct MirRay { /* 0x2A6 */ u8 unLit; // Conditioned on. set in Cobra? } MirRay; // size = 0x2A8 -extern const ActorInit Mir_Ray_InitVars; - #endif // Z_MIR_RAY_H diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index 215b637762..a552e35ab1 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -15,7 +15,7 @@ void MirRay2_Destroy(Actor* thisx, PlayState* play); void MirRay2_Update(Actor* thisx, PlayState* play); void MirRay2_Draw(Actor* thisx, PlayState* play); -const ActorInit Mir_Ray2_InitVars = { +ActorInit Mir_Ray2_InitVars = { ACTOR_MIR_RAY2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h index ac5202bdb9..4bb40d40df 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h @@ -19,6 +19,4 @@ typedef struct MirRay2 { /* 0x1B0 */ LightInfo lightInfo; } MirRay2; // size = 0x1C0 -extern const ActorInit Mir_Ray2_InitVars; - #endif // Z_MIR_RAY2_H diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index e327123d18..8f6fcbfe90 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -16,7 +16,7 @@ void MirRay3_Destroy(Actor* thisx, PlayState* play); void MirRay3_Update(Actor* thisx, PlayState* play); void MirRay3_Draw(Actor* thisx, PlayState* play); -const ActorInit Mir_Ray3_InitVars = { +ActorInit Mir_Ray3_InitVars = { ACTOR_MIR_RAY3, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h index 7aecd111fc..3e285c0505 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h @@ -19,6 +19,4 @@ typedef struct MirRay3 { /* 0x260 */ f32 unk_260; } MirRay3; // size = 0x264 -extern const ActorInit Mir_Ray3_InitVars; - #endif // Z_MIR_RAY3_H diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 5ae0b4ae22..acea3daf10 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -24,7 +24,7 @@ void func_80ACBDFC(ObjAqua* this, PlayState* play); void func_80ACBD34(ObjAqua* this); -const ActorInit Obj_Aqua_InitVars = { +ActorInit Obj_Aqua_InitVars = { ACTOR_OBJ_AQUA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h index fa2b1c6361..a47ea661aa 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h @@ -19,6 +19,4 @@ typedef struct ObjAqua { /* 0x198 */ s16 unk_198; } ObjAqua; // size = 0x19C -extern const ActorInit Obj_Aqua_InitVars; - #endif // Z_OBJ_AQUA_H diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 1325a9a165..565c995046 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -23,7 +23,7 @@ void func_809A562C(ObjArmos* this, PlayState* play); void func_809A57D8(ObjArmos* this); void func_809A57F4(ObjArmos* this, PlayState* play); -const ActorInit Obj_Armos_InitVars = { +ActorInit Obj_Armos_InitVars = { ACTOR_OBJ_ARMOS, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h index a0c91f2140..2e94530059 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h @@ -38,6 +38,4 @@ typedef struct ObjArmos { /* 0x270 */ s16 unk_270; } ObjArmos; // size = 0x274 -extern const ActorInit Obj_Armos_InitVars; - #endif // Z_OBJ_ARMOS_H diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 9904c6beed..2a8a63fecb 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -60,7 +60,7 @@ void func_80938C1C(Actor* thisx, PlayState* play); void func_80938E00(Actor* thisx, PlayState* play); void func_80938F50(Actor* thisx, PlayState* play); -const ActorInit Obj_Bean_InitVars = { +ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index 5af772007a..7699b34276 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -59,6 +59,4 @@ typedef struct ObjBean { /* 0x200 */ u8 unk_200; } ObjBean; // size = 0x204 -extern const ActorInit Obj_Bean_InitVars; - #endif // Z_OBJ_BEAN_H 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 d57c9937d2..f8534afea7 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -19,7 +19,7 @@ void ObjBell_Draw(Actor* thisx, PlayState* play); s32 func_80A356D8(ObjBell* this); s32 func_80A357A8(ObjBell* this, PlayState* play); -const ActorInit Obj_Bell_InitVars = { +ActorInit Obj_Bell_InitVars = { ACTOR_OBJ_BELL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h index c55381ad34..a98f296802 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h @@ -20,6 +20,4 @@ typedef struct ObjBell { /* 0x224 */ UNK_TYPE1 unk_224[0x04]; } ObjBell; // size = 0x228 -extern const ActorInit Obj_Bell_InitVars; - #endif // Z_OBJ_BELL_H diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index e44a4ffde7..4b7e9f4714 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -24,7 +24,7 @@ void func_80AE9180(ObjBigicicle* this, PlayState* play); void func_80AE9258(ObjBigicicle* this, PlayState* play); void func_80AE939C(ObjBigicicle* this, PlayState* play); -const ActorInit Obj_Bigicicle_InitVars = { +ActorInit Obj_Bigicicle_InitVars = { ACTOR_OBJ_BIGICICLE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h index 7e28abd457..2eb5a00bd9 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h @@ -19,6 +19,4 @@ typedef struct ObjBigicicle { /* 0x198 */ ColliderCylinder collider2; } ObjBigicicle; // size = 0x1E4 -extern const ActorInit Obj_Bigicicle_InitVars; - #endif // Z_OBJ_BIGICICLE_H diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 98604578ac..437f0c2346 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -17,7 +17,7 @@ void ObjBlockstop_Update(Actor* thisx, PlayState* play); void ObjBlockstop_CheckForBlock(ObjBlockstop* this, PlayState* play); void ObjBlockstop_TryPlayCutscene(ObjBlockstop* this, PlayState* play); -const ActorInit Obj_Blockstop_InitVars = { +ActorInit Obj_Blockstop_InitVars = { ACTOR_OBJ_BLOCKSTOP, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h index 95af6757c6..15d45a90bb 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h @@ -12,6 +12,4 @@ typedef struct ObjBlockstop { /* 0x144 */ ObjBlockstopActionFunc actionFunc; } ObjBlockstop; // size = 0x148 -extern const ActorInit Obj_Blockstop_InitVars; - #endif // Z_OBJ_BLOCKSTOP_H diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index 1fca2a0018..6545b98e51 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -18,7 +18,7 @@ void ObjBoat_Draw(Actor* thisx, PlayState* play); void func_80B9B428(Actor* thisx, PlayState* play2); -const ActorInit Obj_Boat_InitVars = { +ActorInit Obj_Boat_InitVars = { ACTOR_OBJ_BOAT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h index a3ed2b147b..795c50689b 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h @@ -20,6 +20,4 @@ typedef struct ObjBoat { /* 0x164 */ Vec3s* unk_164; } ObjBoat; // size = 0x168 -extern const ActorInit Obj_Boat_InitVars; - #endif // Z_OBJ_BOAT_H diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 99200987c0..84b2abc634 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -24,7 +24,7 @@ void func_8093A1F0(ObjBombiwa* this, PlayState* play); void func_8093A418(Actor* thisx, PlayState* play); void func_8093A608(Actor* thisx, PlayState* play); -const ActorInit Obj_Bombiwa_InitVars = { +ActorInit Obj_Bombiwa_InitVars = { ACTOR_OBJ_BOMBIWA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h index 50e0bbf92c..b49a893237 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -32,6 +32,4 @@ typedef struct ObjBombiwa { /* 0x204 */ ObjBombiwaActionFunc actionFunc; } ObjBombiwa; // size = 0x208 -extern const ActorInit Obj_Bombiwa_InitVars; - #endif // Z_OBJ_BOMBIWA_H 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 79da4f3328..387d796163 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -18,7 +18,7 @@ void ObjBoyo_Destroy(Actor* thisx, PlayState* play2); void ObjBoyo_Update(Actor* thisx, PlayState* play2); void ObjBoyo_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Boyo_InitVars = { +ActorInit Obj_Boyo_InitVars = { ACTOR_OBJ_BOYO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h index 69e1885303..dcff2a893a 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h @@ -28,6 +28,4 @@ typedef struct ObjBoyo { /* 0x1AC */ s16 unk_1AC; } ObjBoyo; // size = 0x1B0 -extern const ActorInit Obj_Boyo_InitVars; - #endif // Z_OBJ_BOYO_H 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 6f909e770a..e77ea9890f 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -28,7 +28,7 @@ void ObjChan_Draw(Actor* thisx, PlayState* play); void ObjChan_ChandelierAction(ObjChan* this2, PlayState* play); void ObjChan_PotAction(ObjChan* this, PlayState* play); -const ActorInit Obj_Chan_InitVars = { +ActorInit Obj_Chan_InitVars = { ACTOR_OBJ_CHAN, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h index a3a4e6d933..f08f18adf4 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h @@ -57,6 +57,4 @@ typedef struct ObjChan { /* 0x1E0 */ s16 cutscenes[2]; } ObjChan; // size = 0x1E4 -extern const ActorInit Obj_Chan_InitVars; - #endif // Z_OBJ_CHAN_H diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 5fc5d6b319..0c888a4ac6 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -17,7 +17,7 @@ void ObjChikuwa_Destroy(Actor* thisx, PlayState* play); void ObjChikuwa_Update(Actor* thisx, PlayState* play); void ObjChikuwa_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Chikuwa_InitVars = { +ActorInit Obj_Chikuwa_InitVars = { ACTOR_OBJ_CHIKUWA, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h index 7ebba3021f..ee51742466 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h @@ -34,6 +34,4 @@ typedef struct ObjChikuwa { /* 0x9A6 */ u8 unk_9A6; } ObjChikuwa; // size = 0x9A8 -extern const ActorInit Obj_Chikuwa_InitVars; - #endif // Z_OBJ_CHIKUWA_H diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index e290a108ca..367bf16195 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -22,7 +22,7 @@ void func_8098DEA0(ObjComb* this, PlayState* play); void func_8098E098(ObjComb* this); void func_8098E0B8(ObjComb* this, PlayState* play); -const ActorInit Obj_Comb_InitVars = { +ActorInit Obj_Comb_InitVars = { ACTOR_OBJ_COMB, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h index ed51885766..0ee61baaf0 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -34,6 +34,4 @@ typedef struct ObjComb { /* 0x1B8 */ s8 unk_1B8; } ObjComb; // size = 0x1BC -extern const ActorInit Obj_Comb_InitVars; - #endif // Z_OBJ_COMB_H 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 27440cf621..9daa20badb 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -21,7 +21,7 @@ void ObjDanpeilift_Move(ObjDanpeilift* this, PlayState* play); void ObjDanpeilift_Teleport(ObjDanpeilift* this, PlayState* play); void ObjDanpeilift_Wait(ObjDanpeilift* this, PlayState* play); -const ActorInit Obj_Danpeilift_InitVars = { +ActorInit Obj_Danpeilift_InitVars = { ACTOR_OBJ_DANPEILIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h index 31f6b90c4d..392d5d4ca7 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h @@ -32,6 +32,4 @@ typedef struct ObjDanpeilift { /* 0x188 */ s16 cutsceneTimer; } ObjDanpeilift; // size = 0x18C -extern const ActorInit Obj_Danpeilift_InitVars; - #endif // Z_OBJ_DANPEILIFT_H diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 4a648b7f84..060e793ca8 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -17,7 +17,7 @@ void func_80983678(ObjDemo* this, PlayState* play); void func_80983704(ObjDemo* this, PlayState* play); void func_80983634(PlayState* play); -const ActorInit Obj_Demo_InitVars = { +ActorInit Obj_Demo_InitVars = { ACTOR_OBJ_DEMO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h index be774bf07a..065a21fe9d 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h @@ -17,6 +17,4 @@ typedef struct ObjDemo { /* 0x150 */ f32 yRange; } ObjDemo; // size = 0x154 -extern const ActorInit Obj_Demo_InitVars; - #endif // Z_OBJ_DEMO_H diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index fa92bd2e33..fce6d99ece 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -28,7 +28,7 @@ void func_80B139F4(ObjDhouse* this, PlayState* play); void func_80B13C08(Actor* thisx, PlayState* play); void func_80B13E40(Actor* thisx, PlayState* play); -const ActorInit Obj_Dhouse_InitVars = { +ActorInit Obj_Dhouse_InitVars = { ACTOR_OBJ_DHOUSE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h index 807af52f94..c03dbed7df 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h @@ -45,6 +45,4 @@ typedef struct ObjDhouse { /* 0x1370 */ s16 unk_1370; } ObjDhouse; // size = 0x1374 -extern const ActorInit Obj_Dhouse_InitVars; - #endif // Z_OBJ_DHOUSE_H 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 f14dd615a9..0b6a6b988e 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -16,7 +16,7 @@ void ObjDinner_Destroy(Actor* thisx, PlayState* play); void ObjDinner_Update(Actor* thisx, PlayState* play); void ObjDinner_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Dinner_InitVars = { +ActorInit Obj_Dinner_InitVars = { ACTOR_OBJ_DINNER, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h index 8dc49ee483..a27dce28be 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h @@ -10,6 +10,4 @@ typedef struct ObjDinner { /* 0x144 */ char unk_144[0x4]; } ObjDinner; // size = 0x148 -extern const ActorInit Obj_Dinner_InitVars; - #endif // Z_OBJ_DINNER_H diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index c8b9926c5d..9b6c812663 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -35,7 +35,7 @@ typedef enum { /* 0xF */ DORA_DMGEFF_LIGHT } ObjDoraDamageEffect; -const ActorInit Obj_Dora_InitVars = { +ActorInit Obj_Dora_InitVars = { ACTOR_OBJ_DORA, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h index ece93f6274..3c1b17f2aa 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h @@ -21,6 +21,4 @@ typedef struct ObjDora { /* 0x3AA */ s16 unk3AA; // Set but not used } ObjDora; // size = 0x3AC -extern const ActorInit Obj_Dora_InitVars; - #endif // Z_OBJ_DORA_H diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index 3ba7ea655e..01675c173b 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -17,7 +17,7 @@ void ObjDowsing_Update(Actor* thisx, PlayState* play); s32 ObjDowsing_GetFlag(ObjDowsing* this, PlayState* play); s32 ObjDowsing_CheckValidSpawn(ObjDowsing* this, PlayState* play); -const ActorInit Obj_Dowsing_InitVars = { +ActorInit Obj_Dowsing_InitVars = { ACTOR_OBJ_DOWSING, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h index 7b1125a283..879c99d807 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h @@ -18,6 +18,4 @@ typedef struct ObjDowsing { /* 0x000 */ Actor actor; } ObjDowsing; // size = 0x144 -extern const ActorInit Obj_Dowsing_InitVars; - #endif // Z_OBJ_DOWSING_H diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index 5db0592524..f0eaaf25ac 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -25,7 +25,7 @@ void func_80A67450(ObjDriftice* this, PlayState* play); void func_80A674A8(ObjDriftice* this); void func_80A674C4(ObjDriftice* this, PlayState* play); -const ActorInit Obj_Driftice_InitVars = { +ActorInit Obj_Driftice_InitVars = { ACTOR_OBJ_DRIFTICE, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h index e2f37350ab..21e0f8f276 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h @@ -56,6 +56,6 @@ typedef struct ObjDriftice { /* 0x24C */ s32 unk_24C; } ObjDriftice; // size = 0x250 -extern const ActorInit Obj_Driftice_InitVars; +extern ActorInit Obj_Driftice_InitVars; #endif // Z_OBJ_DRIFTICE_H 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 d2da273b59..fd2bf4c022 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -15,7 +15,7 @@ void ObjEnding_Init(Actor* thisx, PlayState* play); void ObjEnding_Update(Actor* thisx, PlayState* play); void ObjEnding_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Ending_InitVars = { +ActorInit Obj_Ending_InitVars = { ACTOR_OBJ_ENDING, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h index 163134f364..dfe6a83ea3 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h @@ -16,6 +16,4 @@ typedef struct ObjEnding { /* 0x148 */ AnimatedMaterial* animMat; } ObjEnding; // size = 0x14C -extern const ActorInit Obj_Ending_InitVars; - #endif // Z_OBJ_ENDING_H diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index cd7106240a..723dfcf3e0 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -16,7 +16,7 @@ void ObjEntotu_Destroy(Actor* thisx, PlayState* play); void ObjEntotu_Update(Actor* thisx, PlayState* play); void ObjEntotu_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Entotu_InitVars = { +ActorInit Obj_Entotu_InitVars = { ACTOR_OBJ_ENTOTU, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h index a00a7fcd49..ba667b6c79 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h @@ -14,6 +14,4 @@ typedef struct ObjEntotu { /* 0x1C6 */ s16 unk_1C6; } ObjEntotu; // size = 0x1C8 -extern const ActorInit Obj_Entotu_InitVars; - #endif // Z_OBJ_ENTOTU_H 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 f3a9d7c38a..ceedeb6c49 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -20,7 +20,7 @@ void ObjEtcetera_Setup(ObjEtcetera* this, PlayState* play); void ObjEtcetera_DrawIdle(Actor* thisx, PlayState* play); void ObjEtcetera_DrawAnimated(Actor* thisx, PlayState* play); -const ActorInit Obj_Etcetera_InitVars = { +ActorInit Obj_Etcetera_InitVars = { ACTOR_OBJ_ETCETERA, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h index 33810ae06a..1805e151a8 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h @@ -33,6 +33,4 @@ typedef struct ObjEtcetera { /* 0x280 */ ObjEtceteraActionFunc actionFunc; } ObjEtcetera; // size = 0x284 -extern const ActorInit Obj_Etcetera_InitVars; - #endif // Z_OBJ_ETCETERA_H diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index 54bd7966cd..a4c4e21d21 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -22,7 +22,7 @@ void func_80A4CC54(ObjFireshield* this); void func_80A4CCBC(ObjFireshield* this); void func_80A4CD28(ObjFireshield* this); -const ActorInit Obj_Fireshield_InitVars = { +ActorInit Obj_Fireshield_InitVars = { ACTOR_OBJ_FIRESHIELD, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h index bc01ceac4d..ffe1d7a356 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h @@ -28,6 +28,4 @@ typedef struct ObjFireshield { /* 0x1A8 */ s8 unk_1A8; } ObjFireshield; // size = 0x1AC -extern const ActorInit Obj_Fireshield_InitVars; - #endif // Z_OBJ_FIRESHIELD_H diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index e31c71ba0b..49e8ac9342 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -31,7 +31,7 @@ s16 D_80A1DA3C; s16 D_80A1DA3E; s16 D_80A1DA40; -const ActorInit Obj_Flowerpot_InitVars = { +ActorInit Obj_Flowerpot_InitVars = { ACTOR_OBJ_FLOWERPOT, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h index 3e803672ca..ec1ec43bb6 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h @@ -21,6 +21,4 @@ typedef struct ObjFlowerpot { /* 0x1EC */ s8 unk_1EC; } ObjFlowerpot; // size = 0x1F0 -extern const ActorInit Obj_Flowerpot_InitVars; - #endif // Z_OBJ_FLOWERPOT_H 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 99a481577e..c3d4d1398e 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -14,7 +14,7 @@ void ObjFunen_Init(Actor* thisx, PlayState* play); void ObjFunen_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Funen_InitVars = { +ActorInit Obj_Funen_InitVars = { ACTOR_OBJ_FUNEN, ACTORCAT_PROP, FLAGS, OBJECT_FUNEN, sizeof(ObjFunen), (ActorFunc)ObjFunen_Init, (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)ObjFunen_Draw, diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h index dfafc94cf3..eb7ca5e2b7 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h @@ -9,6 +9,4 @@ typedef struct ObjFunen { /* 0x000 */ Actor actor; } ObjFunen; // size = 0x144 -extern const ActorInit Obj_Funen_InitVars; - #endif // Z_OBJ_FUNEN_H 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 15c564df2b..315c7dc0f2 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -24,7 +24,7 @@ void func_80B3C39C(ObjGhaka* this, PlayState* play); void func_80B3C4E0(ObjGhaka* this, PlayState* play); void func_80B3C624(ObjGhaka* this, PlayState* play); -const ActorInit Obj_Ghaka_InitVars = { +ActorInit Obj_Ghaka_InitVars = { ACTOR_OBJ_GHAKA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h index 34c71f6b81..5eb92f1e6a 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h @@ -14,6 +14,4 @@ typedef struct ObjGhaka { /* 0x168 */ s16 unk_168; } ObjGhaka; // size = 0x16C -extern const ActorInit Obj_Ghaka_InitVars; - #endif // Z_OBJ_GHAKA_H diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index df880906ee..3414aaafad 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -26,7 +26,7 @@ f32 D_809AAE10[20]; #include "overlays/ovl_Obj_Grass/ovl_Obj_Grass.c" -const ActorInit Obj_Grass_InitVars = { +ActorInit Obj_Grass_InitVars = { ACTOR_OBJ_GRASS, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h index be73c70b50..fffcdad4ef 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h @@ -43,6 +43,4 @@ typedef struct ObjGrass { /* 0x3298 */ struct ObjGrassCarry* unk_3298[2]; } ObjGrass; // size = 0x32A0 -extern const ActorInit Obj_Grass_InitVars; - #endif // Z_OBJ_GRASS_H diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 65008c74a9..568e101416 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -29,7 +29,7 @@ void func_809AB6FC(ObjGrassCarry* this); void func_809AB77C(ObjGrassCarry* this, PlayState* play); void func_809ABB7C(Actor* this, PlayState* play); -const ActorInit Obj_Grass_Carry_InitVars = { +ActorInit Obj_Grass_Carry_InitVars = { ACTOR_OBJ_GRASS_CARRY, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h index 0e59033fcb..fa870305ef 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h @@ -19,6 +19,4 @@ typedef struct ObjGrassCarry { /* 0x19C */ ObjGrassCarryActionFunc actionFunc; } ObjGrassCarry; // size = 0x1A0 -extern const ActorInit Obj_Grass_Carry_InitVars; - #endif // Z_OBJ_GRASS_CARRY_H diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index 125c788508..c57ed608fc 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -13,7 +13,7 @@ void ObjGrassUnit_Init(Actor* thisx, PlayState* play); #if 0 -const ActorInit Obj_Grass_Unit_InitVars = { +ActorInit Obj_Grass_Unit_InitVars = { ACTOR_OBJ_GRASS_UNIT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h index 113132e5e9..58a8a427ad 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h @@ -9,6 +9,4 @@ typedef struct ObjGrassUnit { /* 0x000 */ Actor actor; } ObjGrassUnit; // size = 0x144 -extern const ActorInit Obj_Grass_Unit_InitVars; - #endif // Z_OBJ_GRASS_UNIT_H diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 87c62c5d5c..9c38849c9a 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -37,7 +37,7 @@ void func_80B15330(ObjHakaisi* this, PlayState* play); void func_80B1544C(Actor* thisx, PlayState* play); void func_80B154A0(Actor* thisx, PlayState* play); -const ActorInit Obj_Hakaisi_InitVars = { +ActorInit Obj_Hakaisi_InitVars = { ACTOR_OBJ_HAKAISI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h index a4e5d233c3..ed5341a82b 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h @@ -24,6 +24,4 @@ typedef struct ObjHakaisi { /* 0x19E */ u8 unk_19E; } ObjHakaisi; // size = 0x1A0 -extern const ActorInit Obj_Hakaisi_InitVars; - #endif // Z_OBJ_HAKAISI_H diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 6c90d670c1..752b669cff 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -16,7 +16,7 @@ void ObjHamishi_Destroy(Actor* thisx, PlayState* play2); void ObjHamishi_Update(Actor* thisx, PlayState* play); void ObjHamishi_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Hamishi_InitVars = { +ActorInit Obj_Hamishi_InitVars = { ACTOR_OBJ_HAMISHI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h index da838d4802..962a596123 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h @@ -21,6 +21,4 @@ typedef struct ObjHamishi { /* 0x1A2 */ u8 unk_1A2; } ObjHamishi; // size = 0x1A4 -extern const ActorInit Obj_Hamishi_InitVars; - #endif // Z_OBJ_HAMISHI_H 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 6eb0b0adc8..97fbbec3d9 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -16,7 +16,7 @@ void ObjHana_Destroy(Actor* thisx, PlayState* play); void ObjHana_Update(Actor* thisx, PlayState* play); void ObjHana_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Hana_InitVars = { +ActorInit Obj_Hana_InitVars = { ACTOR_OBJ_HANA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h index f885850cd0..dd8c4676cb 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h @@ -9,6 +9,4 @@ typedef struct ObjHana { /* 0x000 */ Actor actor; } ObjHana; // size = 0x144 -extern const ActorInit Obj_Hana_InitVars; - #endif // Z_OBJ_HANA_H diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 467dfa8b8a..1c33af7fe4 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -23,7 +23,7 @@ void ObjHariko_SetupBobHead(ObjHariko* this); void ObjHariko_BobHead(ObjHariko* this, PlayState* play); void ObjHariko_CheckForQuakes(ObjHariko* this); -const ActorInit Obj_Hariko_InitVars = { +ActorInit Obj_Hariko_InitVars = { ACTOR_OBJ_HARIKO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h index 5d9a8e39b9..88a51a83f5 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h @@ -16,6 +16,4 @@ typedef struct ObjHariko { /* 0x154 */ s16 unk154; // Set but not used } ObjHariko; // size = 0x158 -extern const ActorInit Obj_Hariko_InitVars; - #endif // Z_OBJ_HARIKO_H 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 ae528e3ea7..5ecd2a63f4 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -26,7 +26,7 @@ void ObjHgdoor_SetupStopCs(ObjHgdoor* this); void ObjHgdoor_StopCs(ObjHgdoor* this, PlayState* play); s32 ObjHgdoor_Rotate(ObjHgdoor* this, PlayState* play); -const ActorInit Obj_Hgdoor_InitVars = { +ActorInit Obj_Hgdoor_InitVars = { ACTOR_OBJ_HGDOOR, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h index 3e0af9e8c9..7172952bb2 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h @@ -19,6 +19,4 @@ typedef struct ObjHgdoor { /* 0x166 */ u16 csAction; } ObjHgdoor; // size = 0x168 -extern const ActorInit Obj_Hgdoor_InitVars; - #endif // Z_OBJ_HGDOOR_H 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 9f19241acb..ae047f0292 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -21,7 +21,7 @@ void ObjHsStump_Idle(ObjHsStump* this, PlayState* play); void ObjHsStump_SetupAppear(ObjHsStump* this, PlayState* play); void ObjHsStump_Appear(ObjHsStump* this, PlayState* play); -const ActorInit Obj_HsStump_InitVars = { +ActorInit Obj_HsStump_InitVars = { ACTOR_OBJ_HSSTUMP, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h index 1f82a15b1e..0f06fdfaf1 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h @@ -20,6 +20,4 @@ typedef struct ObjHsStump { /* 0x168 */ f32 rotFactor; } ObjHsStump; // size = 0x16C -extern const ActorInit Obj_HsStump_InitVars; - #endif // Z_OBJ_HSSTUMP_H diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 3339d14401..26d89f00df 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -23,7 +23,7 @@ void func_8093E05C(ObjHsblock* this); void func_8093E0E8(ObjHsblock* this); void func_8093E10C(ObjHsblock* this, PlayState* play); -const ActorInit Obj_Hsblock_InitVars = { +ActorInit Obj_Hsblock_InitVars = { ACTOR_OBJ_HSBLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h index 0411cc9e4e..f919264094 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -17,6 +17,4 @@ typedef struct ObjHsblock { /* 0x15C */ ObjHsblockActionFunc actionFunc; } ObjHsblock; // size = 0x160 -extern const ActorInit Obj_Hsblock_InitVars; - #endif // Z_OBJ_HSBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index dedea23531..8210f23d32 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -28,7 +28,7 @@ void func_80A55310(ObjHugebombiwa* this); void func_80A55564(ObjHugebombiwa* this, PlayState* play); void func_80A55B34(Actor* thisx, PlayState* play); -const ActorInit Obj_Hugebombiwa_InitVars = { +ActorInit Obj_Hugebombiwa_InitVars = { ACTOR_OBJ_HUGEBOMBIWA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h index 67b428182f..932a61c3df 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h @@ -29,6 +29,4 @@ typedef struct ObjHugebombiwa { /* 0x4B4 */ ObjHugebombiwaActionFunc actionFunc; } ObjHugebombiwa; // size = 0x4B8 -extern const ActorInit Obj_Hugebombiwa_InitVars; - #endif // Z_OBJ_HUGEBOMBIWA_H diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index dc4ebb7ef3..f35d270a03 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -46,7 +46,7 @@ ObjHansuiStruct D_80B9DC70[] = { { 3, 3 }, { 3, 5 }, { 3, 1 }, { 3, 6 }, { 3, 2 }, { 3, 4 }, { 3, 0 }, }; -const ActorInit Obj_Hunsui_InitVars = { +ActorInit Obj_Hunsui_InitVars = { ACTOR_OBJ_HUNSUI, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h index 2f3d968a67..14a2eea626 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h @@ -54,6 +54,4 @@ typedef struct ObjHunsui { /* 0x1B4 */ BgDblueMovebg* unk_1B4; } ObjHunsui; // size = 0x1B8 -extern const ActorInit Obj_Hunsui_InitVars; - #endif // Z_OBJ_HUNSUI_H diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 5d438239da..cf6588c318 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -22,7 +22,7 @@ void func_80931A38(ObjIcePoly* this, PlayState* play); void func_80931E58(ObjIcePoly* this, PlayState* play); void func_80931EEC(ObjIcePoly* this, PlayState* play); -const ActorInit Obj_Ice_Poly_InitVars = { +ActorInit Obj_Ice_Poly_InitVars = { ACTOR_OBJ_ICE_POLY, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h index 601c5c9e78..b081a72507 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h @@ -21,6 +21,4 @@ typedef struct ObjIcePoly { /* 0x1E4 */ ColliderCylinder colliders2[2]; } ObjIcePoly; // size = 0x27C -extern const ActorInit Obj_Ice_Poly_InitVars; - #endif // Z_OBJ_ICE_POLY_H 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 b75db4261f..8a039c496d 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -45,7 +45,7 @@ void func_80A26B64(ObjIceblock* this, PlayState* play); void func_80A26B74(ObjIceblock* this, PlayState* play); void func_80A26BF8(ObjIceblock* this, PlayState* play); -const ActorInit Obj_Iceblock_InitVars = { +ActorInit Obj_Iceblock_InitVars = { ACTOR_OBJ_ICEBLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h index 46ebc0c40c..466cd97b7d 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h @@ -78,6 +78,4 @@ typedef struct ObjIceblock { /* 0x2B4 */ f32 unk_2B4; } ObjIceblock; // size = 0x2B8 -extern const ActorInit Obj_Iceblock_InitVars; - #endif // Z_OBJ_ICEBLOCK_H 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 5d28d1790c..0f4f835039 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 @@ -16,7 +16,7 @@ void ObjJgGakki_Destroy(Actor* thisx, PlayState* play); void ObjJgGakki_Update(Actor* thisx, PlayState* play); void ObjJgGakki_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Jg_Gakki_InitVars = { +ActorInit Obj_Jg_Gakki_InitVars = { ACTOR_OBJ_JG_GAKKI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h index a3e8ae8eb8..0da5151a42 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h @@ -11,6 +11,4 @@ typedef struct ObjJgGakki { /* 0x188 */ ColliderCylinder collider; } ObjJgGakki; // size = 0x1D4 -extern const ActorInit Obj_Jg_Gakki_InitVars; - #endif // Z_OBJ_JG_GAKKI_H diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index 21b7645937..af05f0ba34 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -27,7 +27,7 @@ void func_80C15474(ObjJgameLight* this, PlayState* play); void ObjJgameLight_UpdateCollision(ObjJgameLight* this, PlayState* play); void func_80C15718(ObjJgameLight* this, PlayState* play); -const ActorInit Obj_Jgame_Light_InitVars = { +ActorInit Obj_Jgame_Light_InitVars = { ACTOR_OBJ_JGAME_LIGHT, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h index a81bbf3cc0..0be39f7a68 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h @@ -27,6 +27,4 @@ typedef struct ObjJgameLight { /* 0x1B8 */ u8 prevHealth; } ObjJgameLight; // size = 0x1BC -extern const ActorInit Obj_Jgame_Light_InitVars; - #endif // Z_OBJ_JGAME_LIGHT_H diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index cbe3cecfcb..3942fff76e 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -44,7 +44,7 @@ void ObjKendoKanban_Settled(ObjKendoKanban* this, PlayState* play); void ObjKendoKanban_HandlePhysics(ObjKendoKanban* this, PlayState* play); s32 ObjKendoKanban_IsPlayerOnTop(ObjKendoKanban* this, PlayState* play); -const ActorInit Obj_Kendo_Kanban_InitVars = { +ActorInit Obj_Kendo_Kanban_InitVars = { ACTOR_OBJ_KENDO_KANBAN, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h index 9d01b63fcc..72bf6e71ec 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h @@ -31,6 +31,4 @@ typedef struct ObjKendoKanban { /* 0x30C */ u8 boardFragments; } ObjKendoKanban; // size = 0x310 -extern const ActorInit Obj_Kendo_Kanban_InitVars; - #endif // Z_OBJ_KENDO_KANBAN_H 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 37221acca4..abd9b25771 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 @@ -16,7 +16,7 @@ void ObjKepnKoya_Destroy(Actor* thisx, PlayState* play); void ObjKepnKoya_Update(Actor* thisx, PlayState* play); void ObjKepnKoya_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Kepn_Koya_InitVars = { +ActorInit Obj_Kepn_Koya_InitVars = { ACTOR_OBJ_KEPN_KOYA, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h index ce33c0112c..58b4f69a10 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h @@ -10,6 +10,4 @@ typedef struct ObjKepnKoya { /* 0x15C */ UNK_TYPE1 unk15C[0x4]; } ObjKepnKoya; // size = 0x160 -extern const ActorInit Obj_Kepn_Koya_InitVars; - #endif // Z_OBJ_KEPN_KOYA_H diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index b95130ff8d..36927b2629 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -36,7 +36,7 @@ static s16 D_80927384 = 0; static s16 D_80927388 = 0; static s16 D_8092738C = 0; -const ActorInit Obj_Kibako_InitVars = { +ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h index b3ef71cca7..102dd1e1b5 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -22,6 +22,4 @@ typedef struct ObjKibako { /* 0x199 */ s8 unk199; /* room? */ } ObjKibako; // size = 0x19C -extern const ActorInit Obj_Kibako_InitVars; - #endif // Z_OBJ_KIBAKO_H diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index aff712f401..06af2a8e31 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -19,7 +19,7 @@ void ObjKibako2_Draw(Actor* thisx, PlayState* play); void ObjKibako2_Idle(ObjKibako2* this, PlayState* play); void ObjKibako2_Kill(ObjKibako2* this, PlayState* play); -const ActorInit Obj_Kibako2_InitVars = { +ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h index f1816ab4d9..47c8649d9f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -25,6 +25,4 @@ typedef struct ObjKibako2 { /* 0x1AD */ s8 skulltulaNoiseTimer; } ObjKibako2; // size = 0x1B0 -extern const ActorInit Obj_Kibako2_InitVars; - #endif // Z_OBJ_KIBAKO2_H diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 6ff98b96e8..9c9215b24f 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -16,7 +16,7 @@ void ObjKinoko_Destroy(Actor* thisx, PlayState* play); void ObjKinoko_Update(Actor* thisx, PlayState* play); void ObjKinoko_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Kinoko_InitVars = { +ActorInit Obj_Kinoko_InitVars = { ACTOR_OBJ_KINOKO, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h index 9073e3e14c..335f33a022 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h @@ -9,8 +9,6 @@ typedef struct ObjKinoko { /* 0x000 */ Actor actor; } ObjKinoko; // size = 0x144 -extern const ActorInit Obj_Kinoko_InitVars; - #define OBJ_KINOKO_GET_FLAG(thisx) ((thisx)->params & 0x7F) #endif // Z_OBJ_KINOKO_H diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index 810525a582..9ceff660e4 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -23,7 +23,7 @@ void ObjKzsaku_Idle(ObjKzsaku* this, PlayState* play); void ObjKzsaku_Rise(ObjKzsaku* this, PlayState* play); void func_80C08CB0(ObjKzsaku* this, PlayState* play); -const ActorInit Obj_Kzsaku_InitVars = { +ActorInit Obj_Kzsaku_InitVars = { ACTOR_OBJ_KZSAKU, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h index c4a9298fa3..0a6f00187a 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h @@ -17,6 +17,4 @@ typedef struct ObjKzsaku { /* 0x168 */ s16 timer; } ObjKzsaku; // size = 0x16C -extern const ActorInit Obj_Kzsaku_InitVars; - #endif // Z_OBJ_KZSAKU_H diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index efe79c7adb..aff88964b1 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -27,7 +27,7 @@ void func_8093DB70(ObjLift* this); void func_8093DB90(ObjLift* this, PlayState* play); void func_8093DC90(Actor* thisx, PlayState* play); -const ActorInit Obj_Lift_InitVars = { +ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h index ea29a9cb9b..b7f2af0500 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -24,6 +24,4 @@ typedef struct ObjLift { /* 0x178 */ s16 unk_178; } ObjLift; // size = 0x17C -extern const ActorInit Obj_Lift_InitVars; - #endif // Z_OBJ_LIFT_H 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 6fe341dcc8..16a628fa25 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -22,7 +22,7 @@ void func_80AF3BA0(ObjLightblock* this, PlayState* play); void func_80AF3C18(ObjLightblock* this); void func_80AF3C34(ObjLightblock* this, PlayState* play); -const ActorInit Obj_Lightblock_InitVars = { +ActorInit Obj_Lightblock_InitVars = { ACTOR_OBJ_LIGHTBLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h index eb16a7a92c..63a106dac0 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h @@ -19,6 +19,4 @@ typedef struct ObjLightblock { /* 0x1AE */ s8 collisionCounter; } ObjLightblock; // size = 0x1B0 -extern const ActorInit Obj_Lightblock_InitVars; - #endif // Z_OBJ_LIGHTBLOCK_H 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 7272f62c0d..f2946d5362 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -27,7 +27,7 @@ void ObjLightSwitch_SetupDisabled(ObjLightswitch* this); void ObjLightSwitch_Disabled(ObjLightswitch* this, PlayState* play); void ObjLightswitch_Idle(ObjLightswitch* this, PlayState* play); -const ActorInit Obj_Lightswitch_InitVars = { +ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h index a079001381..c26dab2621 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -29,8 +29,6 @@ typedef struct ObjLightswitch { } ObjLightswitch; // size = 0x1C0 -extern const ActorInit Obj_Lightswitch_InitVars; - #define LIGHTSWITCH_FACE_ASLEEP 0 #define LIGHTSWITCH_FACE_WAKING 1 #define LIGHTSWITCH_FACE_FULLAWAKE 2 diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 697c73f6a1..6620c51166 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -21,7 +21,7 @@ void func_80AF04D8(ObjLupygamelift* this, PlayState* play); void func_80AF0514(ObjLupygamelift* this); void func_80AF0530(ObjLupygamelift* this, PlayState* play); -const ActorInit Obj_Lupygamelift_InitVars = { +ActorInit Obj_Lupygamelift_InitVars = { ACTOR_OBJ_LUPYGAMELIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h index e2abd8be53..e25f9cd6d1 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h @@ -21,6 +21,4 @@ typedef struct ObjLupygamelift { /* 0x170 */ s16 timer; } ObjLupygamelift; /* size = 0x174 */ -extern const ActorInit Obj_Lupygamelift_InitVars; - #endif // Z_OBJ_LUPYGAMELIFT_H diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 5adfb7aa6a..fefa5797d5 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -18,7 +18,7 @@ s32 func_8099FA40(ObjMakekinsuta* this, PlayState* play); void func_8099FB64(Actor* thisx, PlayState* play); void func_8099FD7C(Actor* thisx, PlayState* play); -const ActorInit Obj_Makekinsuta_InitVars = { +ActorInit Obj_Makekinsuta_InitVars = { ACTOR_OBJ_MAKEKINSUTA, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h index d5bc998f03..17c9220e24 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -15,6 +15,4 @@ typedef struct ObjMakekinsuta { /* 0x144 */ s8 unk144; } ObjMakekinsuta; // size = 0x148 -extern const ActorInit Obj_Makekinsuta_InitVars; - #endif // Z_OBJ_MAKEKINSUTA_H diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 05fa6b3948..bb7d30f694 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -13,7 +13,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play); void ObjMakeoshihiki_Update(Actor* thisx, PlayState* play); -const ActorInit Obj_Makeoshihiki_InitVars = { +ActorInit Obj_Makeoshihiki_InitVars = { ACTOR_OBJ_MAKEOSHIHIKI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h index 8a419c5507..47fbe831be 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h @@ -15,6 +15,4 @@ typedef struct ObjMakeoshihiki { /* 0x148 */ s32 pathCount; } ObjMakeoshihiki; // size = 0x14C -extern const ActorInit Obj_Makeoshihiki_InitVars; - #endif // Z_OBJ_MAKEOSHIHIKI_H 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 9e3ac57d64..358cfde4b2 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 @@ -16,7 +16,7 @@ void ObjMilkBin_Destroy(Actor* thisx, PlayState* play); void ObjMilkBin_Update(Actor* thisx, PlayState* play2); void ObjMilkBin_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Milk_Bin_InitVars = { +ActorInit Obj_Milk_Bin_InitVars = { ACTOR_OBJ_MILK_BIN, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h index c5f313661a..9eb0d298dc 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h @@ -13,8 +13,6 @@ typedef struct ObjMilkBin { /* 0x198 */ s32 type; } ObjMilkBin; // size = 0x19C -extern const ActorInit Obj_Milk_Bin_InitVars; - typedef enum { /* 0 */ OBJ_MILK_BIN_TYPE_DEFAULT, /* 1 */ OBJ_MILK_BIN_TYPE_1, // This actor will kill itself if the player has obtained the milk bottle and the current time is the night of the second day onwards. diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index 429333546c..556f72b678 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -16,7 +16,7 @@ void ObjMine_Update(Actor* thisx, PlayState* play); void ObjMine_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Obj_Mine_InitVars = { +ActorInit Obj_Mine_InitVars = { ACTOR_OBJ_MINE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h index c2ce765f9b..257a6ff3a9 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h @@ -14,6 +14,4 @@ typedef struct ObjMine { /* 0x01A8 */ char unk_1A8[0x120C]; } ObjMine; // size = 0x13B4 -extern const ActorInit Obj_Mine_InitVars; - #endif // Z_OBJ_MINE_H 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 c02092e9e5..e6f9ec4960 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 @@ -25,7 +25,7 @@ void func_80C06768(ObjMoonStone* this, PlayState* play); void func_80C0685C(ObjMoonStone* this); void func_80C06870(ObjMoonStone* this, PlayState* play); -const ActorInit Obj_Moon_Stone_InitVars = { +ActorInit Obj_Moon_Stone_InitVars = { ACTOR_OBJ_MOON_STONE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h index 375d40fad9..dfb9835a6b 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h @@ -14,6 +14,4 @@ typedef struct ObjMoonStone { /* 0x194 */ s16 unk194; } ObjMoonStone; // size = 0x198 -extern const ActorInit Obj_Moon_Stone_InitVars; - #endif // Z_OBJ_MOON_STONE_H diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index 52f3dd4e9e..2dca46caae 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -25,7 +25,7 @@ void func_80C06D90(ObjMuPict* this, PlayState* play); void func_80C06DC8(ObjMuPict* this, PlayState* play); void func_80C06E88(ObjMuPict* this, PlayState* play); -const ActorInit Obj_Mu_Pict_InitVars = { +ActorInit Obj_Mu_Pict_InitVars = { ACTOR_OBJ_MU_PICT, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h index f5417d9dbc..98902bfb79 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h @@ -17,6 +17,4 @@ typedef struct ObjMuPict { /* 0x14C */ u16 textId; } ObjMuPict; // size = 0x150 -extern const ActorInit Obj_Mu_Pict_InitVars; - #endif // Z_OBJ_MU_PICT_H diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 0297b7da47..815c15af80 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -20,7 +20,7 @@ void ObjMure_ActiveState(ObjMure* this, PlayState* play); void ObjMure_KillActors(ObjMure* this, PlayState* play); void ObjMure_CheckChildren(ObjMure* this, PlayState* play); -const ActorInit Obj_Mure_InitVars = { +ActorInit Obj_Mure_InitVars = { ACTOR_OBJ_MURE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h index bc3669697d..7bf2d40b76 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -29,8 +29,6 @@ typedef struct ObjMure { /* 0x1A0 */ s16 unk_1A0; } ObjMure; // size = 0x1A4 -extern const ActorInit Obj_Mure_InitVars; - #define OBJ_MURE_GET_CHNUM(thisx) (((thisx)->params >> 12) & 0xF) #define OBJ_MURE_GET_PTN(thisx) (((thisx)->params >> 8) & 0x7) #define OBJ_MURE_GET_SVNUM(thisx) (((thisx)->params >> 5) & 0x3) diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 31c5b50aab..bda4dc2585 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -18,7 +18,7 @@ void func_809613FC(ObjMure2* this, PlayState* play); void func_80961490(ObjMure2* this, PlayState* play); #if 0 -const ActorInit Obj_Mure2_InitVars = { +ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h index bf13c3fbc3..f70d45f1e2 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -13,6 +13,4 @@ typedef struct ObjMure2 { /* 0x148 */ char unk_148[0x38]; } ObjMure2; // size = 0x180 -extern const ActorInit Obj_Mure2_InitVars; - #endif // Z_OBJ_MURE2_H diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index e0322f61a3..00f0cc5d74 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -21,7 +21,7 @@ void func_8098F5E4(ObjMure3* this, PlayState* play); void func_8098F66C(ObjMure3* this); void func_8098F680(ObjMure3* this, PlayState* play); -const ActorInit Obj_Mure3_InitVars = { +ActorInit Obj_Mure3_InitVars = { ACTOR_OBJ_MURE3, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h index 2b6c4f891e..8715e43081 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -19,6 +19,4 @@ typedef struct ObjMure3 { /* 0x164 */ u16 unk164; } ObjMure3; // size = 0x168 -extern const ActorInit Obj_Mure3_InitVars; - #endif // Z_OBJ_MURE3_H diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index fddc5a9a9f..55d148f4a3 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -32,7 +32,7 @@ s32 D_80BA36B0; s32 D_80BA36B4; f32 D_80BA36B8; -const ActorInit Obj_Nozoki_InitVars = { +ActorInit Obj_Nozoki_InitVars = { ACTOR_OBJ_NOZOKI, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h index 7b4c3a5b86..4c4b74916f 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h @@ -24,6 +24,4 @@ typedef struct ObjNozoki { /* 0x160 */ ObjNozokiActionFunc actionFunc; } ObjNozoki; // size = 0x164 -extern const ActorInit Obj_Nozoki_InitVars; - #endif // Z_OBJ_NOZOKI_H diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index b7a098b462..3a25ef4020 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -31,7 +31,7 @@ void func_80AC9B5C(ObjOcarinalift* this, PlayState* play); void func_80AC9C20(ObjOcarinalift* this); void func_80AC9C48(ObjOcarinalift* this, PlayState* play); -const ActorInit Obj_Ocarinalift_InitVars = { +ActorInit Obj_Ocarinalift_InitVars = { ACTOR_OBJ_OCARINALIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h index a542fb840b..3789383c2e 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h @@ -29,6 +29,4 @@ typedef enum ObjOcarinaliftParams { /* 0x1 */ OBJOCARINALIFT_PARAMSC_1 } ObjOcarinaliftParams; -extern const ActorInit Obj_Ocarinalift_InitVars; - #endif // Z_OBJ_OCARINALIFT_H diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index c88d367975..1d7762c445 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -25,7 +25,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, PlayState* play); void ObjOshihiki_SetupFall(ObjOshihiki* this, PlayState* play); void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play); -const ActorInit Obj_Oshihiki_InitVars = { +ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h index ade27ca439..d2f61e2cf9 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -60,6 +60,4 @@ typedef struct ObjOshihiki { /* 0x1C8 */ AnimatedMaterial* texture; } ObjOshihiki; // size = 0x1CC -extern const ActorInit Obj_Oshihiki_InitVars; - #endif // Z_OBJ_OSHIHIKI_H diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index e1ec0470c1..29ffa674e1 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -41,7 +41,7 @@ typedef struct ObjPurifyInfo { /* 0x24 */ s32 isDekuCity; } ObjPurifyInfo; // size = 0x28 -const ActorInit Obj_Purify_InitVars = { +ActorInit Obj_Purify_InitVars = { ACTOR_OBJ_PURIFY, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h index 542938c807..2651bf0495 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h @@ -16,8 +16,6 @@ typedef struct ObjPurify { /* 0x168 */ f32 unk168[2]; } ObjPurify; // size = 0x170 -extern const ActorInit Obj_Purify_InitVars; - #define OBJPURIFY_GET_INFO_INDEX(thisx) ((thisx)->params & 0xF) #define OBJPURIFY_GET_UNK_FLAG(thisx) (((thisx)->params >> 0xC) & 1) diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index f3e047020f..3aca23bcad 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -25,7 +25,7 @@ void func_809A3D38(ObjPzlblock* this, PlayState* play); void func_809A3E58(Actor* thisx, PlayState* play); void func_809A3F0C(Actor* thisx, PlayState* play); -const ActorInit Obj_Pzlblock_InitVars = { +ActorInit Obj_Pzlblock_InitVars = { ACTOR_OBJ_PZLBLOCK, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h index c408004838..27a038860f 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h @@ -25,6 +25,4 @@ typedef struct ObjPzlblock { /* 0x17A */ s8 unk_17A; } ObjPzlblock; // size = 0x17C -extern const ActorInit Obj_Pzlblock_InitVars; - #endif // Z_OBJ_PZLBLOCK_H 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 01cfdd8329..d0a705cf26 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -28,7 +28,7 @@ void ObjRaillift_Teleport(ObjRaillift* this, PlayState* play); void ObjRaillift_Wait(ObjRaillift* this, PlayState* play); void ObjRaillift_Move(ObjRaillift* this, PlayState* play); -const ActorInit Obj_Raillift_InitVars = { +ActorInit Obj_Raillift_InitVars = { ACTOR_OBJ_RAILLIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h index cd55d1fa6c..41b7a821e6 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h @@ -38,6 +38,4 @@ typedef struct ObjRaillift { /* 0x188 */ s16 cutsceneTimer; } ObjRaillift; // size = 0x18C -extern const ActorInit Obj_Raillift_InitVars; - #endif // Z_OBJ_RAILLIFT_H diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 64db63a58b..154f662f8c 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -18,7 +18,7 @@ void func_80973CD8(ObjRoomtimer* this, PlayState* play); void func_80973D3C(ObjRoomtimer* this, PlayState* play); void func_80973DE0(ObjRoomtimer* this, PlayState* play); -const ActorInit Obj_Roomtimer_InitVars = { +ActorInit Obj_Roomtimer_InitVars = { ACTOR_OBJ_ROOMTIMER, ACTORCAT_ENEMY, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h index be15ac11ac..5ce7d13d4d 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -15,6 +15,4 @@ typedef struct ObjRoomtimer { /* 0x148 */ s32 switchFlag; } ObjRoomtimer; // size = 0x14C -extern const ActorInit Obj_Roomtimer_InitVars; - #endif // Z_OBJ_ROOMTIMER_H diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index 6a5298728f..ce18a68b0a 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -25,7 +25,7 @@ typedef struct ObjRotliftModelInfo { /* 0x8 */ CollisionHeader* colHeader; } ObjRotliftModelInfo; // size = 0xC -const ActorInit Obj_Rotlift_InitVars = { +ActorInit Obj_Rotlift_InitVars = { ACTOR_OBJ_ROTLIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h index 46cbef0eed..df3fe1dee7 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h @@ -20,6 +20,4 @@ typedef struct ObjRotlift { /* 0x15C */ ObjEtcetera* dekuFlowers[2]; } ObjRotlift; // size = 0x164 -extern const ActorInit Obj_Rotlift_InitVars; - #endif // Z_OBJ_ROTLIFT_H diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 5246b20d4a..6f93935b21 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -16,7 +16,7 @@ void ObjShutter_Destroy(Actor* thisx, PlayState* play); void ObjShutter_Update(Actor* thisx, PlayState* play2); void ObjShutter_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Shutter_InitVars = { +ActorInit Obj_Shutter_InitVars = { ACTOR_OBJ_SHUTTER, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h index b777c64b33..3f23b3dfe0 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h @@ -11,6 +11,4 @@ typedef struct ObjShutter { /* 0x148 */ f32 verticalOffset; } ObjShutter; // size = 0x14C -extern const ActorInit Obj_Shutter_InitVars; - #endif // Z_OBJ_SHUTTER_H diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index e22c73cda0..9265c6615e 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -27,7 +27,7 @@ void func_80A2273C(ObjSkateblock* this, PlayState* play); void func_80A227A4(ObjSkateblock* this); void func_80A227C0(ObjSkateblock* this, PlayState* play); -const ActorInit Obj_Skateblock_InitVars = { +ActorInit Obj_Skateblock_InitVars = { ACTOR_OBJ_SKATEBLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h index 97a2e6ede2..ab4f372404 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h @@ -32,6 +32,4 @@ typedef struct ObjSkateblock { /* 0x1C1 */ u8 unk_1C1; } ObjSkateblock; // size = 0x1C4 -extern const ActorInit Obj_Skateblock_InitVars; - #endif // Z_OBJ_SKATEBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index 9d3b1265de..dd02f6c1be 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -16,7 +16,7 @@ void ObjSmork_Destroy(Actor* thisx, PlayState* play); void ObjSmork_Update(Actor* thisx, PlayState* play); void ObjSmork_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Smork_InitVars = { +ActorInit Obj_Smork_InitVars = { ACTOR_OBJ_SMORK, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h index 5ab3e405c4..a1b21d4426 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h @@ -16,6 +16,4 @@ typedef struct ObjSmork { /* 0x1C6 */ s16 unk_1C6; } ObjSmork; // size = 0x1C8 -extern const ActorInit Obj_Smork_InitVars; - #endif // Z_OBJ_SMORK_H diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index bbfc25a641..068be3ea07 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -33,7 +33,7 @@ void func_80B04B48(ObjSnowball* this, PlayState* play); void func_80B04B60(ObjSnowball* this, PlayState* play); void func_80B04D34(Actor* thisx, PlayState* play); -const ActorInit Obj_Snowball_InitVars = { +ActorInit Obj_Snowball_InitVars = { ACTOR_OBJ_SNOWBALL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h index 0b2974d44b..804c2596cb 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h @@ -40,6 +40,4 @@ typedef struct ObjSnowball { /* 0x211 */ s8 unk_211; } ObjSnowball; // size = 0x214 -extern const ActorInit Obj_Snowball_InitVars; - #endif // Z_OBJ_SNOWBALL_H diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index ec6bd9edaa..d62002e731 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -26,7 +26,7 @@ void func_80B3A13C(ObjSnowball2* this, PlayState* play); void func_80B3A498(ObjSnowball2* this); void func_80B3A500(ObjSnowball2* this, PlayState* play); -const ActorInit Obj_Snowball2_InitVars = { +ActorInit Obj_Snowball2_InitVars = { ACTOR_OBJ_SNOWBALL2, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h index b6990fc1c2..19bd173fb9 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h @@ -24,6 +24,4 @@ typedef struct ObjSnowball2 { /* 0x1B0 */ UNK_TYPE1 unk1B0[4]; } ObjSnowball2; // size = 0x1B4 -extern const ActorInit Obj_Snowball2_InitVars; - #endif // Z_OBJ_SNOWBALL2_H diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 221ae3acc5..42c2bcc954 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -15,7 +15,7 @@ void ObjSound_Destroy(Actor* thisx, PlayState* play); void ObjSound_Update(Actor* thisx, PlayState* play); #if 0 -const ActorInit Obj_Sound_InitVars = { +ActorInit Obj_Sound_InitVars = { ACTOR_OBJ_SOUND, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h index 8f3c802576..a83aa840b8 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h @@ -10,6 +10,4 @@ typedef struct ObjSound { /* 0x144 */ char unk_144[0x4]; } ObjSound; // size = 0x148 -extern const ActorInit Obj_Sound_InitVars; - #endif // Z_OBJ_SOUND_H diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 2a0a722a58..214c74495f 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -23,7 +23,7 @@ void func_80B30A4C(ObjSpidertent* this, PlayState* play); void func_80B30AD4(ObjSpidertent* this); void func_80B30AF8(ObjSpidertent* this, PlayState* play); -const ActorInit Obj_Spidertent_InitVars = { +ActorInit Obj_Spidertent_InitVars = { ACTOR_OBJ_SPIDERTENT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h index 3fdb835976..881a816a7f 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h @@ -27,6 +27,4 @@ typedef struct ObjSpidertent { /* 0x3C8 */ ObjSpidertentActionFunc actionFunc; } ObjSpidertent; // size = 0x3CC -extern const ActorInit Obj_Spidertent_InitVars; - #endif // Z_OBJ_SPIDERTENT_H diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index f2333712f1..83959e1680 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -28,7 +28,7 @@ void func_80A1EC38(ObjSpinyroll* this, PlayState* play); void func_80A1ECC0(ObjSpinyroll* this); void func_80A1ECD4(ObjSpinyroll* this, PlayState* play); -const ActorInit Obj_Spinyroll_InitVars = { +ActorInit Obj_Spinyroll_InitVars = { ACTOR_OBJ_SPINYROLL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h index 10322586a7..36d8e644a1 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h @@ -50,6 +50,4 @@ typedef struct ObjSpinyroll { /* 0x4E2 */ s16 unk_4E2; } ObjSpinyroll; // size = 0x4E4 -extern const ActorInit Obj_Spinyroll_InitVars; - #endif // Z_OBJ_SPINYROLL_H diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index c31168f724..7270f1a393 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -71,7 +71,7 @@ static TexturePtr sEyeSwitchTextures[][4] = { static s32 sIsSegmentTableInit = false; -const ActorInit Obj_Switch_InitVars = { +ActorInit Obj_Switch_InitVars = { ACTOR_OBJ_SWITCH, ACTORCAT_SWITCH, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h index f208a60cf5..764c724a07 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -60,8 +60,6 @@ typedef struct ObjSwitch { /* 0x254 */ f32 floorSwitchDownScale; } ObjSwitch; // size = 0x258 -extern const ActorInit Obj_Switch_InitVars; - #define OBJ_SWITCH_GET_TYPE(thisx) ((thisx)->params&7) #define OBJ_SWITCH_GET_SUBTYPE(thisx) ((thisx)->params >> 4 & 7) #define OBJ_SWITCH_GET_SWITCH_FLAG(thisx) ((thisx)->params >> 8 & 0x7F) diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 6a50a018fc..5eeef1d5ef 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -23,7 +23,7 @@ void func_80C25710(ObjSwprize* this); void func_80C2572C(ObjSwprize* this, PlayState* play); void ObjSwprize_SetupDoNothing(ObjSwprize* this); -const ActorInit Obj_Swprize_InitVars = { +ActorInit Obj_Swprize_InitVars = { ACTOR_OBJ_SWPRIZE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h index 5b7cd2e091..efba85a87c 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h @@ -16,6 +16,4 @@ typedef struct ObjSwprize { /* 0x148 */ s16 timer; } ObjSwprize; // size = 0x14C -extern const ActorInit Obj_Swprize_InitVars; - #endif // Z_OBJ_SWPRIZE_H 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 02a7d59e14..e73892e892 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -18,7 +18,7 @@ void ObjSyokudai_Destroy(Actor* thisx, PlayState* play); void ObjSyokudai_Update(Actor* thisx, PlayState* play2); void ObjSyokudai_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Syokudai_InitVars = { +ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h index d1a0be1c88..d49f38289a 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -16,8 +16,6 @@ typedef struct ObjSyokudai { /* 0x1E4 */ LightInfo lightInfo; } ObjSyokudai; // size = 0x1F4 -extern const ActorInit Obj_Syokudai_InitVars; - typedef enum { /* 0 */ OBJ_SYOKUDAI_TYPE_SWITCH_CAUSES_FLAME, /* 1 */ OBJ_SYOKUDAI_TYPE_FLAME_CAUSES_SWITCH, diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index e4936f1fb4..b8ab34df00 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -18,7 +18,7 @@ void ObjTakarayaWall_Draw(Actor* thisx, PlayState* play); void func_80AD9B04(ObjTakarayaWall* this, PlayState* play); #if 0 -const ActorInit Obj_Takaraya_Wall_InitVars = { +ActorInit Obj_Takaraya_Wall_InitVars = { ACTOR_OBJ_TAKARAYA_WALL, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h index 603041d9f3..225e265122 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h @@ -13,6 +13,4 @@ typedef struct ObjTakarayaWall { /* 0x148 */ char unk_148[0x98]; } ObjTakarayaWall; // size = 0x1E0 -extern const ActorInit Obj_Takaraya_Wall_InitVars; - #endif // Z_OBJ_TAKARAYA_WALL_H diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index b1baf84699..791564b579 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -24,7 +24,7 @@ void func_80B9C07C(ObjTaru* this, PlayState* play); void func_80B9C174(ObjTaru* this, PlayState* play); void func_80B9C1A0(ObjTaru* this, PlayState* play); -const ActorInit Obj_Taru_InitVars = { +ActorInit Obj_Taru_InitVars = { ACTOR_OBJ_TARU, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h index 063e90ef4c..629bc57a5e 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h @@ -23,6 +23,4 @@ typedef struct ObjTaru { /* 0x1AD */ s8 unk_1AD; } ObjTaru; // size = 0x1B0 -extern const ActorInit Obj_Taru_InitVars; - #endif // Z_OBJ_TARU_H diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index 146c46428c..306ca70292 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -23,7 +23,7 @@ void func_809A481C(ObjToge* this, PlayState* play); void func_809A488C(ObjToge* this); void func_809A48AC(ObjToge* this, PlayState* play); -const ActorInit Obj_Toge_InitVars = { +ActorInit Obj_Toge_InitVars = { ACTOR_OBJ_TOGE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h index 9a55a42194..8259e62c88 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h @@ -29,6 +29,4 @@ typedef struct ObjToge { /* 0x1CC */ f32 unk_1CC; } ObjToge; // size = 0x1D0 -extern const ActorInit Obj_Toge_InitVars; - #endif // Z_OBJ_TOGE_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 6d49230430..694a5ac592 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -28,7 +28,7 @@ void ObjTokeiStep_SetupDoNothingOpen(ObjTokeiStep* this); void ObjTokeiStep_DoNothingOpen(ObjTokeiStep* this, PlayState* play); void ObjTokeiStep_DrawOpen(Actor* thisx, PlayState* play); -const ActorInit Obj_Tokei_Step_InitVars = { +ActorInit Obj_Tokei_Step_InitVars = { ACTOR_OBJ_TOKEI_STEP, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h index 537e7ecc78..ddb1517ded 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h @@ -23,6 +23,4 @@ typedef struct ObjTokeiStep { /* 0x160 */ ObjTokeiStepPanel panels[7]; } ObjTokeiStep; // size = 0x1EC -extern const ActorInit Obj_Tokei_Step_InitVars; - #endif // Z_OBJ_TOKEI_STEP_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 15e01b8325..0c81ec0288 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -16,7 +16,7 @@ void ObjTokeiTobira_Update(Actor* thisx, PlayState* play); void ObjTokeiTobira_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Obj_Tokei_Tobira_InitVars = { +ActorInit Obj_Tokei_Tobira_InitVars = { ACTOR_OBJ_TOKEI_TOBIRA, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h index 49e47af199..8f9983995d 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h @@ -14,6 +14,4 @@ typedef struct ObjTokeiTobira { /* 0x160 */ char unk_160[0x10]; } ObjTokeiTobira; // size = 0x170 -extern const ActorInit Obj_Tokei_Tobira_InitVars; - #endif // Z_OBJ_TOKEI_TOBIRA_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index a0183266fa..3dc8b3297e 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -16,7 +16,7 @@ void ObjTokeiTurret_Destroy(Actor* thisx, PlayState* play); void ObjTokeiTurret_Update(Actor* thisx, PlayState* play); void ObjTokeiTurret_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Tokei_Turret_InitVars = { +ActorInit Obj_Tokei_Turret_InitVars = { ACTOR_OBJ_TOKEI_TURRET, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h index 7a2db071e3..620228f535 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h @@ -16,6 +16,4 @@ typedef struct ObjTokeiTurret { /* 0x000 */ DynaPolyActor dyna; } ObjTokeiTurret; // size = 0x15C -extern const ActorInit Obj_Tokei_Turret_InitVars; - #endif // Z_OBJ_TOKEI_TURRET_H 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 421f5dcf0b..0ee9510665 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -62,7 +62,7 @@ void ObjTokeidai_Clock_Draw(Actor* thisx, PlayState* play); void ObjTokeidai_Counterweight_Draw(Actor* thisx, PlayState* play); void ObjTokeidai_ExteriorGear_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Tokeidai_InitVars = { +ActorInit Obj_Tokeidai_InitVars = { ACTOR_OBJ_TOKEIDAI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h index 70ef31c797..e670d19e0a 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h @@ -62,6 +62,4 @@ typedef struct ObjTokeidai { /* 0x174 */ ObjTokeidaiActionFunc actionFunc; } ObjTokeidai; // size = 0x178 -extern const ActorInit Obj_Tokeidai_InitVars; - #endif // Z_OBJ_TOKEIDAI_H diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 4a71acc950..07561b8cd1 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -16,7 +16,7 @@ void ObjToudai_Destroy(Actor* thisx, PlayState* play); void ObjToudai_Update(Actor* thisx, PlayState* play); void ObjToudai_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Toudai_InitVars = { +ActorInit Obj_Toudai_InitVars = { ACTOR_OBJ_TOUDAI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h index c1af4d7332..60f0b97960 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h @@ -18,6 +18,4 @@ typedef struct ObjToudai { /* 0x23A */ UNK_TYPE1 pad23A[6]; } ObjToudai;// size = 0x240 -extern const ActorInit Obj_Toudai_InitVars; - #endif // Z_OBJ_TOUDAI_H 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 ef55e5ab7d..4dcfd4f748 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -20,7 +20,7 @@ void ObjTree_DoNothing(ObjTree* this, PlayState* play); void ObjTree_SetupDoNothing(ObjTree* this); void ObjTree_Sway(ObjTree* this, PlayState* play); -const ActorInit Obj_Tree_InitVars = { +ActorInit Obj_Tree_InitVars = { ACTOR_OBJ_TREE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h index 828530ab37..8d40c57f15 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h @@ -19,6 +19,4 @@ typedef struct ObjTree { /* 0x1B4 */ s16 timer; } ObjTree; // size = 0x1B8 -extern const ActorInit Obj_Tree_InitVars; - #endif // Z_OBJ_TREE_H diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 1f1c9c4a3b..33b4932373 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -41,7 +41,7 @@ s16 D_80929504 = 0; s16 D_80929508 = 0; s16 D_8092950C = 0; -const ActorInit Obj_Tsubo_InitVars = { +ActorInit Obj_Tsubo_InitVars = { ACTOR_OBJ_TSUBO, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h index 28233c911d..2b3d1537f7 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -31,8 +31,6 @@ typedef struct ObjTsubo { /* 0x19B */ u8 unk_19B; } ObjTsubo; // size = 0x19C -extern const ActorInit Obj_Tsubo_InitVars; - typedef enum { /* 0 */ OBJ_TSUBO_TYPE_0, /* 1 */ OBJ_TSUBO_TYPE_1, diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index ce2dd0aba2..687fb78eaa 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -61,7 +61,7 @@ void ObjUm_DefaultAnim(ObjUm* this, PlayState* play); void ObjUm_ChangeAnim(ObjUm* this, PlayState* play, ObjUmAnimation animIndex); void ObjUm_SetupAction(ObjUm* this, ObjUmActionFunc actionFunc); -const ActorInit Obj_Um_InitVars = { +ActorInit Obj_Um_InitVars = { ACTOR_OBJ_UM, ACTORCAT_NPC, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h index a6644009ee..0c6a7178ef 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h @@ -62,8 +62,6 @@ typedef struct ObjUm { /* 0x4E0 */ s32 areAllPotsBroken; // true when all of the pots have been broken } ObjUm; // size = 0x4E4 -extern const ActorInit Obj_Um_InitVars; - typedef enum { /* 0 */ OBJ_UM_TYPE_TERMINA_FIELD, /* 1 */ OBJ_UM_TYPE_RANCH, 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 69a878aea8..d20f988fd8 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -16,7 +16,7 @@ void ObjUsiyane_Destroy(Actor* thisx, PlayState* play); void ObjUsiyane_Update(Actor* thisx, PlayState* play); void ObjUsiyane_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Usiyane_InitVars = { +ActorInit Obj_Usiyane_InitVars = { ACTOR_OBJ_USIYANE, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h index c38a08ed9f..2abc2a38b0 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h @@ -34,6 +34,4 @@ typedef struct ObjUsiyane { /* 0x744 */ s32 unk_744; } ObjUsiyane; // size = 0x748 -extern const ActorInit Obj_Usiyane_InitVars; - #endif // Z_OBJ_USIYANE_H 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 e0d07c4fb6..4b0a797f6e 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -15,7 +15,7 @@ void ObjVisiblock_Init(Actor* thisx, PlayState* play); void ObjVisiblock_Destroy(Actor* thisx, PlayState* play); void ObjVisiblock_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Visiblock_InitVars = { +ActorInit Obj_Visiblock_InitVars = { ACTOR_OBJ_VISIBLOCK, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h index 946685a5cd..5fa08ab860 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h @@ -10,6 +10,4 @@ typedef struct ObjVisiblock { /* 0x15C */ UNK_TYPE1 unk15C[0x4]; } ObjVisiblock; // size = 0x160 -extern const ActorInit Obj_Visiblock_InitVars; - #endif // Z_OBJ_VISIBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index be692069f3..b7a1e59be5 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -27,7 +27,7 @@ void func_80A3D0E8(ObjVspinyroll* this); void func_80A3D0FC(ObjVspinyroll* this, PlayState* play); void func_80A3D2C0(Actor* thisx, PlayState* play); -const ActorInit Obj_Vspinyroll_InitVars = { +ActorInit Obj_Vspinyroll_InitVars = { ACTOR_OBJ_VSPINYROLL, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h index 38dee86fb2..09a91b4374 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h @@ -43,6 +43,4 @@ typedef struct ObjVspinyroll { /* 0x3C8 */ s16 unk_3C8; } ObjVspinyroll; // size = 0x3CC -extern const ActorInit Obj_Vspinyroll_InitVars; - #endif // Z_OBJ_VSPINYROLL_H 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 4e0fb508d6..7d6ade650e 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -22,7 +22,7 @@ s32 ObjWarpstone_BeginOpeningCutscene(ObjWarpstone* this, PlayState* play); s32 ObjWarpstone_PlayOpeningCutscene(ObjWarpstone* this, PlayState* play); s32 ObjWarpstone_OpenedIdle(ObjWarpstone* this, PlayState* play); -const ActorInit Obj_Warpstone_InitVars = { +ActorInit Obj_Warpstone_InitVars = { ACTOR_OBJ_WARPSTONE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h index 8d39deef0d..a2db609d6f 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h @@ -26,8 +26,6 @@ typedef struct ObjWarpstone { /* 0x1AC */ ObjWarpstoneActionFunc actionFunc; } ObjWarpstone; // size = 0x1B0 -extern const ActorInit Obj_Warpstone_InitVars; - #define OBJ_WARPSTONE_GET_ID(thisx) ((u16)((thisx)->params & 0xF)) #define OBJ_WARPSTONE_IS_ACTIVATED(owlId) (((void)0, gSaveContext.save.playerData.owlActivationFlags) & (u16)gBitFlags[(owlId)]) diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 567d9a92e5..5f53030f32 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -16,7 +16,7 @@ void ObjWind_Update(Actor* thisx, PlayState* play); void ObjWind_Draw(Actor* thisx, PlayState* play); #if 0 -const ActorInit Obj_Wind_InitVars = { +ActorInit Obj_Wind_InitVars = { ACTOR_OBJ_WIND, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h index 23296ff09a..08db8914ad 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h @@ -10,6 +10,4 @@ typedef struct ObjWind { /* 0x144 */ char unk_144[0x4]; } ObjWind; // size = 0x148 -extern const ActorInit Obj_Wind_InitVars; - #endif // Z_OBJ_WIND_H diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index c418f65af8..cfeaabcfdb 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -22,7 +22,7 @@ void func_808A7BA0(ObjWturn* this, PlayState* play); void func_808A7C04(ObjWturn* this, PlayState* play); void func_808A7C78(ObjWturn* this, PlayState* play); -const ActorInit Obj_Wturn_InitVars = { +ActorInit Obj_Wturn_InitVars = { ACTOR_OBJ_WTURN, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjWturn), (ActorFunc)ObjWturn_Init, (ActorFunc)Actor_Noop, (ActorFunc)ObjWturn_Update, (ActorFunc)NULL, diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h index 9b8674f599..2e2963d0e5 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h @@ -14,6 +14,4 @@ typedef struct ObjWturn { /* 0x14A */ s16 unk_14A; } ObjWturn; // size = 0x14C -extern const ActorInit Obj_Wturn_InitVars; - #endif // Z_OBJ_WTURN_H diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index 8870295aa2..9399940d88 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -16,7 +16,7 @@ void ObjY2lift_Destroy(Actor* thisx, PlayState* play); void ObjY2lift_Update(Actor* thisx, PlayState* play); void ObjY2lift_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Y2lift_InitVars = { +ActorInit Obj_Y2lift_InitVars = { ACTOR_OBJ_Y2LIFT, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h index a26d305ae6..cacb0fa7bb 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h @@ -13,6 +13,4 @@ typedef struct ObjY2lift { /* 0x15F */ u8 unk15F; } ObjY2lift; // size = 0x160 -extern const ActorInit Obj_Y2lift_InitVars; - #endif // Z_OBJ_Y2LIFT_H diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index b8110ce6a3..9d35288c59 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -29,7 +29,7 @@ typedef struct ShutterInfo { /* 0x1E */ u8 openTimer; } ShutterInfo; // size = 0x20 -const ActorInit Obj_Y2shutter_InitVars = { +ActorInit Obj_Y2shutter_InitVars = { ACTOR_OBJ_Y2SHUTTER, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h index dcc95b1b15..bccdce6450 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h @@ -12,8 +12,6 @@ typedef struct ObjY2shutter { /* 0x15F */ u8 settleTimer; } ObjY2shutter; // size = 0x160 -extern const ActorInit Obj_Y2shutter_InitVars; - typedef enum { /* 0x0 */ SHUTTER_BARRED, /* 0x1 */ SHUTTER_GRATED, 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 845e97da4e..02107b1024 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -16,7 +16,7 @@ void ObjYado_Destroy(Actor* thisx, PlayState* play); void ObjYado_Update(Actor* thisx, PlayState* play); void ObjYado_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Yado_InitVars = { +ActorInit Obj_Yado_InitVars = { ACTOR_OBJ_YADO, ACTORCAT_BG, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h index 28ffd63dc5..52ef8693e5 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h @@ -10,6 +10,4 @@ typedef struct ObjYado { /* 0x144 */ u8 isNight; } ObjYado; // size = 0x148 -extern const ActorInit Obj_Yado_InitVars; - #endif // Z_OBJ_YADO_H 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 185638056c..5af34152a7 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -18,7 +18,7 @@ void ObjYasi_Destroy(Actor* thisx, PlayState* play); void ObjYasi_Update(Actor* thisx, PlayState* play); void ObjYasi_Draw(Actor* thisx, PlayState* play); -const ActorInit Obj_Yasi_InitVars = { +ActorInit Obj_Yasi_InitVars = { ACTOR_OBJ_YASI, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h index d1fdc6aeda..fc2b777d82 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h @@ -9,8 +9,6 @@ typedef struct ObjYasi { /* 0x000 */ DynaPolyActor dyna; } ObjYasi; // size = 0x15C -extern const ActorInit Obj_Yasi_InitVars; - #define PALM_TREE_IS_WIDE(thisx) ((thisx)->params & 1) #endif // Z_OBJ_YASI_H 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 e4a6a86271..db78f579b5 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -27,7 +27,7 @@ void func_808DDE9C(Actor* thisx, PlayState* play2); static f32 D_808DE5B0; -const ActorInit Object_Kankyo_InitVars = { +ActorInit Object_Kankyo_InitVars = { ACTOR_OBJECT_KANKYO, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h index c6e374da86..8dc8d4d85a 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -28,6 +28,4 @@ typedef struct ObjectKankyo { /* 0x1150 */ ObjectKankyoActionFunc actionFunc; } ObjectKankyo; // size = 0x1154 -extern const ActorInit Object_Kankyo_InitVars; - #endif // Z_OBJECT_KANKYO_H diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index fe56ce03ae..a19cb276aa 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -21,7 +21,7 @@ void OceffSpot_End(OceffSpot* this, PlayState* play); void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc); -const ActorInit Oceff_Spot_InitVars = { +ActorInit Oceff_Spot_InitVars = { ACTOR_OCEFF_SPOT, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h index 0a770ee9d3..2e4e2a29a9 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h @@ -18,6 +18,4 @@ typedef struct OceffSpot { /* 0x174 */ OceffSpotActionFunc actionFunc; } OceffSpot; // size = 0x178 -extern const ActorInit Oceff_Spot_InitVars; - #endif // Z_OCEFF_SPOT_H diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index eff8a7dcc5..96d76f8070 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -19,7 +19,7 @@ void OceffStorm_DefaultAction(OceffStorm* this, PlayState* play); void func_80981B48(OceffStorm* this, PlayState* play); void OceffStorm_Draw2(Actor* thisx, PlayState* play); -const ActorInit Oceff_Storm_InitVars = { +ActorInit Oceff_Storm_InitVars = { ACTOR_OCEFF_STORM, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h index 20dd1ffcb3..87a67191c3 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -17,8 +17,6 @@ typedef struct OceffStorm { /* 0x14C */ OceffStormActionFunc actionFunc; } OceffStorm; // size = 0x150 -extern const ActorInit Oceff_Storm_InitVars; - typedef enum { /* 1 */ OCEFF_STORM_ACTION_PARAM_1 = 1 } OceffStormActionParams; diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index ba71cc2675..42bf6c7039 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -15,7 +15,7 @@ void OceffWipe_Destroy(Actor* thisx, PlayState* play); void OceffWipe_Update(Actor* thisx, PlayState* play); void OceffWipe_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe_InitVars = { +ActorInit Oceff_Wipe_InitVars = { ACTOR_OCEFF_WIPE, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h index 6828c996d3..0ee4314d06 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -15,6 +15,4 @@ typedef struct OceffWipe { /* 0x144 */ s16 counter; } OceffWipe; // size = 0x148 -extern const ActorInit Oceff_Wipe_InitVars; - #endif // Z_OCEFF_WIPE_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 0c93d51a8f..3d8004c5c7 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -15,7 +15,7 @@ void OceffWipe2_Destroy(Actor* thisx, PlayState* play); void OceffWipe2_Update(Actor* thisx, PlayState* play); void OceffWipe2_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe2_InitVars = { +ActorInit Oceff_Wipe2_InitVars = { ACTOR_OCEFF_WIPE2, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index c213dfe382..ee2fb29682 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -10,6 +10,4 @@ typedef struct OceffWipe2 { /* 0x144 */ s16 timer; } OceffWipe2; // size = 0x148 -extern const ActorInit Oceff_Wipe2_InitVars; - #endif // Z_OCEFF_WIPE2_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index c7c9249a72..52031ce000 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -16,7 +16,7 @@ void OceffWipe3_Destroy(Actor* thisx, PlayState* play); void OceffWipe3_Update(Actor* thisx, PlayState* play); void OceffWipe3_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe3_InitVars = { +ActorInit Oceff_Wipe3_InitVars = { ACTOR_OCEFF_WIPE3, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h index f29ca92780..a604aae344 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -10,6 +10,4 @@ typedef struct OceffWipe3 { /* 0x144 */ s16 counter; } OceffWipe3; // size = 0x148 -extern const ActorInit Oceff_Wipe3_InitVars; - #endif // Z_OCEFF_WIPE3_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 9c7b8853bf..3554bc78aa 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -15,7 +15,7 @@ void OceffWipe4_Destroy(Actor* thisx, PlayState* play); void OceffWipe4_Update(Actor* thisx, PlayState* play); void OceffWipe4_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe4_InitVars = { +ActorInit Oceff_Wipe4_InitVars = { ACTOR_OCEFF_WIPE4, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index 59b592318b..e65bf575b0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -15,6 +15,4 @@ typedef struct OceffWipe4 { /* 0x144 */ s16 counter; } OceffWipe4; // size = 0x148 -extern const ActorInit Oceff_Wipe4_InitVars; - #endif // Z_OCEFF_WIPE4_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 16053e92e9..0d0db63858 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -15,7 +15,7 @@ void OceffWipe5_Destroy(Actor* thisx, PlayState* play); void OceffWipe5_Update(Actor* thisx, PlayState* play); void OceffWipe5_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe5_InitVars = { +ActorInit Oceff_Wipe5_InitVars = { ACTOR_OCEFF_WIPE5, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h index 05424ea1ef..21e1f23832 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h @@ -12,6 +12,4 @@ typedef struct OceffWipe5 { /* 0x144 */ s16 counter; } OceffWipe5; // size = 0x148 -extern const ActorInit Oceff_Wipe5_InitVars; - #endif // Z_OCEFF_WIPE5_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index c5d5361160..87dbe27521 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -15,7 +15,7 @@ void OceffWipe6_Destroy(Actor* thisx, PlayState* play); void OceffWipe6_Update(Actor* thisx, PlayState* play); void OceffWipe6_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe6_InitVars = { +ActorInit Oceff_Wipe6_InitVars = { ACTOR_OCEFF_WIPE6, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h index c37e3f9d43..2afd8f24fc 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h @@ -10,6 +10,4 @@ typedef struct OceffWipe6 { /* 0x144 */ s16 counter; } OceffWipe6; // size = 0x148 -extern const ActorInit Oceff_Wipe6_InitVars; - #endif // Z_OCEFF_WIPE6_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index c129fe1681..f269a89a5e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -15,7 +15,7 @@ void OceffWipe7_Destroy(Actor* thisx, PlayState* play); void OceffWipe7_Update(Actor* thisx, PlayState* play); void OceffWipe7_Draw(Actor* thisx, PlayState* play); -const ActorInit Oceff_Wipe7_InitVars = { +ActorInit Oceff_Wipe7_InitVars = { ACTOR_OCEFF_WIPE7, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h index d5d82130cf..7cb7019a74 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h @@ -10,6 +10,4 @@ typedef struct OceffWipe7 { /* 0x144 */ s16 counter; } OceffWipe7; // size = 0x148 -extern const ActorInit Oceff_Wipe7_InitVars; - #endif // Z_OCEFF_WIPE7_H diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index fa0121fe6e..d923bdd200 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -19,7 +19,7 @@ void ShotSun_Update(Actor* thisx, PlayState* play); void ShotSun_UpdateForOcarina(ShotSun* this, PlayState* play); void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play); -const ActorInit Shot_Sun_InitVars = { +ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index 49fd2ffb76..3ba7f35d9a 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -18,8 +18,6 @@ typedef struct ShotSun { /* 0x194 */ Vec3s hitboxPos; /* 0x19A */ s16 timer; /* 0x19C */ s8 unk_19C; // leftover from OOT secret ocarina occurrence function. -} ShotSun; // size = 0x1A0 - -extern const ActorInit Shot_Sun_InitVars; +} ShotSun; // size = 0x1A0 #endif // Z_SHOT_SUN_H diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index f54fb4973b..8c1e98bedd 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -18,7 +18,7 @@ void TGSw_Draw(Actor* thisx, PlayState* play); void TGSw_ActionExecuteOneShot(struct TGSw* this, PlayState* play); -const ActorInit TG_Sw_InitVars = { +ActorInit TG_Sw_InitVars = { ACTOR_TG_SW, ACTORCAT_PROP, FLAGS, diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h index 28bebb5d89..cbcb66431d 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h @@ -11,6 +11,4 @@ typedef struct TGSw { /* 0x144 */ TGSwActionFunc actionFunc; } TGSw; // size = 0x148 -extern const ActorInit TG_Sw_InitVars; - #endif // Z_TG_SW_H