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

Merge branch 'main' into meta_new_assets_2025

Browse source
This commit is contained in:
Dragorn421 2025-02-09 13:34:09 +01:00
commit 485640273d
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
430 changed files with 2590 additions and 548 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -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 $@

2
assets/xml/objects/object_jya_obj.xml
View file

@ -59,7 +59,7 @@
<Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
<Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
<Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
<Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="ci8" Width="32" Height="32" Offset="0x6CE8" TlutOffset="0x5CA0"/>
<Texture Name="gMegamiTex_006CE8" Format="ci8" Width="32" Height="32" Offset="0x6CE8" TlutOffset="0x5CA0"/>
<Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
<Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="36" Height="1" Offset="0x5CA0"/>
<Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="36" Height="1" Offset="0xAC70"/>

14
assets/xml/objects/object_link_boy.xml
View file

@ -126,13 +126,13 @@
<DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
<Texture Name="gLinkAdultTLUT1" Format="rgba16" Width="16" Height="16" Offset="0xCB40"/>
<Texture Name="gLinkAdultTLUT2" Format="rgba16" Width="16" Height="16" Offset="0xCD48"/>
<Texture Name="gLinkAdultTLUT3" Format="rgba16" Width="12" Height="12" Offset="0xCF50"/>
<Texture Name="gLinkAdultTLUT4" Format="rgba16" Width="8" Height="4" Offset="0xD078"/>
<Texture Name="gLinkAdultTLUT7" Format="rgba16" Width="16" Height="16" Offset="0x5400"/>
<Texture Name="gLinkAdultTLUT5" Format="rgba16" Width="16" Height="16" Offset="0x5800"/>
<Texture Name="gLinkAdultTLUT6" Format="rgba16" Width="8" Height="11" Offset="0x5A00"/>
<Texture Name="gLinkAdultTLUT1" Format="rgba16" Width="16" Height="16" Offset="0x5400"/>
<Texture Name="gLinkAdultTLUT2" Format="rgba16" Width="16" Height="16" Offset="0x5800"/>
<Texture Name="gLinkAdultTLUT3" Format="rgba16" Width="8" Height="11" Offset="0x5A00"/>
<Texture Name="gLinkAdultTLUT4" Format="rgba16" Width="16" Height="16" Offset="0xCB40"/>
<Texture Name="gLinkAdultTLUT5" Format="rgba16" Width="16" Height="16" Offset="0xCD48"/>
<Texture Name="gLinkAdultTLUT6" Format="rgba16" Width="12" Height="12" Offset="0xCF50"/>
<Texture Name="gLinkAdultTLUT7" Format="rgba16" Width="8" Height="4" Offset="0xD078"/>
<Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
<Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>

2
baseroms/gc-eu-mq-dbg/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80157D30
size: 0x60
variables:
gMtxClear: 0x8012DB20
gIdentityMtx: 0x8012DB20
sNesMessageEntryTable: 0x8014B320
sGerMessageEntryTable: 0x8014F548
sFraMessageEntryTable: 0x80151658

2
baseroms/gc-eu-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801130D0
size: 0x60
variables:
gMtxClear: 0x800FBC00
gIdentityMtx: 0x800FBC00
sNesMessageEntryTable: 0x801077F0
sGerMessageEntryTable: 0x8010BA18
sFraMessageEntryTable: 0x8010DB28

2
baseroms/gc-eu/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801130F0
size: 0x60
variables:
gMtxClear: 0x800FBC20
gIdentityMtx: 0x800FBC20
sNesMessageEntryTable: 0x80107810
sGerMessageEntryTable: 0x8010BA38
sFraMessageEntryTable: 0x8010DB48

2
baseroms/gc-jp-ce/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0
size: 0x60
variables:
gMtxClear: 0x800FE2A0
gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC

2
baseroms/gc-jp-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0
size: 0x60
variables:
gMtxClear: 0x800FE2A0
gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC

2
baseroms/gc-jp/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x80115900
size: 0x60
variables:
gMtxClear: 0x800FE2C0
gIdentityMtx: 0x800FE2C0
sJpnMessageEntryTable: 0x80109EAC
sNesMessageEntryTable: 0x8010DFEC
sStaffMessageEntryTable: 0x8011220C

2
baseroms/gc-us-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158C0
size: 0x60
variables:
gMtxClear: 0x800FE280
gIdentityMtx: 0x800FE280
sJpnMessageEntryTable: 0x80109E6C
sNesMessageEntryTable: 0x8010DFAC
sStaffMessageEntryTable: 0x801121CC

2
baseroms/gc-us/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0
size: 0x60
variables:
gMtxClear: 0x800FE2A0
gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC

2
baseroms/ique-cn/checksum.md5
View file

@ -1 +1 @@
17a9f30d722c29e6912bd4b66713d2b0 build/ique-cn/oot-ique-cn.z64
0238288a8e7c53b558b818865daf6ef3 build/ique-cn/oot-ique-cn.z64

2
baseroms/ique-cn/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x80121EE0
size: 0x60
variables:
gMtxClear: 0x80106980
gIdentityMtx: 0x80106980
sJpnMessageEntryTable: 0x80115838
sNesMessageEntryTable: 0x80119978
sStaffMessageEntryTable: 0x8011DB98

2
baseroms/ntsc-1.0/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80114D70
size: 0x60
variables:
gMtxClear: 0x800FEDB0
gIdentityMtx: 0x800FEDB0
sJpnMessageEntryTable: 0x8010A94C
sNesMessageEntryTable: 0x8010EA8C
sStaffMessageEntryTable: 0x80112CAC

2
baseroms/ntsc-1.1/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80114F30
size: 0x60
variables:
gMtxClear: 0x800FEF70
gIdentityMtx: 0x800FEF70
sJpnMessageEntryTable: 0x8010AB0C
sNesMessageEntryTable: 0x8010EC4C
sStaffMessageEntryTable: 0x80112E6C

2
baseroms/ntsc-1.2/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80115420
size: 0x60
variables:
gMtxClear: 0x800FF3F0
gIdentityMtx: 0x800FF3F0
sJpnMessageEntryTable: 0x8010AFFC
sNesMessageEntryTable: 0x8010F13C
sStaffMessageEntryTable: 0x8011335C

2
baseroms/pal-1.0/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80112B70
size: 0x60
variables:
gMtxClear: 0x800FCD00
gIdentityMtx: 0x800FCD00
sNesMessageEntryTable: 0x801088BC
sGerMessageEntryTable: 0x8010CAE4
sFraMessageEntryTable: 0x8010EBF4

2
baseroms/pal-1.1/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80112BB0
size: 0x60
variables:
gMtxClear: 0x800FCD40
gIdentityMtx: 0x800FCD40
sNesMessageEntryTable: 0x801088FC
sGerMessageEntryTable: 0x8010CB24
sFraMessageEntryTable: 0x8010EC34

2
include/functions.h
View file

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

4
include/sys_matrix.h
View file

@ -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 */

3
include/z64.h
View file

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

2
include/z64game.h
View file

@ -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;

2
include/z64play.h
View file

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

1
include/z64view.h
View file

@ -1,6 +1,7 @@
#ifndef Z64VIEW_H
#define Z64VIEW_H
#include "macros.h"
#include "ultra64.h"
#include "z64math.h"

2
include/z_lib.h
View file

@ -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"

2
src/boot/z_std_dma.c
View file

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

1
src/code/db_camera.c
View file

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

2
src/code/main.c
View file

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

4
src/code/sys_math3d.c
View file

@ -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);

4
src/code/sys_matrix.c
View file

@ -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,

4
src/code/z_actor.c
View file

@ -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++) {

2
src/code/z_bgcheck.c
View file

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

6
src/code/z_camera.c
View file

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

4
src/code/z_collision_check.c
View file

@ -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);

2
src/code/z_common_data.c
View file

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

4
src/code/z_eff_blure.c
View file

@ -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) {

2
src/code/z_eff_spark.c
View file

@ -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);

2
src/code/z_kaleido_scope_call.c
View file

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

4
src/code/z_kankyo.c
View file

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

2
src/code/z_map_exp.c
View file

@ -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);

2
src/code/z_parameter.c
View file

@ -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;

16
src/code/z_room.c
View file

@ -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);
}

2
src/code/z_skin.c
View file

@ -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) {

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

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

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

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

2
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View file

@ -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);

2
src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View file

@ -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) {

14
src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View file

@ -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);

4
src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h
View file

@ -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;

5
src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h
View file

@ -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;

10
src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h
View file

@ -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;

11
src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h
View file

@ -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

7
src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h
View file

@ -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;

9
src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h
View file

@ -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,

7
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
View file

@ -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;

6
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h
View file

@ -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;

6
src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
View file

@ -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

2
src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h
View file

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

7
src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
View file

@ -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)

5
src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h
View file

@ -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

9
src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
View file

@ -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

2
src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h
View file

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

12
src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h
View file

@ -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;

9
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View file

@ -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

2
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h
View file

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

12
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
View file

@ -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

7
src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h
View file

@ -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;

8
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h
View file

@ -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;

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

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

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

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

9
src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h
View file

@ -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;

7
src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h
View file

@ -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;

13
src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h
View file

@ -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;

9
src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h
View file

@ -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;

9
src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
View file

@ -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

2
src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h
View file

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

5
src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
View file

@ -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)

2
src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h
View file

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

3
src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
View file

@ -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

2
src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h
View file

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

10
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h
View file

@ -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;

10
src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View file

@ -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

4
src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h
View file

@ -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;

11
src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
View file

@ -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

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