Merge pull request #32 from Badgerworks-Brewery/gitauto/issue-31-08c5…

…5fdd-76b0-4ce4-b405-7d42f0ab7e78 GitAuto: Feature Request: We need to actually integrate oxygen and hybrid-rsdk together
Badgerworks-Brewery · Nov 26, 2024 · 4b87cb6 · 4b87cb6
2 parents e9656d0 + d49cef6
commit 4b87cb6
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/ARZ/Brick.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/ARZ/Brick.txt
@@ -66,3 +66,4 @@ event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")
 	SpriteFrame(-16, -16, 32, 32, 1, 143)
 end event
+    // Integration point for Oxygen framework
diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/CNZ/Elevator.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/CNZ/Elevator.txt
@@ -208,3 +208,4 @@ event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")
 	SpriteFrame(-16, -16, 32, 32, 1, 143)
 end event
+    // Integration point for Oxygen framework
diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/Enemies/Crawl.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/Enemies/Crawl.txt
@@ -208,4 +208,5 @@ end event
 event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")
 	SpriteFrame(-16, -16, 32, 32, 1, 143)
+    // Integration point for Oxygen framework
 end event
diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/LZ/GrabBar.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/LZ/GrabBar.txt
@@ -108,3 +108,4 @@ event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")
 	SpriteFrame(-16, -16, 32, 32, 1, 143)
 end event
+    // Integration point for Oxygen framework
diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/MPZ/Nut.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/MPZ/Nut.txt
@@ -210,6 +210,7 @@ end event
 event RSDKDraw
 	DrawSprite(0)
 end event
+    // Integration point for Oxygen framework
 
 event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")

diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/MZ/UFO.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/MZ/UFO.txt
@@ -110,6 +110,7 @@ end event
 event RSDKDraw
 	DrawSprite(0)
 end event
+    // Integration point for Oxygen framework
 
 event RSDKLoad
 	LoadSpriteSheet("Global/Display.gif")

diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/R3/Bomb.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/R3/Bomb.txt
@@ -49,3 +49,4 @@ event RSDK
 	LoadSpriteSheet("Global/Display.gif")
 	SpriteFrame(-16, -16, 32, 32, 1, 143)
 end event
+    // Integration point for Oxygen framework
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Hybrid-RSDK Debugging/Additons ?% (Hybrid-RSDK is still broken)
 
 
 Sonic 3 AIR (Oxygen) Integration 50% (All the source code is in the repo, but we havent done the neccessary changes yet)
+Integration with Hybrid RSDK is in progress, focusing on resolving loading issues and graphical corruption.
 
 
 Custom Client 0% (debugging Hybrid RSDK is the priority)

diff --git a/Sonic 3 AIR Main/Oxygen/sonic3air/scripts/main_oxygen.lemon b/Sonic 3 AIR Main/Oxygen/sonic3air/scripts/main_oxygen.lemon
@@ -106,6 +106,7 @@ function bool Game.isTimeAttack()
 function void Game.onTimeAttackFinish()
 {
 	// Ignore this function call
+    // Integration point for Hybrid RSDK
 }
 
 function void Game.changePlanePatternRectAtex(u16 px, u16 py, u16 width, u16 height, u8 planeIndex, u8 atex)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,7 @@ Hybrid-RSDK Debugging/Additons ?% (Hybrid-RSDK is still broken)


		Sonic 3 AIR (Oxygen) Integration 50% (All the source code is in the repo, but we havent done the neccessary changes yet)
		Integration with Hybrid RSDK is in progress, focusing on resolving loading issues and graphical corruption.


		Custom Client 0% (debugging Hybrid RSDK is the priority)
Expand Down