mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix misc 6 (#1148)

Browse source 
* Fix typo `vertexs` -> `vertices`

* Fix typo `limbMatricies` -> `limbMatrices`

* Fix some `gSPTextureRectangle` usage of fixed point constants

* Run formatter

* `ALIGN8` macro

* `object_skj` cleanup

* sholder -> shoulder

* cleanup `stdbool.h`

* Some function prototypes cleanup

* Use macros in `osVirtualToPhysical`
This commit is contained in:
Dragorn421 2022-02-20 14:22:29 +01:00 • committed by GitHub
parent c3533052ca
commit a9526a3354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 128 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -40,14 +40,14 @@ void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBox_Update(Actor* thisx, GlobalContext* globalCtx);
void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnBox_FallOnSwitchFlag(EnBox*, GlobalContext*);
void func_809C9700(EnBox*, GlobalContext*);
void EnBox_AppearOnSwitchFlag(EnBox*, GlobalContext*);
void EnBox_AppearOnRoomClear(EnBox*, GlobalContext*);
void EnBox_AppearInit(EnBox*, GlobalContext*);
void EnBox_AppearAnimation(EnBox*, GlobalContext*);
void EnBox_WaitOpen(EnBox*, GlobalContext*);
void EnBox_Open(EnBox*, GlobalContext*);
void EnBox_FallOnSwitchFlag(EnBox* this, GlobalContext* globalCtx);
void func_809C9700(EnBox* this, GlobalContext* globalCtx);
void EnBox_AppearOnSwitchFlag(EnBox* this, GlobalContext* globalCtx);
void EnBox_AppearOnRoomClear(EnBox* this, GlobalContext* globalCtx);
void EnBox_AppearInit(EnBox* this, GlobalContext* globalCtx);
void EnBox_AppearAnimation(EnBox* this, GlobalContext* globalCtx);
void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx);
void EnBox_Open(EnBox* this, GlobalContext* globalCtx);
const ActorInit En_Box_InitVars = {
ACTOR_EN_BOX,

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

@ -27,7 +27,7 @@ void EnGoma_Stunned(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_LookAtPlayer(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_UpdateHit(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_Debris(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_SpawnHatchDebris(EnGoma* this, GlobalContext* globalCtx2);
void EnGoma_SpawnHatchDebris(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_BossLimb(EnGoma* this, GlobalContext* globalCtx);
void EnGoma_SetupFlee(EnGoma* this);

2
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -1609,7 +1609,7 @@ void EnSkj_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
Matrix_RotateZYX(-0x4000, 0, 0, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj.c", 2430),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gSKJskullMaskDL);
gSPDisplayList(POLY_OPA_DISP++, gSkullKidSkullMaskDL);
Matrix_Pop();
}

2
src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
View file

@ -105,7 +105,7 @@ void EnSkjneedle_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 205),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gSKJNeedleDL);
gSPDisplayList(POLY_OPA_DISP++, gSkullKidNeedleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 210);
}