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

Forest Stage and related actors and objects (#618)

* starting out

* match demo

* full match

* cleanup

* more names

* more names

* headers

* dist from link

* docs

* objects

* format

* organization of xmls

* merge actor

* Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* format

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
petrie911 2021-02-12 16:25:02 -06:00 committed by GitHub
parent ef272322eb
commit b8c2ec1f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 1734 additions and 5992 deletions

View file

@ -5,6 +5,9 @@
*/
#include "z_en_nutsball.h"
#include "objects/object_dns/object_dns.h"
#include "objects/object_hintnuts/object_hintnuts.h"
#include "objects/object_dnk/object_dnk.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#define FLAGS 0x00000010
@ -53,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = {
static s16 sObjectIDs[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK };
static Gfx* sDLists[] = { 0x06002028, 0x060012F0, 0x06004008, 0x06002410, 0x06001890 };
static Gfx* sDLists[] = { 0x06002028, gHintNutsNutDL, 0x06004008, gDntJijiNutDL, gDntStageNutDL };
void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;