mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-30 23:54:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some menu symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2020-10-06 20:59:59 +10:00
parent 3615d6c7f9
commit 33917dffaa
16 changed files with 569 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/game_0e5ce0.h
+35 -35
View File
@@ -8,74 +8,74 @@ s32 func0f0e5ef8(s16 arg0, struct menuitem *item);
u32 func0f0e6038(void);
Gfx *func0f0e6298(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2);
Gfx *menuRenderItemList(Gfx *gdl);
bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemtickdata *data);
bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemDropdown(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemDropdown(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemDropdown(Gfx *gdl);
bool menuTickItemDropdown(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
bool menuTickItemDropdown(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *func0f0e8290(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
bool menuIsStringEmptyOrSpaces(char *text);
Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemtickdata *data);
void menuInitItemKeyboard(struct menuitem *item, union menuitemtickdata *data);
Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *thing);
bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemKeyboard(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderObjective(Gfx *gfx, struct menuframe *frame, s32 index, s32 position, s32 x, s32 y, s32 width, s32 height, s32 arg8, s32 arg9);
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemModel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemModel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemLabel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemLabel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemMeter(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemMeter(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemSelectable(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemSelectable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemSelectable(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemSlider(Gfx *gdl);
bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItemSlider(union menuitemtickdata *data);
bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemSlider(union menuitemdata *data);
Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCarousel(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemCheckbox(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemCheckbox(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCheckbox(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
char *menuItemScrollableGetText(u32 type);
Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItemScrollable(union menuitemtickdata *data);
Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemScrollable(union menuitemdata *data);
Gfx *menuRenderItemMarquee(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemMarquee(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemMarquee(union menuitemtickdata *data);
Gfx *menuRenderItemMarquee(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemMarquee(struct menuitem *item, union menuitemdata *data);
void menuInitItemMarquee(union menuitemdata *data);
Gfx *menuRenderItem07(Gfx *gdl);
Gfx *menuRenderItemRanking(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemtickdata *data);
void menuInitItemRanking(union menuitemtickdata *data);
Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemdata *data);
void menuInitItemRanking(union menuitemdata *data);
Gfx *menuRenderItemPlayerStats(Gfx *gdl);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *func0f0ef2fc(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemdata *data);
u32 func0f0ef394(void);
Gfx *menuRenderControllerTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha);
Gfx *menuRenderControllerLines(Gfx *gdl, struct menurenderthing *thing, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
Gfx *menuRenderControllerLines(Gfx *gdl, struct menurendercontext *context, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
u16 menuControllerGetButtonAction(s32 mode, s32 buttonnum);
Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurenderthing *thing, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuRenderControllerInfo(Gfx *gdl, struct menurenderthing *thing, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuRenderItemController(Gfx *gdl, struct menurenderthing *thing);
void menuInitItemController(union menuitemtickdata *data);
Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuRenderControllerInfo(Gfx *gdl, struct menurendercontext *context, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context);
void menuInitItemController(union menuitemdata *data);
Gfx *menuRenderItem(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItem(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItem(struct menuitem *item, union menuitemtickdata *data);
Gfx *menuRenderItem(Gfx *gdl, struct menurendercontext *context);
bool menuTickItem(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItem(struct menuitem *item, union menuitemdata *data);
Gfx *func0f0f0918(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
#endif
src/include/game/game_1531a0.h
+1 -1
View File
@@ -38,7 +38,7 @@ u32 func0f1552d4(void);
u32 func0f15568c(void);
u32 func0f156024(void);
u32 func0f156030(void);
Gfx *textRenderWhite(Gfx *gdl, s32 *x, s32 *y, char *text, u32 font1, u32 font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, u32 font1, u32 font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
u32 func0f1566cc(void);
u32 func0f156790(void);
u32 func0f156a24(void);
src/include/types.h
+24 -38
View File
@@ -3248,15 +3248,15 @@ struct hoverprop {
u16 size;
};
struct menuitemtickdata_controller {
u8 unk00;
u8 unk01;
u8 unk02;
u8 unk03;
s8 unk04;
struct menuitemdata_controller {
u8 textfadetimer;
u8 contfadetimer;
u8 curmode;
u8 controlgroup;
s8 prevmode;
};
struct menuitemtickdata_dropdown {
struct menuitemdata_dropdown {
u16 unk00;
u16 unk02;
s16 unk04;
@@ -3267,7 +3267,7 @@ struct menuitemtickdata_dropdown {
u16 unk0e;
};
struct menuitemtickdata_keyboard {
struct menuitemdata_keyboard {
char string[11];
s8 col;
s8 row;
@@ -3275,44 +3275,44 @@ struct menuitemtickdata_keyboard {
u8 capseffective : 1; // Same as above, but inverted if holding L or R
};
struct menuitemtickdata_list {
struct menuitemdata_list {
s16 unk00;
s16 unk02;
s16 unk04;
s16 unk06;
};
struct menuitemtickdata_marquee {
struct menuitemdata_marquee {
u16 totalmoved;
u16 sum;
u16 unk04;
u16 unk06;
};
struct menuitemtickdata_ranking {
struct menuitemdata_ranking {
s16 scrolloffset;
};
struct menuitemtickdata_scrollable {
struct menuitemdata_scrollable {
s16 unk00;
s16 unk02;
s16 unk04;
s16 unk06;
};
struct menuitemtickdata_slider {
struct menuitemdata_slider {
s16 unk00;
};
union menuitemtickdata {
struct menuitemtickdata_controller controller;
struct menuitemtickdata_dropdown dropdown;
struct menuitemtickdata_keyboard keyboard;
struct menuitemtickdata_list list;
struct menuitemtickdata_marquee marquee;
struct menuitemtickdata_ranking ranking;
struct menuitemtickdata_scrollable scrollable;
struct menuitemtickdata_slider slider;
union menuitemdata {
struct menuitemdata_controller controller;
struct menuitemdata_dropdown dropdown;
struct menuitemdata_keyboard keyboard;
struct menuitemdata_list list;
struct menuitemdata_marquee marquee;
struct menuitemdata_ranking ranking;
struct menuitemdata_scrollable scrollable;
struct menuitemdata_slider slider;
};
struct handlerdata_carousel {
@@ -6868,15 +6868,7 @@ struct splat {
/*0x440*/ u32 unk440;
};
struct menurenderthing14_controller {
u8 textfadetimer;
u8 contfadetimer;
u8 curmode;
u8 controlgroup;
s8 prevmode;
};
struct menurenderthing {
struct menurendercontext {
s16 x;
s16 y;
s16 width;
@@ -6884,13 +6876,7 @@ struct menurenderthing {
struct menuitem *item;
bool focused;
struct menuframe *frame;
// Suspected to be handlerdata
union {
s16 *s16;
u16 *u16;
struct menurenderthing14_controller *controller;
} unk14;
union menuitemdata *data;
};
struct menucolourpalette {