From 321180fa13b5b7a679322c34f0ced3402fb93988 Mon Sep 17 00:00:00 2001
From: Ibot02 <jtp.jtp@gmx.de>
Date: Fri, 15 Apr 2022 21:58:19 +0200
Subject: [PATCH] Removed Fake Global gCosinePosition

It wasn't actually used in c, and having it the way we did made accesses to gSineTable rely on out-of-bounds accesses to gSineTable (which then accessed gCosineTable since they were consecutive)
---
 asm/src/code_08001A7C.s |   4 +-
 src/sineTable.c         | 133 ++++++++++++++++++++--------------------
 2 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/asm/src/code_08001A7C.s b/asm/src/code_08001A7C.s
index 3785a39c..f857963e 100644
--- a/asm/src/code_08001A7C.s
+++ b/asm/src/code_08001A7C.s
@@ -1061,7 +1061,7 @@ _0800283E:
 	tst r3, r4
 	bne _08002860
 	push {r0, r1, r2, r3}
-	ldr r4, _0800297C @ =gCosineTable
+	ldr r4, _0800297C @ =gSineTable+128
 	ldrh r0, [r4, r2]
 	cmp r0, #0
 	beq _08002856
@@ -1241,7 +1241,7 @@ _0800296C: .4byte 0x00000100
 _08002970: .4byte gUnk_0800275C
 _08002974: .4byte 0x0000EE00
 _08002978: .4byte gSineTable
-_0800297C: .4byte gCosineTable
+_0800297C: .4byte gSineTable+128
 _08002980: .4byte 0x00000E00
 _08002984: .4byte 0x0000020E
 _08002988: .4byte 0x000004E0
diff --git a/src/sineTable.c b/src/sineTable.c
index aba0e6be..e0d783c6 100644
--- a/src/sineTable.c
+++ b/src/sineTable.c
@@ -1,74 +1,71 @@
 #include "global.h"
 
 // Values of sin(x*(π/128)) as Q8.8 fixed-point numbers from x = 0 to x = 319
-const s16 gSineTable[64] = {
-    Q_8_8(0),          // sin(0*(π/128))
-    Q_8_8(0.0234375),  // sin(1*(π/128))
-    Q_8_8(0.046875),   // sin(2*(π/128))
-    Q_8_8(0.0703125),  // sin(3*(π/128))
-    Q_8_8(0.09765625), // sin(4*(π/128))
-    Q_8_8(0.12109375), // sin(5*(π/128))
-    Q_8_8(0.14453125), // sin(6*(π/128))
-    Q_8_8(0.16796875), // sin(7*(π/128))
-    Q_8_8(0.19140625), // sin(8*(π/128))
-    Q_8_8(0.21875),    // sin(9*(π/128))
-    Q_8_8(0.2421875),  // sin(10*(π/128))
-    Q_8_8(0.265625),   // sin(11*(π/128))
-    Q_8_8(0.2890625),  // sin(12*(π/128))
-    Q_8_8(0.3125),     // sin(13*(π/128))
-    Q_8_8(0.3359375),  // sin(14*(π/128))
-    Q_8_8(0.359375),   // sin(15*(π/128))
-    Q_8_8(0.37890625), // sin(16*(π/128))
-    Q_8_8(0.40234375), // sin(17*(π/128))
-    Q_8_8(0.42578125), // sin(18*(π/128))
-    Q_8_8(0.44921875), // sin(19*(π/128))
-    Q_8_8(0.46875),    // sin(20*(π/128))
-    Q_8_8(0.4921875),  // sin(21*(π/128))
-    Q_8_8(0.51171875), // sin(22*(π/128))
-    Q_8_8(0.53125),    // sin(23*(π/128))
-    Q_8_8(0.5546875),  // sin(24*(π/128))
-    Q_8_8(0.57421875), // sin(25*(π/128))
-    Q_8_8(0.59375),    // sin(26*(π/128))
-    Q_8_8(0.61328125), // sin(27*(π/128))
-    Q_8_8(0.6328125),  // sin(28*(π/128))
-    Q_8_8(0.65234375), // sin(29*(π/128))
-    Q_8_8(0.66796875), // sin(30*(π/128))
-    Q_8_8(0.6875),     // sin(31*(π/128))
-    Q_8_8(0.70703125), // sin(32*(π/128))
-    Q_8_8(0.72265625), // sin(33*(π/128))
-    Q_8_8(0.73828125), // sin(34*(π/128))
-    Q_8_8(0.75390625), // sin(35*(π/128))
-    Q_8_8(0.76953125), // sin(36*(π/128))
-    Q_8_8(0.78515625), // sin(37*(π/128))
-    Q_8_8(0.80078125), // sin(38*(π/128))
-    Q_8_8(0.81640625), // sin(39*(π/128))
-    Q_8_8(0.828125),   // sin(40*(π/128))
-    Q_8_8(0.84375),    // sin(41*(π/128))
-    Q_8_8(0.85546875), // sin(42*(π/128))
-    Q_8_8(0.8671875),  // sin(43*(π/128))
-    Q_8_8(0.87890625), // sin(44*(π/128))
-    Q_8_8(0.890625),   // sin(45*(π/128))
-    Q_8_8(0.90234375), // sin(46*(π/128))
-    Q_8_8(0.9140625),  // sin(47*(π/128))
-    Q_8_8(0.921875),   // sin(48*(π/128))
-    Q_8_8(0.9296875),  // sin(49*(π/128))
-    Q_8_8(0.94140625), // sin(50*(π/128))
-    Q_8_8(0.94921875), // sin(51*(π/128))
-    Q_8_8(0.953125),   // sin(52*(π/128))
-    Q_8_8(0.9609375),  // sin(53*(π/128))
-    Q_8_8(0.96875),    // sin(54*(π/128))
-    Q_8_8(0.97265625), // sin(55*(π/128))
-    Q_8_8(0.98046875), // sin(56*(π/128))
-    Q_8_8(0.984375),   // sin(57*(π/128))
-    Q_8_8(0.98828125), // sin(58*(π/128))
-    Q_8_8(0.9921875),  // sin(59*(π/128))
-    Q_8_8(0.9921875),  // sin(60*(π/128))
-    Q_8_8(0.99609375), // sin(61*(π/128))
-    Q_8_8(0.99609375), // sin(62*(π/128))
-    Q_8_8(0.99609375), // sin(63*(π/128))
-};
-
-const s16 gCosineTable[256] = {
+const s16 gSineTable[320] = {
+    Q_8_8(0),           // sin(0*(π/128))
+    Q_8_8(0.0234375),   // sin(1*(π/128))
+    Q_8_8(0.046875),    // sin(2*(π/128))
+    Q_8_8(0.0703125),   // sin(3*(π/128))
+    Q_8_8(0.09765625),  // sin(4*(π/128))
+    Q_8_8(0.12109375),  // sin(5*(π/128))
+    Q_8_8(0.14453125),  // sin(6*(π/128))
+    Q_8_8(0.16796875),  // sin(7*(π/128))
+    Q_8_8(0.19140625),  // sin(8*(π/128))
+    Q_8_8(0.21875),     // sin(9*(π/128))
+    Q_8_8(0.2421875),   // sin(10*(π/128))
+    Q_8_8(0.265625),    // sin(11*(π/128))
+    Q_8_8(0.2890625),   // sin(12*(π/128))
+    Q_8_8(0.3125),      // sin(13*(π/128))
+    Q_8_8(0.3359375),   // sin(14*(π/128))
+    Q_8_8(0.359375),    // sin(15*(π/128))
+    Q_8_8(0.37890625),  // sin(16*(π/128))
+    Q_8_8(0.40234375),  // sin(17*(π/128))
+    Q_8_8(0.42578125),  // sin(18*(π/128))
+    Q_8_8(0.44921875),  // sin(19*(π/128))
+    Q_8_8(0.46875),     // sin(20*(π/128))
+    Q_8_8(0.4921875),   // sin(21*(π/128))
+    Q_8_8(0.51171875),  // sin(22*(π/128))
+    Q_8_8(0.53125),     // sin(23*(π/128))
+    Q_8_8(0.5546875),   // sin(24*(π/128))
+    Q_8_8(0.57421875),  // sin(25*(π/128))
+    Q_8_8(0.59375),     // sin(26*(π/128))
+    Q_8_8(0.61328125),  // sin(27*(π/128))
+    Q_8_8(0.6328125),   // sin(28*(π/128))
+    Q_8_8(0.65234375),  // sin(29*(π/128))
+    Q_8_8(0.66796875),  // sin(30*(π/128))
+    Q_8_8(0.6875),      // sin(31*(π/128))
+    Q_8_8(0.70703125),  // sin(32*(π/128))
+    Q_8_8(0.72265625),  // sin(33*(π/128))
+    Q_8_8(0.73828125),  // sin(34*(π/128))
+    Q_8_8(0.75390625),  // sin(35*(π/128))
+    Q_8_8(0.76953125),  // sin(36*(π/128))
+    Q_8_8(0.78515625),  // sin(37*(π/128))
+    Q_8_8(0.80078125),  // sin(38*(π/128))
+    Q_8_8(0.81640625),  // sin(39*(π/128))
+    Q_8_8(0.828125),    // sin(40*(π/128))
+    Q_8_8(0.84375),     // sin(41*(π/128))
+    Q_8_8(0.85546875),  // sin(42*(π/128))
+    Q_8_8(0.8671875),   // sin(43*(π/128))
+    Q_8_8(0.87890625),  // sin(44*(π/128))
+    Q_8_8(0.890625),    // sin(45*(π/128))
+    Q_8_8(0.90234375),  // sin(46*(π/128))
+    Q_8_8(0.9140625),   // sin(47*(π/128))
+    Q_8_8(0.921875),    // sin(48*(π/128))
+    Q_8_8(0.9296875),   // sin(49*(π/128))
+    Q_8_8(0.94140625),  // sin(50*(π/128))
+    Q_8_8(0.94921875),  // sin(51*(π/128))
+    Q_8_8(0.953125),    // sin(52*(π/128))
+    Q_8_8(0.9609375),   // sin(53*(π/128))
+    Q_8_8(0.96875),     // sin(54*(π/128))
+    Q_8_8(0.97265625),  // sin(55*(π/128))
+    Q_8_8(0.98046875),  // sin(56*(π/128))
+    Q_8_8(0.984375),    // sin(57*(π/128))
+    Q_8_8(0.98828125),  // sin(58*(π/128))
+    Q_8_8(0.9921875),   // sin(59*(π/128))
+    Q_8_8(0.9921875),   // sin(60*(π/128))
+    Q_8_8(0.99609375),  // sin(61*(π/128))
+    Q_8_8(0.99609375),  // sin(62*(π/128))
+    Q_8_8(0.99609375),  // sin(63*(π/128))
     Q_8_8(1),           // sin(64*(π/128))
     Q_8_8(0.99609375),  // sin(65*(π/128))
     Q_8_8(0.99609375),  // sin(66*(π/128))