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

Merge remote-tracking branch 'upstream/master' into elemental-arrows

This commit is contained in:
fig02 2020-03-31 05:03:25 -04:00
commit 8d37f3a15e
372 changed files with 3338 additions and 4404 deletions

View file

@ -465,8 +465,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) {
s32 pad;
Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } };
GraphicsContext* gfxCtx;
s32 pad2[2];
Gfx* gfxArr[2];
Gfx* gfxArr[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972);