1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00

Symbol cleanup (#897)

* 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

View file

@ -5,6 +5,7 @@
*/
#include "z_en_lightbox.h"
#include "objects/object_lightbox/object_lightbox.h"
#define FLAGS 0x00000010
@ -27,9 +28,6 @@ const ActorInit En_Lightbox_InitVars = {
(ActorFunc)EnLightbox_Draw,
};
extern Gfx D_06000B70[];
extern CollisionHeader D_06001F10;
void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
CollisionHeader* colHeader = NULL;
EnLightbox* this = THIS;
@ -59,7 +57,7 @@ void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.unk_15C = 0;
thisx->targetMode = 0;
thisx->gravity = -2.0f;
CollisionHeader_GetVirtual(&D_06001F10, &colHeader);
CollisionHeader_GetVirtual(&object_lightbox_Col_001F10, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
}
@ -112,5 +110,5 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnLightbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000B70);
Gfx_DrawDListOpa(globalCtx, object_lightbox_DL_000B70);
}