Skip to content

Commit 3ff2da3

Browse files
committed
Change some names
1 parent 3e47f99 commit 3ff2da3

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include $(DEVKITARM)/3ds_rules
99

1010
CTRPFLIB ?= $(DEVKITPRO)/libctrpf
1111

12-
TARGET := default
12+
TARGET := LunaCore
1313
PLGINFO := CTRPluginFramework.plgInfo
1414

1515
BUILD := Build

Sources/Game/MenuLayout.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void CreateMenuButtons(int *ptr, std::vector<btn_ctx> &btn_ctxs) {
7878
GameButton *(*InitMenuButton)(GameButton*ptr1, int* ptr2, MenuButtonID::MenuButtonID submenuID, int posX, int posY, int width, int height, const char *string, int buttonType) = (GameButton*(*)(GameButton*, int*, MenuButtonID::MenuButtonID, int, int, int, int, const char *, int))(0x4d6b58+BASE_OFF);
7979
void (*LinkButton)(btn_ctx *ptr1, GameButton *btnPtr) = (void(*)(btn_ctx*, GameButton*))(0x7b1bc0+BASE_OFF);
8080
void (*AddButtonTexUVs)(GameButton* btnPtr, void*, int u, int v, int w, int h, int, uv_vals*, uv_vals*, int, int, int) = (void(*)(GameButton*, void*, int, int, int, int, int, uv_vals*, uv_vals*, int, int, int))(0x4d6a50+BASE_OFF);
81-
void (*LinkButtonTexs)(void*, btn_ctx*) = (void(*)(void*, btn_ctx*))(0x7b1c74+BASE_OFF);
81+
void (*MaybeLinkButtonTexs)(void*, btn_ctx*) = (void(*)(void*, btn_ctx*))(0x7b1c74+BASE_OFF);
8282
void (*MaybeRegisterData)(int*, void*) = (void(*)(int*, void*))(0x7f9788+BASE_OFF);
8383
void (*MaybeAppendButton)(void*) = (void(*)(void*))(0x7b1074+BASE_OFF);
8484

@@ -112,12 +112,11 @@ void CreateMenuButtons(int *ptr, std::vector<btn_ctx> &btn_ctxs) {
112112
AddButtonTexUVs(btn_ctxs[i].btnPtr,(void*)0xabfd74,MenuLayoutBtns[i].iconU,
113113
MenuLayoutBtns[i].iconV,MenuLayoutBtns[i].iconW,MenuLayoutBtns[i].iconH,
114114
0,&uv2,&uv1,2,2,0);
115-
struct ctx_info local_var2;
116-
LinkButtonTexs(&local_var2, &btn_ctxs[i]);
117-
MaybeRegisterData(ptr + 7, &local_var2);
118-
MaybeAppendButton(&local_var2);
119-
}
120-
115+
struct ctx_info tex_ctx;
116+
MaybeLinkButtonTexs(&tex_ctx, &btn_ctxs[i]);
117+
MaybeRegisterData(ptr + 7, &tex_ctx);
118+
MaybeAppendButton(&tex_ctx);
119+
}
121120
}
122121

123122
extern "C" void CreateMenuButtonsCallback(int *ptr) {

0 commit comments

Comments
 (0)