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

Symbol cleanup (#897)

Browse source 
* symbol cleanup

* run formatter

* run formatter

* remove duplicate z_demo_ik symbols

* run formatter
This commit is contained in:
Dragorn421 2021-08-22 17:52:02 +02:00 • committed by GitHub
parent 743f42f651
commit 5e071a014d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 1210 additions and 2940 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
View file

@ -5,6 +5,7 @@
*/
#include "z_obj_dekujr.h"
#include "objects/object_dekujr/object_dekujr.h"
#define FLAGS 0x00000009
@ -41,9 +42,6 @@ static ColliderCylinderInitToActor sCylinderInit = {
{ 60, 80, 0, { 0, 0, 0 } },
};
extern Gfx D_060030D0[]; // Display list for dekujr body
extern Gfx D_060032D8[]; // Display list for dekujr face and shadow
void ObjDekujr_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjDekujr* this = THIS;
s32 pad;
@ -160,7 +158,7 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060030D0);
gSPDisplayList(POLY_OPA_DISP++, object_dekujr_DL_0030D0);
frameCount = globalCtx->state.frames;
gSPSegment(
@ -168,7 +166,7 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060032D8);
gSPDisplayList(POLY_XLU_DISP++, object_dekujr_DL_0032D8);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 409);
}