mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix asset file includes to always start with assets/ (#1260)

Browse source 
* Fix asset includes to consistently start with assets/

* Fix header paths in asset xmls to start with assets/

* Remove -Iassets from compiler options
This commit is contained in:
Roman971 2022-06-06 21:37:25 +02:00 • committed by GitHub
parent b28ad659e3
commit b0bfa9eb69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
572 changed files with 933 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_message_PAL.c
View file

@ -1,7 +1,7 @@
#include "global.h"
#include "message_data_static.h"
#include "vt.h"
#include "textures/parameter_static/parameter_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
s16 sTextFade = false; // original name: key_off_flag ?
@ -31,7 +31,7 @@ MessageTableEntry sNesMessageEntryTable[] = {
#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \
{ textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes },
#define DEFINE_MESSAGE_FFFC
#include "text/message_data.h"
#include "assets/text/message_data.h"
#undef DEFINE_MESSAGE_FFFC
#undef DEFINE_MESSAGE
{ 0xFFFF, 0, NULL },
@ -39,14 +39,14 @@ MessageTableEntry sNesMessageEntryTable[] = {
const char* sGerMessageEntryTable[] = {
#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_ger,
#include "text/message_data.h"
#include "assets/text/message_data.h"
#undef DEFINE_MESSAGE
NULL,
};
const char* sFraMessageEntryTable[] = {
#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_fra,
#include "text/message_data.h"
#include "assets/text/message_data.h"
#undef DEFINE_MESSAGE
NULL,
};
@ -54,7 +54,7 @@ const char* sFraMessageEntryTable[] = {
MessageTableEntry sStaffMessageEntryTable[] = {
#define DEFINE_MESSAGE(textId, type, yPos, staffMessage) \
{ textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_staff },
#include "text/message_data_staff.h"
#include "assets/text/message_data_staff.h"
#undef DEFINE_MESSAGE
{ 0xFFFF, 0, NULL },
};