From 22a8c350eb3a174cae79cd0b4b66932f1b4f53fb Mon Sep 17 00:00:00 2001
From: KeybadeBlox <fluorescencia@protonmail.com>
Date: Tue, 30 Dec 2025 00:39:14 -0500
Subject: [PATCH] Correct .data section ranges in delinked objects

The change in the previous commit was a silly case of not thinking
things through, not realizing that the .data range moved to Core.obj was
nowhere near the beginning of the section as it should be.  g_game has
been moved back into Jet2.obj (time will tell if this is correct) and a
missed data strucure at the beginning of .data (where it ought to be)
now makes up Core.obj's .data portion.
---
 decompile/src/JSRF/Core.cpp | 4 ----
 decompile/src/JSRF/Jet2.cpp | 4 ++++
 delink/objects.csv          | 4 ++--
 readme.md                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/decompile/src/JSRF/Core.cpp b/decompile/src/JSRF/Core.cpp
index 05b93b8..f5e5fb0 100644
--- a/decompile/src/JSRF/Core.cpp
+++ b/decompile/src/JSRF/Core.cpp
@@ -5,7 +5,3 @@ Game and GameObj classes that form the foundation of the JSRF game code.
 #pragma bss_seg(".data")
 
 #include "Core.hpp"
-
-
-// Address: 0x0022FCE0
-Game * g_game;
diff --git a/decompile/src/JSRF/Jet2.cpp b/decompile/src/JSRF/Jet2.cpp
index 4c13bb9..e170652 100644
--- a/decompile/src/JSRF/Jet2.cpp
+++ b/decompile/src/JSRF/Jet2.cpp
@@ -7,6 +7,10 @@ Main function.
 #include "Core.hpp"
 
 
+// Address: 0x0022FCE0
+Game * g_game;
+
+
 // Address: 0x0006F9E0
 // Matching: yes
 void main(void) {
diff --git a/delink/objects.csv b/delink/objects.csv
index 9c0feb8..58357f8 100644
--- a/delink/objects.csv
+++ b/delink/objects.csv
@@ -1,6 +1,6 @@
 Object,Delink?,.text,.text$x,D3D,DSOUND,MMATRIX,XGRPH,XPP,.rdata,.rdata$x,.data,DOLBY
-JSRF/Core.obj,true,0x00011000-0x00013FEB,0x00186BA0-0x00186C14,,,,,,0x001C4390-0x001C44F9,0x001E4D20-0x001E4DAB,0x0022FCE0-0x0022FCE3,
-JSRF/Jet2.obj,true,0x0006F9E0-0x0006FA6F,0x00187710-0x00187724,,,,,,,0x001E620C-0x001E622F,,
+JSRF/Core.obj,true,0x00011000-0x00013FEB,0x00186BA0-0x00186C14,,,,,,0x001C4390-0x001C44F9,0x001E4D20-0x001E4DAB,0x001EB880-0x001EB933,
+JSRF/Jet2.obj,true,0x0006F9E0-0x0006FA6F,0x00187710-0x00187724,,,,,,,0x001E620C-0x001E622F,0x0022FCE0-0x0022FCE3,
 ADX (need to decompose),false,0x0013A570-0x0014555F,?,,,,,,?,?,?,
 XDK Core (need to decompose),false,0x00145560-0x0014B79F,?,,,,,,?,?,?,
 Smilebit libs (need to decompose),false,0x0014B7A0-0x0017BF3F,?,,,,,,?,?,?-0x0022ED2B,
diff --git a/readme.md b/readme.md
index 8ae8aa0..fb7fb2d 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
 A matching decompilation of the Xbox game Jet Set Radio Future.
 
 ## Progress
-- Delinking progress: 0.51% (13087 out of 2574172 bytes in XBE address space)
+- Delinking progress: 0.52% (13263 out of 2574172 bytes in XBE address space)
 - Decompilation progress: 3.1% (3 out of the 98 functions delinked so far)
 
 ## Roadmap