diff --git a/Hybrid-RSDK Main/sonic-hybrid/Scripts/ARZ/Brick.txt b/Hybrid-RSDK Main/sonic-hybrid/Scripts/ARZ/Brick.txt index a8c0b00b..1c581c62 100644 --- 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 index c1a65aba..02993bef 100644 --- 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 index 50201372..cd09231e 100644 --- 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 index 21c7245f..70229992 100644 --- 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 index f3c2001b..6ece7daf 100644 --- 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 index b0da3561..aba5a0a0 100644 --- 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 index 306bab92..2b9a686a 100644 --- 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 index 02a8e5e6..d5ff8e52 100644 --- 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 index 0c6917c1..0a908707 100644 --- 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)