diff --git a/Makefile b/Makefile index 774c6e211b..e19cca56f6 100644 --- a/Makefile +++ b/Makefile @@ -811,9 +811,6 @@ endif #### Various Recipes #### -$(ROM): $(ELF) - $(ELF2ROM) -cic 6105 $< $@ - ifeq ($(PLATFORM),IQUE) COMPRESS_ARGS := --format gzip --pad-to 0x4000 CIC = 6102 @@ -822,6 +819,9 @@ else CIC = 6105 endif +$(ROM): $(ELF) + $(ELF2ROM) -cic $(CIC) $< $@ + $(ROMC): $(ROM) $(ELF) $(BUILD_DIR)/compress_ranges.txt $(PYTHON) tools/compress.py --in $(ROM) --out $@ --dmadata-start `./tools/dmadata_start.sh $(NM) $(ELF)` --compress `cat $(BUILD_DIR)/compress_ranges.txt` --threads $(N_THREADS) $(COMPRESS_ARGS) $(PYTHON) -m ipl3checksum sum --cic $(CIC) --update $@ diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml index 5e77aaa8b0..fc3d53ccdb 100644 --- a/assets/xml/objects/object_jya_obj.xml +++ b/assets/xml/objects/object_jya_obj.xml @@ -59,7 +59,7 @@ - + diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index 4136ba57d4..14917fd165 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -126,13 +126,13 @@ - - - - - - - + + + + + + + diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml index 09abaaf67a..44bbdae424 100644 --- a/baseroms/gc-eu-mq-dbg/config.yml +++ b/baseroms/gc-eu-mq-dbg/config.yml @@ -50,7 +50,7 @@ incbins: vram: 0x80157D30 size: 0x60 variables: - gMtxClear: 0x8012DB20 + gIdentityMtx: 0x8012DB20 sNesMessageEntryTable: 0x8014B320 sGerMessageEntryTable: 0x8014F548 sFraMessageEntryTable: 0x80151658 diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml index 62925ab3b4..e42e48c75f 100644 --- a/baseroms/gc-eu-mq/config.yml +++ b/baseroms/gc-eu-mq/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801130D0 size: 0x60 variables: - gMtxClear: 0x800FBC00 + gIdentityMtx: 0x800FBC00 sNesMessageEntryTable: 0x801077F0 sGerMessageEntryTable: 0x8010BA18 sFraMessageEntryTable: 0x8010DB28 diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml index 278badfb80..b6471875f7 100644 --- a/baseroms/gc-eu/config.yml +++ b/baseroms/gc-eu/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801130F0 size: 0x60 variables: - gMtxClear: 0x800FBC20 + gIdentityMtx: 0x800FBC20 sNesMessageEntryTable: 0x80107810 sGerMessageEntryTable: 0x8010BA38 sFraMessageEntryTable: 0x8010DB48 diff --git a/baseroms/gc-jp-ce/config.yml b/baseroms/gc-jp-ce/config.yml index f73344d892..a4592544ff 100644 --- a/baseroms/gc-jp-ce/config.yml +++ b/baseroms/gc-jp-ce/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801158E0 size: 0x60 variables: - gMtxClear: 0x800FE2A0 + gIdentityMtx: 0x800FE2A0 sJpnMessageEntryTable: 0x80109E8C sNesMessageEntryTable: 0x8010DFCC sStaffMessageEntryTable: 0x801121EC diff --git a/baseroms/gc-jp-mq/config.yml b/baseroms/gc-jp-mq/config.yml index 81927277bd..597e2cff66 100644 --- a/baseroms/gc-jp-mq/config.yml +++ b/baseroms/gc-jp-mq/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801158E0 size: 0x60 variables: - gMtxClear: 0x800FE2A0 + gIdentityMtx: 0x800FE2A0 sJpnMessageEntryTable: 0x80109E8C sNesMessageEntryTable: 0x8010DFCC sStaffMessageEntryTable: 0x801121EC diff --git a/baseroms/gc-jp/config.yml b/baseroms/gc-jp/config.yml index 26e407d8c4..582fd894eb 100644 --- a/baseroms/gc-jp/config.yml +++ b/baseroms/gc-jp/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x80115900 size: 0x60 variables: - gMtxClear: 0x800FE2C0 + gIdentityMtx: 0x800FE2C0 sJpnMessageEntryTable: 0x80109EAC sNesMessageEntryTable: 0x8010DFEC sStaffMessageEntryTable: 0x8011220C diff --git a/baseroms/gc-us-mq/config.yml b/baseroms/gc-us-mq/config.yml index 77f12ba8bd..691aaa1ff9 100644 --- a/baseroms/gc-us-mq/config.yml +++ b/baseroms/gc-us-mq/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801158C0 size: 0x60 variables: - gMtxClear: 0x800FE280 + gIdentityMtx: 0x800FE280 sJpnMessageEntryTable: 0x80109E6C sNesMessageEntryTable: 0x8010DFAC sStaffMessageEntryTable: 0x801121CC diff --git a/baseroms/gc-us/config.yml b/baseroms/gc-us/config.yml index c53cd1841a..9a64c84646 100644 --- a/baseroms/gc-us/config.yml +++ b/baseroms/gc-us/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x801158E0 size: 0x60 variables: - gMtxClear: 0x800FE2A0 + gIdentityMtx: 0x800FE2A0 sJpnMessageEntryTable: 0x80109E8C sNesMessageEntryTable: 0x8010DFCC sStaffMessageEntryTable: 0x801121EC diff --git a/baseroms/ique-cn/checksum.md5 b/baseroms/ique-cn/checksum.md5 index 82dfff85bf..6390fc95b9 100644 --- a/baseroms/ique-cn/checksum.md5 +++ b/baseroms/ique-cn/checksum.md5 @@ -1 +1 @@ -17a9f30d722c29e6912bd4b66713d2b0 build/ique-cn/oot-ique-cn.z64 +0238288a8e7c53b558b818865daf6ef3 build/ique-cn/oot-ique-cn.z64 diff --git a/baseroms/ique-cn/config.yml b/baseroms/ique-cn/config.yml index bcc6ca5b0c..af570e0f0a 100644 --- a/baseroms/ique-cn/config.yml +++ b/baseroms/ique-cn/config.yml @@ -42,7 +42,7 @@ incbins: vram: 0x80121EE0 size: 0x60 variables: - gMtxClear: 0x80106980 + gIdentityMtx: 0x80106980 sJpnMessageEntryTable: 0x80115838 sNesMessageEntryTable: 0x80119978 sStaffMessageEntryTable: 0x8011DB98 diff --git a/baseroms/ntsc-1.0/config.yml b/baseroms/ntsc-1.0/config.yml index 2bdf99411a..667845d383 100644 --- a/baseroms/ntsc-1.0/config.yml +++ b/baseroms/ntsc-1.0/config.yml @@ -45,7 +45,7 @@ incbins: vram: 0x80114D70 size: 0x60 variables: - gMtxClear: 0x800FEDB0 + gIdentityMtx: 0x800FEDB0 sJpnMessageEntryTable: 0x8010A94C sNesMessageEntryTable: 0x8010EA8C sStaffMessageEntryTable: 0x80112CAC diff --git a/baseroms/ntsc-1.1/config.yml b/baseroms/ntsc-1.1/config.yml index 1b110a84c8..66e74a17a4 100644 --- a/baseroms/ntsc-1.1/config.yml +++ b/baseroms/ntsc-1.1/config.yml @@ -45,7 +45,7 @@ incbins: vram: 0x80114F30 size: 0x60 variables: - gMtxClear: 0x800FEF70 + gIdentityMtx: 0x800FEF70 sJpnMessageEntryTable: 0x8010AB0C sNesMessageEntryTable: 0x8010EC4C sStaffMessageEntryTable: 0x80112E6C diff --git a/baseroms/ntsc-1.2/config.yml b/baseroms/ntsc-1.2/config.yml index a631ca5511..4b3b33db46 100644 --- a/baseroms/ntsc-1.2/config.yml +++ b/baseroms/ntsc-1.2/config.yml @@ -45,7 +45,7 @@ incbins: vram: 0x80115420 size: 0x60 variables: - gMtxClear: 0x800FF3F0 + gIdentityMtx: 0x800FF3F0 sJpnMessageEntryTable: 0x8010AFFC sNesMessageEntryTable: 0x8010F13C sStaffMessageEntryTable: 0x8011335C diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml index a8ea60b79d..782e4ce152 100644 --- a/baseroms/pal-1.0/config.yml +++ b/baseroms/pal-1.0/config.yml @@ -50,7 +50,7 @@ incbins: vram: 0x80112B70 size: 0x60 variables: - gMtxClear: 0x800FCD00 + gIdentityMtx: 0x800FCD00 sNesMessageEntryTable: 0x801088BC sGerMessageEntryTable: 0x8010CAE4 sFraMessageEntryTable: 0x8010EBF4 diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml index 4811f1cb93..c7f278dfe2 100644 --- a/baseroms/pal-1.1/config.yml +++ b/baseroms/pal-1.1/config.yml @@ -50,7 +50,7 @@ incbins: vram: 0x80112BB0 size: 0x60 variables: - gMtxClear: 0x800FCD40 + gIdentityMtx: 0x800FCD40 sNesMessageEntryTable: 0x801088FC sGerMessageEntryTable: 0x8010CB24 sFraMessageEntryTable: 0x8010EC34 diff --git a/include/functions.h b/include/functions.h index d861112d49..4a949a2af5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/include/sys_matrix.h b/include/sys_matrix.h index 1d136a06ee..11d494c8c8 100644 --- a/include/sys_matrix.h +++ b/include/sys_matrix.h @@ -11,8 +11,8 @@ typedef enum MatrixMode { /* 1 */ MTXMODE_APPLY // applies transformation to the current matrix } MatrixMode; -extern Mtx gMtxClear; -extern MtxF gMtxFClear; +extern Mtx gIdentityMtx; +extern MtxF gIdentityMtxF; /* Stack operations */ diff --git a/include/z64.h b/include/z64.h index f0ac7d547a..3da9ad2de1 100644 --- a/include/z64.h +++ b/include/z64.h @@ -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 diff --git a/include/z64game.h b/include/z64game.h index 3b50cfd362..e41c0dd8d3 100644 --- a/include/z64game.h +++ b/include/z64game.h @@ -3,7 +3,7 @@ // This file is named "game" after game.c for now, this may change later with the system name #include "ultra64/ultratypes.h" -#include "padmgr.h" +#include "libu64/pad.h" #include "tha.h" struct GraphicsContext; diff --git a/include/z64play.h b/include/z64play.h index cb2e78edc4..4fab4283fc 100644 --- a/include/z64play.h +++ b/include/z64play.h @@ -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; diff --git a/include/z64view.h b/include/z64view.h index 82f4ee48ff..3832eb5f6f 100644 --- a/include/z64view.h +++ b/include/z64view.h @@ -1,6 +1,7 @@ #ifndef Z64VIEW_H #define Z64VIEW_H +#include "macros.h" #include "ultra64.h" #include "z64math.h" diff --git a/include/z_lib.h b/include/z_lib.h index 34581da982..1e9052f93b 100644 --- a/include/z_lib.h +++ b/include/z_lib.h @@ -2,7 +2,7 @@ #define Z_LIB_H #include "libc/stddef.h" -#include "padmgr.h" +#include "libu64/pad.h" #include "z64math.h" #include "color.h" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 38da143aed..9efa427881 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -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; diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 242609295d..eb0a0d8059 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,4 +1,5 @@ #include "global.h" +#include "z64debug_display.h" #define DEBUG_CAM_CONTROLLER_PORT 2 diff --git a/src/code/main.c b/src/code/main.c index d31f7cd211..e654bb05cf 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -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[]; diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 54ae8741e4..4a1ddaf0bb 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -5,8 +5,8 @@ #include "macros.h" #include "sys_math3d.h" -#pragma increment_block_number "gc-eu:97 gc-eu-mq:97 gc-jp:97 gc-jp-ce:97 gc-jp-mq:97 gc-us:97 gc-us-mq:97 ique-cn:97" \ - "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80" +#pragma increment_block_number "gc-eu:120 gc-eu-mq:120 gc-jp:120 gc-jp-ce:120 gc-jp-mq:120 gc-us:120 gc-us-mq:120" \ + "ique-cn:120 ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 19db7799e6..9e56d4088a 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -4,14 +4,14 @@ #endif // clang-format off -Mtx gMtxClear = gdSPDefMtx( +Mtx gIdentityMtx = gdSPDefMtx( 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f ); -MtxF gMtxFClear = { +MtxF gIdentityMtxF = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, diff --git a/src/code/z_actor.c b/src/code/z_actor.c index f59a996e6a..f13360af6c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2314,8 +2314,8 @@ void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* play bzero(actorCtx, sizeof(ActorContext)); ActorOverlayTable_Init(); - Matrix_MtxFCopy(&play->billboardMtxF, &gMtxFClear); - Matrix_MtxFCopy(&play->viewProjectionMtxF, &gMtxFClear); + Matrix_MtxFCopy(&play->billboardMtxF, &gIdentityMtxF); + Matrix_MtxFCopy(&play->viewProjectionMtxF, &gIdentityMtxF); overlayEntry = &gActorOverlayTable[0]; for (i = 0; i < ARRAY_COUNT(gActorOverlayTable); i++) { diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index a134591925..8caacb9405 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -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); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index dda1f5ea30..9fb0365735 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -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; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 8af30ac7ff..6096966e29 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -16,7 +16,7 @@ #include "z_lib.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:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" + "ique-cn:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); @@ -46,7 +46,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, OPEN_DISPS(gfxCtx, "../z_collision_check.c", 713); - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50); gDPPipeSync(POLY_OPA_DISP++); gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2); diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index d5322bbd4f..ced17dc089 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -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 diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 212f5ee7df..db87e31fd3 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -805,7 +805,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPVertex(POLY_XLU_DISP++, &vtx[4 * i], 4, 0); gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } } } @@ -932,7 +932,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->numElements != 0) { if (this->flags == 0) { diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index a997caa129..8074be9007 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -154,7 +154,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293); if (this != NULL) { - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_38); gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE); diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 994c5ac205..9983b9b320 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -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" diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 85e1e1ab61..6d3518aae5 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -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" diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index c658775da3..8c19635d62 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -356,7 +356,7 @@ void Minimap_DrawCompassIcons(PlayState* play) { if (play->interfaceCtx.minimapAlpha >= 0xAA) { Gfx_SetupDL_42Overlay(play->state.gfxCtx); - gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(OVERLAY_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 5b0629047c..91225aae25 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3429,7 +3429,7 @@ void Interface_Draw(PlayState* play) { gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->iconItemSegment); Gfx_SetupDL_42Overlay(play->state.gfxCtx); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATERGBA_PRIM, G_CC_MODULATERGBA_PRIM); - gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(OVERLAY_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // PAUSE_CURSOR_QUAD_4 pauseCtx->cursorVtx[16].v.ob[0] = pauseCtx->cursorVtx[18].v.ob[0] = pauseCtx->equipAnimX / 10; diff --git a/src/code/z_room.c b/src/code/z_room.c index 0c5d37f551..f03ac7881a 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -48,14 +48,14 @@ void Room_DrawNormal(PlayState* play, Room* room, u32 flags) { func_800342EC(&D_801270A0, play); gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); func_80093C80(play); - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } if (flags & ROOM_DRAW_XLU) { func_8003435C(&D_801270A0, play); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } roomShape = &room->roomShape->normal; @@ -122,7 +122,7 @@ void Room_DrawCullable(PlayState* play, Room* room, u32 flags) { func_800342EC(&D_801270A0, play); gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); func_80093C80(play); - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } if (1) {} @@ -131,7 +131,7 @@ void Room_DrawCullable(PlayState* play, Room* room, u32 flags) { func_8003435C(&D_801270A0, play); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } roomShape = &room->roomShape->cullable; @@ -390,7 +390,7 @@ void Room_DrawImageSingle(PlayState* play, Room* room, u32 flags) { if (drawOpa) { Gfx_SetupDL_25Opa(play->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, entry->opa); } @@ -421,7 +421,7 @@ void Room_DrawImageSingle(PlayState* play, Room* room, u32 flags) { if (drawXlu) { gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, entry->xlu); } @@ -499,7 +499,7 @@ void Room_DrawImageMulti(PlayState* play, Room* room, u32 flags) { if (drawOpa) { Gfx_SetupDL_25Opa(play->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, dListsEntry->opa); } @@ -530,7 +530,7 @@ void Room_DrawImageMulti(PlayState* play, Room* room, u32 flags) { if (drawXlu) { gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, dListsEntry->xlu); } diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 55af9b1e2d..4ba0f6cb47 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -207,7 +207,7 @@ void Skin_DrawImpl(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postD skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_MATRIX)) { - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &skin->mtx); if (mtx == NULL) { diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 46f40d3ec0..d202bd9abd 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -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" diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 8237009d97..df7c95b0e9 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -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" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index b162af3792..d0ea75d091 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -244,7 +244,7 @@ void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play) { MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568); gSPDisplayList(POLY_OPA_DISP++, gFireTempleSpinningFlamethrowerDL); - Matrix_MtxFCopy(&mf, &gMtxFClear); + Matrix_MtxFCopy(&mf, &gIdentityMtxF); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_20); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 117064ffb4..840fbeb959 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -360,7 +360,7 @@ Gfx* func_8088DC50(PlayState* play, BgHidanSekizou* this, s16 arg2, s16 arg3, Gf } temp_f20 = Math_SinS(arg2); temp_f22 = Math_CosS(arg2); - Matrix_MtxFCopy(&sp68, &gMtxFClear); + Matrix_MtxFCopy(&sp68, &gIdentityMtxF); temp_v1 = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - arg2; if (ABS(temp_v1) < 0x4000) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 06f5b2a308..66f15cd166 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -5,6 +5,18 @@ */ #include "z_bg_hidan_sima.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rumble.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_hidan_objects/object_hidan_objects.h" #define FLAGS 0 @@ -233,7 +245,7 @@ Gfx* func_8088EB54(PlayState* play, BgHidanSima* this, Gfx* gfx) { f32 sin; s32 pad[2]; - Matrix_MtxFCopy(&mtxF, &gMtxFClear); + Matrix_MtxFCopy(&mtxF, &gIdentityMtxF); cos = Math_CosS(this->dyna.actor.world.rot.y + 0x8000); sin = Math_SinS(this->dyna.actor.world.rot.y + 0x8000); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h index 927391110b..a4f5175c8d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h @@ -2,11 +2,11 @@ #define Z_BG_HIDAN_SIMA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgHidanSima; -typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, PlayState*); +typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, struct PlayState*); typedef struct BgHidanSima { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index e1a7007068..d21b1e8212 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -5,6 +5,11 @@ */ #include "z_bg_hidan_syoku.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" + #include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h index 61e3520b76..2ce3fbfd4e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h @@ -2,11 +2,11 @@ #define Z_BG_HIDAN_SYOKU_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgHidanSyoku; -typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, PlayState*); +typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, struct PlayState*); typedef struct BgHidanSyoku { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 15163c9842..6bfd39e4e5 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -5,6 +5,16 @@ */ #include "z_bg_ice_objects.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h index 13a2334c39..364b087852 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_OBJECTS_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceObjects; -typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, PlayState*); +typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, struct PlayState*); typedef struct BgIceObjects { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 39c891ab4f..0b19f74e6a 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -5,6 +5,17 @@ */ #include "z_bg_ice_shelter.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h index 765b017b32..30286a64d1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_SHELTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceShelter; -typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, PlayState*); +typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, struct PlayState*); typedef enum RedIceType { /* 0 */ RED_ICE_LARGE, // Large red ice block diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index d00358e230..20176f2758 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -5,6 +5,13 @@ */ #include "z_bg_ice_shutter.h" + +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index db8a7ff61c..aad63d435b 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_SHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceShutter; -typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, PlayState*); +typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, struct PlayState*); typedef struct BgIceShutter { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 094f585645..8fb200aca5 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -5,6 +5,15 @@ */ #include "z_bg_ice_turara.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h index eaa6cc843f..46a78eb738 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_TURARA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceTurara; -typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, PlayState*); +typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, struct PlayState*); typedef enum BgIceTuraraType { /* 0 */ TURARA_STALAGMITE, 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 dc5b9323e3..40eaf99d1d 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -5,6 +5,13 @@ */ #include "z_bg_ingate.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_ingate/object_ingate.h" #define FLAGS 0 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 2137cc6464..c9f46446ab 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -2,11 +2,11 @@ #define Z_BG_INGATE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgInGate; -typedef void (*BgInGateActionFunc)(struct BgInGate*, PlayState*); +typedef void (*BgInGateActionFunc)(struct BgInGate*, struct PlayState*); typedef struct BgInGate { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 7963199d74..8dbf588a19 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -5,6 +5,12 @@ */ #include "z_bg_jya_1flift.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h index 31ce5a7f4d..8d772757bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_1FLIFT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJya1flift; -typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, PlayState*); +typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, struct PlayState*); typedef struct BgJya1flift { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 23f5658ce8..e97451e861 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -5,6 +5,12 @@ */ #include "z_bg_jya_amishutter.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h index e15a42fe88..1dad4c1543 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_AMISHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaAmishutter; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index ecdf4aa4de..7a3606213a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -5,6 +5,13 @@ */ #include "z_bg_jya_bigmirror.h" +#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h index 52f2b95930..56b6d8db07 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h @@ -2,8 +2,7 @@ #define Z_BG_JYA_BIGMIRROR_H #include "ultra64.h" -#include "global.h" -#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h" +#include "z64actor.h" #define BIGMIR_PUZZLE_COBRA1_SOLVED (1 << 0) #define BIGMIR_PUZZLE_COBRA2_SOLVED (1 << 1) @@ -15,7 +14,7 @@ struct BgJyaBigmirror; typedef struct BigmirrorCobra { - /* 0x00 */ BgJyaCobra* cobra; + /* 0x00 */ struct BgJyaCobra* cobra; /* 0x04 */ s16 rotY; } BigmirrorCobra; // size = 0x08 diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index eea63927ed..bcd06ce59a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -5,6 +5,15 @@ */ #include "z_bg_jya_block.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index 2d58de5c12..641141945a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BLOCK_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBlock; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index cd177d8044..cd7d83e0f1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -1,5 +1,17 @@ #include "z_bg_jya_bombchuiwa.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 "one_point_cutscene.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h index e936167100..650a95ce74 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_BOMBCHUIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBombchuiwa; -typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, PlayState*); +typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, struct PlayState*); typedef struct BgJyaBombchuiwa { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index c94ee924b1..c7d6fb3d9b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -6,8 +6,15 @@ #include "z_bg_jya_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "sfx.h" #include "terminal.h" +#include "z64effect.h" +#include "z64play.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h index 879291f87c..ed0e29f1e9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BOMBIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBombiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index c32bd92896..6380e0cf6a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -1,8 +1,18 @@ #include "z_bg_jya_cobra.h" #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h" #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h index 8722bcc2ce..32266e2ac4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_COBRA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaCobra; -typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, PlayState*); +typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, struct PlayState*); #define COBRA_SHADOW_TEX_WIDTH 64 #define COBRA_SHADOW_TEX_HEIGHT 64 diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 9122ebfcf9..e46dbfa345 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -6,6 +6,13 @@ */ #include "z_bg_jya_goroiwa.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_goroiwa/object_goroiwa.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h index 2722475480..299f9a65f9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_GOROIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaGoroiwa; -typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, PlayState*); +typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, struct PlayState*); typedef struct BgJyaGoroiwa { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index f327e15f8c..7226d1a821 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -6,6 +6,14 @@ #include "z_bg_jya_haheniron.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_iron/object_jya_iron.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h index 60f9c6ef9e..e8ef33d5d0 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_HAHENIRON_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaHaheniron; -typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, PlayState*); +typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, struct PlayState*); typedef struct BgJyaHaheniron { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index e5a8e139ba..e953b653c1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -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*); diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h index a8189049af..e31894172e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h @@ -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; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 459e3f11af..7aead74061 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -5,8 +5,15 @@ */ #include "z_bg_jya_kanaami.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "ichain.h" +#include "one_point_cutscene.h" #include "quake.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h index 6e5d670fde..a125e8ef53 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_KANAAMI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaKanaami; -typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, PlayState*); +typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, struct PlayState*); typedef struct BgJyaKanaami { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 2d1092c8e5..50571f8ac5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -5,6 +5,13 @@ */ #include "z_bg_jya_lift.h" + +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h index b6c951dc18..ea9abac2bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h @@ -2,10 +2,10 @@ #define Z_BG_JYA_LIFT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaLift; -typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, PlayState*); +typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, struct PlayState*); typedef struct BgJyaLift { /* 0x000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index 546f8c8d64..364e095969 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -6,6 +6,19 @@ #include "z_bg_jya_megami.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 "one_point_cutscene.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h index b24f236013..df3451f9d8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_MEGAMI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaMegami; -typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, PlayState*); +typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, struct PlayState*); typedef struct BgJyaMegamiPiece { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index bbdc93c2f8..4dea268824 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -5,8 +5,15 @@ */ #include "z_bg_jya_zurerukabe.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "ichain.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index 683f681999..d9d920f57b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_ZURERUKABE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaZurerukabe; -typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, PlayState*); +typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, struct PlayState*); typedef struct BgJyaZurerukabe { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index e44f561d83..2a2740349e 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -5,6 +5,15 @@ */ #include "z_bg_menkuri_eye.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index cf27ca1827..7ed3004edd 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_EYE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriEye; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index cb3c724cf5..ee3f35a1db 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -5,6 +5,11 @@ */ #include "z_bg_menkuri_kaiten.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h index c65b08d6e9..5bcdbf8ec4 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_KAITEN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriKaiten; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 589ecd6d7a..0bc0649065 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -5,6 +5,9 @@ */ #include "z_bg_menkuri_nisekabe.h" + +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h index f7cb56a5bf..54cce56eff 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_NISEKABE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriNisekabe; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 2bcc1974b2..156a44aa20 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -6,6 +6,16 @@ #include "z_bg_mizu_bwall.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h index d5eeaad344..4a23306a39 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_BWALL_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuBwall; -typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, PlayState*); +typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, struct PlayState*); typedef struct BgMizuBwall { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 095ab67e43..ae1dd32bc6 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -6,6 +6,16 @@ #include "z_bg_mizu_movebg.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.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 "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h index 1a378f13a5..75a50e864e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_MOVEBG_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" typedef enum BgMizuMovebgType { /* 0 */ MIZUMOVEBG_TYPE_FLOATING_PLATFORM_OUTSIDE_CENTER_PILLAR, @@ -18,7 +18,7 @@ typedef enum BgMizuMovebgType { struct BgMizuMovebg; -typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, PlayState*); +typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, struct PlayState*); typedef struct BgMizuMovebg { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 585f85f6f5..ed8fae2784 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,4 +1,15 @@ #include "z_bg_mizu_shutter.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h index cc42e4ddf3..bcba73f531 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_SHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" #define BGMIZUSHUTTER_GET_SIZE(thisx) PARAMS_GET_U((u16)(thisx)->params, 12, 4) #define BGMIZUSHUTTER_GET_TIMER(thisx) PARAMS_GET_U((u16)(thisx)->params, 6, 6) @@ -12,7 +12,7 @@ struct BgMizuShutter; -typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, PlayState*); +typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, struct PlayState*); typedef struct BgMizuShutter { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 9f1884ea49..3072207ece 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -5,6 +5,12 @@ */ #include "z_bg_mizu_uzu.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h index 94e6b3c9d1..f8fe16ccd7 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_UZU_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuUzu; -typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, PlayState*); +typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, struct PlayState*); typedef struct BgMizuUzu { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 68f551be8b..5a59ddd683 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -5,6 +5,18 @@ */ #include "z_bg_mizu_water.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "regs.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index 21196022f8..26eb33d0d8 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_WATER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuWater; -typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, PlayState*); +typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, struct PlayState*); typedef struct BgMizuWater { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 69bbc3506c..6fa9814a1b 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -5,6 +5,14 @@ */ #include "z_bg_mjin.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_mjin/object_mjin.h" #include "assets/objects/object_mjin_wind/object_mjin_wind.h" #include "assets/objects/object_mjin_soul/object_mjin_soul.h" diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h index 03e18fbb76..1ed19aa2a4 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h @@ -2,11 +2,11 @@ #define Z_BG_MJIN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMjin; -typedef void (*BgMjinActionFunc)(struct BgMjin*, PlayState*); +typedef void (*BgMjinActionFunc)(struct BgMjin*, struct PlayState*); typedef struct BgMjin { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7b02395228..9bc16b1fe4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -5,8 +5,18 @@ */ #include "z_bg_mori_bigst.h" -#include "assets/objects/object_mori_objects/object_mori_objects.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" #include "quake.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index c71eac7ab1..f37499b2f7 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -2,11 +2,11 @@ #define Z_BG_MORI_BIGST_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMoriBigst; -typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, PlayState*); +typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, struct PlayState*); typedef struct BgMoriBigst { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index b441ed008c..53206ecf72 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,4 +1,15 @@ #include "z_bg_mori_elevator.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h index e7bcc5018e..42e45d56fc 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h @@ -2,11 +2,11 @@ #define Z_BG_MORI_ELEVATOR_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMoriElevator; -typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, PlayState*); +typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, struct PlayState*); typedef struct BgMoriElevator { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 7199ec25b5..64d7bb9f46 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -5,6 +5,20 @@ */ #include "z_bg_po_event.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "rand.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_po_sisters/object_po_sisters.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index 412c187227..e279513666 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -2,11 +2,11 @@ #define Z_BG_PO_EVENT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgPoEvent; -typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, PlayState*); +typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, struct PlayState*); typedef struct BgPoEvent { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 566d4342b5..75763a8c7c 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,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 diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h index 21f4bc4f23..eb198e09a0 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h @@ -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; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 5d96a0d750..1ddffb6c98 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -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) diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h index 9149f9214b..eb4abfa662 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h @@ -2,7 +2,7 @@ #define Z_BG_SST_FLOOR_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgSstFloor; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c index 83aa550fde..78dda01d3e 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphItemsInit[19] = { { diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c index 1098d44c3f..3a432692fe 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[9] = { { diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 782d291b74..5b695935df 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -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; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 082b91a56f..1b6f70f93f 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -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) diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h index 5931f9ca3d..1f66092ce9 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c index 58d807607c..1148cf1a99 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c @@ -1,5 +1,4 @@ -#include "global.h" -#include "z_boss_mo.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index ea77056756..2e7a467c22 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -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" diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h index f064f2b842..af358d2dcf 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h @@ -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 diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c index cc06356aa8..4cbb650d7e 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z_boss_sst.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphItemsInitHand[11] = { { 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 df54812326..69db3f243b 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -16,6 +16,7 @@ #include "z_lib.h" #include "z64audio.h" #include "z64curve.h" +#include "z64draw.h" #include "z64effect.h" #include "z64play.h" diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index f0b240070d..b70210c38a 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -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) diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h index ca719594ad..03c6110fae 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h @@ -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; diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 467f27aa3d..307cc9bf00 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -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) diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index a878a21f1f..3e62e46bf0 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -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) diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h index 18b968b15c..910c265939 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h @@ -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; 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 0bb5e1074a..f25d82df23 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -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" 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 83660c5930..8ab1c8a4c7 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -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; 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 6f793ba1a3..3f7649ea7e 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -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) 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 8bac3338da..2903a3b6ea 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 5773eb17ba..d68f1c8502 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index 5f3ec8b134..51cd02d1ef 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -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 diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index b54dc180bc..bdb3c312c0 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -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 diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h index 0147b30cd5..026d4d0199 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h @@ -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 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 d215d02cf3..f20feeefea 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -5,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); 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 381b6a2aae..a4d361542d 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 @@ -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; 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 26af25354a..d93676f337 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -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" 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 9908690e06..2ffe375713 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -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; 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 1bb808abaf..f25ea12904 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -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 \ 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 fc6ca9ac7a..1380afeedd 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 8e9eba0c60..57078a73af 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -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 \ diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h index 0882a288c0..3199639c9d 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h @@ -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, 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 34dd30010e..7148ebe495 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -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); 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 14bc9c6ece..2c1cd88afc 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -2,7 +2,7 @@ #define Z_EN_BOMBF_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnBombf; 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 466ebfce65..dae945bb88 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -1,4 +1,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 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 d753768811..6c7e01d84b 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 6ab5fd6fcf..61d7cc36d4 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -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" diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h index 5f74f70c4d..7c0698d22c 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h @@ -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, diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 60594097ce..78d2cc3336 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -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 diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h index 75281b2343..6807287787 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h @@ -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; 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 a2533df3d5..977d0a5e29 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -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 \ 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 87e9ae0542..153634818b 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -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; 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 a770abcb63..46a15d4d29 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -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); 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 b1d53307ce..46a8b8dbdf 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -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 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 c21d760eb9..cf498eb726 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -6,6 +6,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) 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 6beefc7c3b..76f23bdecf 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index d0b44336bf..a97808faab 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -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 \ diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h index 21872aafce..a7b356e9f6 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 8ecca0200a..9da4c1b8b0 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h index 2ef37c54c9..0f4e072c09 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 504b26eaa9..98ae6c9af6 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index c873e075e3..ccc211dc8b 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -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; 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 5aa697f494..f6c459897e 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -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) 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 dc253717d5..9d86e154c0 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -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" typedef enum BusinessScrubLimb { @@ -59,7 +59,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*); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index ad1eb7e58f..dcc9f85449 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -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 diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h index 607810629c..29c302aed2 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 9f88469f2b..65070ac2c9 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h index 20199a7c2e..540a8951a3 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index b1631fe434..6228b1c2fd 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h index 13974bb1b1..f0bcab6ed1 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 5438c03f4b..1d967ed5fa 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index bef171c584..615304cb01 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -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; 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 5cd7fec6c5..c29dd72198 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -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) 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 664b175799..14bb2a524f 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -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; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 554512b148..d804326890 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -1,4 +1,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) diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h index 7f756596aa..7626924496 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h @@ -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; 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 cd3658756e..a5fd62af6d 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -5,7 +5,28 @@ */ #include "z_en_elf.h" +#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "regs.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" + #include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 2190065f71..60e9940d75 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -4,7 +4,6 @@ #include "ultra64.h" #include "z64actor.h" #include "z64light.h" -#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" struct EnElf; @@ -23,7 +22,7 @@ typedef struct EnElf { /* 0x0278 */ LightInfo lightInfoNoGlow; /* 0x0288 */ LightNode* lightNodeNoGlow; /* 0x028C */ Vec3f unk_28C; - /* 0x0298 */ ElfMsg* elfMsg; + /* 0x0298 */ struct ElfMsg* elfMsg; /* 0x029C */ f32 unk_29C; /* 0x02A0 */ f32 unk_2A0; /* 0x02A4 */ f32 unk_2A4; 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 e513de558e..f087917032 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -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) 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 2dc033f98c..b9c8c1d882 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -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 { diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 55f97c3686..c61b3d7103 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -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 diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h index 33dcca4447..7ba20450e8 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h @@ -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; 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 e4d6d3e049..f9af6f916d 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 @@ -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) 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 6a72e29224..23f7a29776 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -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) 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 165cc5c26e..529815b7f7 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -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; 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 035a825073..4e31c7b77f 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -5,6 +5,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) 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 4c30b8773b..4aefd1ad97 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -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; 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 ee133164c2..a144c4b3c6 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -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 \ 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 95a365dd9b..2bed02b4a0 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -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 { diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index bb11ab8f58..7332f89eaa 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -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 | \ diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h index 7940a98157..7342d1f606 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h @@ -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 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 af3ca60170..6ded127aef 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,4 +1,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 \ 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 a7fa2d7134..277e039e2d 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -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 { diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 8cfec63ce1..b02686145d 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -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" diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h index 58e19ea9c1..c680fb1440 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h @@ -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, diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 8ecd36af5e..c36cbeb5d4 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -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) diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index 8ca9f1ac6a..e1a7ff3ea0 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -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; 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 47e40b5af1..22b37cbab5 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -5,8 +5,13 @@ */ #include "z_en_girla.h" + +#include "rand.h" +#include "sys_matrix.h" #include "terminal.h" +#include "z_lib.h" #include "z64draw.h" +#include "z64play.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 971d0109c4..504837044e 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -2,14 +2,14 @@ #define Z_EN_GIRLA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnGirlA; -typedef void (*EnGirlAActionFunc)(struct EnGirlA*, PlayState*); -typedef void (*EnGirlA2Func)(PlayState*, struct EnGirlA*); -typedef void (*EnGirlA3Func)(Actor*, PlayState*, s32); -typedef s32 (*EnGirlA4Func)(PlayState*, struct EnGirlA*); +typedef void (*EnGirlAActionFunc)(struct EnGirlA*, struct PlayState*); +typedef void (*EnGirlA2Func)(struct PlayState*, struct EnGirlA*); +typedef void (*EnGirlA3Func)(Actor*, struct PlayState*, s32); +typedef s32 (*EnGirlA4Func)(struct PlayState*, struct EnGirlA*); typedef struct EnGirlA { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 575df93e53..f2e02c709c 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -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) diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h index a0a97f20fb..c901cc937c 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h @@ -2,7 +2,7 @@ #define Z_EN_GOMA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" typedef enum GomaType { /* 0 */ ENGOMA_NORMAL, @@ -13,7 +13,7 @@ typedef enum GomaType { struct EnGoma; -typedef void (*EnGomaActionFunc)(struct EnGoma*, PlayState*); +typedef void (*EnGomaActionFunc)(struct EnGoma*, struct PlayState*); typedef enum EnGomaLimb { /* 0 */ GOMA_LIMB_NONE, diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 0bc4ac8119..af76fe441f 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -5,8 +5,23 @@ */ #include "z_en_heishi1.h" -#include "assets/objects/object_sd/object_sd.h" + +#include "libc64/math64.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_lib.h" +#include "z64debug_display.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_sd/object_sd.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h index 93bc570223..bc1837241e 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h @@ -2,11 +2,11 @@ #define Z_EN_HEISHI1_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnHeishi1; -typedef void (*EnHeishi1ActionFunc)(struct EnHeishi1*, PlayState*); +typedef void (*EnHeishi1ActionFunc)(struct EnHeishi1*, struct PlayState*); typedef struct EnHeishi1 { /* 0x0000 */ Actor actor; 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 9a77366416..bdee0a8ad0 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -5,6 +5,21 @@ */ #include "z_en_honotrap.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_math3d.h" +#include "sys_matrix.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/gameplay_dangeon_keep/gameplay_dangeon_keep.h" 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 f1b085686c..debd2bfb7c 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -2,11 +2,11 @@ #define Z_EN_HONOTRAP_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnHonotrap; -typedef void (*EnHonotrapActionFunc)(struct EnHonotrap*, PlayState*); +typedef void (*EnHonotrapActionFunc)(struct EnHonotrap*, struct PlayState*); typedef union EnHonotrapCollider { struct { 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 075facff4d..5429024c74 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -5,10 +5,32 @@ */ #include "z_en_horse.h" -#include "z64horse.h" -#include "global.h" -#include "versions.h" #include "overlays/actors/ovl_En_In/z_en_in.h" + +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" +#include "rumble.h" +#include "segmented_address.h" +#include "seqcmd.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "versions.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64horse.h" +#include "z64play.h" +#include "z64player.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/object_horse/object_horse.h" #include "assets/objects/object_hni/object_hni.h" #include "assets/scenes/overworld/spot09/spot09_scene.h" diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index c760dc54d7..7764f3d020 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -706,7 +706,7 @@ void EnHorseNormal_Draw(Actor* thisx, PlayState* play2) { if (mtx == NULL) { return; } - gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_800A63CC(&this->actor, play, &this->skin, NULL, NULL, true, 0, SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS | SKIN_DRAW_FLAG_CUSTOM_MATRIX); 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 e95e5d4fac..e6e2d09247 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -5,10 +5,27 @@ */ #include "z_en_ik.h" -#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" -#include "assets/objects/object_ik/object_ik.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "rumble.h" +#include "sfx.h" +#include "sequence.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" +#include "z64skin_matrix.h" + +#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" +#include "assets/objects/object_ik/object_ik.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 70c45063b5..a0ecd34d0f 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -2,11 +2,11 @@ #define Z_EN_IK_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnIk; -typedef void (*EnIkActionFunc)(struct EnIk*, PlayState*); +typedef void (*EnIkActionFunc)(struct EnIk*, struct PlayState*); #define IK_GET_UPPER_PARAMS(thisx) PARAMS_GET_NOSHIFT(this->actor.params, 8, 8) #define IK_GET_ARMOR_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 8) 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 7ce346f633..333550942f 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,6 +1,23 @@ #include "z_en_in.h" -#include "versions.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "letterbox.h" +#include "regs.h" +#include "segmented_address.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "versions.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #include "assets/objects/object_in/object_in.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 84b5db8bac..00774d0ddb 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -2,11 +2,11 @@ #define Z_EN_IN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnIn; -typedef void (*EnInActionFunc)(struct EnIn*, PlayState*); +typedef void (*EnInActionFunc)(struct EnIn*, struct PlayState*); typedef enum IngoLimb { /* 0x00 */ INGO_LIMB_NONE, 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 4740bbc791..51ad0b9b32 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -5,8 +5,20 @@ */ #include "z_en_insect.h" -#include "global.h" +#include "overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_math3d.h" #include "terminal.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 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 31d2c1d050..733758935d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -3,7 +3,6 @@ #include "ultra64.h" #include "z64actor.h" -#include "overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h" struct EnInsect; @@ -33,7 +32,7 @@ typedef struct EnInsect { /* 0x031A */ s16 actionTimer; /* 0x031C */ s16 lifeTimer; /* 0x031E */ s16 crawlSoundDelay; - /* 0x0320 */ ObjMakekinsuta* soilActor; + /* 0x0320 */ struct ObjMakekinsuta* soilActor; /* 0x0324 */ f32 unk_324; /* 0x0328 */ s16 unk_328; /* 0x032A */ u8 unk_32A; 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 7e84670426..38f818d01a 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -7,9 +7,23 @@ #include "z_en_ishi.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" #include "quake.h" #include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS ACTOR_FLAG_THROW_ONLY 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 f4469ea7bc..731929a384 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -2,7 +2,7 @@ #define Z_EN_ISHI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" // The switch flag value for this actor is constructed in a unique way. // There are two separate param values which get OR'd together to create one final switch flag index. @@ -25,9 +25,9 @@ typedef enum EnIshiType { struct EnIshi; -typedef void (*EnIshiActionFunc)(struct EnIshi*, PlayState*); -typedef void (*EnIshiEffectSpawnFunc)(struct EnIshi*, PlayState*); -typedef void (*EnIshiDrawFunc)(struct EnIshi*, PlayState*); +typedef void (*EnIshiActionFunc)(struct EnIshi*, struct PlayState*); +typedef void (*EnIshiEffectSpawnFunc)(struct EnIshi*, struct PlayState*); +typedef void (*EnIshiDrawFunc)(struct EnIshi*, struct PlayState*); typedef struct EnIshi { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 45a9390f63..7bd9d248f7 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -5,7 +5,18 @@ */ #include "z_en_kakasi2.h" + +#include "gfx_setupdl.h" +#include "one_point_cutscene.h" +#include "regs.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64debug_display.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_ka/object_ka.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h index 9309c16725..c3398d7e7f 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h @@ -2,11 +2,11 @@ #define Z_EN_KAKASI2_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnKakasi2; -typedef void (*EnKakasi2ActionFunc)(struct EnKakasi2*, PlayState*); +typedef void (*EnKakasi2ActionFunc)(struct EnKakasi2*, struct PlayState*); typedef struct EnKakasi2 { /* 0x0000 */ Actor actor; 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 e46125878e..eb6b0f1c23 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -7,10 +7,20 @@ #include "z_en_kusa.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" +#include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_kusa/object_kusa.h" -#include "terminal.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) 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 4a895fe15a..a375581cf9 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -2,11 +2,11 @@ #define Z_EN_KUSA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnKusa; -typedef void (*EnKusaActionFunc)(struct EnKusa*, PlayState*); +typedef void (*EnKusaActionFunc)(struct EnKusa*, struct PlayState*); typedef enum EnKusaType { /* 0 */ ENKUSA_TYPE_0, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 1e97b32486..485052002e 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -5,8 +5,24 @@ */ #include "z_en_mb.h" -#include "assets/objects/object_mb/object_mb.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 "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_mb/object_mb.h" /* * This actor can have three behaviors: diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h index 66afb9eeb1..8c3ddc6029 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h @@ -2,11 +2,11 @@ #define Z_EN_MB_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnMb; -typedef void (*EnMbActionFunc)(struct EnMb*, PlayState*); +typedef void (*EnMbActionFunc)(struct EnMb*, struct PlayState*); typedef enum EnMbState { /* 0 */ ENMB_STATE_SPEAR_SPEARPATH_DAMAGED, 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 144c76b2cb..284e725a6c 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -5,10 +5,27 @@ */ #include "z_en_niw.h" -#include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" + +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "rand.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_niw/object_niw.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h index 283b6a52cd..a0f58d0a35 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -2,11 +2,11 @@ #define Z_EN_NIW_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnNiw; -typedef void (*EnNiwActionFunc)(struct EnNiw*, PlayState*); +typedef void (*EnNiwActionFunc)(struct EnNiw*, struct PlayState*); typedef struct EnNiwEffect { /* 0x0000 */ u8 type; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 6af946ddeb..8521831bcb 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -5,8 +5,20 @@ */ #include "z_en_niw_girl.h" -#include "assets/objects/object_gr/object_gr.h" +#include "overlays/actors/ovl_En_Niw/z_en_niw.h" + +#include "libc64/math64.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "segmented_address.h" +#include "sys_matrix.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_gr/object_gr.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h index e63e2df72f..422cf33e48 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h @@ -2,12 +2,11 @@ #define Z_EN_NIW_GIRL_H #include "ultra64.h" -#include "global.h" -#include "../ovl_En_Niw/z_en_niw.h" +#include "z64actor.h" struct EnNiwGirl; -typedef void (*EnNiwGirlActionFunc)(struct EnNiwGirl*, PlayState*); +typedef void (*EnNiwGirlActionFunc)(struct EnNiwGirl*, struct PlayState*); typedef struct EnNiwGirl { /* 0x0000 */ Actor actor; @@ -27,7 +26,7 @@ typedef struct EnNiwGirl { /* 0x027A */ s16 unk_27A; /* 0x027C */ f32 unk_27C; /* 0x0280 */ f32 unk_280; - /* 0x0284 */ EnNiw* chasedEnNiw; + /* 0x0284 */ struct EnNiw* chasedEnNiw; /* 0x0288 */ ColliderCylinder collider; /* 0x02D4 */ NpcInteractInfo interactInfo; } EnNiwGirl; // size = 0x02FC 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 114971a1de..d76c28b720 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -6,6 +6,15 @@ #include "z_en_nutsball.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_dekunuts/object_dekunuts.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" 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 00fe77a05c..bcd4e0a936 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -2,7 +2,7 @@ #define Z_EN_NUTSBALL_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" #define NUTSBALL_GET_TYPE(thisx) ((thisx)->params) @@ -16,7 +16,7 @@ typedef enum EnNutsballType { struct EnNutsball; -typedef void (*EnNutsballActionFunc)(struct EnNutsball*, PlayState*); +typedef void (*EnNutsballActionFunc)(struct EnNutsball*, struct PlayState*); typedef struct EnNutsball { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index e31bd37d52..37bc973c1c 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -1,4 +1,18 @@ #include "z_en_ny.h" + +#include "libc64/math64.h" +#include "attributes.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 "assets/objects/object_ny/object_ny.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h index 18c109cc51..477fcf7b5c 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h @@ -2,11 +2,11 @@ #define Z_EN_NY_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnNy; -typedef void (*EnNyActionFunc)(struct EnNy*, PlayState*); +typedef void (*EnNyActionFunc)(struct EnNy*, struct PlayState*); typedef struct EnNy { /* 0x0000 */ Actor actor; 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 40eef58eb4..0e02db3bab 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 @@ -5,10 +5,17 @@ */ #include "z_en_okarina_effect.h" + +#include "regs.h" +#include "sequence.h" #include "terminal.h" #include "versions.h" - +#include "z64audio.h" +#include "z64debug_display.h" #include "z64frame_advance.h" +#include "z64play.h" + +#include "global.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 f45c4a88ee..bca8c99234 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 @@ -2,11 +2,11 @@ #define Z_EN_OKARINA_EFFECT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnOkarinaEffect; -typedef void (*EnOkarinaEffectActionFunc)(struct EnOkarinaEffect*, PlayState*); +typedef void (*EnOkarinaEffectActionFunc)(struct EnOkarinaEffect*, struct PlayState*); typedef struct EnOkarinaEffect { /* 0x0000 */ Actor actor; 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 96928130ae..6f6d65ca54 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 @@ -5,10 +5,22 @@ */ #include "z_en_okarina_tag.h" -#include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" -#include "assets/scenes/overworld/spot02/spot02_scene.h" + +#include "attributes.h" +#include "regs.h" +#include "segmented_address.h" +#include "sfx.h" #include "terminal.h" #include "versions.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64debug_display.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" +#include "assets/scenes/overworld/spot02/spot02_scene.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 1192d0cfce..76ac1581a5 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 @@ -2,11 +2,11 @@ #define Z_EN_OKARINA_TAG_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnOkarinaTag; -typedef void (*EnOkarinaTagActionFunc)(struct EnOkarinaTag*, PlayState*); +typedef void (*EnOkarinaTagActionFunc)(struct EnOkarinaTag*, struct PlayState*); typedef struct EnOkarinaTag { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index f0c0b4d3b3..2ff69c780e 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -1,5 +1,6 @@ -#include "z_en_okarina_tag.h" +#include "sequence.h" #include "z64cutscene_commands.h" +#include "z64player.h" // clang-format off CutsceneData gWindmillSpinningFasterCs[] = { 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 0baff94145..1e89d5fcd7 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -1,4 +1,17 @@ #include "z_en_okuta.h" + +#include "libc64/qrand.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_okuta/object_okuta.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) 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 01c2ba1140..5409481022 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -2,11 +2,11 @@ #define Z_EN_OKUTA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnOkuta; -typedef void (*EnOkutaActionFunc)(struct EnOkuta*, PlayState*); +typedef void (*EnOkutaActionFunc)(struct EnOkuta*, struct PlayState*); typedef struct EnOkuta { /* 0x0000 */ Actor actor; 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 a083ef85d7..fa8b531406 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,5 +1,21 @@ #include "z_en_ossan.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" +#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" +#include "overlays/actors/ovl_En_Tana/z_en_tana.h" + +#include "libc64/qrand.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" +#include "segmented_address.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_ossan/object_ossan.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" @@ -7,7 +23,6 @@ #include "assets/objects/object_zo/object_zo.h" #include "assets/objects/object_rs/object_rs.h" #include "assets/objects/object_ds2/object_ds2.h" -#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "assets/objects/object_masterkokiri/object_masterkokiri.h" #include "assets/objects/object_km1/object_km1.h" #include "assets/objects/object_mastergolon/object_mastergolon.h" 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 c2101e9d9e..7df4be57b8 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -2,17 +2,15 @@ #define Z_EN_OSSAN_H #include "ultra64.h" -#include "global.h" -#include "overlays/actors/ovl_En_Tana/z_en_tana.h" -#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" +#include "z64actor.h" struct EnOssan; -typedef void (*EnOssanActionFunc)(struct EnOssan*, PlayState*); -typedef void (*EnOssanTalkOwnerFunc)(PlayState*); -typedef void (*EnOssanInitFunc)(struct EnOssan*, PlayState*); +typedef void (*EnOssanActionFunc)(struct EnOssan*, struct PlayState*); +typedef void (*EnOssanTalkOwnerFunc)(struct PlayState*); +typedef void (*EnOssanInitFunc)(struct EnOssan*, struct PlayState*); typedef s16 (*EnOssanGetGirlAParamsFunc)(s16); -typedef void (*EnOssanStateFunc)(struct EnOssan*, PlayState*, Player*); +typedef void (*EnOssanStateFunc)(struct EnOssan*, struct PlayState*, struct Player*); typedef struct StickDirectionPrompt { /* 0x00 */ u32 stickColorR; @@ -37,7 +35,7 @@ typedef struct EnOssan { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ EnOssanActionFunc actionFunc; - /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, PlayState*); + /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, struct PlayState*); /* 0x0198 */ ColliderCylinder collider; // unused /* 0x01E4 */ s16 timer; /* 0x01E6 */ s16 delayTimer; @@ -53,11 +51,11 @@ typedef struct EnOssan { /* 0x01F8 */ void (*blinkFunc)(struct EnOssan*); /* 0x01FC */ s16 stateFlag; /* 0x01FE */ s16 tempStateFlag; - /* 0x0200 */ EnGirlA* shelfSlots[8]; + /* 0x0200 */ struct EnGirlA* shelfSlots[8]; // Shelves are indexed as such: /* 7 5 3 1 */ /* 6 4 2 0 */ - /* 0x0220 */ EnTana* shelves; + /* 0x0220 */ struct EnTana* shelves; /* 0x0224 */ s32 stickAccumX; /* 0x0228 */ s32 stickAccumY; /* 0x022C */ u8 moveHorizontal; 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 215442f52e..c10a8edcb4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -5,6 +5,20 @@ */ #include "z_en_part.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_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" 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 3502d80a80..405e795e75 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -2,11 +2,11 @@ #define Z_EN_PART_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnPart; -typedef void (*EnPartActionFunc)(struct EnPart*, PlayState*); +typedef void (*EnPartActionFunc)(struct EnPart*, struct PlayState*); typedef struct EnPart { /* 0x000 */ Actor actor; 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 6265f2c5f3..adaf5e84d8 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,8 +1,23 @@ #include "z_en_peehat.h" -#include "assets/objects/object_peehat/object_peehat.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#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_peehat/object_peehat.h" + #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) 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 2449fc3405..a10bff420a 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -2,7 +2,7 @@ #define Z_EN_PEEHAT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" typedef enum PeahatType { /* -1 */ PEAHAT_TYPE_GROUNDED = -1, @@ -12,7 +12,7 @@ typedef enum PeahatType { struct EnPeehat; -typedef void (*EnPeehatActionFunc)(struct EnPeehat*, PlayState*); +typedef void (*EnPeehatActionFunc)(struct EnPeehat*, struct PlayState*); typedef struct EnPeehat { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index e515efabed..a0f605204c 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -6,6 +6,22 @@ #include "z_en_po_relay.h" #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.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 "z64light.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_tk/object_tk.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h index 70567ada79..e4a440d940 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h @@ -2,11 +2,12 @@ #define Z_EN_PO_RELAY_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct EnPoRelay; -typedef void (*EnPoRelayActionFunc)(struct EnPoRelay*, PlayState*); +typedef void (*EnPoRelayActionFunc)(struct EnPoRelay*, struct PlayState*); typedef struct EnPoRelay { /* 0x0000 */ Actor actor; 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 3af363a28f..1b549f772d 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 @@ -5,6 +5,25 @@ */ #include "z_en_po_sisters.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "one_point_cutscene.h" +#include "rand.h" +#include "sequence.h" +#include "sfx.h" +#include "ichain.h" +#include "sys_matrix.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" 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 524f8a867f..bc25e9d035 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 @@ -2,11 +2,12 @@ #define Z_EN_PO_SISTERS_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct EnPoSisters; -typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, PlayState*); +typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, struct PlayState*); typedef struct EnPoSisters { /* 0x0000 */ Actor actor; 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 2168c89e6b..2deead5141 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -5,6 +5,22 @@ */ #include "z_en_poh.h" + +#include "libc64/qrand.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 "z64light.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.h" 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 749047b75f..93dd40e176 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -2,11 +2,12 @@ #define Z_EN_POH_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct EnPoh; -typedef void (*EnPohActionFunc)(struct EnPoh*, PlayState*); +typedef void (*EnPohActionFunc)(struct EnPoh*, struct PlayState*); typedef enum EnPohType { EN_POH_NORMAL, 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 d5766aaf9c..b735514051 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -14,6 +14,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" diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 1fbcc178ad..fb3f20bc6c 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -7,7 +7,22 @@ #include "z_en_reeba.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" + +#include "libc64/qrand.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "regs.h" +#include "sfx.h" #include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64debug_display.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_reeba/object_reeba.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index 36173bf355..a357af86ef 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -2,11 +2,11 @@ #define Z_EN_REEBA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnReeba; -typedef void (*EnReebaActionFunc)(struct EnReeba*, PlayState*); +typedef void (*EnReebaActionFunc)(struct EnReeba*, struct PlayState*); typedef struct EnReeba { /* 0x0000 */ Actor actor; 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 ff67d09329..f252b8d08e 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -5,9 +5,24 @@ */ #include "z_en_rr.h" -#include "assets/objects/object_rr/object_rr.h" + +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.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_rr/object_rr.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ 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 44ac232668..f0ed5b5c30 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -2,11 +2,11 @@ #define Z_EN_RR_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnRr; -typedef void (*EnRrActionFunc)(struct EnRr*, PlayState*); +typedef void (*EnRrActionFunc)(struct EnRr*, struct PlayState*); typedef struct EnRrBodySegment { /* 0x00 */ f32 height; 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 647d321273..d1a2d3715f 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -5,7 +5,17 @@ */ #include "z_en_sb.h" + +#include "attributes.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" #include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_sb/object_sb.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) 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 a6dbd2cdf8..f2f0e42adb 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -2,11 +2,11 @@ #define Z_EN_SB_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSb; -typedef void (*EnSbActionFunc)(struct EnSb*, PlayState*); +typedef void (*EnSbActionFunc)(struct EnSb*, struct PlayState*); typedef struct EnSb { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 8eb853a808..eee717b358 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -5,6 +5,17 @@ */ #include "z_en_shopnuts.h" +#include "overlays/actors/ovl_En_Dns/z_en_dns.h" +#include "overlays/actors/ovl_En_Nutsball/z_en_nutsball.h" + +#include "gfx.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + +#include "assets/objects/object_shopnuts/object_shopnuts.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h index 33971269f7..8bea3a0a68 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h @@ -2,15 +2,14 @@ #define Z_EN_SHOPNUTS_H #include "ultra64.h" -#include "global.h" -#include "overlays/actors/ovl_En_Dns/z_en_dns.h" -#include "overlays/actors/ovl_En_Nutsball/z_en_nutsball.h" +#include "z64actor.h" +#include "assets/objects/object_shopnuts/object_shopnuts.h" struct EnShopnuts; #define SHOPNUTS_GET_TYPE(thisx) ((thisx)->params) -typedef void (*EnShopnutsActionFunc)(struct EnShopnuts*, PlayState*); +typedef void (*EnShopnutsActionFunc)(struct EnShopnuts*, struct PlayState*); typedef struct EnShopnuts { /* 0x0000 */ Actor actor; 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 1a61fcfb9d..b6a7ef4398 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -6,6 +6,20 @@ #include "z_en_skb.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.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 "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_skb/object_skb.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 216b5848cc..dc5f15f9c0 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -2,11 +2,11 @@ #define Z_EN_SKB_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSkb; -typedef void (*EnSkbActionFunc)(struct EnSkb*, PlayState*); +typedef void (*EnSkbActionFunc)(struct EnSkb*, struct PlayState*); typedef struct EnSkb { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 2c576afbcb..9d8ff555ca 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1,5 +1,25 @@ #include "z_en_skj.h" #include "overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "regs.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64debug_display.h" +#include "z64ocarina.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #include "assets/objects/object_skj/object_skj.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h index dc0f97cc92..1d49c81c42 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h @@ -2,11 +2,11 @@ #define Z_EN_SKJ_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSkj; -typedef void (*EnSkjActionFunc)(struct EnSkj*, PlayState*); +typedef void (*EnSkjActionFunc)(struct EnSkj*, struct PlayState*); typedef struct EnSkj { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 0804263355..91e9273054 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -5,6 +5,13 @@ */ #include "z_en_skjneedle.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_skj/object_skj.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h index 1c4f444946..08ec8f4639 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h @@ -2,7 +2,7 @@ #define Z_EN_SKJNEEDLE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSkjneedle; 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 d7b6a20e50..347680b3f7 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -5,6 +5,18 @@ */ #include "z_en_st.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_st/object_st.h" #define 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 4200ca0d32..f2c070ab84 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -2,11 +2,11 @@ #define Z_EN_ST_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSt; -typedef void (*EnStActionFunc)(struct EnSt* this, PlayState* play); +typedef void (*EnStActionFunc)(struct EnSt* this, struct PlayState* play); typedef struct EnSt { /* 0x0000 */ Actor actor; 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 b9b6b47c94..bb80c4bfcf 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,4 +1,19 @@ #include "z_en_sw.h" + +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "attributes.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 "z64player.h" + #include "assets/objects/object_st/object_st.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 c766e9f9e9..20e1888e55 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -2,11 +2,11 @@ #define Z_EN_SW_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSw; -typedef void (*EnSwActionFunc)(struct EnSw* this, PlayState* play); +typedef void (*EnSwActionFunc)(struct EnSw* this, struct PlayState* play); typedef struct EnSw { /* 0x0000 */ Actor actor; @@ -34,7 +34,7 @@ typedef struct EnSw { /* 0x0420 */ f32 unk_420; /* 0x0424 */ char unk_424[0x8]; /* 0x042C */ u8 unk_42C; - /* 0x0430 */ CollisionPoly* unk_430; + /* 0x0430 */ struct CollisionPoly* unk_430; /* 0x0434 */ Vec3f unk_434; /* 0x0440 */ s16 unk_440; /* 0x0442 */ s16 unk_442; diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index ed7d99541f..6c2ae0f09f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -1,9 +1,17 @@ #include "z_en_syateki_itm.h" -#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h" +#include "rand.h" +#include "regs.h" +#include "sfx.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 typedef enum EnSyatekItemRound { diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h index c670208bec..46f54b7c79 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h @@ -2,11 +2,11 @@ #define Z_EN_SYATEKI_ITM_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSyatekiItm; -typedef void (*EnSyatekiItmActionFunc)(struct EnSyatekiItm*, PlayState*); +typedef void (*EnSyatekiItmActionFunc)(struct EnSyatekiItm*, struct PlayState*); typedef enum EnSyatekiSignal { /* 0 */ ENSYATEKI_NONE, 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 5575182fe6..b4dfce2165 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 @@ -1,6 +1,17 @@ #include "z_en_syateki_man.h" -#include "terminal.h" #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "one_point_cutscene.h" +#include "regs.h" +#include "seqcmd.h" +#include "sequence.h" +#include "terminal.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_ossan/object_ossan.h" #define 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 eea46817ff..306c33104f 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 @@ -2,11 +2,11 @@ #define Z_EN_SYATEKI_MAN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnSyatekiMan; -typedef void (*EnSyatekiManActionFunc) (struct EnSyatekiMan*, PlayState*); +typedef void (*EnSyatekiManActionFunc) (struct EnSyatekiMan*, struct PlayState*); typedef void (*EnSyatekiManOtherFunc) (struct EnSyatekiMan*); typedef struct EnSyatekiMan { diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 866329c2ab..28397c9c53 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -5,6 +5,13 @@ */ #include "z_en_tana.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_shop_dungen/object_shop_dungen.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h index 763d1303c6..1804bcd798 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h @@ -2,7 +2,7 @@ #define Z_EN_TANA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnTana; 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 c8257aa85e..0f9a9aa228 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -13,13 +13,13 @@ #include "ichain.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_sk2/object_sk2.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 b253b7ea0b..ede13c3e71 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -7,7 +7,21 @@ #include "z_en_tite.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.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 "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_tite/object_tite.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 a049cabaae..a383e4d11e 100755 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -2,11 +2,11 @@ #define Z_EN_TITE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnTite; -typedef void (*EnTiteActionFunc)(struct EnTite*, PlayState*); +typedef void (*EnTiteActionFunc)(struct EnTite*, struct PlayState*); typedef enum EnTiteType { /* -2 */ TEKTITE_BLUE = -2, 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 747b0085c6..a19b7ecc13 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -5,6 +5,21 @@ */ #include "z_en_tk.h" + +#include "libc64/math64.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 "z_en_item00.h" +#include "z_lib.h" +#include "z64play.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tk/object_tk.h" 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 208b4e81d7..2ce0b9ef87 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -2,8 +2,7 @@ #define Z_EN_TK_H #include "ultra64.h" -#include "global.h" -#include "z64.h" +#include "z64actor.h" /* Dirt particle effect */ struct EnTkEff; @@ -22,7 +21,7 @@ typedef struct EnTkEff { struct EnTk; -typedef void (*EnTkActionFunc)(struct EnTk*, PlayState*); +typedef void (*EnTkActionFunc)(struct EnTk*, struct PlayState*); typedef struct EnTk { /* 0x0000 */ Actor actor; 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 8e69a1537f..3764145d20 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -5,9 +5,26 @@ */ #include "z_en_torch2.h" -#include "assets/objects/object_torch2/object_torch2.h" + +#include "libc64/qrand.h" #include "libu64/pad.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sfx.h" +#include "sequence.h" #include "versions.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_torch2/object_torch2.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ 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 d96b08527e..bb132bc91e 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -2,7 +2,7 @@ #define Z_EN_TORCH2_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" // Uses the Player struct (from z64player.h) diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 79500059b5..e18621b19e 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -5,7 +5,23 @@ */ #include "z_en_tp.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.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 "assets/objects/object_tp/object_tp.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h index f878ab934a..5b0645b50a 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h @@ -2,11 +2,11 @@ #define Z_EN_TP_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnTp; -typedef void (*EnTpActionFunc)(struct EnTp*, PlayState*); +typedef void (*EnTpActionFunc)(struct EnTp*, struct PlayState*); typedef struct EnTp { /* 0x0000 */ Actor actor; 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 8db28db170..57ece9581d 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 @@ -5,9 +5,19 @@ */ #include "z_en_tubo_trap.h" -#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "regs.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/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 17dc2f2054..3abe8b625a 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 @@ -2,11 +2,11 @@ #define Z_EN_TUBO_TRAP_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnTuboTrap; -typedef void (*EnTuboTrapActionFunc)(struct EnTuboTrap*, PlayState*); +typedef void (*EnTuboTrapActionFunc)(struct EnTuboTrap*, struct PlayState*); typedef struct EnTuboTrap { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index fa83618611..011b004b68 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -5,6 +5,19 @@ */ #include "z_en_vali.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 "assets/objects/object_vali/object_vali.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h index c5df42825b..1a031d964b 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h @@ -2,11 +2,11 @@ #define Z_EN_VALI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnVali; -typedef void (*EnValiActionFunc)(struct EnVali*, PlayState*); +typedef void (*EnValiActionFunc)(struct EnVali*, struct PlayState*); typedef enum EnValiLimb { /* 0x00 */ EN_VALI_LIMB_NONE, 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 9847d4fa8d..d5d2ec1b06 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -5,8 +5,22 @@ */ #include "z_en_vm.h" -#include "assets/objects/object_vm/object_vm.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.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 "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_vm/object_vm.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 5b0fe1629e..7705d87032 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -2,11 +2,11 @@ #define Z_EN_VM_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnVm; -typedef void (*EnVmActionFunc)(struct EnVm*, PlayState*); +typedef void (*EnVmActionFunc)(struct EnVm*, struct PlayState*); typedef struct EnVm { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index c650e79e85..28411c959f 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -15,11 +15,10 @@ #include "quake.h" #include "terminal.h" #include "z_lib.h" +#include "z64debug_display.h" #include "z64effect.h" #include "z64play.h" -#include "global.h" - #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnWallTubo_Init(Actor* thisx, PlayState* play); 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 abbf3ecaa0..ddd3744d5b 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -5,8 +5,21 @@ */ #include "z_en_wallmas.h" -#include "assets/objects/object_wallmaster/object_wallmaster.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.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_wallmaster/object_wallmaster.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 c82df375dc..76ee52d9e0 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -2,7 +2,7 @@ #define Z_EN_WALLMAS_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" typedef enum WallmasType { /* 0x00 */ WMT_TIMER, @@ -12,7 +12,7 @@ typedef enum WallmasType { struct EnWallmas; -typedef void (*EnWallmasActionFunc)(struct EnWallmas*, PlayState*); +typedef void (*EnWallmasActionFunc)(struct EnWallmas*, struct PlayState*); typedef struct EnWallmas { /* 0x0000 */ Actor actor; 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 a7268efc97..86f9fabc11 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 @@ -5,8 +5,14 @@ */ #include "z_en_weather_tag.h" + +#include "regs.h" #include "terminal.h" #include "versions.h" +#include "z_lib.h" +#include "z64debug_display.h" +#include "z64play.h" +#include "z64player.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 ccfc0e3f67..52b617a0e7 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 @@ -2,11 +2,11 @@ #define Z_EN_WEATHER_TAG_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWeatherTag; -typedef void (*EnWeatherTagActionFunc)(struct EnWeatherTag*, PlayState*); +typedef void (*EnWeatherTagActionFunc)(struct EnWeatherTag*, struct PlayState*); typedef struct EnWeatherTag { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 3d3387fcd2..b312e0fd6a 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -5,6 +5,20 @@ */ #include "z_en_weiyer.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) diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h index fbaefbd9a5..ab1b81c34f 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h @@ -2,11 +2,11 @@ #define Z_EN_WEIYER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWeiyer; -typedef void (*EnWeiyerActionFunc)(struct EnWeiyer*, PlayState*); +typedef void (*EnWeiyerActionFunc)(struct EnWeiyer*, struct PlayState*); typedef struct EnWeiyer { /* 0x0000 */ Actor actor; 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 36aaac2344..e68242cdf9 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -5,8 +5,25 @@ */ #include "z_en_wf.h" -#include "terminal.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.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 "terminal.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_wf/object_wf.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 83e46e6d19..7f38a95495 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -2,11 +2,11 @@ #define Z_EN_WF_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWf; -typedef void (*EnWfActionFunc)(struct EnWf*, PlayState*); +typedef void (*EnWfActionFunc)(struct EnWf*, struct PlayState*); typedef enum EnWfLimb { /* 0 */ WOLFOS_LIMB_NONE, diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index b60361d810..94dca26a3b 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -5,7 +5,15 @@ */ #include "z_en_wonder_item.h" + +#include "regs.h" +#include "sfx.h" #include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64debug_display.h" +#include "z64play.h" +#include "z64player.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h index 4aca3ffe0a..5b99e235c3 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h @@ -2,11 +2,11 @@ #define Z_EN_WONDER_ITEM_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWonderItem; -typedef void (*EnWonderItemUpdateFunc)(struct EnWonderItem*, PlayState*); +typedef void (*EnWonderItemUpdateFunc)(struct EnWonderItem*, struct PlayState*); typedef struct EnWonderItem { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index ba76e3877b..0f235f1224 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -5,7 +5,11 @@ */ #include "z_en_wonder_talk.h" + +#include "regs.h" #include "terminal.h" +#include "z64debug_display.h" +#include "z64play.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h index ae21c5b41f..a42c3febfc 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h @@ -2,11 +2,11 @@ #define Z_EN_WONDER_TALK_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWonderTalk; -typedef void (*EnWonderTalkFunc)(struct EnWonderTalk*, PlayState*); +typedef void (*EnWonderTalkFunc)(struct EnWonderTalk*, struct PlayState*); typedef struct EnWonderTalk { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 578c9851dc..a8b118d25b 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -5,7 +5,12 @@ */ #include "z_en_wonder_talk2.h" + +#include "regs.h" #include "terminal.h" +#include "z64debug_display.h" +#include "z64play.h" +#include "z64player.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h index f58775426f..0dad49d375 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h @@ -2,11 +2,11 @@ #define Z_EN_WONDER_TALK2_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWonderTalk2; -typedef void (*EnWonderTalk2Func)(struct EnWonderTalk2*, PlayState*); +typedef void (*EnWonderTalk2Func)(struct EnWonderTalk2*, struct PlayState*); typedef struct EnWonderTalk2 { /* 0x0000 */ Actor actor; 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 c66a2232dd..bf32807226 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -5,6 +5,21 @@ */ #include "z_en_wood02.h" + +#include "libc64/qrand.h" +#include "attributes.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 "z64play.h" +#include "z64player.h" +#include "z64skin_matrix.h" + #include "assets/objects/object_wood02/object_wood02.h" #define FLAGS 0 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 14ca5b967e..89242188ae 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -2,7 +2,7 @@ #define Z_EN_WOOD02_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnWood02; diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index f294fb60c2..c9842c6d9f 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -5,7 +5,16 @@ */ #include "z_en_yabusame_mark.h" + +#include "regs.h" +#include "sequence.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64debug_display.h" +#include "z64effect.h" +#include "z64play.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h index f4ec71bec5..12cfb46cbb 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h @@ -2,11 +2,11 @@ #define Z_EN_YABUSAME_MARK_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnYabusameMark; -typedef void (*EnYabusameMarkActionFunc)(struct EnYabusameMark*, PlayState*); +typedef void (*EnYabusameMarkActionFunc)(struct EnYabusameMark*, struct PlayState*); typedef struct EnYabusameMark { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 70812e3f0f..41e4055fb2 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -5,6 +5,25 @@ */ #include "z_en_zf.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "regs.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_zf/object_zf.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h index c5ade78544..9dfb3119b9 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h @@ -2,11 +2,11 @@ #define Z_EN_ZF_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnZf; -typedef void (*EnZfActionFunc)(struct EnZf*, PlayState*); +typedef void (*EnZfActionFunc)(struct EnZf*, struct PlayState*); typedef enum EnZfType { /* -2 */ ENZF_TYPE_DINOLFOS = -2, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index dfefdf63b9..0aec93dbcb 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -19,6 +19,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "z_en_item00.h" #include "z_lib.h" #include "z64audio.h" #include "z64frame_advance.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 e845f465a5..04028bff74 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -5,7 +5,13 @@ */ #include "z_item_etcetera.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "rand.h" #include "z64draw.h" +#include "z64effect.h" +#include "z64play.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 c5054884bd..e938c81267 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -2,11 +2,11 @@ #define Z_ITEM_ETC_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ItemEtcetera; -typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, PlayState*); +typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, struct PlayState*); typedef struct ItemEtcetera { /* 0x0000 */ Actor actor; 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 3f36c3da17..40594c86f6 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -6,6 +6,7 @@ #include "z_item_inbox.h" #include "z64draw.h" +#include "z64play.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) 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 3bf3cf1570..d13bad0053 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -2,11 +2,11 @@ #define Z_ITEM_INBOX_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ItemInbox; -typedef void (*ItemInboxActionFunc)(struct ItemInbox*, PlayState*); +typedef void (*ItemInboxActionFunc)(struct ItemInbox*, struct PlayState*); typedef struct ItemInbox { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 434322abc5..61d19aee51 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -5,7 +5,14 @@ */ #include "z_item_ocarina.h" + +#include "libu64/debug.h" +#include "segmented_address.h" +#include "sfx.h" #include "z64draw.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/scenes/overworld/spot00/spot00_scene.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h index 9a02b99ed0..3ae598e7d1 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h @@ -2,11 +2,11 @@ #define Z_ITEM_OCARINA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ItemOcarina; -typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, PlayState*); +typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, struct PlayState*); typedef struct ItemOcarina { /* 0x0000 */ Actor actor; 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 1915999df6..8fd7f63d0b 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -5,6 +5,19 @@ */ #include "z_mir_ray.h" + +#include "libu64/debug.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mir_ray/object_mir_ray.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) 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 4e93149075..652516ec11 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -2,7 +2,8 @@ #define Z_MIR_RAY_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct MirRay; @@ -22,7 +23,7 @@ typedef struct MirRayDataEntry { typedef struct MirRayShieldReflection { /* 0x00 */ Vec3f pos; /* 0x0C */ MtxF mtx; - /* 0x4C */ CollisionPoly* reflectionPoly; + /* 0x4C */ struct CollisionPoly* reflectionPoly; /* 0x50 */ u8 opacity; } MirRayShieldReflection; // size = 0x54 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 a7bf1716d7..0ce75f8cfd 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -5,9 +5,25 @@ */ #include "z_obj_bean.h" -#include "assets/objects/object_mamenoki/object_mamenoki.h" -#include "assets/objects/gameplay_keep/gameplay_keep.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "regs.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "sys_matrix.h" #include "terminal.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_mamenoki/object_mamenoki.h" #define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS 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 317db48216..42ba39261c 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -2,11 +2,11 @@ #define Z_OBJ_BEAN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjBean; -typedef void (*ObjBeanActionFunc)(struct ObjBean*, PlayState*); +typedef void (*ObjBeanActionFunc)(struct ObjBean*, struct PlayState*); typedef void (*ObjBeanTransformFunc)(struct ObjBean*); typedef struct ObjBean { 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 6f86b829a4..495ca93b33 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -6,6 +6,17 @@ #include "z_obj_comb.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 "sys_matrix.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS 0 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 3a6ce86413..331648ed33 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -2,11 +2,11 @@ #define Z_OBJ_COMB_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjComb; -typedef void (*ObjCombActionFunc)(struct ObjComb*, PlayState*); +typedef void (*ObjCombActionFunc)(struct ObjComb*, struct PlayState*); typedef struct ObjComb { /* 0x0000 */ Actor actor; 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 0f26d40611..cb90bd2ce1 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -5,9 +5,19 @@ */ #include "z_obj_kibako.h" -#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.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 "z64player.h" + +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" + #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjKibako_Init(Actor* thisx, PlayState* play); 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 9378a51ce7..7538b53705 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -2,11 +2,11 @@ #define Z_OBJ_KIBAKO_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjKibako; -typedef void (*ObjKibakoActionFunc)(struct ObjKibako*, PlayState*); +typedef void (*ObjKibakoActionFunc)(struct ObjKibako*, struct PlayState*); typedef struct ObjKibako { /* 0x0000 */ Actor actor; 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 035dbb9b09..591909a579 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -5,9 +5,18 @@ */ #include "z_obj_kibako2.h" -#include "assets/objects/object_kibako2/object_kibako2.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.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_kibako2/object_kibako2.h" + #define FLAGS 0 void ObjKibako2_Init(Actor* thisx, PlayState* play); 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 73f0e90b67..177ef0b04c 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -2,11 +2,11 @@ #define Z_OBJ_KIBAKO2_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjKibako2; -typedef void (*ObjKibako2ActionFunc)(struct ObjKibako2*, PlayState*); +typedef void (*ObjKibako2ActionFunc)(struct ObjKibako2*, struct PlayState*); typedef struct ObjKibako2 { /* 0x0000 */ DynaPolyActor dyna; 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 90e1b5dda7..5d1f63d6b6 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -7,6 +7,10 @@ #include "z_obj_mure.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" +#include "libc64/qrand.h" +#include "ichain.h" +#include "z64play.h" + #define FLAGS 0 void ObjMure_Init(Actor* thisx, PlayState* play); 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 386c6ed0d8..20cf667daa 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -2,11 +2,11 @@ #define Z_OBJ_MURE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjMure; -typedef void (*ObjMureActionFunc)(struct ObjMure*, PlayState*); +typedef void (*ObjMureActionFunc)(struct ObjMure*, struct PlayState*); #define OBJMURE_MAX_SPAWNS 15 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 c9ed01e3c9..51035c0678 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -6,6 +6,12 @@ #include "z_obj_mure3.h" +#include "ichain.h" +#include "sys_math3d.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64play.h" + #define FLAGS 0 void ObjMure3_Init(Actor* thisx, PlayState* play); 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 415babc61b..fc9a3e83aa 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -2,17 +2,17 @@ #define Z_OBJ_MURE3_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjMure3; -typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, PlayState*); -typedef void (*ObjMure3SpawnFunc)(struct ObjMure3*, PlayState*); +typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, struct PlayState*); +typedef void (*ObjMure3SpawnFunc)(struct ObjMure3*, struct PlayState*); typedef struct ObjMure3 { /* 0x0000 */ Actor actor; /* 0x014C */ ObjMure3ActionFunc actionFunc; - /* 0x0150 */ EnItem00* unk_150[7]; + /* 0x0150 */ struct EnItem00* unk_150[7]; /* 0x016C */ u16 unk_16C; } ObjMure3; // size = 0x0170 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 7c221da0b8..acdf87414d 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -6,6 +6,17 @@ #include "z_obj_syokudai.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" 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 8c4e1b7d16..795e855ae8 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -2,7 +2,8 @@ #define Z_OBJ_SYOKUDAI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct ObjSyokudai; 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 a5911678e4..057d660ab4 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -6,6 +6,16 @@ #include "z_obj_tsubo.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.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 "z64player.h" + #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" 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 aa30398c78..8e27cc8310 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -2,11 +2,11 @@ #define Z_OBJ_TSUBO_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjTsubo; -typedef void (*ObjTsuboActionFunc)(struct ObjTsubo*, PlayState*); +typedef void (*ObjTsuboActionFunc)(struct ObjTsubo*, struct PlayState*); typedef struct ObjTsubo { /* 0x0000 */ Actor actor; 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 c7c63690b7..18ea2231d5 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -6,6 +6,14 @@ #include "z_oceff_storm.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); 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 e4b831a208..aebc002780 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -2,11 +2,11 @@ #define Z_OCEFF_STORM_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct OceffStorm; -typedef void (*OceffStormActionFunc)(struct OceffStorm*, PlayState*); +typedef void (*OceffStormActionFunc)(struct OceffStorm*, struct PlayState*); typedef struct OceffStorm { /* 0x0000 */ Actor actor; 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 a91fb67154..20d506b593 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -7,8 +7,20 @@ #include "z_shot_sun.h" #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "assets/scenes/overworld/spot06/spot06_scene.h" + +#include "one_point_cutscene.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_math3d.h" #include "terminal.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "z64environment.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/scenes/overworld/spot06/spot06_scene.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) 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 9687e5940e..4415e6e98f 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -2,11 +2,11 @@ #define Z_SHOT_SUN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ShotSun; -typedef void (*ShotSunActionFunc)(struct ShotSun*, PlayState*); +typedef void (*ShotSunActionFunc)(struct ShotSun*, struct PlayState*); typedef struct ShotSun { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 8ec56b193c..cffcfe1e44 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4,11 +4,6 @@ * Description: Link */ -#include "ultra64.h" -#include "global.h" -#include "quake.h" -#include "versions.h" - #include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h" #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h" #include "overlays/actors/ovl_En_Boom/z_en_boom.h" @@ -20,6 +15,38 @@ #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "letterbox.h" +#include "map.h" +#include "one_point_cutscene.h" +#include "quake.h" +#include "rand.h" +#include "regs.h" +#include "rumble.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "ultra64.h" +#include "versions.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "zelda_arena.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index f107473306..9ff1bd5a96 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_blast.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rInnerColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index b38f343e8e..bfceec5856 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_BLAST_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsBlastParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 4fd99e3626..a6f909b56a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_bomb.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define EFFSSBOMB_LIFESPAN 20 @@ -67,7 +78,7 @@ void EffectSsBomb_Draw(PlayState* play, u32 index, EffectSs* this) { SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h index 5d42b118c8..923739819b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBombInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index e848dd47b8..4ec61bc8ea 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_bomb2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h index 249a2a6507..8aea4d3cc5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB2_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBomb2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index be7d160712..f23d0a9aab 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_bubble.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index 3c3c8f80df..7701365bdc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BUBBLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 5b178002d1..b66766dd19 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_d_fire.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/object_dodongo/object_dodongo.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index c59c9add92..fbaa8aa28c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_D_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsDFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 56b7b4db36..e8b904a4b6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_dead_db.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sfx.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index 0ea6bd0fda..fb7fc84af1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DEAD_DB_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDeadDbInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index ac0df1b437..c6e2803bb9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_dead_dd.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index 80d46899e7..c9c91ec609 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DEAD_DD_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDeadDdInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 9d9c695d88..4d649d4be4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -5,6 +5,13 @@ */ #include "z_eff_ss_dead_ds.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index 3714bf41ba..7a7d57363a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_DEAD_DS_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsDeadDsInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 07335e2488..2f5901ca2e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_dt_bubble.h" + +#include "libc64/qrand.h" +#include "color.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index cac4c1a08c..6138c86046 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DT_BUBBLE_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDtBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index cdb56fc74e..899e9f2a2d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_dust.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] @@ -96,7 +107,7 @@ void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this) { SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index 5cb686ae94..958bde91f8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DUST_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDustInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 73795ab2d4..56dc375337 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_en_fire.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScaleMax regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index c511827ecf..14acb95e40 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -2,10 +2,10 @@ #define Z_EFF_SS_EN_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsEnFireInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ s16 scale; /* 0x12 */ s16 unk_12; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 4a2d5a584c..f4f8e01d1c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -5,7 +5,17 @@ */ #include "z_eff_ss_en_ice.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_math.h" +#include "sys_matrix.h" #include "versions.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 22929d39dd..238b005bcc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_EN_ICE_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsEnIceInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 scale; /* 0x14 */ Vec3f velocity; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index e3506295da..3af854c502 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_extra.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_yabusame_point/object_yabusame_point.h" #define rObjectSlot regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index c8047d21fa..1bf5a5d30c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_EXTRA_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsExtraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 6b07df0582..9f00f52e30 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_fcircle.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rUnused regs[3] // probably supposed to be an alpha diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index 2e3eb74184..fc2a4ec2de 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -2,10 +2,10 @@ #define Z_EFF_SS_FCIRCLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsFcircleInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ s16 radius; /* 0x12 */ s16 height; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 089c7f73eb..de4ae887bb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_fire_tail.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index 70f5df7e19..ebe8a7203d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_FIRE_TAIL_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsFireTailInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 scale; /* 0x14 */ Vec3f unk_14; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index 351fadab7c..05e4a3d8bf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -5,6 +5,11 @@ */ #include "z_eff_ss_g_fire.h" + +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" u32 EffectSsGFire_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index cfb5dcfafb..52312527d9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index f93bb0e7d6..9610917043 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -5,6 +5,12 @@ */ #include "z_eff_ss_g_magma.h" + +#include "libc64/qrand.h" +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" u32 EffectSsGMagma_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index ab1b97a1de..55215239d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_MAGMA_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGMagmaInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 11fc08606b..9ee5cbe831 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_g_magma2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_kingdodongo/object_kingdodongo.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index 715e01e7db..2ddc9f4ce7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_G_MAGMA2_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGMagma2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 48a2eec4f0..2c83108d35 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_g_ripple.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rWaterBoxNum regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index 63487ee0ca..86a7d8378e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_RIPPLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGRippleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index f43f4f3a52..a5472c29fa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_g_spk.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h index 8627bc0528..0d94bd7e0a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_G_SPK_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGSpkInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ Vec3f velocity; /* 0x1C */ Vec3f accel; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index 4e7c26308c..3baab32db9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -5,6 +5,11 @@ */ #include "z_eff_ss_g_splash.h" + +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object slot (`rgObjectSlot`) diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index c13e19cd1c..fa1907f667 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_G_SPLASH_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGSplashInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 2e279a5b12..5271fc1616 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -87,7 +87,7 @@ void EffectSsHitMark_Draw(PlayState* play, u32 index, EffectSs* this) { SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 7f0fc02fa1..9ce9885de3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_ice_piece.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_math.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index f7b376a7ad..afb96c213c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_PIECE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsIcePieceInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 9997240be7..5c1b5fc164 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_ice_smoke.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_fz/object_fz.h" #define rObjectSlot regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index 64833be518..24c27f1cf6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_SMOKE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsIceSmokeInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 10a3b668ab..12d9c5a5eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_k_fire.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rAlpha regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index 1896b47a73..eb8e8764d7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_K_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsKFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index 5973ca9e1e..f7c22aaa19 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -5,6 +5,18 @@ */ #include "z_eff_ss_kirakira.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rRotSpeed regs[0] @@ -97,7 +109,7 @@ void EffectSsKiraKira_Draw(PlayState* play, u32 index, EffectSs* this) { SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotY, &mfTransBillboardRotY); SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotY, &mfScale, &mfResult); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index 7f8c18da3e..0c128ff7ab 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_KIRAKIRA_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsKiraKiraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 0e2560e34f..f44ac38496 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_lightning.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] @@ -100,7 +111,7 @@ void EffectSsLightning_Draw(PlayState* play, u32 index, EffectSs* this) { SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotate, &mfTransBillboardRotate); SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotate, &mfScale, &mfResult); - gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index ad352e9013..39f5d51841 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_LIGHTNING_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsLightningInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index f707251cba..1dadd7f069 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -5,6 +5,18 @@ */ #include "z_eff_ss_sibuki.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index 18aaf0d200..e45c2c6f2a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSibukiInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index e85a53e890..8566be1623 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_sibuki2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index 7fb20d8b33..37a9425dc7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI2_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSibuki2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index ed1d5edccf..2277a71d85 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -6,6 +6,11 @@ #include "z_eff_ss_solder_srch_ball.h" +#include "z64bgcheck.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #define rUnused regs[1] u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index 70aa558b65..b105f063d5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SOLDERSRCHBALL_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSolderSrchBallInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index ba327e465a..f78855692d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_stick.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 8e01aeb003..4b5ccda965 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STICK_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsStickInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index e1083373b8..5ecd83add1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_stone1.h" + +#include "color.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rReg0 regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index d329161277..efb8df225d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STONE1_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsStone1InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 122ba09af0..2946a39357 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -3,8 +3,9 @@ #include "libc/stddef.h" #include "ultra64.h" -#include "global.h" +#include "gfx.h" #include "versions.h" +#include "z64game.h" #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.newf[index])]) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 6c641e1da5..306d2e1923 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1,14 +1,34 @@ #include "file_select.h" + +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "letterbox.h" +#include "macros.h" +#if PLATFORM_N64 +#include "n64dd.h" +#endif +#include "regs.h" +#include "seqcmd.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z64audio.h" +#include "z64environment.h" +#include "z64save.h" +#include "z64skybox.h" +#include "z64sram.h" +#include "z64view.h" + +#include "global.h" + #if OOT_PAL_N64 #include "assets/objects/object_mag/object_mag.h" #endif #include "assets/textures/title_static/title_static.h" #include "assets/textures/parameter_static/parameter_static.h" -#if PLATFORM_N64 -#include "n64dd.h" -#endif #if OOT_PAL_N64 static s32 sInitialLanguageAlphaAsInt = 100; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 9c6e8ff2db..4479689ede 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -1,5 +1,14 @@ #include "file_select.h" +#include "controller.h" +#include "regs.h" +#include "sfx.h" +#include "z64save.h" +#include "z64sram.h" + +#include "macros.h" +#include "global.h" + // In iQue versions, this file contains many workarounds for EGCS internal // compiler errors (see docs/compilers.md) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index 9bafd123bd..c22f822cd5 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -1,6 +1,19 @@ #include "file_select.h" + +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z64audio.h" +#include "z64save.h" + +#include "macros.h" +#include "global.h" + #include "assets/textures/title_static/title_static.h" #include "assets/overlays/ovl_file_choose/ovl_file_choose.h" diff --git a/tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt b/tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt index 99b4bad0a6..54d92b15e1 100644 --- a/tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt @@ -1,2 +1,2 @@ -8012DB20 gMtxClear +8012DB20 gIdentityMtx 80A8E610 sShadowTex diff --git a/tools/ZAPDConfigs/gc-eu-mq/SymbolMap.txt b/tools/ZAPDConfigs/gc-eu-mq/SymbolMap.txt index 70056f6b08..7e1132fc21 100644 --- a/tools/ZAPDConfigs/gc-eu-mq/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-eu-mq/SymbolMap.txt @@ -1,2 +1,2 @@ -800FBC00 gMtxClear +800FBC00 gIdentityMtx 80A72FA0 sShadowTex diff --git a/tools/ZAPDConfigs/gc-eu/SymbolMap.txt b/tools/ZAPDConfigs/gc-eu/SymbolMap.txt index b523f5646d..99b8cf8c05 100644 --- a/tools/ZAPDConfigs/gc-eu/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-eu/SymbolMap.txt @@ -1,2 +1,2 @@ -800FBC20 gMtxClear +800FBC20 gIdentityMtx 80A73020 sShadowTex diff --git a/tools/ZAPDConfigs/gc-jp-ce/SymbolMap.txt b/tools/ZAPDConfigs/gc-jp-ce/SymbolMap.txt index 12d96f7aa2..038e0ca7b4 100644 --- a/tools/ZAPDConfigs/gc-jp-ce/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-jp-ce/SymbolMap.txt @@ -1,2 +1,2 @@ -800FE2A0 gMtxClear +800FE2A0 gIdentityMtx 80A74120 sShadowTex diff --git a/tools/ZAPDConfigs/gc-jp-mq/SymbolMap.txt b/tools/ZAPDConfigs/gc-jp-mq/SymbolMap.txt index 8dcd14d673..5f5a09bdce 100644 --- a/tools/ZAPDConfigs/gc-jp-mq/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-jp-mq/SymbolMap.txt @@ -1,2 +1,2 @@ -800FE2A0 gMtxClear +800FE2A0 gIdentityMtx 80A740D0 sShadowTex diff --git a/tools/ZAPDConfigs/gc-jp/SymbolMap.txt b/tools/ZAPDConfigs/gc-jp/SymbolMap.txt index 2062d21792..86349adc0f 100644 --- a/tools/ZAPDConfigs/gc-jp/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-jp/SymbolMap.txt @@ -1,2 +1,2 @@ -800FE2C0 gMtxClear +800FE2C0 gIdentityMtx 80A74150 sShadowTex diff --git a/tools/ZAPDConfigs/gc-us-mq/SymbolMap.txt b/tools/ZAPDConfigs/gc-us-mq/SymbolMap.txt index 3ea1df6ccf..252ade1105 100644 --- a/tools/ZAPDConfigs/gc-us-mq/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-us-mq/SymbolMap.txt @@ -1,2 +1,2 @@ -800FE280 gMtxClear +800FE280 gIdentityMtx 80A740B0 sShadowTex diff --git a/tools/ZAPDConfigs/gc-us/SymbolMap.txt b/tools/ZAPDConfigs/gc-us/SymbolMap.txt index 554f92028a..79433d6691 100644 --- a/tools/ZAPDConfigs/gc-us/SymbolMap.txt +++ b/tools/ZAPDConfigs/gc-us/SymbolMap.txt @@ -1,2 +1,2 @@ -800FE2A0 gMtxClear +800FE2A0 gIdentityMtx 80A74130 sShadowTex diff --git a/tools/ZAPDConfigs/ique-cn/SymbolMap.txt b/tools/ZAPDConfigs/ique-cn/SymbolMap.txt index 52ff547fde..37a1f9a672 100644 --- a/tools/ZAPDConfigs/ique-cn/SymbolMap.txt +++ b/tools/ZAPDConfigs/ique-cn/SymbolMap.txt @@ -1,2 +1,2 @@ -80106980 gMtxClear +80106980 gIdentityMtx 80AE0B10 sShadowTex diff --git a/tools/ZAPDConfigs/ntsc-1.0/SymbolMap.txt b/tools/ZAPDConfigs/ntsc-1.0/SymbolMap.txt index f19720a6c6..0d0ae8d436 100644 --- a/tools/ZAPDConfigs/ntsc-1.0/SymbolMap.txt +++ b/tools/ZAPDConfigs/ntsc-1.0/SymbolMap.txt @@ -1,2 +1,2 @@ -800FEDB0 gMtxClear +800FEDB0 gIdentityMtx 80AE0AE0 sShadowTex diff --git a/tools/ZAPDConfigs/ntsc-1.1/SymbolMap.txt b/tools/ZAPDConfigs/ntsc-1.1/SymbolMap.txt index 8bf78d7c3c..d494cd2bfe 100644 --- a/tools/ZAPDConfigs/ntsc-1.1/SymbolMap.txt +++ b/tools/ZAPDConfigs/ntsc-1.1/SymbolMap.txt @@ -1,2 +1,2 @@ -800FEF70 gMtxClear +800FEF70 gIdentityMtx 80AE0C80 sShadowTex diff --git a/tools/ZAPDConfigs/ntsc-1.2/SymbolMap.txt b/tools/ZAPDConfigs/ntsc-1.2/SymbolMap.txt index 2b9bac5cb0..5f7af0dc80 100644 --- a/tools/ZAPDConfigs/ntsc-1.2/SymbolMap.txt +++ b/tools/ZAPDConfigs/ntsc-1.2/SymbolMap.txt @@ -1,2 +1,2 @@ -800FF3F0 gMtxClear +800FF3F0 gIdentityMtx 80AE0FE0 sShadowTex diff --git a/tools/ZAPDConfigs/pal-1.0/SymbolMap.txt b/tools/ZAPDConfigs/pal-1.0/SymbolMap.txt index 1f09fd7edd..5ebd4ad9ab 100644 --- a/tools/ZAPDConfigs/pal-1.0/SymbolMap.txt +++ b/tools/ZAPDConfigs/pal-1.0/SymbolMap.txt @@ -1,2 +1,2 @@ -800FCD00 gMtxClear +800FCD00 gIdentityMtx 80AE19F0 sShadowTex diff --git a/tools/ZAPDConfigs/pal-1.1/SymbolMap.txt b/tools/ZAPDConfigs/pal-1.1/SymbolMap.txt index a326070e29..d41f225318 100644 --- a/tools/ZAPDConfigs/pal-1.1/SymbolMap.txt +++ b/tools/ZAPDConfigs/pal-1.1/SymbolMap.txt @@ -1,2 +1,2 @@ -800FCD40 gMtxClear +800FCD40 gIdentityMtx 80AE1B80 sShadowTex diff --git a/tools/assets/extract/extract_xml_z64.py b/tools/assets/extract/extract_xml_z64.py index 67ed7886a3..bdc6f84254 100644 --- a/tools/assets/extract/extract_xml_z64.py +++ b/tools/assets/extract/extract_xml_z64.py @@ -322,9 +322,9 @@ def main(): from .extase_oot64.dlist_resources import MtxResource, TextureResource from ..n64 import G_IM_FMT, G_IM_SIZ - file_gMtxClear = File("sys_matrix__gMtxClear", size=0x40) - file_gMtxClear.add_resource(MtxResource(file_gMtxClear, 0, "gMtxClear")) - version_memctx_base.set_direct_file(vc.variables["gMtxClear"], file_gMtxClear) + file_gIdentityMtx = File("sys_matrix__gIdentityMtx", size=0x40) + file_gIdentityMtx.add_resource(MtxResource(file_gIdentityMtx, 0, "gIdentityMtx")) + version_memctx_base.set_direct_file(vc.variables["gIdentityMtx"], file_gIdentityMtx) file_sShadowTex = File("z_en_jsjutan__sShadowTex", size=0x800) file_sShadowTex.add_resource( diff --git a/tools/com-plugin/.gitrepo b/tools/com-plugin/.gitrepo index ad5310ed1c..6215d57598 100644 --- a/tools/com-plugin/.gitrepo +++ b/tools/com-plugin/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:Thar0/com-plugin.git branch = main - commit = 81595ed1ca40d22846064537ba5fa8147b9f7068 - parent = a1632bcbfc04672f21866f11bf074b420dea9693 + commit = fc5aa5eda0b09e8e3cf91ce1530f886bb1ab8eef + parent = 54939bac3ac972a24918d3fdc97d58199ff54bc9 method = merge cmdver = 0.4.6 diff --git a/tools/com-plugin/Makefile b/tools/com-plugin/Makefile index 8fb570f822..c15dfb6ed6 100644 --- a/tools/com-plugin/Makefile +++ b/tools/com-plugin/Makefile @@ -14,6 +14,6 @@ clean: $(RM) $(TARGET) $(DEP_FILES) $(TARGET): $(SOURCES) - $(CC) -shared $(CFLAGS) -MMD -o $@ $^ + $(CC) -shared $(CFLAGS) -MMD -o $@ $(SOURCES) -include $(DEP_FILES) diff --git a/tools/decompress_baserom.py b/tools/decompress_baserom.py index aeea9e3dae..4e79d848e0 100755 --- a/tools/decompress_baserom.py +++ b/tools/decompress_baserom.py @@ -30,10 +30,11 @@ def decompress_zlib(data: bytes) -> bytes: return bytes(output) -def decompress(data: bytes, is_zlib_compressed: bool) -> bytes: - if is_zlib_compressed: +def decompress(data: bytes, is_ique: bool) -> bytes: + if is_ique: return decompress_zlib(data) - return crunch64.yaz0.decompress(data) + else: + return crunch64.yaz0.decompress(data) def round_up(n, shift): @@ -41,11 +42,13 @@ def round_up(n, shift): return (n + mod - 1) >> shift << shift -def update_crc(decompressed: io.BytesIO) -> io.BytesIO: +def update_crc(decompressed: io.BytesIO, is_ique: bool) -> io.BytesIO: print("Recalculating crc...") - calculated_checksum = ipl3checksum.CICKind.CIC_X105.calculateChecksum( - bytes(decompressed.getbuffer()) - ) + if is_ique: + cic_kind = ipl3checksum.CICKind.CIC_6102_7101 + else: + cic_kind = ipl3checksum.CICKind.CIC_X105 + calculated_checksum = cic_kind.calculateChecksum(bytes(decompressed.getbuffer())) new_crc = struct.pack(f">II", calculated_checksum[0], calculated_checksum[1]) decompressed.seek(0x10) @@ -57,7 +60,7 @@ def decompress_rom( file_content: bytearray, dmadata_start: int, dma_entries: list[dmadata.DmaEntry], - is_zlib_compressed: bool, + is_ique: bool, ) -> bytearray: rom_segments = {} # vrom start : data s.t. len(data) == vrom_end - vrom_start new_dmadata = [] # new dmadata: list[dmadata.Entry] @@ -73,7 +76,7 @@ def decompress_rom( new_dmadata.append(dma_entry) continue if dma_entry.is_compressed(): - new_contents = decompress(file_content[p_start:p_end], is_zlib_compressed) + new_contents = decompress(file_content[p_start:p_end], is_ique) rom_segments[v_start] = new_contents else: rom_segments[v_start] = file_content[p_start : p_start + v_end - v_start] @@ -95,7 +98,7 @@ def decompress_rom( decompressed.seek(padding_start) decompressed.write(b"\x00" * (padding_end - padding_start)) # re-calculate crc - return bytearray(update_crc(decompressed).getbuffer()) + return bytearray(update_crc(decompressed, is_ique).getbuffer()) def get_str_hash(byte_array): @@ -246,10 +249,8 @@ def main(): # Decompress if any(dma_entry.is_compressed() for dma_entry in dma_entries): print("Decompressing rom...") - is_zlib_compressed = version in {"ique-cn", "ique-zh"} - file_content = decompress_rom( - file_content, dmadata_start, dma_entries, is_zlib_compressed - ) + is_ique = version.startswith("ique-") + file_content = decompress_rom(file_content, dmadata_start, dma_entries, is_ique) # Double check the hash str_hash = get_str_hash(file_content)