From d0bd1df531b6b118222ace6679d1fa8a749a7d02 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 09:54:48 -0400 Subject: Merge two fields in party_menu heap struct --- src/party_menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/party_menu.c') diff --git a/src/party_menu.c b/src/party_menu.c index 9a021aa41..66069804b 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -107,8 +107,7 @@ struct Struct203CEC4 u8 windowId[3]; u8 actions[8]; u8 listSize; - u16 palBuffer[0xB0]; - u8 filler[0xA0]; + u16 palBuffer[0x100]; s16 data[16]; }; -- cgit v1.2.3 From 3f43523352b279fc4498ee4bfde2213504e3ece8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 12:38:11 -0400 Subject: Add comment to merged field --- src/party_menu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/party_menu.c') diff --git a/src/party_menu.c b/src/party_menu.c index 66069804b..f20bdff51 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -107,7 +107,11 @@ struct Struct203CEC4 u8 windowId[3]; u8 actions[8]; u8 listSize; - u16 palBuffer[0x100]; + // In vanilla Emerald, only the first 0xB0 hwords (0x160 bytes) are actually used. + // However, a full 0x100 hwords (0x200 bytes) are allocated. + // It is likely that the 0x160 value used below is a constant defined by + // bin2c, the utility used to encode the compressed palette data. + u16 palBuffer[BG_PLTT_SIZE / sizeof(u16)]; s16 data[16]; }; -- cgit v1.2.3 From b839c213073f99d73d03bb28f0fd350e13afba09 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Jun 2019 16:23:00 -0400 Subject: Fix/suppress warnings when building with gcc-8 --- src/party_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/party_menu.c') diff --git a/src/party_menu.c b/src/party_menu.c index f20bdff51..ad5807ce4 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1596,8 +1596,8 @@ static void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, M gUnknown_0203CEC4->task = task; gUnknown_0203CEC4->exitCallback = NULL; gUnknown_0203CEC4->unk8_1 = 0; - gUnknown_0203CEC4->unk8_2 = 0xFF; - gUnknown_0203CEC4->unk9_0 = 0xFF; + gUnknown_0203CEC4->unk8_2 = 0x7F; + gUnknown_0203CEC4->unk9_0 = 0x7F; if (a == 4) gUnknown_0203CEC4->unk8_0 = TRUE; -- cgit v1.2.3 From 20863ac85bcf047feeeba8295d0f9bcecef6f636 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Jul 2019 20:46:00 -0400 Subject: Resolve compile warnings in modern --- src/party_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/party_menu.c') diff --git a/src/party_menu.c b/src/party_menu.c index ad5807ce4..dd0a4dabd 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1820,7 +1820,7 @@ static bool8 AllocPartyMenuBg(void) static bool8 AllocPartyMiscGfx(void) { - int sizeout; + u32 sizeout; switch (gUnknown_0203CEC4->data[0]) { -- cgit v1.2.3