From 985852f8376c295553899bd570015a4c6aee2b79 Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Sun, 19 Dec 2021 20:21:27 +0000 Subject: [PATCH] Fix actor struct offsets (#463) * Fix offsets * Bell Co-authored-by: Anghelo Carvajal --- src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h | 2 +- src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h | 2 +- src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h | 2 +- src/overlays/actors/ovl_Boss_02/z_boss_02.h | 4 ++-- src/overlays/actors/ovl_Boss_07/z_boss_07.h | 2 +- src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h | 8 ++++---- src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h | 2 +- src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h | 2 +- src/overlays/actors/ovl_En_Az/z_en_az.h | 2 +- src/overlays/actors/ovl_En_Bat/z_en_bat.h | 2 +- src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h | 2 +- src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h | 2 +- src/overlays/actors/ovl_En_Bombal/z_en_bombal.h | 2 +- src/overlays/actors/ovl_En_Bubble/z_en_bubble.h | 2 +- src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h | 2 +- src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h | 2 +- src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h | 2 +- src/overlays/actors/ovl_En_Dnh/z_en_dnh.h | 2 +- src/overlays/actors/ovl_En_Encount1/z_en_encount1.h | 2 +- src/overlays/actors/ovl_En_Encount3/z_en_encount3.h | 2 +- src/overlays/actors/ovl_En_Estone/z_en_estone.h | 2 +- src/overlays/actors/ovl_En_Firefly/z_en_firefly.h | 2 +- src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h | 2 +- .../actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h | 2 +- src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.h | 2 +- src/overlays/actors/ovl_En_Maruta/z_en_maruta.h | 2 +- src/overlays/actors/ovl_En_Minideath/z_en_minideath.h | 2 +- src/overlays/actors/ovl_En_Mkk/z_en_mkk.h | 2 +- src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h | 2 +- src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h | 2 +- src/overlays/actors/ovl_En_Paper/z_en_paper.h | 2 +- src/overlays/actors/ovl_En_Pm/z_en_pm.h | 4 ++-- src/overlays/actors/ovl_En_Racedog/z_en_racedog.h | 2 +- src/overlays/actors/ovl_En_Ru/z_en_ru.h | 2 +- src/overlays/actors/ovl_En_Shn/z_en_shn.h | 2 +- src/overlays/actors/ovl_En_Si/z_en_si.h | 2 +- src/overlays/actors/ovl_En_Slime/z_en_slime.h | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.h | 2 +- src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h | 2 +- src/overlays/actors/ovl_En_Test6/z_en_test6.h | 2 +- src/overlays/actors/ovl_En_Tg/z_en_tg.h | 2 +- src/overlays/actors/ovl_En_Trt2/z_en_trt2.h | 2 +- src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h | 2 +- src/overlays/actors/ovl_En_Viewer/z_en_viewer.h | 2 +- src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h | 2 +- src/overlays/actors/ovl_En_Zo/z_en_zo.h | 2 +- src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h | 2 +- src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h | 2 +- src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h | 2 +- src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h | 2 +- src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h | 2 +- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h | 2 +- src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h | 2 +- src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h | 2 +- src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h | 2 +- .../actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h | 2 +- src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h | 2 +- src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h | 2 +- 60 files changed, 65 insertions(+), 65 deletions(-) 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 5eac10d0b0..4a0e14d2fd 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 @@ -10,7 +10,7 @@ typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, GlobalContext*); typedef struct BgDyYoseizo { /* 0x0000 */ Actor actor; /* 0x0144 */ BgDyYoseizoActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x33BC]; + /* 0x0148 */ char unk_148[0x33BC]; } BgDyYoseizo; // size = 0x3504 extern const ActorInit Bg_Dy_Yoseizo_InitVars; 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 8bbcb45bfb..b4d176d9e9 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 @@ -10,7 +10,7 @@ typedef void (*BgFireWallActionFunc)(struct BgFireWall*, GlobalContext*); typedef struct BgFireWall { /* 0x0000 */ Actor actor; /* 0x0144 */ BgFireWallActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x68]; + /* 0x0148 */ char unk_148[0x68]; } BgFireWall; // size = 0x1B0 extern const ActorInit Bg_Fire_Wall_InitVars; 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 e2ae361122..6fc19e4ca0 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 @@ -10,7 +10,7 @@ typedef void (*BgSpoutFireActionFunc)(struct BgSpoutFire*, GlobalContext*); typedef struct BgSpoutFire { /* 0x0000 */ Actor actor; /* 0x0144 */ BgSpoutFireActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x50]; + /* 0x0148 */ char unk_148[0x50]; } BgSpoutFire; // size = 0x198 extern const ActorInit Bg_Spout_Fire_InitVars; 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 d630acb8f5..babf40b769 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.h +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.h @@ -40,7 +40,7 @@ typedef struct Boss02 { /* 0x016C */ s16 unk_016C; /* 0x0170 */ Vec3f unk_0170; /* 0x017C */ Vec3f unk_017C; - /* 0x018C */ Vec3f unk_0188; + /* 0x0188 */ Vec3f unk_0188; /* 0x0194 */ u8 unk_0194; /* 0x0195 */ u8 unk_0195; /* 0x0196 */ s16 unk_0196; @@ -53,7 +53,7 @@ typedef struct Boss02 { /* 0x01AC */ f32 unk_01AC; /* 0x01B0 */ Vec3f unk_01B0; /* 0x01BC */ Vec3f unk_01BC[200]; - /* 0x0B1c */ Vec3f unk_0B1C[200]; + /* 0x0B1C */ Vec3f unk_0B1C[200]; /* 0x147C */ Vec3f unk_147C[23]; /* 0x1590 */ SkelAnime skelAnime; /* 0x15D4 */ Vec3s jointTable[13]; 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 21e30eb920..b8ace3f9ce 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.h +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.h @@ -10,7 +10,7 @@ typedef void (*Boss07ActionFunc)(struct Boss07*, GlobalContext*); typedef struct Boss07 { /* 0x0000 */ Actor actor; /* 0x0144 */ Boss07ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xAAD8]; + /* 0x0148 */ char unk_148[0xAAD8]; } Boss07; // size = 0xAC20 extern const ActorInit Boss_07_InitVars; 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 5e29a38156..3b5882692f 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h @@ -13,16 +13,16 @@ typedef struct BossHakuginParticle { /* 0x18 */ s16 unk_18; /* 0x1A */ s16 unk_1A; /* 0x1C */ Vec3s unk_1C; - /* 0x22 */ f32 unk_24; + /* 0x24 */ f32 unk_24; } BossHakuginParticle; // size = 0x28 typedef struct BossHakugin { /* 0x0000 */ Actor actor; - /* 0x0144 */ char unk_144[0x44]; + /* 0x0144 */ char unk_0144[0x44]; /* 0x0188 */ BossHakuginActionFunc actionFunc; - /* 0x018C */ char unk_18C[0x86C]; + /* 0x018C */ char unk_018C[0x86C]; /* 0x09F8 */ BossHakuginParticle unk_9F8[180]; - /* 0x0A14 */ char unk_A04[0x2DFC]; + /* 0x2618 */ char unk_2618[0x11F8]; } BossHakugin; // size = 0x3810 extern const ActorInit Boss_Hakugin_InitVars; 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 958608c653..4ce31a8a17 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h @@ -10,7 +10,7 @@ typedef void (*DmHinaActionFunc)(struct DmHina*, GlobalContext*); typedef struct DmHina { /* 0x0000 */ Actor actor; /* 0x0144 */ DmHinaActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x3C]; + /* 0x0148 */ char unk_148[0x3C]; } DmHina; // size = 0x184 extern const ActorInit Dm_Hina_InitVars; 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 e0418f3057..5f30ef196e 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 @@ -10,7 +10,7 @@ typedef void (*EnAob01ActionFunc)(struct EnAob01*, GlobalContext*); typedef struct EnAob01 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnAob01ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x2FC]; + /* 0x0148 */ char unk_148[0x2FC]; } EnAob01; // size = 0x444 extern const ActorInit En_Aob_01_InitVars; 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 17b2b85fa3..89d7c1a09b 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.h +++ b/src/overlays/actors/ovl_En_Az/z_en_az.h @@ -10,7 +10,7 @@ typedef void (*EnAzActionFunc)(struct EnAz*, GlobalContext*); typedef struct EnAz { /* 0x0000 */ Actor actor; /* 0x0144 */ EnAzActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x290]; + /* 0x0148 */ char unk_148[0x290]; } EnAz; // size = 0x3D8 extern const ActorInit En_Az_InitVars; 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 d1f949f441..2ccaaa8928 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.h +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.h @@ -10,7 +10,7 @@ typedef void (*EnBatActionFunc)(struct EnBat*, GlobalContext*); typedef struct EnBat { /* 0x0000 */ Actor actor; /* 0x0144 */ EnBatActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x94]; + /* 0x0148 */ char unk_148[0x94]; } EnBat; // size = 0x1DC extern const ActorInit En_Bat_InitVars; 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 157ac7eaf2..20416b4f9f 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 @@ -10,7 +10,7 @@ typedef void (*EnBba01ActionFunc)(struct EnBba01*, GlobalContext*); typedef struct EnBba01 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnBba01ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4D4]; + /* 0x0148 */ char unk_148[0x4D4]; } EnBba01; // size = 0x61C extern const ActorInit En_Bba_01_InitVars; 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 13172b1808..910ad51745 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 @@ -10,7 +10,7 @@ typedef void (*EnBomChuActionFunc)(struct EnBomChu*, GlobalContext*); typedef struct EnBomChu { /* 0x0000 */ Actor actor; /* 0x0144 */ EnBomChuActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x98]; + /* 0x0148 */ char unk_148[0x98]; } EnBomChu; // size = 0x1E0 extern const ActorInit En_Bom_Chu_InitVars; 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 ea538d5ce1..ce6fd67244 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h @@ -10,7 +10,7 @@ typedef void (*EnBombalActionFunc)(struct EnBombal*, GlobalContext*); typedef struct EnBombal { /* 0x0000 */ Actor actor; /* 0x0144 */ EnBombalActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x28FC]; + /* 0x0148 */ char unk_148[0x28FC]; } EnBombal; // size = 0x2A44 extern const ActorInit En_Bombal_InitVars; 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 c78b9df693..f2901b3249 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -10,7 +10,7 @@ typedef void (*EnBubbleActionFunc)(struct EnBubble*, GlobalContext*); typedef struct EnBubble { /* 0x0000 */ Actor actor; /* 0x0144 */ EnBubbleActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x110]; + /* 0x0148 */ char unk_148[0x110]; } EnBubble; // size = 0x258 extern const ActorInit En_Bubble_InitVars; 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 4211550ecd..db0e797e96 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 @@ -10,7 +10,7 @@ typedef void (*EnCne01ActionFunc)(struct EnCne01*, GlobalContext*); typedef struct EnCne01 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnCne01ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4D4]; + /* 0x0148 */ char unk_148[0x4D4]; } EnCne01; // size = 0x61C extern const ActorInit En_Cne_01_InitVars; 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 31d1b980e7..6bab3c11a6 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 @@ -10,7 +10,7 @@ typedef void (*EnColManActionFunc)(struct EnColMan*, GlobalContext*); typedef struct EnColMan { /* 0x0000 */ Actor actor; /* 0x0144 */ EnColManActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x58]; + /* 0x0148 */ char unk_148[0x58]; } EnColMan; // size = 0x1A0 extern const ActorInit En_Col_Man_InitVars; 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 4ed2a76ab8..e6a00853e1 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h @@ -20,7 +20,7 @@ typedef struct EnDinofos { /* 0x28C */ s16 unk_28C; /* 0x28E */ s16 unk_28E; /* 0x290 */ s16 unk_290; - /* 0x290 */ s16 unk_292; + /* 0x292 */ s16 unk_292; /* 0x294 */ UNK_TYPE1 unk_294[4]; /* 0x298 */ s16 camId; /* 0x29A */ Vec3s unk_29A; 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 9edb339d46..21336aa912 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h @@ -10,7 +10,7 @@ typedef void (*EnDnhActionFunc)(struct EnDnh*, GlobalContext*); typedef struct EnDnh { /* 0x0000 */ Actor actor; /* 0x0144 */ EnDnhActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x74]; + /* 0x0148 */ char unk_148[0x74]; } EnDnh; // size = 0x1BC extern const ActorInit En_Dnh_InitVars; 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 e473615cbe..72638d9a6a 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -10,7 +10,7 @@ typedef void (*EnEncount1ActionFunc)(struct EnEncount1*, GlobalContext*); typedef struct EnEncount1 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnEncount1ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x1C]; + /* 0x0148 */ char unk_148[0x1C]; } EnEncount1; // size = 0x164 extern const ActorInit En_Encount1_InitVars; 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 49c7ccef43..dbfe780527 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h @@ -10,7 +10,7 @@ typedef void (*EnEncount3ActionFunc)(struct EnEncount3*, GlobalContext*); typedef struct EnEncount3 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnEncount3ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x84]; + /* 0x0148 */ char unk_148[0x84]; } EnEncount3; // size = 0x1CC extern const ActorInit En_Encount3_InitVars; 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 eec7f2d24b..848d41f8b7 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.h +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.h @@ -10,7 +10,7 @@ typedef void (*EnEstoneActionFunc)(struct EnEstone*, GlobalContext*); typedef struct EnEstone { /* 0x0000 */ Actor actor; /* 0x0144 */ EnEstoneActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x2C2C]; + /* 0x0148 */ char unk_148[0x2C2C]; } EnEstone; // size = 0x2D74 extern const ActorInit En_Estone_InitVars; 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 72a4739cbf..e4439ec36b 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -34,7 +34,7 @@ typedef struct EnFirefly { /* 0x2F4 */ u32 unk_2F4; /* 0x2F8 */ Vec3f unk_2F8; /* 0x304 */ Vec3f unk_304; - /* 0x304 */ Vec3f unk_310; + /* 0x310 */ Vec3f unk_310; /* 0x31C */ ColliderSphere collider; } EnFirefly; // size = 0x374 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 6207c5fc34..f9983e26a3 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -10,7 +10,7 @@ typedef void (*EnHonotrapActionFunc)(struct EnHonotrap*, GlobalContext*); typedef struct EnHonotrap { /* 0x0000 */ Actor actor; /* 0x0144 */ EnHonotrapActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x17C]; + /* 0x0148 */ char unk_148[0x17C]; } EnHonotrap; // size = 0x2C4 extern const ActorInit En_Honotrap_InitVars; 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 d565469742..df29dbc602 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 @@ -10,7 +10,7 @@ typedef void (*EnInvadepohDemoActionFunc)(struct EnInvadepohDemo*, GlobalContext typedef struct EnInvadepohDemo { /* 0x0000 */ Actor actor; /* 0x0144 */ EnInvadepohDemoActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x180]; + /* 0x0148 */ char unk_148[0x180]; } EnInvadepohDemo; // size = 0x2C8 extern const ActorInit En_Invadepoh_Demo_InitVars; 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 b34679bd3e..72aeb93b7c 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h @@ -10,7 +10,7 @@ typedef void (*EnKujiyaActionFunc)(struct EnKujiya*, GlobalContext*); typedef struct EnKujiya { /* 0x0000 */ Actor actor; /* 0x0144 */ EnKujiyaActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4]; + /* 0x0148 */ char unk_148[0x4]; } EnKujiya; // size = 0x14C extern const ActorInit En_Kujiya_InitVars; 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 e3756a4d28..612f7b2eff 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -10,7 +10,7 @@ typedef void (*EnKusaActionFunc)(struct EnKusa*, GlobalContext*); typedef struct EnKusa { /* 0x0000 */ Actor actor; /* 0x0144 */ EnKusaActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x54]; + /* 0x0148 */ char unk_148[0x54]; } EnKusa; // size = 0x19C extern const ActorInit En_Kusa_InitVars; 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 4ed2d7f6ea..df53fbe499 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h @@ -10,7 +10,7 @@ typedef void (*EnMarutaActionFunc)(struct EnMaruta*, GlobalContext*); typedef struct EnMaruta { /* 0x0000 */ Actor actor; /* 0x0144 */ EnMarutaActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xDC]; + /* 0x0148 */ char unk_148[0xDC]; } EnMaruta; // size = 0x224 extern const ActorInit En_Maruta_InitVars; 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 854589854a..7ac4dee6cc 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h @@ -10,7 +10,7 @@ typedef void (*EnMinideathActionFunc)(struct EnMinideath*, GlobalContext*); typedef struct EnMinideath { /* 0x0000 */ Actor actor; /* 0x0144 */ EnMinideathActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x164]; + /* 0x0148 */ char unk_148[0x164]; } EnMinideath; // size = 0x2AC extern const ActorInit En_Minideath_InitVars; 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 0bc6037484..c80fc7a20e 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h @@ -10,7 +10,7 @@ typedef void (*EnMkkActionFunc)(struct EnMkk*, GlobalContext*); typedef struct EnMkk { /* 0x0000 */ Actor actor; /* 0x0144 */ EnMkkActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x8C]; + /* 0x0148 */ char unk_148[0x8C]; } EnMkk; // size = 0x1D4 extern const ActorInit En_Mkk_InitVars; 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 58c625b361..796482b141 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 @@ -10,7 +10,7 @@ typedef void (*EnMttagActionFunc)(struct EnMttag*, GlobalContext*); typedef struct EnMttag { /* 0x0000 */ Actor actor; /* 0x0144 */ EnMttagActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x20]; + /* 0x0148 */ char unk_148[0x20]; } EnMttag; // size = 0x168 extern const ActorInit En_Mt_tag_InitVars; 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 0c6cfe423d..53b63236e1 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 @@ -10,7 +10,7 @@ typedef void (*EnOkarinaTagActionFunc)(struct EnOkarinaTag*, GlobalContext*); typedef struct EnOkarinaTag { /* 0x0000 */ Actor actor; /* 0x0144 */ EnOkarinaTagActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x14]; + /* 0x0148 */ char unk_148[0x14]; } EnOkarinaTag; // size = 0x15C extern const ActorInit En_Okarina_Tag_InitVars; 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 d2e12e137d..0147442a92 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.h +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.h @@ -10,7 +10,7 @@ typedef void (*EnPaperActionFunc)(struct EnPaper*, GlobalContext*); typedef struct EnPaper { /* 0x0000 */ Actor actor; /* 0x0144 */ EnPaperActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xC40]; + /* 0x0148 */ char unk_148[0xC40]; } EnPaper; // size = 0xD88 extern const ActorInit En_Paper_InitVars; 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 d571f43bd6..6d545373b8 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h @@ -24,11 +24,11 @@ typedef struct EnPm { /* 0x0250 */ s32 unk_250; /* 0x0254 */ s32 unk_254; /* 0x0258 */ u8 unk_258; - /* 0x026C */ UNK_TYPE* unk_25C; + /* 0x025C */ UNK_TYPE* unk_25C; /* 0x0260 */ s8 unk_260; /* 0x0264 */ s32 unk_264; /* 0x0268 */ Actor* unk_268; - /* 0x0268 */ Vec3f unk_26C; + /* 0x026C */ Vec3f unk_26C; /* 0x0278 */ Vec3f unk_278; /* 0x0284 */ Vec3f unk_284; /* 0x0290 */ Vec3s unk_290; 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 da4ced9ddf..a4b721f5de 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h @@ -10,7 +10,7 @@ typedef void (*EnRacedogActionFunc)(struct EnRacedog*, GlobalContext*); typedef struct EnRacedog { /* 0x0000 */ Actor actor; /* 0x0144 */ EnRacedogActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x180]; + /* 0x0148 */ char unk_148[0x180]; } EnRacedog; // size = 0x2C8 extern const ActorInit En_Racedog_InitVars; 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 9b1037ed4d..b368fb584f 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.h +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h @@ -10,7 +10,7 @@ typedef void (*EnRuActionFunc)(struct EnRu*, GlobalContext*); typedef struct EnRu { /* 0x0000 */ Actor actor; /* 0x0144 */ EnRuActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x30C]; + /* 0x0148 */ char unk_148[0x30C]; } EnRu; // size = 0x454 extern const ActorInit En_Ru_InitVars; 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 8f02bd8c57..b5d98919d9 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.h +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.h @@ -10,7 +10,7 @@ typedef void (*EnShnActionFunc)(struct EnShn*, GlobalContext*); typedef struct EnShn { /* 0x0000 */ Actor actor; /* 0x0144 */ EnShnActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x1A8]; + /* 0x0148 */ char unk_148[0x1A8]; } EnShn; // size = 0x2F0 extern const ActorInit En_Shn_InitVars; 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 60a7937a98..26e33e728a 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -10,7 +10,7 @@ typedef void (*EnSiActionFunc)(struct EnSi*, GlobalContext*); typedef struct EnSi { /* 0x0000 */ Actor actor; /* 0x0144 */ EnSiActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x58]; + /* 0x0148 */ char unk_148[0x58]; } EnSi; // size = 0x1A0 extern const ActorInit En_Si_InitVars; 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 6269f331e6..c24cae04e1 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h @@ -10,7 +10,7 @@ typedef void (*EnSlimeActionFunc)(struct EnSlime*, GlobalContext*); typedef struct EnSlime { /* 0x0000 */ Actor actor; /* 0x0144 */ EnSlimeActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xC0]; + /* 0x0148 */ char unk_148[0xC0]; } EnSlime; // size = 0x208 extern const ActorInit En_Slime_InitVars; 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 975e4e36d8..4c30b49655 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -43,7 +43,7 @@ typedef struct EnSw { /* 0x047C */ s16 unk_47C[12]; /* 0x0494 */ s16 unk_494; /* 0x0496 */ s16 unk_496; - /* 0x0468 */ s16 unk_498; + /* 0x0498 */ s16 unk_498; /* 0x049C */ s32 unk_49C; /* 0x04A0 */ s32 unk_4A0; } EnSw; // size = 0x4A4 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 22dd08e893..5e9512c7cf 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h @@ -10,7 +10,7 @@ typedef void (*EnTanron2ActionFunc)(struct EnTanron2*, GlobalContext*); typedef struct EnTanron2 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnTanron2ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xB4]; + /* 0x0148 */ char unk_148[0xB4]; } EnTanron2; // size = 0x1FC extern const ActorInit En_Tanron2_InitVars; 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 94f2556228..9cee7cf1d2 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.h +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h @@ -10,7 +10,7 @@ typedef void (*EnTest6ActionFunc)(struct EnTest6*, GlobalContext*); typedef struct EnTest6 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnTest6ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x140]; + /* 0x0148 */ char unk_148[0x140]; } EnTest6; // size = 0x288 extern const ActorInit En_Test6_InitVars; 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 706618774e..de0c6fd2e3 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -10,7 +10,7 @@ typedef void (*EnTgActionFunc)(struct EnTg*, GlobalContext*); typedef struct EnTg { /* 0x0000 */ Actor actor; /* 0x0144 */ EnTgActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x400]; + /* 0x0148 */ char unk_148[0x400]; } EnTg; // size = 0x548 extern const ActorInit En_Tg_InitVars; 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 69fb439fd9..11320af0cb 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h @@ -10,7 +10,7 @@ typedef void (*EnTrt2ActionFunc)(struct EnTrt2*, GlobalContext*); typedef struct EnTrt2 { /* 0x0000 */ Actor actor; /* 0x0144 */ EnTrt2ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x294]; + /* 0x0148 */ char unk_148[0x294]; } EnTrt2; // size = 0x3DC extern const ActorInit En_Trt2_InitVars; 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 ed083ec50e..793958ed74 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 @@ -10,7 +10,7 @@ typedef void (*EnTruMtActionFunc)(struct EnTruMt*, GlobalContext*); typedef struct EnTruMt { /* 0x0000 */ Actor actor; /* 0x0144 */ EnTruMtActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x260]; + /* 0x0148 */ char unk_148[0x260]; } EnTruMt; // size = 0x3A8 extern const ActorInit En_Tru_Mt_InitVars; 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 6b145b0c55..566c21f3ce 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -10,7 +10,7 @@ typedef void (*EnViewerActionFunc)(struct EnViewer*, GlobalContext*); typedef struct EnViewer { /* 0x0000 */ Actor actor; /* 0x0144 */ EnViewerActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x10]; + /* 0x0148 */ char unk_148[0x10]; } EnViewer; // size = 0x158 extern const ActorInit En_Viewer_InitVars; 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 0ff444fcec..0f5b705f5c 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 @@ -10,7 +10,7 @@ typedef void (*EnWizFireActionFunc)(struct EnWizFire*, GlobalContext*); typedef struct EnWizFire { /* 0x0000 */ Actor actor; /* 0x0144 */ EnWizFireActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x29AC]; + /* 0x0148 */ char unk_148[0x29AC]; } EnWizFire; // size = 0x2AF4 extern const ActorInit En_Wiz_Fire_InitVars; diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h index b876205f5f..a823a1ec07 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -10,7 +10,7 @@ typedef void (*EnZoActionFunc)(struct EnZo*, GlobalContext*); typedef struct EnZo { /* 0x0000 */ Actor actor; /* 0x0144 */ EnZoActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x2DC]; + /* 0x0148 */ char unk_148[0x2DC]; } EnZo; // size = 0x424 extern const ActorInit En_Zo_InitVars; 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 2f2dd7b132..76265bcec2 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h @@ -11,7 +11,7 @@ typedef struct ObjBell { /* 0x1B4 */ ColliderSphere collider2; /* 0x20C */ s16 unk_20C; // bell rotation angle? /* 0x20E */ s16 unk_20E; - /* 0x20E */ s16 unk_20F; + /* 0x210 */ s16 unk_210; /* 0x212 */ s16 unk_212; /* 0x214 */ s16 unk_214; /* 0x216 */ char unk_216[0x06]; 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 79fb22868c..5c3235ef2a 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h @@ -10,7 +10,7 @@ typedef void (*ObjBigicicleActionFunc)(struct ObjBigicicle*, GlobalContext*); typedef struct ObjBigicicle { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjBigicicleActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x9C]; + /* 0x0148 */ char unk_148[0x9C]; } ObjBigicicle; // size = 0x1E4 extern const ActorInit Obj_Bigicicle_InitVars; 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 a00ad595b0..8b498f39e5 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h @@ -10,7 +10,7 @@ typedef void (*ObjChanActionFunc)(struct ObjChan*, GlobalContext*); typedef struct ObjChan { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjChanActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x9C]; + /* 0x0148 */ char unk_148[0x9C]; } ObjChan; // size = 0x1E4 extern const ActorInit Obj_Chan_InitVars; 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 9ca91823e8..303a3ed5e5 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -10,7 +10,7 @@ typedef void (*ObjCombActionFunc)(struct ObjComb*, GlobalContext*); typedef struct ObjComb { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjCombActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x74]; + /* 0x0148 */ char unk_148[0x74]; } ObjComb; // size = 0x1BC extern const ActorInit Obj_Comb_InitVars; 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 b2ffc1121b..2631e91bef 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h @@ -10,7 +10,7 @@ typedef void (*ObjDemoActionFunc)(struct ObjDemo*, GlobalContext*); typedef struct ObjDemo { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjDemoActionFunc actionFunc; - /* 0x0148 */ char unk_144[0xC]; + /* 0x0148 */ char unk_148[0xC]; } ObjDemo; // size = 0x154 extern const ActorInit Obj_Demo_InitVars; 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 f77913d881..d9ac284bdc 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h @@ -10,7 +10,7 @@ typedef void (*ObjHarikoActionFunc)(struct ObjHariko*, GlobalContext*); typedef struct ObjHariko { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjHarikoActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x10]; + /* 0x0148 */ char unk_148[0x10]; } ObjHariko; // size = 0x158 extern const ActorInit Obj_Hariko_InitVars; 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 4ee73ecbe3..b306e2552c 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -10,7 +10,7 @@ typedef void (*ObjMure2ActionFunc)(struct ObjMure2*, GlobalContext*); typedef struct ObjMure2 { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjMure2ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x38]; + /* 0x0148 */ char unk_148[0x38]; } ObjMure2; // size = 0x180 extern const ActorInit Obj_Mure2_InitVars; 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 c000b1e6f5..67252a147d 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -10,7 +10,7 @@ typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, GlobalContext*); typedef struct ObjMure3 { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjMure3ActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x20]; + /* 0x0148 */ char unk_148[0x20]; } ObjMure3; // size = 0x168 extern const ActorInit Obj_Mure3_InitVars; 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 0a98759d03..db43c5c16b 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -10,7 +10,7 @@ typedef void (*ObjRoomtimerActionFunc)(struct ObjRoomtimer*, GlobalContext*); typedef struct ObjRoomtimer { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjRoomtimerActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4]; + /* 0x0148 */ char unk_148[0x4]; } ObjRoomtimer; // size = 0x14C extern const ActorInit Obj_Roomtimer_InitVars; 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 148c8deb6c..680417d506 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h @@ -10,7 +10,7 @@ typedef void (*ObjSwprizeActionFunc)(struct ObjSwprize*, GlobalContext*); typedef struct ObjSwprize { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjSwprizeActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4]; + /* 0x0148 */ char unk_148[0x4]; } ObjSwprize; // size = 0x14C extern const ActorInit Obj_Swprize_InitVars; 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 0d734b85e5..83f267d37f 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 @@ -10,7 +10,7 @@ typedef void (*ObjTakarayaWallActionFunc)(struct ObjTakarayaWall*, GlobalContext typedef struct ObjTakarayaWall { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjTakarayaWallActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x98]; + /* 0x0148 */ char unk_148[0x98]; } ObjTakarayaWall; // size = 0x1E0 extern const ActorInit Obj_Takaraya_Wall_InitVars; 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 31b7df5836..d3a188e41d 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -10,7 +10,7 @@ typedef void (*ObjTsuboActionFunc)(struct ObjTsubo*, GlobalContext*); typedef struct ObjTsubo { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjTsuboActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x54]; + /* 0x0148 */ char unk_148[0x54]; } ObjTsubo; // size = 0x19C extern const ActorInit Obj_Tsubo_InitVars; 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 e7e4073a33..0b0b8b3752 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h @@ -10,7 +10,7 @@ typedef void (*ObjWturnActionFunc)(struct ObjWturn*, GlobalContext*); typedef struct ObjWturn { /* 0x0000 */ Actor actor; /* 0x0144 */ ObjWturnActionFunc actionFunc; - /* 0x0148 */ char unk_144[0x4]; + /* 0x0148 */ char unk_148[0x4]; } ObjWturn; // size = 0x14C extern const ActorInit Obj_Wturn_InitVars;