From adee6f4d2f62ec86ab7872d4ca183e8da2e666b8 Mon Sep 17 00:00:00 2001
From: Larry <kholdfuzion@gmail.com>
Date: Tue, 15 Aug 2017 14:29:16 -0500
Subject: [PATCH] some more labeling, add some macros

Former-commit-id: a0e66d353da10f9f8a23b09a720ca3602d567b10 [formerly 5b501aa45ee4c28c84a85047f156e387923de7ef] [formerly 1da19f922961ed77e773dea01963d282bce1c9a9 [formerly fe941d9413dc028168c5b123d541f08d4f38c1d9]]
Former-commit-id: bc3396186f9ca56eca49d6fed1d1527563e550c4 [formerly a2eea53fec78147e499896c8a00ace7e73afba60]
Former-commit-id: deff51f2acb748e2bf857d50c1a77c9d649e0d22
---
 ge007.u.s                 | 38 ++++++++++++++++++++++++++++++++++++++
 ge007.u.s.REMOVED.git-id  |  1 -
 macros.inc                | 20 ++++++++++++++++++++
 src/code.s.REMOVED.git-id |  2 +-
 src/data.s.REMOVED.git-id |  2 +-
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 ge007.u.s
 delete mode 100644 ge007.u.s.REMOVED.git-id
 create mode 100644 macros.inc

diff --git a/ge007.u.s b/ge007.u.s
new file mode 100644
index 0000000..9e3b7a9
--- /dev/null
+++ b/ge007.u.s
@@ -0,0 +1,38 @@
+# Goldeneye 007 (U) disassembly and split file
+# generated by n64split v0.4a - N64 ROM splitter
+
+# assembler directives
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+.include "globals.inc"
+.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"
+.include "font/font.s"
+.include "music/music.s"
+.include "obseg/ob_seg.s"
+.include "images/images.s"
+
+# PADDING region BE6D10-C00000 [192F0]
+.space 0x192F0, 0xFF
+
+.include "src/data.s"
+.include "src/bss.s"
+.include "src/buffers.s"
+
+
+
diff --git a/ge007.u.s.REMOVED.git-id b/ge007.u.s.REMOVED.git-id
deleted file mode 100644
index 20ce4f1..0000000
--- a/ge007.u.s.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d7fdfbb50318016feb8ea6b238a257940674758e
\ No newline at end of file
diff --git a/macros.inc b/macros.inc
new file mode 100644
index 0000000..03d4b0c
--- /dev/null
+++ b/macros.inc
@@ -0,0 +1,20 @@
+.macro get_value name, value
+get_\name:
+ lui   $v0, %hi(\value)
+ jr    $ra
+ addiu $v0, $v0, %lo(\value)
+.endm
+
+.macro jump_via_reg location, register=$a3
+jump_\location:
+ lui   \register, %hi(\location)
+ addiu \register, \register, %lo(\location)
+ jr    \register
+ nop
+.endm
+
+
+.macro debug_handler_table_entry sp, string
+.word \sp
+.word \string
+.endm
diff --git a/src/code.s.REMOVED.git-id b/src/code.s.REMOVED.git-id
index 76fc61a..c2d73a2 100644
--- a/src/code.s.REMOVED.git-id
+++ b/src/code.s.REMOVED.git-id
@@ -1 +1 @@
-73d3873bf4e2ae98c301302dd6d1b63953667182
\ No newline at end of file
+a4ceb469053ac4efd66cb0f157ababee045581ea
\ No newline at end of file
diff --git a/src/data.s.REMOVED.git-id b/src/data.s.REMOVED.git-id
index 643e00d..2e6522a 100644
--- a/src/data.s.REMOVED.git-id
+++ b/src/data.s.REMOVED.git-id
@@ -1 +1 @@
-e9d5d918b2e50ec94ef3cabdf723b50978003d38
\ No newline at end of file
+cd9ca7879c25b807a81c06f40f9e55a009f319e1
\ No newline at end of file