From e6f616cd59c54616a2c0f46f0246ae5312525f95 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Fri, 30 Jun 2023 23:34:25 +0300 Subject: [PATCH] Fix merge --- include/PICA/regs.hpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/PICA/regs.hpp b/include/PICA/regs.hpp index b14c8a70..6c868484 100644 --- a/include/PICA/regs.hpp +++ b/include/PICA/regs.hpp @@ -22,13 +22,7 @@ namespace PICA { Tex0BorderColor = 0x81, Tex1BorderColor = 0x91, Tex2BorderColor = 0x99, - TexEnv0Source = 0xC0, - TexEnv1Source = 0xC8, - TexEnv2Source = 0xD0, - TexEnv3Source = 0xD8, TexEnvUpdateBuffer = 0xE0, - TexEnv4Source = 0xF0, - TexEnv5Source = 0xF8, TexEnvBufferColor = 0xFD, // clang-format off