mirror of
https://github.com/HackerN64/HackerOoT.git
synced 2026-01-21 10:37:37 -08:00
Rename gameplay_keep folder to gameplay_hacker_keep (#191)
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
#include "gfx.h"
|
||||
|
||||
u64 gBottleContentsTex[] = {
|
||||
#include "assets/objects/gameplay_keep/bottle_contents.i8.inc.c"
|
||||
#include "assets/objects/gameplay_hacker_keep/bottle_contents.i8.inc.c"
|
||||
};
|
||||
|
||||
u64 gBottleGlassNewTex[] = {
|
||||
#include "assets/objects/gameplay_keep/bottle_glass.i8.inc.c"
|
||||
#include "assets/objects/gameplay_hacker_keep/bottle_glass.i8.inc.c"
|
||||
};
|
||||
|
||||
Vtx gameplay_keepVtx_000080[] = {
|
||||
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 598 B |
@@ -0,0 +1,5 @@
|
||||
#include "config.h"
|
||||
|
||||
#if MM_BOTTLE_MODEL
|
||||
#include "assets/objects/gameplay_hacker_keep/bottle.c"
|
||||
#endif
|
||||
@@ -1,5 +0,0 @@
|
||||
#include "config.h"
|
||||
|
||||
#if MM_BOTTLE_MODEL
|
||||
#include "assets/objects/gameplay_keep/bottle.c"
|
||||
#endif
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "object_link_boy.h"
|
||||
#include "assets/objects/gameplay_keep/gameplay_keep.h"
|
||||
#include "assets/objects/gameplay_keep/gameplay_hacker_keep.h"
|
||||
#include "assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h"
|
||||
|
||||
#include "array_count.h"
|
||||
#include "gfx.h"
|
||||
@@ -898,7 +898,7 @@ Gfx gLinkAdultRightHandHoldingHookshotFarDL[196] = {
|
||||
|
||||
#if MM_BOTTLE_MODEL
|
||||
Gfx gLinkAdultBottleDL[] = {
|
||||
#include "assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c"
|
||||
#include "assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c"
|
||||
};
|
||||
#else
|
||||
Gfx gLinkAdultBottleDL[35] = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "object_link_child.h"
|
||||
#include "assets/objects/gameplay_keep/gameplay_keep.h"
|
||||
#include "assets/objects/gameplay_keep/gameplay_hacker_keep.h"
|
||||
#include "assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.h"
|
||||
|
||||
#include "array_count.h"
|
||||
#include "gfx.h"
|
||||
@@ -569,7 +569,7 @@ Gfx gLinkChildRightArmStretchedSlingshotDL[134] = {
|
||||
|
||||
#if MM_BOTTLE_MODEL
|
||||
Gfx gLinkChildBottleDL[] = {
|
||||
#include "assets/objects/gameplay_keep/gLinkMMBottleDL.inc.c"
|
||||
#include "assets/objects/gameplay_hacker_keep/gLinkMMBottleDL.inc.c"
|
||||
};
|
||||
#else
|
||||
Gfx gLinkChildBottleDL[33] = {
|
||||
|
||||
@@ -1148,7 +1148,7 @@ beginseg
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep.o"
|
||||
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_hacker_keep.o"
|
||||
include "$(BUILD_DIR)/assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.o"
|
||||
number 4
|
||||
endseg
|
||||
|
||||
|
||||
Reference in New Issue
Block a user