mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Reduce overlay dependencies on global.h (3) (#2449)

Browse source 
* kill more global.h references

* .format.py

* bss

* ique
This commit is contained in:
mzxrules 2025-02-05 15:07:19 -05:00 • committed by GitHub
parent 8b82eb1ff7
commit 54939bac3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
219 changed files with 1580 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -183,8 +183,6 @@ void DebugCamera_Reset(Camera* cam, DebugCam* debugCam);
void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3);
s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame);
s32 func_800C0D34(PlayState* this, Actor* actor, s16* yaw);
s32 func_800C0DB4(PlayState* this, Vec3f* pos);
void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);
void PreRender_Init(PreRender* this);
void PreRender_SetValues(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf);

3
include/z64.h
View file

@ -87,9 +87,6 @@
#include "libc64/sleep.h"
#include "libc64/sprintf.h"
#include "libu64/debug.h"
#include "z64debug_display.h"
#include "z64draw.h"
#include "z_en_item00.h"
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240

2
include/z64play.h
View file

@ -148,6 +148,8 @@ void Play_SetupRespawnPoint(PlayState* this, s32 respawnMode, s32 playerParams);
void Play_TriggerVoidOut(PlayState* this);
void Play_TriggerRespawn(PlayState* this);
int Play_CamIsNotFixed(PlayState* this);
s32 func_800C0D34(PlayState* this, Actor* actor, s16* yaw);
s32 func_800C0DB4(PlayState* this, Vec3f* pos);
#if DEBUG_FEATURES
extern void* gDebugCutsceneScript;

2
src/boot/z_std_dma.c
View file

@ -28,7 +28,7 @@
#endif
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.2:62 pal-1.0:60 pal-1.1:60"
"ntsc-1.2:76 pal-1.0:74 pal-1.1:74"
StackEntry sDmaMgrStackInfo;
OSMesgQueue sDmaMgrMsgQueue;

1
src/code/db_camera.c
View file

@ -1,4 +1,5 @@
#include "global.h"
#include "z64debug_display.h"
#define DEBUG_CAM_CONTROLLER_PORT 2

2
src/code/main.c
View file

@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
#endif
#pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
"ique-cn:128 ntsc-1.0:122 ntsc-1.1:122 ntsc-1.2:122 pal-1.0:120 pal-1.1:120"
"ique-cn:160 ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136 pal-1.0:134 pal-1.1:134"
extern u8 _buffersSegmentEnd[];

2
src/code/z_bgcheck.c
View file

@ -2,7 +2,7 @@
#include "terminal.h"
#include "line_numbers.h"
#pragma increment_block_number "ntsc-1.0:108 ntsc-1.1:104 ntsc-1.2:104"
#pragma increment_block_number "ntsc-1.0:120 ntsc-1.1:120 ntsc-1.2:120"
u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);

6
src/code/z_camera.c
View file

@ -4,8 +4,8 @@
#include "terminal.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@ -3639,7 +3639,7 @@ s32 Camera_KeepOn3(Camera* camera) {
}
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:124 ntsc-1.1:124 ntsc-1.2:124 pal-1.0:122 pal-1.1:122"
"ique-cn:128 ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136"
s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50;

2
src/code/z_common_data.c
View file

@ -3,7 +3,7 @@
#include "versions.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:160 pal-1.1:160"
"ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:192 pal-1.1:192"
ALIGNED(16) SaveContext gSaveContext;
#if PLATFORM_IQUE

2
src/code/z_kaleido_scope_call.c
View file

@ -1,5 +1,5 @@
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:192 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:192 pal-1.1:192"
"ique-cn:192 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
#include "global.h"
#include "terminal.h"

4
src/code/z_kankyo.c
View file

@ -1,5 +1,5 @@
#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:192 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:220 pal-1.1:220"
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
"ique-cn:208 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:232 pal-1.1:232"
#include "global.h"
#include "ultra64.h"

1
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View file

@ -16,6 +16,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

3
src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View file

@ -12,12 +12,11 @@
#include "ichain.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "global.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_haka_objects/object_haka_objects.h"

11
src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
View file

@ -5,9 +5,18 @@
*/
#include "z_bg_jya_ironobj.h"
#include "assets/objects/object_jya_iron/object_jya_iron.h"
#include "overlays/actors/ovl_En_Ik/z_en_ik.h"
#include "libc64/qrand.h"
#include "ichain.h"
#include "sfx.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_jya_iron/object_jya_iron.h"
#define FLAGS 0
typedef void (*BgJyaIronobjIkFunc)(BgJyaIronobj*, PlayState*, EnIk*);

4
src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h
View file

@ -2,11 +2,11 @@
#define Z_BG_JYA_IRONOBJ_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct BgJyaIronobj;
typedef void (*BgJyaIronobjActionFunc)(struct BgJyaIronobj*, PlayState*);
typedef void (*BgJyaIronobjActionFunc)(struct BgJyaIronobj*, struct PlayState*);
typedef struct BgJyaIronobj {
/* 0x0000 */ DynaPolyActor dyna;

14
src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View file

@ -1,6 +1,18 @@
#include "z_bg_spot18_basket.h"
#include "assets/objects/object_spot18_obj/object_spot18_obj.h"
#include "libc64/qrand.h"
#include "ichain.h"
#include "one_point_cutscene.h"
#include "sfx.h"
#include "sys_math3d.h"
#include "terminal.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_spot18_obj/object_spot18_obj.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

4
src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h
View file

@ -2,11 +2,11 @@
#define Z_BG_SPOT18_BASKET_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct BgSpot18Basket;
typedef void (*BgSpot18BasketActionFunc)(struct BgSpot18Basket*, PlayState*);
typedef void (*BgSpot18BasketActionFunc)(struct BgSpot18Basket*, struct PlayState*);
typedef struct BgSpot18Basket {
/* 0x0000 */ DynaPolyActor dyna;

11
src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
View file

@ -5,6 +5,17 @@
*/
#include "z_bg_sst_floor.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_sst/object_sst.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

2
src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h
View file

@ -2,7 +2,7 @@
#define Z_BG_SST_FLOOR_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct BgSstFloor;

2
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -133,7 +133,7 @@ static EnGanonMant* sCape;
// TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
// data around. It would be easier if we had more options for controlling BSS ordering in debug.
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
"ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
static s32 sSeed1;
static s32 sSeed2;

22
src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View file

@ -5,11 +5,31 @@
*/
#include "z_boss_goma.h"
#include "assets/objects/object_goma/object_goma.h"
#include "overlays/actors/ovl_En_Goma/z_en_goma.h"
#include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "libc64/math64.h"
#include "libc64/qrand.h"
#include "attributes.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "rumble.h"
#include "segmented_address.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64environment.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_goma/object_goma.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
ACTOR_FLAG_DRAW_CULLING_DISABLED)

4
src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h
View file

@ -2,11 +2,11 @@
#define Z_BOSS_GOMA_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct BossGoma;
typedef void (*BossGomaActionFunc)(struct BossGoma*, PlayState*);
typedef void (*BossGomaActionFunc)(struct BossGoma*, struct PlayState*);
typedef enum BossGomaLimb {
/* 0 */ BOSSGOMA_LIMB_NONE,

28
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -5,12 +5,34 @@
*/
#include "z_boss_sst.h"
#include "versions.h"
#include "assets/objects/object_sst/object_sst.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "rumble.h"
#include "segmented_address.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_math3d.h"
#include "sys_matrix.h"
#include "versions.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "z64skin_matrix.h"
#include "global.h"
#include "assets/objects/object_sst/object_sst.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"pal-1.0:128 pal-1.1:128"

4
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h
View file

@ -2,11 +2,11 @@
#define Z_BOSS_SST_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct BossSst;
typedef void (*BossSstActionFunc)(struct BossSst*, PlayState*);
typedef void (*BossSstActionFunc)(struct BossSst*, struct PlayState*);
#define BOSS_SST_EFFECT_COUNT 18

1
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -16,6 +16,7 @@
#include "z_lib.h"
#include "z64audio.h"
#include "z64curve.h"
#include "z64draw.h"
#include "z64effect.h"
#include "z64play.h"

11
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View file

@ -5,8 +5,17 @@
*/
#include "z_demo_geff.h"
#include "assets/objects/object_geff/object_geff.h"
#include "overlays/actors/ovl_Demo_Gt/z_demo_gt.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z64play.h"
#include "assets/objects/object_geff/object_geff.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

12
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h
View file

@ -2,22 +2,20 @@
#define Z_DEMO_GEFF_H
#include "ultra64.h"
#include "global.h"
#include "../ovl_Demo_Gt/z_demo_gt.h"
#include "z64actor.h"
struct DemoGeff;
typedef void (*DemoGeffInitFunc)(struct DemoGeff*, PlayState*);
typedef void (*DemoGeffActionFunc)(struct DemoGeff*, PlayState*);
typedef void (*DemoGeffDrawFunc)(struct DemoGeff*, PlayState*);
typedef void (*DemoGeffInitFunc)(struct DemoGeff*, struct PlayState*);
typedef void (*DemoGeffActionFunc)(struct DemoGeff*, struct PlayState*);
typedef void (*DemoGeffDrawFunc)(struct DemoGeff*, struct PlayState*);
typedef struct DemoGeff {
/* 0x0000 */ Actor actor;
/* 0x014C */ s32 action;
/* 0x0150 */ s32 drawConfig;
/* 0x0154 */ s32 objectSlot;
/* 0x0158 */ DemoGt* demoGt;
/* 0x0158 */ struct DemoGt* demoGt;
/* 0x015C */ f32 deltaPosX;
/* 0x0160 */ f32 deltaPosY;
/* 0x0164 */ f32 deltaPosZ;

5
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -7,6 +7,7 @@
#include "z_demo_gj.h"
#include "libc64/math64.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
@ -14,13 +15,13 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64draw.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_gj/object_gj.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

17
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View file

@ -1,11 +1,24 @@
#include "z_demo_gt.h"
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "regs.h"
#include "rumble.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64frame_advance.h"
#include "z64play.h"
#include "assets/objects/object_gt/object_gt.h"
#include "assets/objects/object_geff/object_geff.h"
#include "terminal.h"
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

6
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h
View file

@ -2,12 +2,12 @@
#define Z_DEMO_GT_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct DemoGt;
typedef void (*DemoGtUpdateFunc)(struct DemoGt*, PlayState*);
typedef void (*DemoGtDrawFunc)(Actor*, PlayState*);
typedef void (*DemoGtUpdateFunc)(struct DemoGt*, struct PlayState*);
typedef void (*DemoGtDrawFunc)(struct Actor*, struct PlayState*);
typedef struct DemoGt {
/* 0x0000 */ DynaPolyActor dyna;

17
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View file

@ -6,15 +6,30 @@
#include "z_door_shutter.h"
#include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "one_point_cutscene.h"
#include "rumble.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "quake.h"
#include "versions.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_gnd/object_gnd.h"
#include "assets/objects/object_goma/object_goma.h"
#include "assets/objects/object_ydan_objects/object_ydan_objects.h"
#include "assets/objects/object_ddan_objects/object_ddan_objects.h"
#include "assets/objects/object_bdan_objects/object_bdan_objects.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_bdoor/object_bdoor.h"
#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
#include "assets/objects/object_ganon_objects/object_ganon_objects.h"

4
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
View file

@ -2,7 +2,7 @@
#define Z_DOOR_SHUTTER_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
/**
* Actor Parameters
@ -39,7 +39,7 @@ typedef enum DoorShutterType {
struct DoorShutter;
typedef void (*DoorShutterActionFunc)(struct DoorShutter*, PlayState*);
typedef void (*DoorShutterActionFunc)(struct DoorShutter*, struct PlayState*);
typedef struct DoorShutter {
/* 0x0000 */ SLIDING_DOOR_ACTOR_BASE;

16
src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -5,9 +5,23 @@
*/
#include "z_en_am.h"
#include "assets/objects/object_am/object_am.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_am/object_am.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
ACTOR_FLAG_CAN_PRESS_SWITCHES)

4
src/overlays/actors/ovl_En_Am/z_en_am.h
View file

@ -2,11 +2,11 @@
#define Z_EN_AM_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnAm;
typedef void (*EnAmActionFunc)(struct EnAm*, PlayState*);
typedef void (*EnAmActionFunc)(struct EnAm*, struct PlayState*);
typedef struct EnAm {
/* 0x0000 */ DynaPolyActor dyna;

15
src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
View file

@ -5,10 +5,23 @@
*/
#include "z_en_anubice.h"
#include "assets/objects/object_anubice/object_anubice.h"
#include "overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h"
#include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h"
#include "libc64/math64.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_anubice/object_anubice.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

5
src/overlays/actors/ovl_En_Anubice/z_en_anubice.h
View file

@ -2,8 +2,7 @@
#define Z_EN_ANUBICE_H
#include "ultra64.h"
#include "global.h"
#include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h"
#include "z64actor.h"
struct EnAnubice;
@ -54,7 +53,7 @@ typedef struct EnAnubice {
/* 0x028C */ Vec3f fireballRot;
/* 0x0298 */ Vec3f home;
/* 0x02A4 */ Vec3f knockbackRecoveryVelocity;
/* 0x02B0 */ BgHidanCurtain* flameCircles[5];
/* 0x02B0 */ struct BgHidanCurtain* flameCircles[5];
/* 0x02C4 */ char unk_2C4[0x4]; // Possibly another element of flameCircles
/* 0x02C8 */ ColliderCylinder collider;
} EnAnubice; // size = 0x0314

6
src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c
View file

@ -5,7 +5,13 @@
*/
#include "z_en_anubice_tag.h"
#include "overlays/actors/ovl_En_Anubice/z_en_anubice.h"
#include "regs.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64debug_display.h"
#include "z64play.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

7
src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h
View file

@ -2,17 +2,16 @@
#define Z_EN_ANUBICE_TAG_H
#include "ultra64.h"
#include "global.h"
#include "overlays/actors/ovl_En_Anubice/z_en_anubice.h"
#include "z64actor.h"
struct EnAnubiceTag;
typedef void (*EnAnubiceTagActionFunc)(struct EnAnubiceTag*, PlayState*);
typedef void (*EnAnubiceTagActionFunc)(struct EnAnubiceTag*, struct PlayState*);
typedef struct EnAnubiceTag {
/* 0x0000 */ Actor actor;
/* 0x014C */ EnAnubiceTagActionFunc actionFunc;
/* 0x0150 */ EnAnubice* anubis;
/* 0x0150 */ struct EnAnubice* anubis;
/* 0x0154 */ f32 extraTriggerRange;
} EnAnubiceTag; // size = 0x0158

18
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
View file

@ -5,10 +5,24 @@
*/
#include "z_en_attack_niw.h"
#include "versions.h"
#include "assets/objects/object_niw/object_niw.h"
#include "overlays/actors/ovl_En_Niw/z_en_niw.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "versions.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "z64.h"
#include "assets/objects/object_niw/object_niw.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
void EnAttackNiw_Init(Actor* thisx, PlayState* play);

4
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
View file

@ -2,11 +2,11 @@
#define Z_EN_ATTACK_NIW_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnAttackNiw;
typedef void (*EnAttackNiwActionFunc)(struct EnAttackNiw*, PlayState*);
typedef void (*EnAttackNiwActionFunc)(struct EnAttackNiw*, struct PlayState*);
typedef struct EnAttackNiw {
/* 0x0000 */ Actor actor;

16
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -5,6 +5,22 @@
*/
#include "z_en_bb.h"
#include "libc64/qrand.h"
#include "attributes.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_Bb/object_Bb.h"

4
src/overlays/actors/ovl_En_Bb/z_en_bb.h
View file

@ -2,11 +2,11 @@
#define Z_EN_BB_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBb;
typedef void (*EnBbActionFunc)(struct EnBb*, PlayState*);
typedef void (*EnBbActionFunc)(struct EnBb*, struct PlayState*);
typedef struct EnBb {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View file

@ -1,4 +1,23 @@
#include "z_en_bigokuta.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "rumble.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_bigokuta/object_bigokuta.h"
#define FLAGS \

4
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
View file

@ -2,11 +2,11 @@
#define Z_EN_BIGOKUTA_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBigokuta;
typedef void (*EnBigokutaActionFunc)(struct EnBigokuta*, PlayState*);
typedef void (*EnBigokutaActionFunc)(struct EnBigokuta*, struct PlayState*);
typedef struct EnBigokuta {
/* 0x0000 */ Actor actor;

11
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -5,7 +5,18 @@
*/
#include "z_en_bili.h"
#include "libc64/qrand.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "versions.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_bl/object_bl.h"
#define FLAGS \

4
src/overlays/actors/ovl_En_Bili/z_en_bili.h
View file

@ -2,11 +2,11 @@
#define Z_EN_BILI_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBili;
typedef void (*EnBiliActionFunc)(struct EnBili*, PlayState*);
typedef void (*EnBiliActionFunc)(struct EnBili*, struct PlayState*);
typedef enum EnBiliLimb {
/* 0 */ EN_BILI_LIMB_NONE,

15
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -5,9 +5,22 @@
*/
#include "z_en_bombf.h"
#include "assets/objects/object_bombf/object_bombf.h"
#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "regs.h"
#include "rumble.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_bombf/object_bombf.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
void EnBombf_Init(Actor* thisx, PlayState* play);

2
src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
View file

@ -2,7 +2,7 @@
#define Z_EN_BOMBF_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBombf;

12
src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
View file

@ -1,4 +1,16 @@
#include "z_en_bubble.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "sfx.h"
#include "sys_math3d.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_bubble/object_bubble.h"
#define FLAGS ACTOR_FLAG_ATTENTION_ENABLED

4
src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
View file

@ -2,11 +2,11 @@
#define Z_EN_BUBBLE_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBubble;
typedef void (*EnBubbleActionFunc)(struct EnBubble*, PlayState*);
typedef void (*EnBubbleActionFunc)(struct EnBubble*, struct PlayState*);
typedef struct EnBubble {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -5,7 +5,26 @@
*/
#include "z_en_bw.h"
#include "libc64/math64.h"
#include "libc64/qrand.h"
#include "attributes.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "rand.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "versions.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_bw/object_bw.h"

4
src/overlays/actors/ovl_En_Bw/z_en_bw.h
View file

@ -2,10 +2,10 @@
#define Z_EN_BW_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnBw;
typedef void (*EnBwActionFunc)(struct EnBw*, PlayState*);
typedef void (*EnBwActionFunc)(struct EnBw*, struct PlayState*);
typedef enum TorchSlugLimb {
/* 0 */ TORCH_SLUG_LIMB_NONE,

10
src/overlays/actors/ovl_En_Changer/z_en_changer.c
View file

@ -5,9 +5,15 @@
*/
#include "z_en_changer.h"
#include "terminal.h"
#include "overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
#include "overlays/actors/ovl_En_Box/z_en_box.h"
#include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
#include "overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
#include "rand.h"
#include "regs.h"
#include "terminal.h"
#include "z64debug_display.h"
#include "z64play.h"
#define FLAGS 0

11
src/overlays/actors/ovl_En_Changer/z_en_changer.h
View file

@ -2,19 +2,18 @@
#define Z_EN_CHANGER_H
#include "ultra64.h"
#include "global.h"
#include "overlays/actors/ovl_En_Box/z_en_box.h"
#include "z64actor.h"
struct EnChanger;
typedef void (*EnChangerActionFunc)(struct EnChanger*, PlayState*);
typedef void (*EnChangerActionFunc)(struct EnChanger*, struct PlayState*);
typedef struct EnChanger {
/* 0x0000 */ Actor actor;
/* 0x014C */ EnChangerActionFunc actionFunc;
/* 0x0150 */ EnBox* leftChest;
/* 0x0154 */ EnBox* rightChest;
/* 0x0158 */ EnBox* finalChest;
/* 0x0150 */ struct EnBox* leftChest;
/* 0x0154 */ struct EnBox* rightChest;
/* 0x0158 */ struct EnBox* finalChest;
/* 0x015C */ s16 leftChestNum;
/* 0x015E */ s16 rightChestNum;
/* 0x0160 */ s16 leftChestGetItemId;

12
src/overlays/actors/ovl_En_Crow/z_en_crow.c
View file

@ -1,4 +1,16 @@
#include "z_en_crow.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_crow/object_crow.h"
#define FLAGS \

4
src/overlays/actors/ovl_En_Crow/z_en_crow.h
View file

@ -2,11 +2,11 @@
#define Z_EN_CROW_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnCrow;
typedef void (*EnCrowActionFunc)(struct EnCrow*, PlayState*);
typedef void (*EnCrowActionFunc)(struct EnCrow*, struct PlayState*);
typedef struct EnCrow {
/* 0x0000 */ Actor actor;

16
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View file

@ -1,8 +1,20 @@
#include "z_en_dekubaba.h"
#include "assets/objects/object_dekubaba/object_dekubaba.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_dekubaba/object_dekubaba.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
void EnDekubaba_Init(Actor* thisx, PlayState* play);

6
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DEKUBABA_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDekubaba;
typedef void (*EnDekubabaActionFunc)(struct EnDekubaba*, PlayState*);
typedef void (*EnDekubabaActionFunc)(struct EnDekubaba*, struct PlayState*);
typedef enum DekuBabaType {
/* 0 */ DEKUBABA_NORMAL,
@ -25,7 +25,7 @@ typedef struct EnDekubaba {
/* 0x01D0 */ Vec3s jointTable[8];
/* 0x0200 */ Vec3s morphTable[8];
/* 0x0230 */ f32 size; // Used everywhere to rescale offsets etc. for Big ones
/* 0x0234 */ CollisionPoly* boundFloor;
/* 0x0234 */ struct CollisionPoly* boundFloor;
/* 0x0238 */ ColliderJntSph collider;
/* 0x0258 */ ColliderJntSphElement colliderElements[7];
} EnDekubaba; // size = 0x0418

9
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View file

@ -6,6 +6,15 @@
#include "z_en_dekunuts.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "ichain.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_dekunuts/object_dekunuts.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)

4
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DEKUNUTS_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDekunuts;
typedef void (*EnDekunutsActionFunc)(struct EnDekunuts*, PlayState*);
typedef void (*EnDekunutsActionFunc)(struct EnDekunuts*, struct PlayState*);
typedef struct EnDekunuts {
/* 0x0000 */ Actor actor;

26
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -1,4 +1,30 @@
/*
* File: z_en_dh.c
* Overlay: ovl_En_Dh
* Description: Dead Hand
*/
#include "z_en_dh.h"
#include "libc64/qrand.h"
#include "attributes.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_dh/object_dh.h"
#define FLAGS \

4
src/overlays/actors/ovl_En_Dh/z_en_dh.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DH_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDh;
typedef void (*EnDhActionFunc)(struct EnDh*, PlayState*);
typedef void (*EnDhActionFunc)(struct EnDh*, struct PlayState*);
typedef struct EnDh {
/* 0x0000 */ Actor actor;

14
src/overlays/actors/ovl_En_Dha/z_en_dha.c
View file

@ -5,8 +5,20 @@
*/
#include "z_en_dha.h"
#include "versions.h"
#include "overlays/actors/ovl_En_Dh/z_en_dh.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "versions.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_dh/object_dh.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Dha/z_en_dha.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DHA_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDha;
typedef void (*EnDhaActionFunc)(struct EnDha*, PlayState*);
typedef void (*EnDhaActionFunc)(struct EnDha*, struct PlayState*);
typedef struct EnDha {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View file

@ -6,8 +6,25 @@
#include "z_en_diving_game.h"
#include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h"
#include "assets/objects/object_zo/object_zo.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "rand.h"
#include "regs.h"
#include "segmented_address.h"
#include "sequence.h"
#include "sfx.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_zo/object_zo.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DIVING_GAME_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDivingGame;
typedef void (*EnDivingGameActionFunc)(struct EnDivingGame*, PlayState*);
typedef void (*EnDivingGameActionFunc)(struct EnDivingGame*, struct PlayState*);
typedef struct EnDivingGame {
/* 0x0000 */ Actor actor;

12
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -5,7 +5,19 @@
*/
#include "z_en_dns.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "sfx.h"
#include "terminal.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_shopnuts/object_shopnuts.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)

4
src/overlays/actors/ovl_En_Dns/z_en_dns.h
View file

@ -2,7 +2,7 @@
#define Z_EN_DNS_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
#include "assets/objects/object_shopnuts/object_shopnuts.h"
#define DNS_GET_TYPE(thisx) ((thisx)->params)
@ -37,7 +37,7 @@ typedef enum EnDnsAnimation {
struct EnDns;
typedef void (*EnDnsActionFunc)(struct EnDns*, PlayState*);
typedef void (*EnDnsActionFunc)(struct EnDns*, struct PlayState*);
typedef u32 (*EnDnsCanBuyFunc)(struct EnDns*);
typedef void (*EnDnsPaymentFunc)(struct EnDns*);

14
src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
View file

@ -5,10 +5,22 @@
*/
#include "z_en_dnt_demo.h"
#include "overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h"
#include "overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h"
#include "attributes.h"
#include "one_point_cutscene.h"
#include "rand.h"
#include "regs.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64debug_display.h"
#include "z64play.h"
#include "z64player.h"
#define FLAGS 0

4
src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DNT_DEMO_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDntDemo;
typedef void (*EnDntDemoActionFunc)(struct EnDntDemo*, PlayState*);
typedef void (*EnDntDemoActionFunc)(struct EnDntDemo*, struct PlayState*);
typedef struct EnDntDemo {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -5,10 +5,27 @@
*/
#include "z_en_dnt_jiji.h"
#include "assets/objects/object_dns/object_dns.h"
#include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "libc64/math64.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "one_point_cutscene.h"
#include "rand.h"
#include "regs.h"
#include "segmented_address.h"
#include "seqcmd.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_dns/object_dns.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DNT_JIJI_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDntJiji;
typedef void (*EnDntJijiActionFunc)(struct EnDntJiji*, PlayState*);
typedef void (*EnDntJijiActionFunc)(struct EnDntJiji*, struct PlayState*);
typedef struct EnDntJiji {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file

@ -5,14 +5,29 @@
*/
#include "z_en_dnt_nomal.h"
#include "assets/objects/object_dnk/object_dnk.h"
#include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
#include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h"
#include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "assets/objects/object_hintnuts/object_hintnuts.h"
#include "libc64/math64.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "one_point_cutscene.h"
#include "rand.h"
#include "regs.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "versions.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_dnk/object_dnk.h"
#include "assets/objects/object_hintnuts/object_hintnuts.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DNT_NOMAL_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDntNomal;
typedef void (*EnDntNomalActionFunc)(struct EnDntNomal*, PlayState*);
typedef void (*EnDntNomalActionFunc)(struct EnDntNomal*, struct PlayState*);
typedef struct EnDntNomal {
/* 0x0000 */ Actor actor;

12
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -6,6 +6,18 @@
#include "z_en_dodojr.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_dodojr/object_dodojr.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)

4
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DODOJR_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDodojr;
typedef void (*EnDodojrActionFunc)(struct EnDodojr*, PlayState*);
typedef void (*EnDodojrActionFunc)(struct EnDodojr*, struct PlayState*);
typedef struct EnDodojr {
/* 0x0000 */ Actor actor;

15
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -1,6 +1,21 @@
#include "z_en_dodongo.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_dodongo/object_dodongo.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
View file

@ -2,11 +2,11 @@
#define Z_EN_DODONGO_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnDodongo;
typedef void (*EnDodongoActionFunc)(struct EnDodongo*, PlayState*);
typedef void (*EnDodongoActionFunc)(struct EnDodongo*, struct PlayState*);
typedef struct EnDodongo {
/* 0x0000 */ Actor actor;

14
src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
View file

@ -1,4 +1,18 @@
#include "z_en_eiyer.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "sfx.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_ei/object_ei.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)

4
src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h
View file

@ -2,11 +2,11 @@
#define Z_EN_EIYER_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnEiyer;
typedef void (*EnEiyerActionFunc)(struct EnEiyer*, PlayState*);
typedef void (*EnEiyerActionFunc)(struct EnEiyer*, struct PlayState*);
typedef struct EnEiyer {
/* 0x0000 */ Actor actor;

10
src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
View file

@ -1,6 +1,14 @@
#include "z_en_encount1.h"
#include "terminal.h"
#include "overlays/actors/ovl_En_Tite/z_en_tite.h"
#include "overlays/actors/ovl_En_Reeba/z_en_reeba.h"
#include "rand.h"
#include "regs.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64debug_display.h"
#include "z64play.h"
#include "z64player.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)

7
src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
View file

@ -2,14 +2,13 @@
#define Z_EN_ENCOUNT1_H
#include "ultra64.h"
#include "global.h"
#include "overlays/actors/ovl_En_Reeba/z_en_reeba.h"
#include "z64actor.h"
#define SPAWNER_PARAMS(type, number, total) ((type << 0xB) | (number << 0x6) | total)
struct EnEncount1;
typedef void (*EnEncount1UpdateFunc)(struct EnEncount1*, PlayState*);
typedef void (*EnEncount1UpdateFunc)(struct EnEncount1*, struct PlayState*);
typedef struct EnEncount1 {
/* 0x0000 */ Actor actor;
@ -27,7 +26,7 @@ typedef struct EnEncount1 {
/* 0x0164 */ s16 timer;
/* 0x0166 */ u8 reduceLeevers;
/* 0x0168 */ f32 spawnRange;
/* 0x016C */ EnReeba* bigLeever;
/* 0x016C */ struct EnReeba* bigLeever;
} EnEncount1; // size = 0x0170
typedef enum EnEncount1type {

15
src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View file

@ -1,6 +1,19 @@
#include "z_en_ex_ruppy.h"
#include "overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "rand.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "../ovl_En_Diving_Game/z_en_diving_game.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

4
src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h
View file

@ -2,11 +2,11 @@
#define Z_EN_EX_RUPPY_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnExRuppy;
typedef void (*EnExRuppyActionFunc)(struct EnExRuppy*, PlayState*);
typedef void (*EnExRuppyActionFunc)(struct EnExRuppy*, struct PlayState*);
typedef struct EnExRuppy {
/* 0x0000 */ Actor actor;

3
src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
View file

@ -10,12 +10,11 @@
#include "sys_matrix.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64debug_display.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/object_efc_star_field/object_efc_star_field.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

18
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View file

@ -5,10 +5,24 @@
*/
#include "z_en_firefly.h"
#include "versions.h"
#include "assets/objects/object_firefly/object_firefly.h"
#include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "versions.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_firefly/object_firefly.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)

4
src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
View file

@ -2,11 +2,11 @@
#define Z_EN_FIREFLY_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnFirefly;
typedef void (*EnFireflyActionFunc)(struct EnFirefly*, PlayState*);
typedef void (*EnFireflyActionFunc)(struct EnFirefly*, struct PlayState*);
typedef struct EnFirefly {
/* 0x0000 */ Actor actor;

12
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View file

@ -5,6 +5,18 @@
*/
#include "z_en_floormas.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_wallmaster/object_wallmaster.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)

4
src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
View file

@ -2,11 +2,11 @@
#define Z_EN_FLOORMAS_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
typedef struct EnFloormas EnFloormas;
typedef void (*EnFloormasActionFunc)(EnFloormas* this, PlayState* play);
typedef void (*EnFloormasActionFunc)(EnFloormas* this, struct PlayState* play);
struct EnFloormas{
/* 0x0000 */ Actor actor;

24
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -1,6 +1,28 @@
#include "z_en_fr.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "one_point_cutscene.h"
#include "rand.h"
#include "regs.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64debug_display.h"
#include "z64effect.h"
#include "z64light.h"
#include "z64ocarina.h"
#include "z64play.h"
#include "z64player.h"
#include "global.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
#include "assets/objects/object_fr/object_fr.h"
#define FLAGS \

5
src/overlays/actors/ovl_En_Fr/z_en_fr.h
View file

@ -2,11 +2,12 @@
#define Z_EN_FR_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
#include "z64light.h"
struct EnFr;
typedef void (*EnFrActionFunc)(struct EnFr*, PlayState*);
typedef void (*EnFrActionFunc)(struct EnFr*, struct PlayState*);
typedef void (*EnFrBlinkFunc)(struct EnFr*);
typedef enum FrogType {

15
src/overlays/actors/ovl_En_Fw/z_en_fw.c
View file

@ -5,9 +5,22 @@
*/
#include "z_en_fw.h"
#include "assets/objects/object_fw/object_fw.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "libc64/math64.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_fw/object_fw.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \

4
src/overlays/actors/ovl_En_Fw/z_en_fw.h
View file

@ -2,11 +2,11 @@
#define Z_EN_FW_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnFw;
typedef void (*EnFwActionFunc)(struct EnFw* this, PlayState* play);
typedef void (*EnFwActionFunc)(struct EnFw* this, struct PlayState* play);
#define EN_FW_EFFECT_COUNT 20

13
src/overlays/actors/ovl_En_Fz/z_en_fz.c
View file

@ -1,4 +1,17 @@
#include "z_en_fz.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "assets/objects/object_fz/object_fz.h"
#define FLAGS \

4
src/overlays/actors/ovl_En_Fz/z_en_fz.h
View file

@ -2,11 +2,11 @@
#define Z_EN_FZ_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnFz;
typedef void (*EnFzActionFunc)(struct EnFz*, PlayState*);
typedef void (*EnFzActionFunc)(struct EnFz*, struct PlayState*);
typedef void (*EnFzSpawnIceSmokeFunc)(struct EnFz*);
typedef struct EnFzEffect {

19
src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
View file

@ -5,10 +5,27 @@
*/
#include "z_en_g_switch.h"
#include "terminal.h"
#include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h"
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "rand.h"
#include "regs.h"
#include "segmented_address.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64debug_display.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_tsubo/object_tsubo.h"

4
src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h
View file

@ -2,11 +2,11 @@
#define Z_EN_G_SWITCH_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnGSwitch;
typedef void (*EnGSwitchActionFunc)(struct EnGSwitch*, PlayState*);
typedef void (*EnGSwitchActionFunc)(struct EnGSwitch*, struct PlayState*);
typedef enum EnGSwitchMoveMode {
/* 0 */ GSWITCH_NONE,

17
src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View file

@ -5,6 +5,23 @@
*/
#include "z_en_geldb.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "segmented_address.h"
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/object_geldb/object_geldb.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

4
src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
View file

@ -2,7 +2,7 @@
#define Z_EN_GELDB_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnGeldB;
@ -34,7 +34,7 @@ typedef enum EnGeldBLimb {
/* 0x18 */ GELDB_LIMB_MAX
} EnGeldBLimb;
typedef void (*EnGeldBActionFunc)(struct EnGeldB*, PlayState*);
typedef void (*EnGeldBActionFunc)(struct EnGeldB*, struct PlayState*);
typedef struct EnGeldB {
/* 0x0000 */ Actor actor;

19
src/overlays/actors/ovl_En_Goma/z_en_goma.c
View file

@ -5,11 +5,26 @@
*/
#include "z_en_goma.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "assets/objects/object_gol/object_gol.h"
#include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "libc64/math64.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
#include "rand.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "assets/objects/object_gol/object_gol.h"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
ACTOR_FLAG_DRAW_CULLING_DISABLED)

Some files were not shown because too many files have changed in this diff Show more