mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 17:30:25 +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

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View file

@ -1,6 +1,6 @@
#include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h"
#include "textures/icon_item_static/icon_item_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
#include "assets/textures/icon_item_static/icon_item_static.h"
void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
static s16 D_8082A070[][4] = {

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View file

@ -1,5 +1,5 @@
#include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
// Positions of each input section in the editor
static u16 sSectionPositions[][2] = {

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -1,6 +1,6 @@
#include "z_kaleido_scope.h"
#include "textures/icon_item_static/icon_item_static.h"
#include "textures/parameter_static/parameter_static.h"
#include "assets/textures/icon_item_static/icon_item_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
static u8 sChildUpgrades[] = { UPG_BULLET_BAG, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE };
static u8 sAdultUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE };

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View file

@ -1,5 +1,5 @@
#include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
u8 gAmmoItems[] = {
ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE,

14
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
View file

@ -1,11 +1,11 @@
#include "z_kaleido_scope.h"
#include "textures/icon_item_24_static/icon_item_24_static.h"
#include "textures/icon_item_nes_static/icon_item_nes_static.h"
#include "textures/icon_item_ger_static/icon_item_ger_static.h"
#include "textures/icon_item_fra_static/icon_item_fra_static.h"
#include "textures/icon_item_field_static/icon_item_field_static.h"
#include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
#include "textures/icon_item_nes_static/icon_item_nes_static.h"
#include "assets/textures/icon_item_24_static/icon_item_24_static.h"
#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h"
#include "assets/textures/icon_item_ger_static/icon_item_ger_static.h"
#include "assets/textures/icon_item_fra_static/icon_item_fra_static.h"
#include "assets/textures/icon_item_field_static/icon_item_field_static.h"
#include "assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h"
void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
static void* dungeonItemTexs[] = {

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -1,10 +1,10 @@
#include "z_kaleido_scope.h"
#include "textures/icon_item_static/icon_item_static.h"
#include "textures/icon_item_24_static/icon_item_24_static.h"
#include "textures/icon_item_nes_static/icon_item_nes_static.h"
#include "textures/icon_item_ger_static/icon_item_ger_static.h"
#include "textures/icon_item_fra_static/icon_item_fra_static.h"
#include "textures/icon_item_gameover_static/icon_item_gameover_static.h"
#include "assets/textures/icon_item_static/icon_item_static.h"
#include "assets/textures/icon_item_24_static/icon_item_24_static.h"
#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h"
#include "assets/textures/icon_item_ger_static/icon_item_ger_static.h"
#include "assets/textures/icon_item_fra_static/icon_item_fra_static.h"
#include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h"
#include "vt.h"
static void* sEquipmentFRATexs[] = {

2
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View file

@ -1,5 +1,5 @@
#include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h"
#include "assets/textures/parameter_static/parameter_static.h"
typedef struct {
/* 0x00 */ void* texture;