diff --git a/Makefile.REMOVED.git-id b/Makefile.REMOVED.git-id
index 5faecf46..e1e514ad 100644
--- a/Makefile.REMOVED.git-id
+++ b/Makefile.REMOVED.git-id
@@ -1 +1 @@
-8d71f11770202fe889e79c0246ef557b3174108a
\ No newline at end of file
+08e5a53a45b82874451186b2e7c039f7ec10c379
\ No newline at end of file
diff --git a/ge007.u.ld.REMOVED.git-id b/ge007.u.ld.REMOVED.git-id
index 35979ff4..23f05d08 100644
--- a/ge007.u.ld.REMOVED.git-id
+++ b/ge007.u.ld.REMOVED.git-id
@@ -1 +1 @@
-b07c459d8cd2f095a27c98eac0b533963852ad4c
\ No newline at end of file
+9c8a4a493ffea0a48f68f1f7e3b75d207b848c36
\ No newline at end of file
diff --git a/ge007.u.s b/ge007.u.s
index 9e3b7a90..ef1e15cb 100644
--- a/ge007.u.s
+++ b/ge007.u.s
@@ -9,16 +9,7 @@
 .include "macros.inc"
 
 .include "src/header.s"
-.include "src/entry.s"
-.include "src/code.s"
 
-.section .c_data, "a"
-Compressedrodata:
- # make a hole for when we compress .data segment
- .space 0x11C00
-Compressedrodata_end:
-
-.include "src/rarezip.s"
 .include "src/tlbcode.s"
 .include "bin/romfiles.s"
 .include "ramrom/ramrom.s"
@@ -30,7 +21,6 @@ Compressedrodata_end:
 # PADDING region BE6D10-C00000 [192F0]
 .space 0x192F0, 0xFF
 
-.include "src/data.s"
 .include "src/bss.s"
 .include "src/buffers.s"
 
diff --git a/macros.inc b/macros.inc
new file mode 100644
index 00000000..a6708a83
--- /dev/null
+++ b/macros.inc
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+ # enum	image_format, mappedto_2
+.set rgba, 0
+.set yuv, 1
+.set ci, 2
+.set ia, 3
+.set i, 4
+
+ # ---------------------------------------------------------------------------
+
+ # enum	image_bitdepth,	mappedto_3
+.set D_4BIT, 0
+.set D_8BIT, 1
+.set D_16BIT, 2
+.set D_32BIT, 3
+
+ # ---------------------------------------------------------------------------
+
+ # enum	cm_flags, mappedto_4
+.set clamp, 1
+.set mirror, 2
+
+.macro texture_entry index, width, height, level, format, depth, flagsS, flagsT, pad
+.word \index
+.byte \width
+.byte \height
+.byte \level
+.byte \format
+.byte \depth
+.byte \flagsS
+.byte \flagsT
+.byte \pad
+.endm
diff --git a/macros.inc.REMOVED.git-id b/macros.inc.REMOVED.git-id
deleted file mode 100644
index 6cf41130..00000000
--- a/macros.inc.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c0d1ea1e646e6cee5351b9bec8f4d726e0b4e051
\ No newline at end of file
diff --git a/src/bss.s b/src/bss.s
deleted file mode 100644
index 55075826..00000000
--- a/src/bss.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.section .bss
-.global _BSS_START
-_BSS_START:
-.space 0x31080
-_BSS_END:
-
diff --git a/src/bss.s.REMOVED.git-id b/src/bss.s.REMOVED.git-id
new file mode 100644
index 00000000..4f0205ff
--- /dev/null
+++ b/src/bss.s.REMOVED.git-id
@@ -0,0 +1 @@
+a6cb47f91f3414691c15db2f3d9ad3daf6af6457
\ No newline at end of file
diff --git a/src/code.s.REMOVED.git-id b/src/code.s.REMOVED.git-id
index 0b04d1c0..1efb0791 100644
--- a/src/code.s.REMOVED.git-id
+++ b/src/code.s.REMOVED.git-id
@@ -1 +1 @@
-ead7ebb1e8603eb353d270d246b30cf12102c1b5
\ No newline at end of file
+134a75867308727d7af7643ca47502f788c4f371
\ No newline at end of file
diff --git a/src/data.s.REMOVED.git-id b/src/data.s.REMOVED.git-id
index 6e778569..77c4522b 100644
--- a/src/data.s.REMOVED.git-id
+++ b/src/data.s.REMOVED.git-id
@@ -1 +1 @@
-3f1bc06d9797c1e84a40501bad179ae934d5c8cb
\ No newline at end of file
+8f820b5e749cf8540f22b2ed5348b7f5815d3a6a
\ No newline at end of file
diff --git a/src/entry.s.REMOVED.git-id b/src/entry.s.REMOVED.git-id
index d857f010..4b021792 100644
--- a/src/entry.s.REMOVED.git-id
+++ b/src/entry.s.REMOVED.git-id
@@ -1 +1 @@
-9327d6e033e8bc73d638e2daf83434f4c511f147
\ No newline at end of file
+0b62f42271eb5d000d9071af811aa9b880f75451
\ No newline at end of file
diff --git a/src/rarezip.s.REMOVED.git-id b/src/rarezip.s.REMOVED.git-id
index 0516ff52..da913df0 100644
--- a/src/rarezip.s.REMOVED.git-id
+++ b/src/rarezip.s.REMOVED.git-id
@@ -1 +1 @@
-c916ae32392a8245b21d1d75dd861fb84e100035
\ No newline at end of file
+450938001b4dbffe0dc2c043827c553681106ad3
\ No newline at end of file