Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-26 08:17:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove braces around one-line expressions; add constants/rgb.h

Browse Source
This commit is contained in:
PikalaxALT 2021-07-12 17:00:40 -04:00
parent 6f7f507c50
commit 20ddd44176
6 changed files with 27 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/constants/rgb.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef POKERUBY_CONSTANTS_RGB_H
#define POKERUBY_CONSTANTS_RGB_H
#define GET_R(color) ((color) & 0x1F)
#define GET_G(color) (((color) >> 5) & 0x1F)
#define GET_B(color) (((color) >> 10) & 0x1F)
#define RGB_ALPHA (1 << 15)
#define IS_ALPHA(color) ((color) & RGB_ALPHA)
#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
#endif // POKERUBY_CONSTANTS_RGB_H

10
src/image_processing_effects.c
View File

@ -1,15 +1,7 @@
#include "global.h"
#include "image_processing_effects.h"
#include "contest_painting.h"
#define GET_R(color) ((color) & 0x1F)
#define GET_G(color) (((color) >> 5) & 0x1F)
#define GET_B(color) (((color) >> 10) & 0x1F)
#define RGB_ALPHA (1 << 15)
#define IS_ALPHA(color) ((color) & RGB_ALPHA)
#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
#include "constants/rgb.h"
u16 *gCanvasPixels;
u8 gCanvasColumnStart;

18
src/item_menu.c
View File

@ -1847,28 +1847,18 @@ static void sub_80A5414(u8 taskId)
if (sReturnLocation == RETURN_TO_FIELD_5)
{
if (sPopupMenuSelection == 0)
{
sub_8072DDC(12);
}
else if (sPopupMenuSelection < 2)
{
sub_8072DCC(47);
}
else
{
sub_8072DCC(48);
}
}
else
{
if (sPopupMenuSelection < 2)
{
sub_8072DCC(47);
}
else
{
sub_8072DCC(48);
}
}
}
}
@ -1879,7 +1869,7 @@ static void sub_80A5600(u8 taskId)
while (1)
{
if ((gMain.newAndRepeatedKeys & 0xF0) == DPAD_UP)
if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
{
if (sPopupMenuSelection != 0 && sPopupMenuActionList[sPopupMenuSelection - 1] != 8)
{
@ -1888,7 +1878,7 @@ static void sub_80A5600(u8 taskId)
}
break;
}
if ((gMain.newAndRepeatedKeys & 0xF0) == DPAD_DOWN)
if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
{
if (sPopupMenuSelection != gUnknown_02038564 - 1 && sPopupMenuSelection != 2 && sPopupMenuActionList[sPopupMenuSelection + 1] != 8)
{
@ -1897,7 +1887,7 @@ static void sub_80A5600(u8 taskId)
}
break;
}
if ((gMain.newAndRepeatedKeys & 0xF0) == DPAD_LEFT)
if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT)
{
if ((sPopupMenuSelection >= 3) && sPopupMenuActionList[sPopupMenuSelection - 3] != 8)
{
@ -1906,7 +1896,7 @@ static void sub_80A5600(u8 taskId)
}
break;
}
if ((gMain.newAndRepeatedKeys & 0xF0) == DPAD_RIGHT)
if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT)
{
if ((sPopupMenuSelection < 3) && sPopupMenuActionList[sPopupMenuSelection + 3] != 8)
{

35
src/pokenav.c
View File

@ -25,6 +25,7 @@
#include "constants/flags.h"
#include "constants/game_stat.h"
#include "pokenav.h"
#include "constants/rgb.h"
// Static type declarations
@ -462,8 +463,6 @@ void sub_80EF58C(u8 a)
}
}
#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes)
{
u16 i;
@ -472,12 +471,12 @@ void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes)
for (i = 0; i < d; i++)
{
s32 r1 = Q_24_8((((*a) >> 0)) & 0x1F);
s32 g1 = Q_24_8((((*a) >> 5)) & 0x1F);
s32 b1 = Q_24_8((((*a) >> 10)) & 0x1F);
s32 r2 = Q_24_8((((*b) >> 0)) & 0x1F);
s32 g2 = Q_24_8((((*b) >> 5)) & 0x1F);
s32 b2 = Q_24_8((((*b) >> 10)) & 0x1F);
s32 r1 = Q_24_8(GET_R(*a));
s32 g1 = Q_24_8(GET_G(*a));
s32 b1 = Q_24_8(GET_B(*a));
s32 r2 = Q_24_8(GET_R(*b));
s32 g2 = Q_24_8(GET_G(*b));
s32 b2 = Q_24_8(GET_B(*b));
s32 dr = (r2 - r1) / c;
s32 dg = (g2 - g1) / c;
s32 db = (b2 - b1) / c;
@ -1385,17 +1384,15 @@ bool8 sub_80F0D5C(void)
u32 r5;
if (gPokenavStructPtr->unkD15C == 7)
{
return FALSE;
}
if (++gPokenavStructPtr->unk306 < 2)
{
return TRUE;
}
gPokenavStructPtr->unk306 = 0;
BasicInitMenuWindow(&gWindowTemplate_81E70D4);
r5 = (gPokenavStructPtr->unk8778 + 2 + gPokenavStructPtr->unkD15C * 2) & 0x1F;
#ifndef NONMATCHING
asm("":::"r2"); // fakematch
#endif //NONMATCHING
switch (gPokenavStructPtr->unkD15C)
{
default:
@ -4916,13 +4913,9 @@ void sub_80F66E0(void)
break;
};
for (j = 0; j < r2; j++)
{
gPokenavStructPtr->unkBC4C[gPokenavStructPtr->unkBC8E++] = r9 + j;
}
if (r2 && r9 > 24)
{
gPokenavStructPtr->unkBC8F++;
}
r9 += r0;
}
if (gPokenavStructPtr->unkBC8E != gPokenavStructPtr->unkBC8F)
@ -4965,16 +4958,12 @@ u8 sub_80F68E8(void)
{
r4--;
if (gPokenavStructPtr->unkBC96[r4] != 0)
{
break;
}
}
if (gPokenavStructPtr->unkBC96[r4] != 0)
{
if (r5 >= gPokenavStructPtr->unkBC96[r4])
{
r5 = gPokenavStructPtr->unkBC96[r4] - 1;
}
break;
}
r4 = gPokenavStructPtr->unkBC91;
@ -4985,16 +4974,12 @@ u8 sub_80F68E8(void)
{
r4++;
if (gPokenavStructPtr->unkBC96[r4] != 0)
{
break;
}
}
if (gPokenavStructPtr->unkBC96[r4] != 0)
{
if (r5 >= gPokenavStructPtr->unkBC96[r4])
{
r5 = gPokenavStructPtr->unkBC96[r4] - 1;
}
break;
}
r4 = gPokenavStructPtr->unkBC91;
@ -5025,9 +5010,7 @@ u8 sub_80F68E8(void)
gPokenavStructPtr->unkBC91 = r4;
}
else
{
r12 = 0;
}
}
return r12;
}

8
src/pokenav_before.c
View File

@ -2463,9 +2463,7 @@ void sub_80ED858(void)
break;
case 1:
if (!sub_80F5B50())
{
gPokenavStructPtr->unk304 = 2;
}
break;
case 2:
sub_80F0174(1);
@ -2546,9 +2544,7 @@ void sub_80ED858(void)
break;
case 6:
if (!sub_8055870())
{
gPokenavStructPtr->unk304 = 4;
}
break;
case 7:
sub_80EEFBC(3);
@ -2597,9 +2593,7 @@ void sub_80ED858(void)
#if DEBUG
if (gLinkOpen == TRUE)
{
debug_sub_8008264(gLink.recvQueue.count, 9, 6, 2, 4);
}
#endif
}
@ -3312,9 +3306,7 @@ bool8 sub_80EEA0C(void)
break;
case 5:
if (!sub_8055870())
{
gPokenavStructPtr->unk6E16++;
}
break;
case 6:
sub_80F1DF0();

5
src/script_menu.c
View File

@ -915,15 +915,10 @@ void ScriptMenu_CreatePCMenu(void)
sp8[r4++] = GetStringWidthInTilesForScriptMenu(gPCText_LanettesPC);
else
sp8[r4++] = GetStringWidthInTilesForScriptMenu(gPCText_SomeonesPC);
sp8[r4++] = GetStringWidthInTilesForScriptMenu(gPCText_PlayersPC);
sp8[r4++] = GetStringWidthInTilesForScriptMenu(gPCText_LogOff);
if (FlagGet(FLAG_SYS_GAME_CLEAR))
{
sp8[r4++] = GetStringWidthInTilesForScriptMenu(gPCText_HallOfFame);
}
width = 0;
for (r5 = 0; r5 < r4; r5++)