mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-25 16:32:04 +00:00
Code Issues Projects Releases Wiki Activity

fixups

Browse source
This commit is contained in:
Dragorn421 2025-02-09 13:34:19 +01:00
parent 485640273d
commit e311e2d378
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
3 changed files with 1 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/overlays/actors/ovl_En_Dns/z_en_dns.h
View file

@ -5,28 +5,6 @@
#include "z64actor.h" #include "z64actor.h"
#include "assets/objects/object_shopnuts/object_shopnuts.h" #include "assets/objects/object_shopnuts/object_shopnuts.h"
typedef enum BusinessScrubLimb {
/* 0x00 */ BUSINESS_SCRUB_LIMB_NONE,
/* 0x01 */ BUSINESS_SCRUB_LIMB_ROOT,
/* 0x02 */ BUSINESS_SCRUB_LIMB_LEFT_THIGH,
/* 0x03 */ BUSINESS_SCRUB_LIMB_LEFT_SHIN,
/* 0x04 */ BUSINESS_SCRUB_LIMB_LEFT_FOOT,
/* 0x05 */ BUSINESS_SCRUB_LIMB_RIGHT_THIGH,
/* 0x06 */ BUSINESS_SCRUB_LIMB_RIGHT_SHIN,
/* 0x07 */ BUSINESS_SCRUB_LIMB_RIGHT_FOOT,
/* 0x08 */ BUSINESS_SCRUB_LIMB_TOP_LEAF,
/* 0x09 */ BUSINESS_SCRUB_LIMB_NOSE,
/* 0x0A */ BUSINESS_SCRUB_LIMB_LEFT_UPPER_ARM,
/* 0x0B */ BUSINESS_SCRUB_LIMB_LEFT_FOREARM,
/* 0x0C */ BUSINESS_SCRUB_LIMB_LEFT_HAND,
/* 0x0D */ BUSINESS_SCRUB_LIMB_RIGHT_UPPER_ARM,
/* 0x0E */ BUSINESS_SCRUB_LIMB_RIGHT_FOREARM,
/* 0x0F */ BUSINESS_SCRUB_LIMB_RIGHT_HAND,
/* 0x10 */ BUSINESS_SCRUB_LIMB_EYES,
/* 0x11 */ BUSINESS_SCRUB_LIMB_BODY,
/* 0x12 */ BUSINESS_SCRUB_LIMB_MAX
} BusinessScrubLimb;
#define DNS_GET_TYPE(thisx) ((thisx)->params) #define DNS_GET_TYPE(thisx) ((thisx)->params)
typedef enum EnDnsType { typedef enum EnDnsType {

23
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -7,29 +7,6 @@
#include "z_en_ma1.h" #include "z_en_ma1.h"
#include "assets/objects/object_ma1/object_ma1.h" #include "assets/objects/object_ma1/object_ma1.h"
typedef enum ChildMalonLimb {
/* 0x00 */ CHILD_MALON_LIMB_NONE,
/* 0x01 */ CHILD_MALON_ROOT,
/* 0x02 */ CHILD_MALON_LIMB_LEFT_THIGH,
/* 0x03 */ CHILD_MALON_LIMB_LEFT_SHIN,
/* 0x04 */ CHILD_MALON_LIMB_LEFT_FOOT,
/* 0x05 */ CHILD_MALON_LIMB_RIGHT_THIGH,
/* 0x06 */ CHILD_MALON_LIMB_RIGHT_SHIN,
/* 0x07 */ CHILD_MALON_LIMB_RIGHT_FOOT,
/* 0x08 */ CHILD_MALON_LIMB_CHEST,
/* 0x09 */ CHILD_MALON_LIMB_LEFT_SHOULDER,
/* 0x0A */ CHILD_MALON_LIMB_LEFT_ARM,
/* 0x0B */ CHILD_MALON_LIMB_LEFT_HAND,
/* 0x0C */ CHILD_MALON_LIMB_RIGHT_SHOULDER,
/* 0x0D */ CHILD_MALON_LIMB_RIGHT_ARM,
/* 0x0E */ CHILD_MALON_LIMB_RIGHT_HAND,
/* 0x0F */ CHILD_MALON_LIMB_HEAD,
/* 0x10 */ CHILD_MALON_LIMB_DRESS_UPPER,
/* 0x11 */ CHILD_MALON_LIMB_DRESS_MIDDLE,
/* 0x12 */ CHILD_MALON_LIMB_DRESS_LOWER,
/* 0x13 */ CHILD_MALON_LIMB_MAX
} ChildMalonLimb;
#define FLAGS \ #define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

3
tools/assets/extract/extract_xml_z64.py
View file

@ -1,6 +1,5 @@
import dataclasses import dataclasses
from pathlib import Path from pathlib import Path
from pprint import pprint
from ..descriptor.base import ( from ..descriptor.base import (
BaseromFileBackingMemory, BaseromFileBackingMemory,
@ -159,7 +158,7 @@ def process_pool(
).append(file_dep) ).append(file_dep)
elif isinstance(rescoll_dep.start_address, VRAMStartAddress): elif isinstance(rescoll_dep.start_address, VRAMStartAddress):
file_memctx.set_direct_file(rescoll_dep.start_address.vram, file_dep) file_memctx.set_direct_file(rescoll_dep.start_address.vram, file_dep)
if file_dep != file : if file_dep != file:
file.referenced_files.add(file_dep) file.referenced_files.add(file_dep)
else: else:
raise NotImplementedError(rescoll_dep.start_address) raise NotImplementedError(rescoll_dep.start_address)