From 7f571fddf010c789feba163752e7142db2e8b4e5 Mon Sep 17 00:00:00 2001
From: EpochFlame <82550703+EpochFlame@users.noreply.github.com>
Date: Sun, 3 Oct 2021 14:09:49 -0400
Subject: [PATCH] extab and extabindex shiftable

---
 .clang-format |  7 -------
 .gitignore    |  1 +
 asm/exidx.s   | 28 +++++++++++++++-------------
 asm/extab.s   | 17 ++++++-----------
 4 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 75dfe3168..000000000
--- a/.clang-format
+++ /dev/null
@@ -1,7 +0,0 @@
-BasedOnStyle: WebKit
-ColumnLimit: 80
-AlignTrailingComments:  true
-AlignAfterOpenBracket: true
-AlignConsecutiveAssignments: true
-AllowShortFunctionsOnASingleLine: true
-FixNamespaceComments: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e0819dec3..54af572ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ build
 tools/mwcc_compiler/
 decomp/
 src/.clang-format
+.clang-format
diff --git a/asm/exidx.s b/asm/exidx.s
index 350e122ec..833b8d3a8 100644
--- a/asm/exidx.s
+++ b/asm/exidx.s
@@ -1,25 +1,27 @@
 .include "macros.inc"
 .section ._exidx, "a"  # 0x80005660 - 0x800056C0
-	.4byte 0x800C1748
+.global lbl_80005660
+lbl_80005660:
+	.4byte __destroy_new_array
 	.4byte 0x0000007C
-	.4byte 0x80005600
-	.4byte 0x800C17C4
+	.4byte $$2205
+	.4byte __destroy_arr
 	.4byte 0x00000078
-	.4byte 0x80005608
-	.4byte 0x800C183C
+	.4byte $$2210
+	.4byte __construct_array
 	.4byte 0x000000FC
-	.4byte 0x80005610
-	.4byte 0x800C1938
+	.4byte $$2231
+	.4byte __dt__26__partial_array_destructorFv
 	.4byte 0x000000B8
-	.4byte 0x80005628
-	.4byte 0x800C19F0
+	.4byte $$2239
+	.4byte __construct_new_array
 	.4byte 0x00000104
-	.4byte 0x80005630
+	.4byte $$2262
 .global lbl_8000569C
 lbl_8000569C:
-	.4byte 0x80005660
-	.4byte 0x8000569C
-	.4byte 0x800C1748
+	.4byte lbl_80005660
+	.4byte lbl_8000569C
+	.4byte __destroy_new_array
 	.4byte 0x000003AC
 	.4byte 0x00000000
 	.4byte 0x00000000
diff --git a/asm/extab.s b/asm/extab.s
index d7c5a3682..dc38f9183 100644
--- a/asm/extab.s
+++ b/asm/extab.s
@@ -3,11 +3,11 @@
 .global $$2205
 $$2205:
 	.4byte 0x30080000
-	.4byte 0x00000000
+	.skip 0x4
 .global $$2210
 $$2210:
 	.4byte 0x20080000
-	.4byte 0x00000000
+	.skip 0x4
 .global $$2231
 $$2231:
 	.4byte 0x20080000
@@ -15,11 +15,11 @@ $$2231:
 	.4byte 0x00000010
 	.4byte 0x00000000
 	.4byte 0x82000008
-	.4byte 0x800C1938
+	.4byte __dt__26__partial_array_destructorFv
 .global $$2239
 $$2239:
 	.4byte 0x18080000
-	.4byte 0x00000000
+	.skip 0x4
 .global $$2262
 $$2262:
 	.4byte 0x28080000
@@ -27,11 +27,6 @@ $$2262:
 	.4byte 0x00000010
 	.4byte 0x00000000
 	.4byte 0x82000008
-	.4byte 0x800C1938
-	.4byte 0x00000000
-	.4byte 0x00000000
-	.4byte 0x00000000
-	.4byte 0x00000000
-	.4byte 0x00000000
-	.4byte 0x00000000
+	.4byte __dt__26__partial_array_destructorFv
+	.skip 0x18