mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-12 13:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_misc_4' of github.com:Dragorn421/oot into fix_misc_4

Browse Source
This commit is contained in:
Dragorn421
2021-12-16 16:30:53 +01:00
parent eaf3d76dd1 419473b77e
commit 84f374a9a9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+1 -1
View File
@@ -245,7 +245,7 @@ typedef struct {
/* 0x0004 */ char unk_04[0x04];
/* 0x0008 */ u8 total; // total number of actors loaded
/* 0x0009 */ char unk_09[0x03];
/* 0x000C */ ActorListEntry actorLists[12];
/* 0x000C */ ActorListEntry actorLists[ACTORCAT_MAX];
/* 0x006C */ TargetContext targetCtx;
struct {
/* 0x0104 */ u32 swch;
include/z64actor.h
+2 -1
View File
@@ -334,7 +334,8 @@ typedef enum {
/* 0x08 */ ACTORCAT_MISC,
/* 0x09 */ ACTORCAT_BOSS,
/* 0x0A */ ACTORCAT_DOOR,
/* 0x0B */ ACTORCAT_CHEST
/* 0x0B */ ACTORCAT_CHEST,
/* 0x0C */ ACTORCAT_MAX
} ActorCategory;
#define DEFINE_ACTOR(_0, enum, _2) enum,
src/code/z_actor.c
+1 -1
View File
@@ -1982,7 +1982,7 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry*
func_8002FA60(globalCtx);
}
u32 D_80116068[] = {
u32 D_80116068[ACTORCAT_MAX] = {
0x100000C0, 0x100000C0, 0x00000000, 0x100004C0, 0x00000080, 0x300000C0,
0x10000080, 0x00000000, 0x300000C0, 0x100004C0, 0x00000000, 0x100000C0,
};