diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-08-15 07:56:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 10:56:20 -0400 |
| commit | f90e3ee739689ffa404e0e45eddf2e08dc5569dd (patch) | |
| tree | af6ee237d196e4a550fc3b6d34f36db0ce6e2b88 /src/code | |
| parent | 5dc98392e034a3f4ba1dafbf69883d657db4817d (diff) | |
Color_RGBAu32 (#253)
* Renamed deprecated RGB5A1 to RGBA16
* Cleanup shopkeeper structs with Color_RGBAu32 and Vec3f
* Rename functions with RGB5A1 in them
* BSS fix
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/PreRender.c | 4 | ||||
| -rw-r--r-- | src/code/sys_initial_check.c | 4 | ||||
| -rw-r--r-- | src/code/z_scene_proc.c | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/code/PreRender.c b/src/code/PreRender.c index f3ce934bf..bdf4d326c 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -283,8 +283,8 @@ void PreRender_AntiAliasAlgorithm(PreRender* this, s32 x, s32 y) { s32 pxR2; s32 pxG2; s32 pxB2; - Color_RGB5A1 pxIn; - Color_RGB5A1 pxOut; + Color_RGBA16 pxIn; + Color_RGBA16 pxOut; u32 pxR3; u32 pxG3; u32 pxB3; diff --git a/src/code/sys_initial_check.c b/src/code/sys_initial_check.c index d435abae0..7b0a26cc8 100644 --- a/src/code/sys_initial_check.c +++ b/src/code/sys_initial_check.c @@ -1,12 +1,12 @@ #include "global.h" -#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_WriteRGB5A1Pixel.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_WriteRGBA16Pixel.s") #pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_WriteI4Pixel.s") #pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_DrawI4Texture.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_ClearRGB5A1.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_ClearRGBA16.s") #pragma GLOBAL_ASM("asm/non_matchings/code/sys_initial_check/Check_DrawExpansionPakErrorMessage.s") diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c index 7c77d6cd5..bdd3ea1ad 100644 --- a/src/code/z_scene_proc.c +++ b/src/code/z_scene_proc.c @@ -1,8 +1,9 @@ +#include "prevent_bss_reordering.h" #include "global.h" -static s32 sMatAnimStep; -static u32 sMatAnimFlags; -static f32 sMatAnimAlphaRatio; +s32 sMatAnimStep; +u32 sMatAnimFlags; +f32 sMatAnimAlphaRatio; // Default displaylist that sets a valid displaylist into all of the segments. static Gfx sSceneDrawDefaultDL[] = { |