From e11bcb959912ac02058e4bc96cd24bfb27721a58 Mon Sep 17 00:00:00 2001 From: M&M Date: Mon, 1 Feb 2021 20:26:42 -0800 Subject: [PATCH] [Sonic Lost World] Numerous additions & fixes - Added Time Trials Everywhere - Added Retry in Normal Play - Added Quickboot - Fixed missing texture in E3 menu - Fixed green video on staff roll Additionally, Splatoon's map list from the Map Swap pack has been separated into its own file. --- Mods/SonicLostWorld_Quickboot/patches.txt | 24 ++++++ Mods/SonicLostWorld_Quickboot/rules.txt | 6 ++ Mods/SonicLostWorld_Quickboot/stagelist.txt | 85 +++++++++++++++++++ .../patches.txt | 4 + Mods/SonicLostWorld_RetryNormalPlay/rules.txt | 6 ++ .../patches.txt | 6 ++ .../rules.txt | 6 ++ .../SonicLostWorld_Resolution/rules.txt | 2 + src/Splatoon/Mods/MapSwap/maplist.txt | 69 +++++++++++++++ src/Splatoon/Mods/MapSwap/patches.txt | 84 +----------------- 10 files changed, 212 insertions(+), 80 deletions(-) create mode 100644 Mods/SonicLostWorld_Quickboot/patches.txt create mode 100644 Mods/SonicLostWorld_Quickboot/rules.txt create mode 100644 Mods/SonicLostWorld_Quickboot/stagelist.txt create mode 100644 Mods/SonicLostWorld_RetryNormalPlay/patches.txt create mode 100644 Mods/SonicLostWorld_RetryNormalPlay/rules.txt create mode 100644 Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt create mode 100644 Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt create mode 100644 src/Splatoon/Mods/MapSwap/maplist.txt diff --git a/Mods/SonicLostWorld_Quickboot/patches.txt b/Mods/SonicLostWorld_Quickboot/patches.txt new file mode 100644 index 00000000..60e0a3b4 --- /dev/null +++ b/Mods/SonicLostWorld_Quickboot/patches.txt @@ -0,0 +1,24 @@ +[sonic2013_v48] +moduleMatches = 0xC5691A40 + +# Game States +_E3Addr = 0x101B2150 +_kioskAddr = 0x101B2280 +_saveInitAddr = 0x101B2168 +_titleAddr = 0x101B2178 +_multiAddr = 0x101B2188 +_worldMapAddr = 0x101B2120 +_stageAddr = 0x101B2128 +_miniGameAddr = 0x101B2198 +_gameOverAddr = 0x101B21A8 +_staffRollAddr = 0x101B2110 + +# MANDATORY - DO NOT TOUCH +0x02A83AAC = lwz r7, (_saveInitAddr - 0x101B213C)(r12) # Boot now goes to SaveInit (previously Product) + +# Change the Addr mentioned here to any of the game states above +0x02A83EF8 = lwz r6, (_titleAddr - 0x101B2174)(r11) # SaveInit now goes to whatever is chosen (previously Title) + +# Change the string to go to any stage upon boot (if state is set to Stage) +# List of stages are in stagelist.txt +0x101B2378 = .string "w1a01" diff --git a/Mods/SonicLostWorld_Quickboot/rules.txt b/Mods/SonicLostWorld_Quickboot/rules.txt new file mode 100644 index 00000000..3eae913d --- /dev/null +++ b/Mods/SonicLostWorld_Quickboot/rules.txt @@ -0,0 +1,6 @@ +[Definition] +titleIds = 0005000010135700,000500001012B100,0005000010128F00 +name = Quickboot +path = "Sonic Lost World/Mods/Quickboot" +description = Boot straight to the title screen.|Can be customized by modifying the patch file.|Made by M&&M and Sajid. +version = 4 diff --git a/Mods/SonicLostWorld_Quickboot/stagelist.txt b/Mods/SonicLostWorld_Quickboot/stagelist.txt new file mode 100644 index 00000000..3c9fe15d --- /dev/null +++ b/Mods/SonicLostWorld_Quickboot/stagelist.txt @@ -0,0 +1,85 @@ +These are a list of stages that are present, taken from actstgdata.lua: + +w1草原 (Windy Hill) +"w1a01" - w1-1:グラスヒル +"w1a03" - w1-2:月光 +"xind01" - w1-3:インディ洞窟 +"w1a06" - w1-4:月光２ + +w2砂漠 (Desert Ruins) +"w2a01" - w2-1:サンドワーム軍 +"xbee01" - w2-2:ハチの巣ガンメン +"xswe01" - w2-3:ilomiloお菓子 +"w2a06" - w2-4:竜巻 + +w3南国 (Tropical Resort) +"w3a01" - w3-1:南国ビーチ +"w3a03" - w3-2:フルーツ農園 +"xsea01" - w3-3:海底洞窟 +"w3a06" - w3-4:オニキンメ +"w6a03" - w3-X:上昇気流 + +w4雪 (Frozen Factory) +"w4a01" - w4-1:軍事工場 +"w4a04" - w4-2:ポッポーズ +"xcas01" - w4-3:カジノ +"w4a06" - w4-4:ゲレンデ + +w5ジャングル (Silent Forest) +"w5a01" - w5-1:ジャングル軌道施設 +"w5a02" - w5-2:ミミズク +"xind02" - w5-3:インディ洞窟2 +"xmoa01" - w5-4:モアイ + +w6空 (Sky Road) +"w1a04" - w6-1:大ナール軍 +"w5a03" - w6-2:飛竜 +"w6a05" - w6-3:上昇気流２ +"w2c01" - w6-4:黄色三連バネ +"xnim02" - w6-X:キン斗雲２ + +w7溶岩 (Lava Mountain) +"w7a01" - w7-1:火山 +"xsea02" - w7-2:海底洞窟2 +"w7a02" - w7-3:城塞火山2 +"w7a06" - w7-4:ラスボス戦 + +w8スペシャル (Hidden World) +"xcub01" - w8-1:ルービックキューブ +"xsky01" - w8-2:スカイチェイス +"xnim01" - w8-3:筋斗雲 +"xbak01" - w8-4:バクバク足場 + +ミニゲーム (Circus) +"mini01" - seesaw1 +"mini02" - seesaw2 +"mini03" - seesaw3 +"mini04" - trampoline1 +"mini05" - trampoline2 +"mini06" - trampoline3 +"mini07" - cannon1 +"mini08" - cannon2 +"mini09" - cannon3 +"mini10" - w7 only + +対戦 (Battle) +"batl01" - スピードレース1 1-1 w1a01 グラスヒル +"batl02" - スピードレース2　1-3 xind01 インディ洞窟 +"batl03" - スピードレース3 2-4 w2a06 竜巻 +"batl04" - スピードレース4 4-1 w4a01 軍事工場 +"batl05" - スピードレース5 5-3 xind02 インディー洞窟2 +"batl06" - エキスパートスピード1 2-1 w2a01 サンドワーム軍 +"batl07" - エキスパートスピード2 3-1 w3a01 南国ビーチ +"batl08" - エキスパートスピード3 3-3 xsea01 海底洞窟 +"batl09" - エキスパートスピード4 5-1 w5a01 ジャングル軌道施設 +"batl10" - エキスパートスピード5 6-3 w6a05 上昇気流2 +"batl11" - リングレース1 2-4 w2a06 竜巻 +"batl12" - リングレース2 4-B w4a06 ゲレンデ +"batl13" - リングレース3 5-2 w5a02 ミミズク +"batl14" - リングレース4 6-3 w6a05 上昇気流2 +"batl15" - リングレース5 4-B w7a02 城塞火山２（ラッシュ） + +DLC +"zdlc01" - NiGHTS +"zdlc02" - ヨッシーアイランド (Yoshi's Island) +"zdlc03" - ゼルダの伝説 (The Legend of Zelda) diff --git a/Mods/SonicLostWorld_RetryNormalPlay/patches.txt b/Mods/SonicLostWorld_RetryNormalPlay/patches.txt new file mode 100644 index 00000000..6c583f1b --- /dev/null +++ b/Mods/SonicLostWorld_RetryNormalPlay/patches.txt @@ -0,0 +1,4 @@ +[sonic2013] +moduleMatches = 0xC5691A40 + +0x02A9D798 = cmpwi r3, 1 # Set IsTimeAttack to 1 diff --git a/Mods/SonicLostWorld_RetryNormalPlay/rules.txt b/Mods/SonicLostWorld_RetryNormalPlay/rules.txt new file mode 100644 index 00000000..ae64a75a --- /dev/null +++ b/Mods/SonicLostWorld_RetryNormalPlay/rules.txt @@ -0,0 +1,6 @@ +[Definition] +titleIds = 0005000010135700,000500001012B100,0005000010128F00 +name = Retry in Normal Play +path = "Sonic Lost World/Mods/Retry in Normal Play" +description = Allows you to retry outside of time trials.|Made by M&&M and Sajid. +version = 4 diff --git a/Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt b/Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt new file mode 100644 index 00000000..89527873 --- /dev/null +++ b/Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt @@ -0,0 +1,6 @@ +[sonic2013] +moduleMatches = 0xC5691A40 + +_bakuAddr = 0x02A8FAC4 + +0x02A8FA7C = bl _bakuAddr # Branch past code looking for only_normalplay in actstgmission.lua diff --git a/Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt b/Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt new file mode 100644 index 00000000..790a4af2 --- /dev/null +++ b/Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt @@ -0,0 +1,6 @@ +[Definition] +titleIds = 0005000010135700,000500001012B100,0005000010128F00 +name = Time Trials Everywhere +path = "Sonic Lost World/Mods/Time Trials Everywhere" +description = Allows you to do time trials in every stage except for DLC.|Made by M&&M. +version = 4 diff --git a/Resolutions/SonicLostWorld_Resolution/rules.txt b/Resolutions/SonicLostWorld_Resolution/rules.txt index e217e9e3..d511cd44 100644 --- a/Resolutions/SonicLostWorld_Resolution/rules.txt +++ b/Resolutions/SonicLostWorld_Resolution/rules.txt @@ -157,6 +157,7 @@ $gameHeight = 720 width = 1280 height = 720 tileModesExcluded = 0x001 +formatsExcluded = 0x032 overwriteWidth = ($width / $gameWidth) * 1280 overwriteHeight = ($height / $gameHeight) * 720 @@ -182,6 +183,7 @@ overwriteHeight = ($height / $gameHeight) * 192 [TextureRedefine] # Depth of Field Pass width = 320 height = 180 +tileModesExcluded = 0x001 overwriteWidth = ($width / $gameWidth) * 320 overwriteHeight = ($height / $gameHeight) * 180 diff --git a/src/Splatoon/Mods/MapSwap/maplist.txt b/src/Splatoon/Mods/MapSwap/maplist.txt new file mode 100644 index 00000000..4d028304 --- /dev/null +++ b/src/Splatoon/Mods/MapSwap/maplist.txt @@ -0,0 +1,69 @@ +Map Types: +"Vss" - VSGame +"Msn" - Mission +"Plz" - Plaza +"Wld" - World +"Shr" - ShootingRange +"Ttr" - Tutorial +"Stf" - StaffRoll + +List of maps: +"Fld_Tutorial00_Ttr" - Tutorial +"Fld_TutorialShow00_Ttr" - Tutorial +"Fld_MatchRoom_Mch" - Match Room +"Fld_ShootingRange_Shr" - Shooting Range +"Fld_World00_Wld" - Octo Valley +"Fld_EasyHide00_Msn" - Mission +"Fld_EasyClimb00_Msn" - Mission +"Fld_EasyJump00_Msn" - Mission +"Fld_Geyser00_Msn" - Mission +"Fld_Sponge00_Msn" - Mission +"Fld_Propeller00_Msn" - Mission +"Fld_PaintingLift00_Msn" - Mission +"Fld_RvlMaze00_Msn" - Mission +"Fld_OctZero00_Msn" - Mission +"Fld_InkRail00_Msn" - Mission +"Fld_Invisible00_Msn" - Mission +"Fld_Dozer00_Msn" - Mission +"Fld_SlideLift00_Msn" - Mission +"Fld_RvlSkatePark00_Msn" - Mission +"Fld_OctRuins00_Msn" - Mission +"Fld_Propeller01_Msn" - Mission +"Fld_Charge00_Msn" - Mission +"Fld_PaintingLift01_Msn" - Mission +"Fld_TurnLift00_Msn" - Mission +"Fld_RvlRuins00_Msn" - Mission +"Fld_OctCrank00_Msn" - Mission +"Fld_Trance00_Msn" - Mission +"Fld_Sponge01_Msn" - Mission +"Fld_Fusya00_Msn" - Mission +"Fld_Dozer01_Msn" - Mission +"Fld_RvlSeaPlant00_Msn" - Mission +"Fld_OctSkatePark00_Msn" - Mission +"Fld_BossStampKing_Bos_Msn" - The Mighty Octostomp! +"Fld_BossCylinderKing_Bos_Msn" - The Dreaded Octonozzle! +"Fld_BossBallKing_Bos_Msn" - The Rampaging Octowhirl! +"Fld_BossMouthKing_Bos_Msn" - The Ravenous Octomaw! +"Fld_BossRailKing_Bos_Msn" - Enter the Octobot King! (DJ Octavio) +"Fld_StaffRoll00_Stf" - Staff Roll +"Fld_Crank00_Dul" - Urchin Underpass (Dojo) +"Fld_Warehouse00_Dul" - Walleye Warehouse (Dojo) +"Fld_SeaPlant00_Dul" - Saltspray Rig (Dojo) +"Fld_UpDown00_Dul" - Arowana Mall (Dojo) +"Fld_SkatePark00_Dul" - Blackbelly Skatepark (Dojo) +"Fld_Crank00_Vss" - Urchin Underpass +"Fld_Warehouse00_Vss" - Walleye Warehouse +"Fld_SeaPlant00_Vss" - Saltspray Rig +"Fld_UpDown00_Vss" - Arowana Mall +"Fld_SkatePark00_Vss" - Blackbelly Skatepark +"Fld_Athletic00_Vss" - Camp Triggerfish +"Fld_Amida00_Vss" - Port Mackerel +"Fld_Maze00_Vss" - Kelp Dome +"Fld_Tuzura00_Vss" - Moray Towers +"Fld_Ruins00_Vss" - Bluefin Depot +"Fld_Office00_Vss" - Ancho-V Games +"Fld_Quarry00_Vss" - Piranha Pit +"Fld_Jyoheki00_Vss" - Flounder Heights +"Fld_Pivot00_Vss" - Museum d'Alfonsino +"Fld_Hiagari00_Vss" - Mahi-Mahi Resort +"Fld_Kaisou00_Vss" - Hammerhead Bridge diff --git a/src/Splatoon/Mods/MapSwap/patches.txt b/src/Splatoon/Mods/MapSwap/patches.txt index a25bf581..5714ca97 100644 --- a/src/Splatoon/Mods/MapSwap/patches.txt +++ b/src/Splatoon/Mods/MapSwap/patches.txt @@ -1,83 +1,7 @@ [Gambit272] moduleMatches = 0xF7A78809 -0x100F9CE0 = .string "Fld_Tutorial00_Ttr" #Tutorial [Original: Fld_Tutorial00_Ttr] - -#0x100F1244 = .string "Fld_Plaza00_Plz" #Inkopolis Plaza (Crashes) [Original: Fld_Plaza00_Plz] - -0x10101F38 = .string "Fld_World00_Wld" #Octo Valley [Original: Fld_World00_Wld] - -#0x100F8E74 = .string "Fld_StaffRoll00_Stf" #Staff Roll (Crashes) [Original: Fld_StaffRoll00_Stf] - -0x100F8958 = .string "Fld_ShootingRange_Shr" #Shooting Range [Original: Fld_ShootingRange_Shr] - -#Map Types: -#_Vss #VSGame -#_Msn #Mission -#_Plz #Plaza -#_Wld #World -#_Shr #ShootingRange -#_Ttr #Tutorial -#_Stf #StaffRoll - -#List of maps: -#Fld_Tutorial00_Ttr #Tutorial -#Fld_TutorialShow00_Ttr #Tutorial -#Fld_Plaza00_Plz #Inkopolis Plaza (Crashes) -#Fld_MatchRoom_Mch #Match Room -#Fld_ShootingRange_Shr #Shooting Range -#Fld_World00_Wld #Octo Valley -#Fld_EasyHide00_Msn #Mission -#Fld_EasyClimb00_Msn #Mission -#Fld_EasyJump00_Msn #Mission -#Fld_Geyser00_Msn #Mission -#Fld_Sponge00_Msn #Mission -#Fld_Propeller00_Msn #Mission -#Fld_PaintingLift00_Msn #Mission -#Fld_RvlMaze00_Msn #Mission -#Fld_OctZero00_Msn #Mission -#Fld_InkRail00_Msn #Mission -#Fld_Invisible00_Msn #Mission -#Fld_Dozer00_Msn #Mission -#Fld_SlideLift00_Msn #Mission -#Fld_RvlSkatePark00_Msn #Mission -#Fld_OctRuins00_Msn #Mission -#Fld_Propeller01_Msn #Mission -#Fld_Charge00_Msn #Mission -#Fld_PaintingLift01_Msn #Mission -#Fld_TurnLift00_Msn #Mission -#Fld_RvlRuins00_Msn #Mission -#Fld_OctCrank00_Msn #Mission -#Fld_Trance00_Msn #Mission -#Fld_Sponge01_Msn #Mission -#Fld_Fusya00_Msn #Mission -#Fld_Dozer01_Msn #Mission -#Fld_RvlSeaPlant00_Msn #Mission -#Fld_OctSkatePark00_Msn #Mission -#Fld_BossStampKing_Bos_Msn #Octostomper -#Fld_BossCylinderKing_Bos_Msn #Boss -#Fld_BossBallKing_Bos_Msn #Boss -#Fld_BossMouthKing_Bos_Msn #Boss -#Fld_BossRailKing_Bos_Msn #DJ Octavio -#Fld_StaffRoll00_Stf #Staff Roll -#Fld_Crank00_Dul #Urchin Underpass [Dojo] -#Fld_Warehouse00_Dul #Walleye Warehouse [Dojo] -#Fld_SeaPlant00_Dul #Saltspray Rig [Dojo] -#Fld_UpDown00_Dul #Arowana Mall [Dojo] -#Fld_SkatePark00_Dul #Blackbelly Skatepark [Dojo] -#Fld_Crank00_Vss #Urchin Underpass -#Fld_Warehouse00_Vss #Walleye Warehouse -#Fld_SeaPlant00_Vss #Saltspray Rig -#Fld_UpDown00_Vss #Arowana Mall -#Fld_SkatePark00_Vss #Blackbelly Skatepark -#Fld_Athletic00_Vss #Camp Triggerfish -#Fld_Amida00_Vss #Port Mackerel -#Fld_Maze00_Vss #Kelp Dome -#Fld_Tuzura00_Vss #Moray Towers -#Fld_Ruins00_Vss #Bluefin Depot -#Fld_Office00_Vss #Ancho-V Games -#Fld_Quarry00_Vss #Piranha Pit -#Fld_Jyoheki00_Vss #Flounder Heights -#Fld_Pivot00_Vss #Museum d'Alfonsino -#Fld_Hiagari00_Vss #Mahi-Mahi Resort -#Fld_Kaisou00_Vss #Hammerhead Bridge +# List of maps are in maplist.txt +0x100F9CE0 = .string "Fld_Tutorial00_Ttr" # Tutorial (Original: Fld_Tutorial00_Ttr) +0x10101F38 = .string "Fld_World00_Wld" # Octo Valley (Original: Fld_World00_Wld) +0x100F8958 = .string "Fld_ShootingRange_Shr" # Shooting Range (Original: Fld_ShootingRange_Shr)