Skip to content

Rename gameplay_keep folder to gameplay_hacker_keep #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yanis002 merged 1 commit into from
Nov 20, 2025
Merged

Rename gameplay_keep folder to gameplay_hacker_keep #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/objects/gameplay_keep/bottle.c → assets/objects/gameplay_hacker_keep/bottle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
0 ...ects/gameplay_keep/bottle_contents.i8.png → ...meplay_hacker_keep/bottle_contents.i8.png
View file
Open in desktop
File renamed without changes
0 ...objects/gameplay_keep/bottle_glass.i8.png → .../gameplay_hacker_keep/bottle_glass.i8.png
View file
Open in desktop
File renamed without changes
0 ...jects/gameplay_keep/gLinkMMBottleDL.inc.c → ...ameplay_hacker_keep/gLinkMMBottleDL.inc.c
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions assets/objects/gameplay_hacker_keep/gameplay_hacker_keep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "config.h"

#if MM_BOTTLE_MODEL
#include "assets/objects/gameplay_hacker_keep/bottle.c"
#endif
0 ...ects/gameplay_keep/gameplay_hacker_keep.h → ...meplay_hacker_keep/gameplay_hacker_keep.h
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions assets/objects/gameplay_keep/gameplay_hacker_keep.c
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions assets/objects/object_link_boy/object_link_boy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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] = {
Expand Down
4 changes: 2 additions & 2 deletions assets/objects/object_link_child/object_link_child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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] = {
Expand Down
2 changes: 1 addition & 1 deletion spec/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down