mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ovl_En_Ru2_new

Browse source
This commit is contained in:
Ethan Roseman 2020-03-24 00:30:09 -04:00
commit b3f865dc58
1377 changed files with 16844 additions and 28111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -1,6 +1,6 @@
#include "z_en_ru2.h"
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000010
void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx);

3
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -4,8 +4,7 @@
#include <ultra64.h>
#include <global.h>
typedef struct
{
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ s8 unk_190;