Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-20 15:55:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Kermalis
2025-03-10 00:48:34 -04:00
parent 322e0d3b7b
commit e968ef8aa3
15 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/structs/str_text.h
View File

@@ -64,12 +64,12 @@ typedef struct WindowTemplate
#define MAX_WINDOWS 4
// All fields are zeroed out except for type which is set to WINDOW_TYPE_NORMAL.
#define WINDOW_DUMMY (Window) { .unk0 = 0, .type = WINDOW_TYPE_NORMAL, .pos = { .x = 0, .y = 0 }, .width = 0, .height = 0, .unk10 = 0, .unk12 = 0, .header = NULL }
#define WIN_TEMPLATE_DUMMY (WindowTemplate) { .unk0 = 0, .type = WINDOW_TYPE_NORMAL, .pos = { .x = 0, .y = 0 }, .width = 0, .height = 0, .unk10 = 0, .unk12 = 0, .header = NULL }
// size: 0x60
typedef struct WindowTemplates
{
/* 0x0 */ sWindowTemplate id[MAX_WINDOWS];
/* 0x0 */ WindowTemplate id[MAX_WINDOWS];
} WindowTemplates;
#endif // GUARD_STR_TEXT_H

20
src/code_803E724.c
View File

@@ -185,9 +185,9 @@ static const struct WindowTemplates gUnknown_80F62B0 =
.unk12 = 0,
.header = NULL,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -203,9 +203,9 @@ static const struct WindowTemplates gUnknown_80F6310 =
.unk12 = 0,
.header = NULL,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -239,7 +239,7 @@ static const struct WindowTemplates gUnknown_80F6370 =
.unk12 = 0,
.header = NULL,
},
[3] = WINDOW_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -255,9 +255,9 @@ static const struct WindowTemplates gUnknown_80F63D0 =
.unk12 = 2,
.header = NULL,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

4
src/code_8066D04.c
View File

@@ -949,8 +949,8 @@ static const WindowTemplates gUnknown_8106DC8 = {
.unk12 = 0,
.header = NULL
},
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

4
src/dungeon_menu_items.c
View File

@@ -133,7 +133,9 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
.unk10 = 0x10,
.header = &header,
},
WINDOW_DUMMY, WINDOW_DUMMY, WINDOW_DUMMY
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY
},
};

12
src/dungeon_menu_moves.c
View File

@@ -208,9 +208,9 @@ bool8 ShowDungeonMovesMenu(Entity * entity, bool8 addLinkOptions, bool8 addUseMo
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
u8 unk[4];
@@ -946,9 +946,9 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
Move movesLocal[8];

42
src/dungeon_menu_others.c
View File

@@ -493,9 +493,9 @@ static void PrintOthersMenuOptions(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -566,9 +566,9 @@ static void PrintQuickSaveMenuOptions(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -619,9 +619,9 @@ static void PrintGameOptions(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -674,9 +674,9 @@ static void PrintDungeonOptions(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
s32 mapOptionUnderscoreWidths[] = {16, 25, 27};
@@ -765,9 +765,9 @@ static void PrintOthersOptions(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
s32 underscoreWidths[] = {19, 17, 25};
@@ -953,9 +953,9 @@ static void PrintHintsMenu(void)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -1008,9 +1008,9 @@ static void ShowChosenHintWindow(s32 hintId)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

6
src/dungeon_menu_recruitment.c
View File

@@ -72,9 +72,9 @@ static const WindowTemplates sRecruitmentSearchWindows = {
.unk12 = 2,
.header = &sRecruitmentWindowHeader,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

12
src/dungeon_menu_stairs.c
View File

@@ -58,9 +58,9 @@ void ShowDungeonStairsMenu(Entity *mon)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -178,9 +178,9 @@ static void ShowStairsDescription(DungeonPos *pos)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
s32 i, statusesCount;

28
src/dungeon_menu_team.c
View File

@@ -188,9 +188,9 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
.unk12 = 0,
.header = &sTeamWindowHeader,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -520,9 +520,9 @@ void ShowDungeonTacticsMenu(ActionContainer *a0)
.unk12 = 2,
.header = &sTeamWindowHeader,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
EntityInfo *monInfo;
@@ -755,9 +755,9 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
.unk12 = 2,
.header = &sTeamWindowHeader,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
s32 r8;
@@ -1410,9 +1410,9 @@ static void ShowStatusInfoWindow(s32 statusId)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -1488,8 +1488,8 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId)
.unk12 = 0,
.header = NULL,
},
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
bool8 bPress = FALSE;

12
src/dungeon_menu_tile.c
View File

@@ -53,9 +53,9 @@ void ShowDungeonTileMenu(Entity *mon)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -168,9 +168,9 @@ static void ShowTileDescription(DungeonPos *pos)
.unk12 = 0,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
u8 trapName[0x60];

6
src/dungeon_submenu.c
View File

@@ -19,7 +19,7 @@ void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
s32 i;
WindowTemplates windows = {
.id = {
[0] = WINDOW_DUMMY,
[0] = WIN_TEMPLATE_DUMMY,
[1] = {
.type = WINDOW_TYPE_NORMAL,
.pos = {22, 4},
@@ -27,8 +27,8 @@ void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
.height = 4,
.unk10 = 4,
},
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

6
src/friend_areas_map_util.c
View File

@@ -305,9 +305,9 @@ void FriendAreasMap_PrintAvailableSubAreas(void)
.unk10 = 2,
.header = &header,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

16
src/string_format.c
View File

@@ -159,17 +159,27 @@ static EWRAM_DATA MenuInputStructSub gUnknown_202EC28 = {0};
static EWRAM_INIT WindowTemplates sUnknown_203B198 = {
.id = {
[0] = {
.pos = {2, 15},
.unk0 = 0,
.type = WINDOW_TYPE_0,
.pos = { .x = 2, .y = 15 },
.width = 26,
.height = 5,
.unk10 = 7,
.unk12 = 0,
.header = NULL,
},
[1] = {
.unk0 = 0x40,
.type = WINDOW_TYPE_7,
.pos = { .x = 0, .y = 0 },
.width = 0,
.height = 0,
.unk10 = 0,
.unk12 = 0,
.header = NULL,
},
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

8
src/text.c
View File

@@ -113,10 +113,10 @@ static const u32 gUnknown_80B853C[16] =
static const WindowTemplates sDummyWindows =
{
.id = {
[0] = WINDOW_DUMMY,
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[0] = WIN_TEMPLATE_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};

10
src/world_map.c
View File

@@ -54,8 +54,8 @@ static EWRAM_INIT WindowTemplates sWorldMapWindows = {
.height = 3,
.unk10 = 3,
},
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};
@@ -492,9 +492,9 @@ static void PrintDungeonName(DungeonLocation *dungLocation)
.height = 2,
.unk10 = 2,
},
[1] = WINDOW_DUMMY,
[2] = WINDOW_DUMMY,
[3] = WINDOW_DUMMY,
[1] = WIN_TEMPLATE_DUMMY,
[2] = WIN_TEMPLATE_DUMMY,
[3] = WIN_TEMPLATE_DUMMY,
}
};