pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

popup and window priority (#960)

Browse Source 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-03-01 21:36:11 -05:00 committed by GitHub
parent 49584c67b6
commit 8a7432f465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 393 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/enums.h
View File

@ -3667,10 +3667,12 @@ enum PopupResult {
enum WindowPriority {
WINDOW_PRIORITY_0 = 0,
WINDOW_PRIORITY_1 = 1,
WINDOW_PRIORITY_10 = 10,
WINDOW_PRIORITY_19 = 19,
WINDOW_PRIORITY_20 = 20,
WINDOW_PRIORITY_21 = 21,
WINDOW_PRIORITY_64 = 64,
};
/// not really
@ -5361,7 +5363,7 @@ enum CameraFlags {
enum CameraMoveFlags {
CAMERA_MOVE_IGNORE_PLAYER_Y = 0x00000001,
CAMERA_MOVE_FLAG_2 = 0x00000002,
CAMERA_MOVE_FLAG_4 = 0x00000004
CAMERA_MOVE_FLAG_4 = 0x00000004,
};
enum CameraSettingsType {
@ -5943,7 +5945,7 @@ enum WindowId {
WINDOW_ID_17 = 17,
WINDOW_ID_18 = 18,
WINDOW_ID_19 = 19,
WINDOW_ID_20 = 20,
WINDOW_ID_CURRENCY_COUNTER = 20,
WINDOW_ID_21 = 21,
WINDOW_ID_PAUSE_MAIN = 22,
WINDOW_ID_PAUSE_DECRIPTION = 23,

4
src/415D90.c
View File

@ -1180,7 +1180,7 @@ s32 btl_submenu_moves_update(void) {
moveX = 20;
moveY = BattleMenu_Moves_PosY;
set_window_properties(8, moveX, 186, 280, 32, 20, func_802A4494, NULL, -1);
set_window_properties(8, moveX, 186, 280, 32, WINDOW_PRIORITY_20, func_802A4494, NULL, -1);
set_window_update(WINDOW_ID_1, WINDOW_UPDATE_SHOW);
if (!BattleMenu_UsingSpiritsSubmenu) {
set_window_update(WINDOW_ID_2, WINDOW_UPDATE_SHOW);
@ -1808,7 +1808,7 @@ s32 func_802A4A54(void) {
set_window_properties(WINDOW_ID_7, x + 18, y - 6, 108, 16, 1, func_802A56F8, NULL, -1);
x = 20;
y = 186;
set_window_properties(WINDOW_ID_8, x, y, 280, 32, 20, func_802A5738, NULL, -1);
set_window_properties(WINDOW_ID_8, x, y, 280, 32, WINDOW_PRIORITY_20, func_802A5738, NULL, -1);
set_window_update(WINDOW_ID_6, WINDOW_UPDATE_SHOW);
set_window_update(WINDOW_ID_7, WINDOW_UPDATE_SHOW);
set_window_update(WINDOW_ID_8, WINDOW_UPDATE_SHOW);

8
src/80850_len_3060.c
View File

@ -1106,7 +1106,7 @@ void update_coin_counter(void) {
if ((uiStatus->displayCoins == playerData->coins) || (uiStatus->unk_6C[0] <= 30)) {
uiStatus->unk_6C[0] -= 1;
if (uiStatus->unk_6C[0] == 0) {
set_window_update(WINDOW_ID_20, (s32)basic_hidden_window_update);
set_window_update(WINDOW_ID_CURRENCY_COUNTER, (s32)basic_hidden_window_update);
uiStatus->unk_6C[1] = 15;
D_8010CD10 = 0;
D_8010CD12 = 1;
@ -1127,7 +1127,7 @@ void show_coin_counter(void) {
s32 index;
if ((D_8010CD10 != 0) || (D_8010CD12 != 0)) {
set_window_update(WINDOW_ID_20, WINDOW_UPDATE_HIDE);
set_window_update(WINDOW_ID_CURRENCY_COUNTER, WINDOW_UPDATE_HIDE);
if (uiStatus->iconIndex12 > -1) {
hud_element_free(uiStatus->iconIndex10);
hud_element_free(uiStatus->iconIndex11);
@ -1140,8 +1140,8 @@ void show_coin_counter(void) {
}
if (uiStatus->unk_6C[0] == 0) {
set_window_properties(WINDOW_ID_20, 32, 164, 64, 20, 0x15, coin_counter_draw_content, 0, -1);
set_window_update(WINDOW_ID_20, (s32)basic_window_update);
set_window_properties(WINDOW_ID_CURRENCY_COUNTER, 32, 164, 64, 20, WINDOW_PRIORITY_21, coin_counter_draw_content, 0, -1);
set_window_update(WINDOW_ID_CURRENCY_COUNTER, (s32)basic_window_update);
index = hud_element_create(&HES_MenuTimes);
uiStatus->iconIndex10 = index;
hud_element_set_flags(index, HUD_ELEMENT_FLAG_80);

507
src/8a860_len_3f30.c
View File

File diff suppressed because it is too large Load Diff

6
src/filemenu/filemenu_common.c
View File

@ -57,7 +57,7 @@ MenuWindowBP filemenu_common_windowBPs[3] = {
},
.width = 288,
.height = 192,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = NULL,
.tab = NULL,
.parentID = -1,
@ -73,7 +73,7 @@ MenuWindowBP filemenu_common_windowBPs[3] = {
},
.width = 288,
.height = 192,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = filemenu_draw_contents_copy_arrow,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -89,7 +89,7 @@ MenuWindowBP filemenu_common_windowBPs[3] = {
},
.width = 320,
.height = 240,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = filemenu_draw_cursor,
.tab = NULL,
.parentID = -1,

4
src/filemenu/filemenu_createfile.c
View File

@ -19,7 +19,7 @@ MenuWindowBP filemenu_createfile_windowBPs[] = {
.pos = { .x = 68, .y = 10 },
.width = 164,
.height = 46,
.priority = 64,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = &filemenu_draw_contents_file_create_header,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -33,7 +33,7 @@ MenuWindowBP filemenu_createfile_windowBPs[] = {
.pos = { .x = 12, .y = 67 },
.width = 262,
.height = 113,
.priority = 64,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = &filemenu_draw_contents_choose_name,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,

2
src/filemenu/filemenu_info.c
View File

@ -21,7 +21,7 @@ MenuWindowBP filemenu_info_windowBPs[] = {
.pos = { .x = 0, .y = 0 },
.width = 0,
.height = 0,
.priority = 64,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = &filemenu_info_draw_message_contents,
.tab = NULL,
.parentID = -1,

28
src/filemenu/filemenu_main.c
View File

@ -69,7 +69,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 0, .y = 0 },
.width = 0,
.height = 0,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_title,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -83,7 +83,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = -2, .y = 6 },
.width = 68,
.height = 20,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_stereo,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -97,7 +97,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 221, .y = 6 },
.width = 68,
.height = 20,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_mono,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -111,7 +111,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 5, .y = 171 },
.width = 88,
.height = 16,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_option_left,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -125,7 +125,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 0, .y = 171 },
.width = 88,
.height = 16,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_option_center,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -139,7 +139,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 195, .y = 171 },
.width = 88,
.height = 16,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_option_right,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -153,7 +153,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 9, .y = 110 },
.width = 130,
.height = 54,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_2_info,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -167,7 +167,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 3, .y = -8 },
.width = 124 + OFFSET_WIDTH,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_2_title ,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_FILE2_INFO,
@ -181,7 +181,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 149, .y = 110 },
.width = 130,
.height = 54,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_3_info,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -195,7 +195,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 3, .y = -8 },
.width = 124 + OFFSET_WIDTH,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_3_title,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_FILE3_INFO,
@ -209,7 +209,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 9, .y = 41 },
.width = 130 + OFFSET_WIDTH,
.height = 54,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_0_info,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -223,7 +223,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 3, .y = -8 },
.width = 124 + OFFSET_WIDTH,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_0_title,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_FILE0_INFO,
@ -237,7 +237,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 149, .y = 41 },
.width = 130,
.height = 54,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_1_info,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_MAIN,
@ -251,7 +251,7 @@ MenuWindowBP filemenu_main_windowBPs[] = {
.pos = { .x = 3, .y = -8 },
.width = 124 + OFFSET_WIDTH,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_draw_contents_file_1_title,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_FILE1_INFO,

4
src/filemenu/filemenu_yesno.c
View File

@ -41,7 +41,7 @@ MenuWindowBP filemenu_yesno_windowBPs[] = {
.pos = { .x = 0, .y = 0 },
.width = 0,
.height = 0,
.priority = 0x40,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = &filemenu_yesno_draw_options_contents,
.tab = NULL,
.parentID = -1,
@ -55,7 +55,7 @@ MenuWindowBP filemenu_yesno_windowBPs[] = {
.pos = { .x = 0, .y = 0 },
.width = 0,
.height = 0,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &filemenu_yesno_draw_prompt_contents,
.tab = NULL,
.parentID = WINDOW_ID_FILEMENU_YESNO_OPTIONS,

2
src/pause/pause_badges.c
View File

@ -64,7 +64,7 @@ MenuWindowBP gPauseBadgesWindowBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 1,
.priority = WINDOW_PRIORITY_1,
.fpDrawContents = &pause_badges_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,

2
src/pause/pause_items.c
View File

@ -39,7 +39,7 @@ MenuWindowBP gPauseItemsWindowBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 1,
.priority = WINDOW_PRIORITY_1,
.fpDrawContents = &pause_items_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,

4
src/pause/pause_map.c
View File

@ -106,7 +106,7 @@ MenuWindowBP gPauseMapWindowBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 1,
.priority = WINDOW_PRIORITY_1,
.fpDrawContents = &pause_map_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -120,7 +120,7 @@ MenuWindowBP gPauseMapWindowBPs[] = {
.pos = { .x = 56, .y = 124 },
.width = 180,
.height = 20,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_map_draw_title,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAP,

66
src/pause/pause_partners.c
View File

@ -39,12 +39,14 @@ HudScript* gPausePartnersIconScripts[] = {
&HES_FPCost, &HES_StatFp_1, &HES_PartnerRank, &HES_PartnerRank,
&HES_MoveDiamond, &HES_MoveBlueOrb, &HES_MoveGreenOrb, &HES_MoveRedOrb
};
Vp gPausePartnersViewport = {
.vp = {
.vscale = { 640, 480, 511, 0 },
.vtrans = { 640, 480, 511, 0 },
}
};
s32 gPausePartnersSpriteAnims[][4] = {
{
ANIM_WorldGoombario_Still,
@ -95,18 +97,57 @@ s32 gPausePartnersSpriteAnims[][4] = {
ANIM_LIST_END
}
};
s32 gPausePartnersPartnerIDs[] = { 1, 2, 3, 4, 9, 6, 7, 8};
s32 gPausePartnersMessages[] = {
MSG_PartnerDesc_Goombario_Pause, MSG_PartnerDesc_Kooper_Pause, MSG_PartnerDesc_Bombette_Pause, MSG_PartnerDesc_Parakarry_Pause,
MSG_PartnerDesc_Bow_Pause, MSG_PartnerDesc_Watt_Pause, MSG_PartnerDesc_Sushie_Pause, MSG_PartnerDesc_Lakilester_Pause
s32 gPausePartnersPartnerIDs[] = {
PARTNER_GOOMBARIO,
PARTNER_KOOPER,
PARTNER_BOMBETTE,
PARTNER_PARAKARRY,
PARTNER_BOW,
PARTNER_WATT,
PARTNER_SUSHIE,
PARTNER_LAKILESTER,
};
s32 gPausePartnersMoveBase[] = { MOVE_HEADBONK1, MOVE_SHELL_TOSS1, MOVE_BODY_SLAM1, MOVE_SKY_DIVE1,
MOVE_SMACK1, MOVE_ELECTRO_DASH1, MOVE_BELLY_FLOP1, MOVE_SPINY_FLIP1 };
s32 gPausePartnersMessages[] = {
MSG_PartnerDesc_Goombario_Pause,
MSG_PartnerDesc_Kooper_Pause,
MSG_PartnerDesc_Bombette_Pause,
MSG_PartnerDesc_Parakarry_Pause,
MSG_PartnerDesc_Bow_Pause,
MSG_PartnerDesc_Watt_Pause,
MSG_PartnerDesc_Sushie_Pause,
MSG_PartnerDesc_Lakilester_Pause
};
s32 gPausePartnersMoveBase[] = {
MOVE_HEADBONK1,
MOVE_SHELL_TOSS1,
MOVE_BODY_SLAM1,
MOVE_SKY_DIVE1,
MOVE_SMACK1,
MOVE_ELECTRO_DASH1,
MOVE_BELLY_FLOP1,
MOVE_SPINY_FLIP1
};
s8 gPausePartnersGridData[] = {
4, 5, 6, 7,
0, 1, 2, 3
};
char* gPausePartnersAssetNames[] = { "party_kurio", "party_kameki", "party_pinki", "party_pareta", "party_resa", "party_akari", "party_opuku", "party_pokopi", "letter_peach" };
char* gPausePartnersAssetNames[] = {
"party_kurio",
"party_kameki",
"party_pinki",
"party_pareta",
"party_resa",
"party_akari",
"party_opuku",
"party_pokopi",
"letter_peach"
};
s8* gPausePartnersImageBuffers[] = { gPauseBufferImg1, gPauseBufferImg2 };
s8* gPausePartnersPaletteBuffers[] = { gPauseBufferPal1, gPauseBufferPal2 };
s32 D_8024F74C = 0;
@ -135,7 +176,7 @@ MenuWindowBP gPausePartnersWindowBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 1,
.priority = WINDOW_PRIORITY_1,
.fpDrawContents = &pause_partners_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -148,7 +189,7 @@ MenuWindowBP gPausePartnersWindowBPs[] = {
.pos = { .x = 8, .y = 103 },
.width = 112,
.height = 20,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_partners_draw_title,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_PARTNERS,
@ -161,7 +202,7 @@ MenuWindowBP gPausePartnersWindowBPs[] = {
.pos = { .x = 133, .y = 36 },
.width = 140,
.height = 80,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_partners_draw_movelist,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_PARTNERS,
@ -174,7 +215,7 @@ MenuWindowBP gPausePartnersWindowBPs[] = {
.pos = { .x = 12, .y = -6 },
.width = 80,
.height = 16,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_partners_draw_movelist_title,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_PARTNERS_MOVELIST,
@ -187,7 +228,7 @@ MenuWindowBP gPausePartnersWindowBPs[] = {
.pos = { .x = 102, .y = -12 },
.width = 32,
.height = 32,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_partners_draw_movelist_flower,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_PARTNERS_MOVELIST,
@ -546,6 +587,7 @@ void pause_partners_init(MenuPanel* panel) {
void pause_partners_handle_input(MenuPanel* panel) {
s32 delta;
s32 level, level2;
s32 partnerID;
s32 oldPos;
if (gPausePartnersNumPartners >= 2 && (gPausePartnersLevel == 0 || (gPauseHeldButtons & (BUTTON_Z | BUTTON_R)))) {

4
src/pause/pause_spirits.c
View File

@ -104,7 +104,7 @@ MenuWindowBP gPauseSpiritsWindowsBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 1,
.priority = WINDOW_PRIORITY_1,
.fpDrawContents = &pause_spirits_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -118,7 +118,7 @@ MenuWindowBP gPauseSpiritsWindowsBPs[] = {
.pos = { .x = 86, .y = 124 },
.width = 120,
.height = 20,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_spirits_draw_title,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_SPIRITS,

2
src/pause/pause_stats.c
View File

@ -91,7 +91,7 @@ MenuWindowBP gStatsMenuWindowBPs[] = {
.pos = { .x = 3, .y = 16 },
.width = 289,
.height = 154,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &pause_stats_draw_contents,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,

14
src/pause/pause_tabs.c
View File

@ -30,7 +30,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 64,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = pause_tabs_draw_stats,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -44,7 +44,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = pause_tabs_draw_badges,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -58,7 +58,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = pause_tabs_draw_items,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -72,7 +72,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = pause_tabs_draw_party,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -86,7 +86,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = pause_tabs_draw_spirits,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -100,7 +100,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 0, .y = 7 },
.width = 43,
.height = 15,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = pause_tabs_draw_map,
.tab = NULL,
.parentID = WINDOW_ID_PAUSE_MAIN,
@ -114,7 +114,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
.pos = { .x = 8, .y = 8 },
.width = 16,
.height = 16,
.priority = 64,
.priority = WINDOW_PRIORITY_64,
.fpDrawContents = pause_tabs_draw_invis,
.tab = NULL,
.parentID = WINDOW_ID_NONE,

4
src/status_icons.c
View File

@ -295,7 +295,7 @@ void draw_merlee_message(void* data) {
width = get_msg_width(messageID, 0) + 23;
xPos = 160 - (width / 2);
height = 45;
set_window_properties(WINDOW_ID_BATTLE_POPUP, xPos, 80, width, height, 0, draw_merlee_message_string, popup, -1);
set_window_properties(WINDOW_ID_BATTLE_POPUP, xPos, 80, width, height, WINDOW_PRIORITY_0, draw_merlee_message_string, popup, -1);
set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW);
}
break;
@ -307,7 +307,7 @@ void draw_merlee_message(void* data) {
width = get_msg_width(messageID, 0) + 23;
xPos = 160 - (width / 2);
height = 28;
set_window_properties(WINDOW_ID_BATTLE_POPUP, xPos, 80, width, height, 0, draw_merlee_message_string, popup, -1);
set_window_properties(WINDOW_ID_BATTLE_POPUP, xPos, 80, width, height, WINDOW_PRIORITY_0, draw_merlee_message_string, popup, -1);
set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW);
}
break;

4
src/world/area_kkj/kkj_19/kkj_19_2_main.c
View File

@ -119,7 +119,7 @@ MenuWindowBP N(IngredientWindows)[] = {
.pos = { 100, 66 },
.width = 120,
.height = 28,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &N(draw_content_ingredient_name),
.tab = NULL,
.parentID = -1,
@ -132,7 +132,7 @@ MenuWindowBP N(IngredientWindows)[] = {
.pos = { 32, 184 },
.width = 256,
.height = 32,
.priority = 0,
.priority = WINDOW_PRIORITY_0,
.fpDrawContents = &N(draw_content_ingredient_desc),
.tab = NULL,
.parentID = -1,

4
src/world/script_api/shops.c
View File

@ -944,8 +944,8 @@ API_CALLABLE(MakeShop) {
hud_element_set_flags(shop->costIconID, HUD_ELEMENT_FLAG_80);
hud_element_clear_flags(shop->costIconID, HUD_ELEMENT_FLAG_FILTER_TEX);
get_worker(create_worker_frontUI(NULL, draw_shop_items));
set_window_properties(WINDOW_ID_ITEM_INFO_NAME, 100, 66, 120, 28, 0, shop_draw_item_name, NULL, -1);
set_window_properties(WINDOW_ID_ITEM_INFO_DESC, 32, 184, 256, 32, 1, shop_draw_item_desc, NULL, -1);
set_window_properties(WINDOW_ID_ITEM_INFO_NAME, 100, 66, 120, 28, WINDOW_PRIORITY_0, shop_draw_item_name, NULL, -1);
set_window_properties(WINDOW_ID_ITEM_INFO_DESC, 32, 184, 256, 32, WINDOW_PRIORITY_1, shop_draw_item_desc, NULL, -1);
gWindowStyles[10].defaultStyleID = WINDOW_STYLE_9;
gWindowStyles[11].defaultStyleID = WINDOW_STYLE_3;
shop->currentItemSlot = 0;

34
ver/us/asm/bss2_2.s
View File

@ -70,22 +70,22 @@ dlabel gPopupState
dlabel D_8010D644
.space 4
dlabel PopupSelectedIdx
dlabel PopupMenu_SelectedIndex
.space 4
dlabel D_8010D64C
dlabel PopupMenu_PrevSelectedIndex
.space 4
dlabel D_8010D650
dlabel PopupMenu_Alpha
.space 4
dlabel D_8010D654
dlabel PopupMenu_FirstDisplayIndex
.space 1
dlabel D_8010D655
dlabel PopupMenu_LastDisplayIndex
.space 1
dlabel D_8010D656
dlabel PopupMenu_DisplayedEntryCount
.space 2
dlabel D_8010D658
@ -94,28 +94,28 @@ dlabel D_8010D658
dlabel D_8010D65A
.space 2
dlabel D_8010D65C
dlabel PopupMenu_EmptybarHEID
.space 4
dlabel D_8010D660
dlabel PopupMenu_TitleIconHEID
.space 4
dlabel D_8010D664
dlabel PopupMenu_TimesHEID
.space 4
dlabel D_8010D668
dlabel PopupMenu_PartnerLevelHEID
.space 4
dlabel D_8010D66C
dlabel PopupMenu_CursorHEID
.space 4
dlabel D_8010D670
dlabel PopupMenu_UpArrowHEID
.space 4
dlabel D_8010D674
dlabel PopupMenu_DownArrowHEID
.space 4
dlabel D_8010D678
dlabel PopupMenu_EntryIconHEID
.space 4
dlabel D_8010D67C
@ -136,10 +136,10 @@ dlabel D_8010D684
dlabel D_8010D686
.space 2
dlabel D_8010D688
dlabel PopupMenu_StarPieceCounterPosX
.space 2
dlabel D_8010D68A
dlabel PopupMenu_StarPieceCounterPosY
.space 2
dlabel D_8010D68C
@ -148,7 +148,7 @@ dlabel D_8010D68C
dlabel PopupNotBattle
.space 1
dlabel D_8010D68F
dlabel PopupMenu_MaxDisplayableEntryCount
.space 1
dlabel D_8010D690

24
ver/us/symbol_addrs.txt
View File

@ -3099,7 +3099,7 @@ popup_menu_draw_title_contents = 0x800F4648; // type:func rom:0x8DAF8
func_800F48F4 = 0x800F48F4; // type:func rom:0x8DDA4
func_800F4944 = 0x800F4944; // type:func rom:0x8DDF4
func_800F4C1C = 0x800F4C1C; // type:func rom:0x8E0CC
func_800F4C6C = 0x800F4C6C; // type:func rom:0x8E11C
popup_draw_cost_icon = 0x800F4C6C; // type:func rom:0x8E11C
popup_draw_already_have_partner = 0x800F4CF0; // type:func rom:0x8E1A0
func_800F4D28 = 0x800F4D28; // type:func rom:0x8E1D8
create_standard_popup_menu = 0x800F4E40; // type:func rom:0x8E2F0
@ -3881,16 +3881,16 @@ update_entity_transform_matrix = 0x8011022C; // type:func rom:0xA692C
update_shadow_transform_matrix = 0x80110374; // type:func rom:0xA6A74
gPopupState = 0x8010D640; // type:data rom:0xA6AF0
D_8010D644 = 0x8010D644; // type:data rom:0xA6AF4
PopupSelectedIdx = 0x8010D648; // type:data rom:0xA6AF8
D_8010D64C = 0x8010D64C; // type:data rom:0xA6AFC
D_8010D650 = 0x8010D650; // type:data rom:0xA6B00
D_8010D654 = 0x8010D654; // type:data rom:0xA6B04
D_8010D655 = 0x8010D655; // type:data rom:0xA6B05
D_8010D656 = 0x8010D656; // type:data rom:0xA6B06
PopupMenu_SelectedIndex = 0x8010D648; // type:data rom:0xA6AF8
PopupMenu_PrevSelectedIndex = 0x8010D64C; // type:data rom:0xA6AFC
PopupMenu_Alpha = 0x8010D650; // type:data rom:0xA6B00
PopupMenu_FirstDisplayIndex = 0x8010D654; // type:data rom:0xA6B04
PopupMenu_LastDisplayIndex = 0x8010D655; // type:data rom:0xA6B05
PopupMenu_DisplayedEntryCount = 0x8010D656; // type:data rom:0xA6B06
D_8010D658 = 0x8010D658; // type:data rom:0xA6B08
D_8010D65A = 0x8010D65A; // type:data rom:0xA6B0A
D_8010D65C = 0x8010D65C; // type:data rom:0xA6B0C
D_8010D660 = 0x8010D660; // type:data rom:0xA6B10
PopupMenu_EmptybarHEID = 0x8010D65C; // type:data rom:0xA6B0C
PopupTitleIconHEID = 0x8010D660; // type:data rom:0xA6B10
D_8010D664 = 0x8010D664; // type:data rom:0xA6B14
D_8010D668 = 0x8010D668; // type:data rom:0xA6B18
D_8010D66C = 0x8010D66C; // type:data rom:0xA6B1C
@ -3903,11 +3903,11 @@ D_8010D680 = 0x8010D680; // type:data rom:0xA6B30
D_8010D682 = 0x8010D682; // type:data rom:0xA6B32
D_8010D684 = 0x8010D684; // type:data rom:0xA6B34
D_8010D686 = 0x8010D686; // type:data rom:0xA6B36
D_8010D688 = 0x8010D688; // type:data rom:0xA6B38
D_8010D68A = 0x8010D68A; // type:data rom:0xA6B3A
PopupMenu_StarPieceCounterPosX = 0x8010D688; // type:data rom:0xA6B38
PopupMenu_StarPieceCounterPosY = 0x8010D68A; // type:data rom:0xA6B3A
D_8010D68C = 0x8010D68C; // type:data rom:0xA6B3C
PopupNotBattle = 0x8010D68E; // type:data rom:0xA6B3E
D_8010D68F = 0x8010D68F; // type:data rom:0xA6B3F
PopupMenu_MaxDisplayableEntryCount = 0x8010D68F; // type:data rom:0xA6B3F
D_8010D690 = 0x8010D690; // type:data rom:0xA6B40
D_8010D691 = 0x8010D691; // type:data rom:0xA6B41
D_8010D692 = 0x8010D692; // type:data rom:0xA6B42