mirror of https://github.com/zeldaret/oot.git
fix merge
This commit is contained in:
parent
a178de26a4
commit
16d7ed76c9
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "ultra64.h"
|
||||
#include "tex_len.h"
|
||||
#include "z64interface.h"
|
||||
#include "interface.h"
|
||||
|
||||
extern u64 gQuestIconMedallionForestTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)];
|
||||
extern u64 gQuestIconMedallionFireTex[TEX_LEN(u64, QUEST_ICON_WIDTH, QUEST_ICON_HEIGHT, 32)];
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "ultra64.h"
|
||||
#include "tex_len.h"
|
||||
#include "versions.h"
|
||||
#include "z64item.h"
|
||||
#include "item.h"
|
||||
|
||||
#if OOT_NTSC
|
||||
|
||||
|
|
Loading…
Reference in New Issue