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

Decompile object_syokudai and object_ydan_objects (#699)

Browse source 
* add deku and torch objects

* why git?
This commit is contained in:
Zelllll 2021-02-17 13:42:59 -06:00 • committed by GitHub
parent ad751f02d2
commit f57e0467d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 63 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
View file

@ -7,6 +7,7 @@
#include "z_obj_syokudai.h"
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_syokudai/object_syokudai.h"
#define FLAGS 0x00000410
@ -258,7 +259,7 @@ void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* displayLists[] = { 0x060003A0, 0x06000B90, 0x06000870 };
static Gfx* displayLists[] = { gGoldenTorchDL, gTimedTorchDL, gWoodenTorchDL };
s32 pad;
ObjSyokudai* this = THIS;
s32 timerMax;