fix merge

This commit is contained in:
Dragorn421 2025-06-02 11:18:55 +02:00
parent a178de26a4
commit 16d7ed76c9
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
2 changed files with 2 additions and 2 deletions

View File

@ -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)];

View File

@ -4,7 +4,7 @@
#include "ultra64.h"
#include "tex_len.h"
#include "versions.h"
#include "z64item.h"
#include "item.h"
#if OOT_NTSC