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

[iQue] Match z_actor (#2431)

Browse source 
* [iQue] Match z_actor

* Reword comment
This commit is contained in:
cadmic 2025-01-19 19:29:35 -08:00 • committed by GitHub
parent c3806155c3
commit 284ecb114e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 253 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -575,7 +575,7 @@ EGCS_O_FILES += $(BUILD_DIR)/src/boot/inflate.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/is_debug_ique.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_locale.o
EGCS_O_FILES += $(BUILD_DIR)/src/boot/z_std_dma.o
# EGCS_O_FILES += $(BUILD_DIR)/src/code/z_actor.o
EGCS_O_FILES += $(BUILD_DIR)/src/code/z_actor.o
EGCS_O_FILES += $(BUILD_DIR)/src/code/z_common_data.o
EGCS_O_FILES += $(BUILD_DIR)/src/code/z_construct.o
EGCS_O_FILES += $(BUILD_DIR)/src/code/z_kanfont.o

2
include/z64actor.h
View file

@ -971,7 +971,7 @@ void Flags_SetEventChkInf(s32 flag);
s32 Flags_GetInfTable(s32 flag);
void Flags_SetInfTable(s32 flag);
u16 func_80037C30(struct PlayState* play, s16 arg1);
s32 func_80037D98(struct PlayState* play, Actor* actor, s16 arg2, s32* arg3);
s32 func_80037D98(struct PlayState* play, Actor* actor, s32 arg2, s32* arg3);
s32 Actor_TrackPlayer(struct PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* torsoRot, Vec3f focusPos);
#endif

2
include/z64play.h
View file

@ -130,7 +130,7 @@ f32 func_800BFCB8(PlayState* this, MtxF* mf, Vec3f* pos);
void* Play_LoadFile(PlayState* this, RomFile* file);
void Play_GetScreenPos(PlayState* this, Vec3f* src, Vec3f* dest);
s16 Play_CreateSubCamera(PlayState* this);
s16 Play_GetActiveCamId(PlayState* this);
s32 Play_GetActiveCamId(PlayState* this);
s16 Play_ChangeCameraStatus(PlayState* this, s16 camId, s16 status);
void Play_ClearCamera(PlayState* this, s16 camId);
void Play_ClearAllSubCameras(PlayState* this);

452
src/code/z_actor.c
View file

File diff suppressed because it is too large Load diff

6
src/code/z_parameter.c
View file

@ -1100,9 +1100,9 @@ void Interface_SetSceneRestrictions(PlayState* play) {
InterfaceContext* interfaceCtx = &play->interfaceCtx;
s16 i = 0;
u8 sceneId;
#if !PLATFORM_IQUE
s32 pad[3];
#endif
s32 pad1;
s32 pad2;
s32 pad3;
interfaceCtx->restrictions.all = 0;
interfaceCtx->restrictions.dinsNayrus = 0;

2
src/code/z_play.c
View file

@ -1622,7 +1622,7 @@ s16 Play_CreateSubCamera(PlayState* this) {
return camId;
}
s16 Play_GetActiveCamId(PlayState* this) {
s32 Play_GetActiveCamId(PlayState* this) {
return this->activeCamId;
}

5
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -92,9 +92,8 @@ void ConsoleLogo_Draw(ConsoleLogoState* this) {
Vec3f v3;
Vec3f v1;
Vec3f v2;
#if !PLATFORM_IQUE
s32 pad2[2];
#endif
s32 pad2;
s32 pad3;
OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 395);