Game-Decompilation/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-23 05:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more goods

Browse Source
This commit is contained in:
Ethan 2024-11-10 22:28:10 +09:00
parent 7f3cd8079b
commit 989598c6b7
No known key found for this signature in database
GPG Key ID: 9BCC97FDA5482E7A
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -835,7 +835,7 @@ b32 is_point_visible(f32 x, f32 y, f32 z, s32 depthQueryID, f32* screenX, f32* s
void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z);
void* mdl_get_next_texture_address(s32);
s32 cancel_current_message(void);
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style);
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u16 style);
void mdl_get_shroud_tint_params(u8* r, u8* g, u8* b, u8* a);
s32 entity_base_block_idle(Entity* entity);

3
src/filemenu/filemenu_main.c
View File

@ -83,12 +83,13 @@ BSS u8 filemenu_filename[8];
#define FILE_NUMBER_X 33
#define FILE_NAME_X 46
#define NUMBER_OFFSET_Y 0
#endif
#if VERSION_JP
#define WIN_FILES_TITLE_WIDTH 168
#else
#define WIN_FILES_TITLE_WIDTH 162
#endif
#endif
extern HudScript HES_OptionMonoOn_de;
extern HudScript HES_OptionMonoOff_de;

45
src/filemenu/filemenu_msg.c
View File

@ -10,12 +10,13 @@ extern MessageCharset* MsgCharsets[5];
extern PAL_BIN D_802F4560[80][8];
extern u8 filemenu_glyphBuffer[20][0x80];
// 1742f0
#if VERSION_JP
u8 filemenu_msg_JP_1[0x50] = {0};
#endif
#if VERSION_IQUE
u8 filemenu_msg_C6[] = { 0xF7, 0xF7, 0x84, 0x05, 0x62, 0x14, 0xFD };
u8 filemenu_msg_C7[] = { 0xFD };
u8 filemenu_msg_C8[] = { 0xFD };
u8 filemenu_msg_C9[] = { 0x6C, 0x2B, 0x8D, 0x04, 0xFD };
u8 filemenu_msg_CA[] = { 0x7C, 0x04, 0x7D, 0x04, 0xFD };
#elif VERSION_IQUE
u8 filemenu_msg_C6[] = { 0xF7, 0xF7, 0x84, 0x05, 0x62, 0x14, 0xFD };
u8 filemenu_msg_C7[] = { 0xFD };
u8 filemenu_msg_C8[] = { 0xFD };
@ -49,6 +50,10 @@ u8* filemenu_specialSymbols[][5] = {
s32 filemenu_specialSymbols[] = { (s32)filemenu_msg_C6, (s32)filemenu_msg_C7, (s32)filemenu_msg_C8, (s32)filemenu_msg_C9, (s32)filemenu_msg_CA };
#endif
#if VERSION_JP
u8 filemenu_msg_JP_1[0x40] = {0};
#endif
Gfx filemenu_dl_draw_char_init[] = {
gsDPPipeSync(),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@ -691,15 +696,14 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) {
}
#endif
#if VERSION_JP // TODO ASDF
__asm__("nop");
__asm__("nop");
__asm__("nop");
__asm__("nop");
#endif
if (c == MSG_CHAR_READ_SPACE) {
#if VERSION_JP
__asm__("nop");
__asm__("nop");
return charData->monospaceWidth;
#else
return charWidth - 6;
#endif
}
switch (c) {
@ -719,17 +723,27 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) {
return 0;
}
#if VERSION_JP
#define SOMETHING_1 0xC6
#define SOMETHING_2 0x2A
#else
#define SOMETHING_1 0xA2
#define SOMETHING_2 0x4E
#endif
void filemenu_draw_message(u8* message, s32 x, s32 y, s32 alpha, s32 color, u32 flags) {
s32 flag1 = flags & 1;
s32 flag2 = flags >> 3;
flag2 &= 1;
#if !VERSION_JP
if (flag1 == 1) {
y -= 2;
}
#endif
if ((u32)message < 0x100) {
if ((u32)message - 0xA2 >= 0x4E) {
if ((u32)message - SOMETHING_1 >= SOMETHING_2) {
filemenu_draw_char((s32)message, x, y, flag1, color, flag2);
return;
}
@ -764,6 +778,11 @@ void filemenu_draw_message(u8* message, s32 x, s32 y, s32 alpha, s32 color, u32
#endif
}
}
#if VERSION_JP
else {
draw_msg(message, x, y, alpha, color, flags);
}
#endif
}
u8* filemenu_get_menu_message(s32 idx) {

2
src/msg.c
View File

@ -1991,7 +1991,7 @@ s32 get_msg_lines(s32 msgID) {
}
#endif
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) {
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u16 style) {
MessagePrintState stackPrinter;
MessagePrintState* printer;
u16 bufferPos;