mirror of https://github.com/zeldaret/oot.git
Rename files for some of the newly named unused NTSC stuff
This commit is contained in:
parent
a326042581
commit
b2c0bc8525
|
@ -71,9 +71,9 @@
|
||||||
#include "gameplay_keep_0x38FB0.h"
|
#include "gameplay_keep_0x38FB0.h"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
#include "gameplay_keep_ntsc_0x39850.h"
|
#include "gameplay_keep_ntsc_0x39850.h"
|
||||||
#include "gameplay_keep_ntsc_0x39970.h"
|
#include "unused_bomb_icon_model_ntsc.h"
|
||||||
#include "gameplay_keep_ntsc_0x39A40.h"
|
#include "unused_heart_icon_model_ntsc.h"
|
||||||
#include "gameplay_keep_ntsc_0x39B10.h"
|
#include "unused_arrow_icon_model_ntsc.h"
|
||||||
#endif
|
#endif
|
||||||
#include "gameplay_keep_0x393B0.h"
|
#include "gameplay_keep_0x393B0.h"
|
||||||
#include "liftable_rock_model.h"
|
#include "liftable_rock_model.h"
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
#include "gameplay_keep_0x3B1E0.h"
|
#include "gameplay_keep_0x3B1E0.h"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
#include "gameplay_keep_ntsc_0x3C610.h"
|
#include "gameplay_keep_ntsc_0x3C610.h"
|
||||||
#include "gameplay_keep_ntsc_0x3D220.h"
|
#include "unused_heart_container_icon_model_ntsc.h"
|
||||||
#endif
|
#endif
|
||||||
#include "rectangular_sign_model.h"
|
#include "rectangular_sign_model.h"
|
||||||
#include "gameplay_keep_0x3C2E0.h"
|
#include "gameplay_keep_0x3C2E0.h"
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include "drop_recovery_heart_tex.h"
|
#include "drop_recovery_heart_tex.h"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
#include "gameplay_keep_ntsc_0x41580.h"
|
#include "unused_heart_piece_icon_tex_ntsc.h"
|
||||||
#endif
|
#endif
|
||||||
#include "item_drop_dl.h"
|
#include "item_drop_dl.h"
|
||||||
#include "gameplay_keep_0x3F140.h"
|
#include "gameplay_keep_0x3F140.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gameplay_keep_ntsc_0x39B10.h"
|
#include "unused_arrow_icon_model_ntsc.h"
|
||||||
#include "item_drops_ntsc.h"
|
#include "item_drops_ntsc.h"
|
||||||
#include "gfx.h"
|
#include "gfx.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef GAMEPLAY_KEEP_NTSC_0x39B10
|
#ifndef GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
|
||||||
#define GAMEPLAY_KEEP_NTSC_0x39B10
|
#define GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
|
||||||
|
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
||||||
#include "region.h"
|
#include "region.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gameplay_keep_ntsc_0x39970.h"
|
#include "unused_bomb_icon_model_ntsc.h"
|
||||||
#include "item_drops_ntsc.h"
|
#include "item_drops_ntsc.h"
|
||||||
#include "gfx.h"
|
#include "gfx.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef GAMEPLAY_KEEP_NTSC_0x39970_H
|
#ifndef GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
|
||||||
#define GAMEPLAY_KEEP_NTSC_0x39970_H
|
#define GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
|
||||||
|
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
||||||
#include "region.h"
|
#include "region.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gameplay_keep_ntsc_0x3D220.h"
|
#include "unused_heart_container_icon_model_ntsc.h"
|
||||||
#include "gameplay_keep_ntsc_0x46A40.h"
|
#include "gameplay_keep_ntsc_0x46A40.h"
|
||||||
#include "gfx.h"
|
#include "gfx.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef GAMEPLAY_KEEP_NTSC_0x3D220_H
|
#ifndef GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
|
||||||
#define GAMEPLAY_KEEP_NTSC_0x3D220_H
|
#define GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
|
||||||
|
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
||||||
#include "region.h"
|
#include "region.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gameplay_keep_ntsc_0x39A40.h"
|
#include "unused_heart_icon_model_ntsc.h"
|
||||||
#include "item_drops_ntsc.h"
|
#include "item_drops_ntsc.h"
|
||||||
#include "gfx.h"
|
#include "gfx.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef GAMEPLAY_KEEP_NTSC_0x39A40_H
|
#ifndef GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
|
||||||
#define GAMEPLAY_KEEP_NTSC_0x39A40_H
|
#define GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
|
||||||
|
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
||||||
#include "region.h"
|
#include "region.h"
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gameplay_keep_ntsc_0x41580.h"
|
#include "unused_heart_piece_icon_tex_ntsc.h"
|
||||||
|
|
||||||
u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
|
u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
|
||||||
#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
|
#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef GAMEPLAY_KEEP_NTSC_0x41580_H
|
#ifndef GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
|
||||||
#define GAMEPLAY_KEEP_NTSC_0x41580_H
|
#define GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
|
||||||
|
|
||||||
#include "tex_len.h"
|
#include "tex_len.h"
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
10
spec/spec
10
spec/spec
|
@ -1067,9 +1067,9 @@ beginseg
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.o"
|
||||||
#endif
|
#endif
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
|
||||||
|
@ -1090,7 +1090,7 @@ beginseg
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.o"
|
||||||
#endif
|
#endif
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
|
||||||
|
@ -1100,7 +1100,7 @@ beginseg
|
||||||
#endif
|
#endif
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o"
|
||||||
#if OOT_REGION != REGION_EU
|
#if OOT_REGION != REGION_EU
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.o"
|
||||||
#endif
|
#endif
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o"
|
||||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o"
|
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o"
|
||||||
|
|
Loading…
Reference in New Issue