From 54dcc40064824891fdf8d04a9fb35ad876dc3134 Mon Sep 17 00:00:00 2001 From: Berkeley <65060738+tariq-nasheed@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:44:24 -0500 Subject: [PATCH] start of source tree reorganization --- CMakeLists.txt | 3 +- .../{Objects/Boilerplate => Mania}/Animals.c | 0 .../{Objects/Boilerplate => Mania}/Animals.h | 0 .../Boilerplate => Mania}/BSS/BSS_Setup.c | 0 .../Boilerplate => Mania}/BSS/BSS_Setup.h | 0 .../Boilerplate => Mania}/CPZ/AmoebaDroid.c | 0 .../Boilerplate => Mania}/CPZ/AmoebaDroid.h | 0 .../Boilerplate => Mania}/CPZ/Bubbler.c | 0 .../Boilerplate => Mania}/CPZ/Bubbler.h | 0 .../Boilerplate => Mania}/CPZ/CPZSetup.c | 0 .../Boilerplate => Mania}/CPZ/CPZSetup.h | 0 .../Boilerplate => Mania}/CPZ/CaterkillerJr.c | 0 .../Boilerplate => Mania}/CPZ/CaterkillerJr.h | 0 .../Boilerplate => Mania}/CPZ/Grabber.c | 0 .../Boilerplate => Mania}/CPZ/Grabber.h | 0 .../Boilerplate => Mania}/CPZ/Spiny.c | 0 .../Boilerplate => Mania}/CPZ/Spiny.h | 0 .../{Objects/Boilerplate => Mania}/Camera.c | 0 .../{Objects/Boilerplate => Mania}/Camera.h | 0 .../CollapsingPlatform.c | 0 .../CollapsingPlatform.h | 0 .../{Objects/Boilerplate => Mania}/Debris.c | 0 .../{Objects/Boilerplate => Mania}/Debris.h | 0 .../Boilerplate => Mania}/ERZ/ERZStart.c | 0 .../Boilerplate => Mania}/ERZ/ERZStart.h | 0 .../Boilerplate => Mania}/ERZ/PhantomEgg.c | 0 .../Boilerplate => Mania}/ERZ/PhantomEgg.h | 0 .../Boilerplate => Mania}/ERZ/PhantomMystic.c | 0 .../Boilerplate => Mania}/ERZ/PhantomMystic.h | 0 .../ERZ/PhantomShinobi.c | 0 .../ERZ/PhantomShinobi.h | 0 .../Boilerplate => Mania}/Explosion.c | 0 .../Boilerplate => Mania}/Explosion.h | 0 .../Boilerplate => Mania}/FBZ/BigSqueeze.c | 0 .../Boilerplate => Mania}/FBZ/BigSqueeze.h | 0 .../Boilerplate => Mania}/FBZ/Blaster.c | 0 .../Boilerplate => Mania}/FBZ/Blaster.h | 0 .../Boilerplate => Mania}/FBZ/Clucker.c | 0 .../Boilerplate => Mania}/FBZ/Clucker.h | 0 .../Boilerplate => Mania}/FBZ/FBZTrash.c | 0 .../Boilerplate => Mania}/FBZ/FBZTrash.h | 0 .../Boilerplate => Mania}/FBZ/Technosqueek.c | 0 .../Boilerplate => Mania}/FBZ/Technosqueek.h | 0 .../{Objects/Boilerplate => Mania}/FXFade.c | 0 .../{Objects/Boilerplate => Mania}/FXFade.h | 0 .../Boilerplate => Mania}/GHZ/Batbrain.c | 0 .../Boilerplate => Mania}/GHZ/Batbrain.h | 0 .../Boilerplate => Mania}/GHZ/BuzzBomber.c | 0 .../Boilerplate => Mania}/GHZ/BuzzBomber.h | 0 .../Boilerplate => Mania}/GHZ/Chopper.c | 0 .../Boilerplate => Mania}/GHZ/Chopper.h | 0 .../Boilerplate => Mania}/GHZ/Crabmeat.c | 0 .../Boilerplate => Mania}/GHZ/Crabmeat.h | 0 .../Boilerplate => Mania}/GHZ/DDWrecker.c | 0 .../Boilerplate => Mania}/GHZ/DDWrecker.h | 0 .../Boilerplate => Mania}/GHZ/DERobot.c | 0 .../Boilerplate => Mania}/GHZ/DERobot.h | 0 .../Boilerplate => Mania}/GHZ/Motobug.c | 0 .../Boilerplate => Mania}/GHZ/Motobug.h | 0 .../Boilerplate => Mania}/GHZ/Newtron.c | 0 .../Boilerplate => Mania}/GHZ/Newtron.h | 0 .../Boilerplate => Mania}/GHZ/Splats.c | 0 .../Boilerplate => Mania}/GHZ/Splats.h | 0 .../Global/InvincibleStars.c | 0 .../Global/InvincibleStars.h | 0 .../Boilerplate => Mania}/Global/PauseMenu.c | 0 .../Boilerplate => Mania}/Global/PauseMenu.h | 0 .../Boilerplate => Mania}/HCZ/Blastoid.c | 0 .../Boilerplate => Mania}/HCZ/Blastoid.h | 0 .../Boilerplate => Mania}/HCZ/Buggernaut.c | 0 .../Boilerplate => Mania}/HCZ/Buggernaut.h | 0 .../Boilerplate => Mania}/HCZ/HCZSetup.c | 0 .../Boilerplate => Mania}/HCZ/HCZSetup.h | 0 .../{Objects/Boilerplate => Mania}/HCZ/Jawz.c | 0 .../{Objects/Boilerplate => Mania}/HCZ/Jawz.h | 0 .../Boilerplate => Mania}/HCZ/Jellygnite.c | 0 .../Boilerplate => Mania}/HCZ/Jellygnite.h | 0 .../Boilerplate => Mania}/HCZ/LaundroMobile.c | 0 .../Boilerplate => Mania}/HCZ/LaundroMobile.h | 0 .../Boilerplate => Mania}/HCZ/MegaChopper.c | 0 .../Boilerplate => Mania}/HCZ/MegaChopper.h | 0 .../Boilerplate => Mania}/HCZ/Pointdexter.c | 0 .../Boilerplate => Mania}/HCZ/Pointdexter.h | 0 .../Boilerplate => Mania}/HCZ/TurboSpiker.c | 0 .../Boilerplate => Mania}/HCZ/TurboSpiker.h | 0 .../{Objects/Boilerplate => Mania}/ItemBox.c | 2 +- src/hypermania/Mania/ItemBox.h | 7 + .../Boilerplate => Mania}/LRZ/Drillerdroid.c | 0 .../Boilerplate => Mania}/LRZ/Drillerdroid.h | 0 .../Boilerplate => Mania}/LRZ/DrillerdroidO.c | 0 .../Boilerplate => Mania}/LRZ/DrillerdroidO.h | 0 .../Boilerplate => Mania}/LRZ/Fireworm.c | 0 .../Boilerplate => Mania}/LRZ/Fireworm.h | 0 .../Boilerplate => Mania}/LRZ/HeavyKing.c | 0 .../Boilerplate => Mania}/LRZ/HeavyKing.h | 0 .../Boilerplate => Mania}/LRZ/HeavyRider.c | 0 .../Boilerplate => Mania}/LRZ/HeavyRider.h | 0 .../Boilerplate => Mania}/LRZ/Rexon.c | 0 .../Boilerplate => Mania}/LRZ/Rexon.h | 0 .../Boilerplate => Mania}/LRZ/RockDrill.c | 0 .../Boilerplate => Mania}/LRZ/RockDrill.h | 0 .../Boilerplate => Mania}/LRZ/Toxomister.c | 0 .../Boilerplate => Mania}/LRZ/Toxomister.h | 0 .../MMZ/EggPistonsMKII.c | 0 .../MMZ/EggPistonsMKII.h | 0 .../Boilerplate => Mania}/MMZ/FarPlane.c | 0 .../Boilerplate => Mania}/MMZ/FarPlane.h | 0 .../Boilerplate => Mania}/MMZ/Gachapandora.c | 0 .../Boilerplate => Mania}/MMZ/Gachapandora.h | 0 .../Boilerplate => Mania}/MMZ/MechaBu.c | 0 .../Boilerplate => Mania}/MMZ/MechaBu.h | 0 .../Boilerplate => Mania}/MMZ/PohBee.c | 0 .../Boilerplate => Mania}/MMZ/PohBee.h | 0 .../Boilerplate => Mania}/MMZ/Scarab.c | 0 .../Boilerplate => Mania}/MMZ/Scarab.h | 0 .../Boilerplate => Mania}/MSZ/Armadiloid.c | 0 .../Boilerplate => Mania}/MSZ/Armadiloid.h | 0 .../Boilerplate => Mania}/MSZ/Bumpalo.c | 0 .../Boilerplate => Mania}/MSZ/Bumpalo.h | 0 .../Boilerplate => Mania}/MSZ/Cactula.c | 0 .../Boilerplate => Mania}/MSZ/Cactula.h | 0 .../Boilerplate => Mania}/MSZ/DBTower.c | 0 .../Boilerplate => Mania}/MSZ/DBTower.h | 0 .../Boilerplate => Mania}/MSZ/Hatterkiller.c | 0 .../Boilerplate => Mania}/MSZ/Hatterkiller.h | 0 .../Boilerplate => Mania}/MSZ/HeavyMystic.c | 0 .../Boilerplate => Mania}/MSZ/HeavyMystic.h | 0 .../Boilerplate => Mania}/MSZ/Rattlekiller.c | 0 .../Boilerplate => Mania}/MSZ/Rattlekiller.h | 0 .../Boilerplate => Mania}/MSZ/RollerMKII.c | 0 .../Boilerplate => Mania}/MSZ/RollerMKII.h | 0 .../MSZ/UberCaterkiller.c | 0 .../MSZ/UberCaterkiller.h | 0 .../Boilerplate => Mania}/MSZ/Vultron.c | 0 .../Boilerplate => Mania}/MSZ/Vultron.h | 0 .../{Objects/Boilerplate => Mania}/Music.c | 0 .../{Objects/Boilerplate => Mania}/Music.h | 0 .../Boilerplate => Mania}/OOZ/Aquis.c | 0 .../Boilerplate => Mania}/OOZ/Aquis.h | 0 .../Boilerplate => Mania}/OOZ/MegaOctus.c | 0 .../Boilerplate => Mania}/OOZ/MegaOctus.h | 0 .../Boilerplate => Mania}/OOZ/MeterDroid.c | 0 .../Boilerplate => Mania}/OOZ/MeterDroid.h | 0 .../Boilerplate => Mania}/OOZ/OOZSetup.c | 0 .../Boilerplate => Mania}/OOZ/OOZSetup.h | 0 .../Boilerplate => Mania}/OOZ/Octus.c | 0 .../Boilerplate => Mania}/OOZ/Octus.h | 0 .../{Objects/Boilerplate => Mania}/OOZ/Sol.c | 0 .../{Objects/Boilerplate => Mania}/OOZ/Sol.h | 0 .../Boilerplate => Mania}/PGZ/Dragonfly.c | 0 .../Boilerplate => Mania}/PGZ/Dragonfly.h | 0 .../Boilerplate => Mania}/PGZ/HeavyShinobi.c | 0 .../Boilerplate => Mania}/PGZ/HeavyShinobi.h | 0 .../Boilerplate => Mania}/PGZ/IceBomba.c | 0 .../Boilerplate => Mania}/PGZ/IceBomba.h | 0 .../Boilerplate => Mania}/PGZ/JuggleSaw.c | 0 .../Boilerplate => Mania}/PGZ/JuggleSaw.h | 0 .../Boilerplate => Mania}/PGZ/Shiversaw.c | 0 .../Boilerplate => Mania}/PGZ/Shiversaw.h | 0 .../Boilerplate => Mania}/PGZ/Woodrow.c | 0 .../Boilerplate => Mania}/PGZ/Woodrow.h | 0 .../{Objects/Boilerplate => Mania}/Ring.c | 0 .../{Objects/Boilerplate => Mania}/Ring.h | 0 .../Boilerplate => Mania}/SPZ/Canista.c | 0 .../Boilerplate => Mania}/SPZ/Canista.h | 0 .../Boilerplate => Mania}/SPZ/MicDrop.c | 0 .../Boilerplate => Mania}/SPZ/MicDrop.h | 0 .../Boilerplate => Mania}/SPZ/Shutterbug.c | 0 .../Boilerplate => Mania}/SPZ/Shutterbug.h | 0 .../Boilerplate => Mania}/SPZ/Tubinaut.c | 0 .../Boilerplate => Mania}/SPZ/Tubinaut.h | 0 .../Boilerplate => Mania}/SPZ/WeatherMobile.c | 0 .../Boilerplate => Mania}/SPZ/WeatherMobile.h | 0 .../Boilerplate => Mania}/SSZ/Dango.c | 0 .../Boilerplate => Mania}/SSZ/Dango.h | 0 .../Boilerplate => Mania}/SSZ/GigaMetal.c | 0 .../Boilerplate => Mania}/SSZ/GigaMetal.h | 0 .../Boilerplate => Mania}/SSZ/Hotaru.c | 0 .../Boilerplate => Mania}/SSZ/Hotaru.h | 0 .../Boilerplate => Mania}/SSZ/HotaruHiWatt.c | 0 .../Boilerplate => Mania}/SSZ/HotaruHiWatt.h | 0 .../Boilerplate => Mania}/SSZ/HotaruMKII.c | 0 .../Boilerplate => Mania}/SSZ/HotaruMKII.h | 0 .../Boilerplate => Mania}/SSZ/Kabasira.c | 0 .../Boilerplate => Mania}/SSZ/Kabasira.h | 0 .../Boilerplate => Mania}/SSZ/Kanabun.c | 0 .../Boilerplate => Mania}/SSZ/Kanabun.h | 0 .../Boilerplate => Mania}/SSZ/MetalSonic.c | 0 .../Boilerplate => Mania}/SSZ/MetalSonic.h | 0 .../{Objects/Boilerplate => Mania}/SaveGame.c | 0 src/hypermania/Mania/SaveGame.h | 21 +++ .../Boilerplate => Mania}/ScoreBonus.c | 0 src/hypermania/Mania/ScoreBonus.h | 2 + .../Boilerplate => Mania}/TMZ/BallHog.c | 0 .../Boilerplate => Mania}/TMZ/BallHog.h | 0 .../Boilerplate => Mania}/TMZ/CrimsonEye.c | 0 .../Boilerplate => Mania}/TMZ/CrimsonEye.h | 0 .../Boilerplate => Mania}/TMZ/FlasherMKII.c | 0 .../Boilerplate => Mania}/TMZ/FlasherMKII.h | 0 .../Boilerplate => Mania}/TMZ/SentryBug.c | 0 .../Boilerplate => Mania}/TMZ/SentryBug.h | 0 .../Boilerplate => Mania}/TMZ/TurboTurtle.c | 0 .../Boilerplate => Mania}/TMZ/TurboTurtle.h | 0 .../{Objects/Boilerplate => Mania}/Zone.c | 0 src/hypermania/Mania/Zone.h | 5 + src/hypermania/ModFunctions.h | 42 ++--- src/hypermania/Objects/All.c | 40 ++--- src/hypermania/Objects/Boilerplate/ItemBox.h | 14 -- src/hypermania/Objects/Boilerplate/SaveGame.h | 27 --- .../Objects/Boilerplate/ScoreBonus.h | 8 - src/hypermania/Objects/Boilerplate/Zone.h | 11 -- src/hypermania/Objects/Enemy.c | 164 +++++++++--------- src/hypermania/Objects/Enemy.h | 164 +++++++++--------- src/hypermania/Objects/HPZ/HPZBeam.c | 2 +- src/hypermania/dllmain.c | 40 ++--- 215 files changed, 263 insertions(+), 289 deletions(-) rename src/hypermania/{Objects/Boilerplate => Mania}/Animals.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Animals.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/BSS/BSS_Setup.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/BSS/BSS_Setup.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/AmoebaDroid.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/AmoebaDroid.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Bubbler.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Bubbler.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/CPZSetup.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/CPZSetup.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/CaterkillerJr.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/CaterkillerJr.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Grabber.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Grabber.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Spiny.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CPZ/Spiny.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Camera.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Camera.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CollapsingPlatform.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/CollapsingPlatform.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Debris.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Debris.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/ERZStart.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/ERZStart.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomEgg.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomEgg.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomMystic.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomMystic.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomShinobi.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ERZ/PhantomShinobi.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Explosion.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Explosion.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/BigSqueeze.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/BigSqueeze.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Blaster.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Blaster.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Clucker.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Clucker.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/FBZTrash.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/FBZTrash.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Technosqueek.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FBZ/Technosqueek.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FXFade.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/FXFade.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Batbrain.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Batbrain.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/BuzzBomber.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/BuzzBomber.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Chopper.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Chopper.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Crabmeat.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Crabmeat.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/DDWrecker.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/DDWrecker.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/DERobot.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/DERobot.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Motobug.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Motobug.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Newtron.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Newtron.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Splats.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/GHZ/Splats.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Global/InvincibleStars.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Global/InvincibleStars.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Global/PauseMenu.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Global/PauseMenu.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Blastoid.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Blastoid.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Buggernaut.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Buggernaut.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/HCZSetup.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/HCZSetup.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Jawz.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Jawz.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Jellygnite.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Jellygnite.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/LaundroMobile.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/LaundroMobile.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/MegaChopper.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/MegaChopper.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Pointdexter.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/Pointdexter.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/TurboSpiker.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/HCZ/TurboSpiker.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ItemBox.c (60%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Drillerdroid.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Drillerdroid.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/DrillerdroidO.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/DrillerdroidO.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Fireworm.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Fireworm.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/HeavyKing.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/HeavyKing.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/HeavyRider.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/HeavyRider.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Rexon.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Rexon.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/RockDrill.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/RockDrill.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Toxomister.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/LRZ/Toxomister.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/EggPistonsMKII.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/EggPistonsMKII.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/FarPlane.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/FarPlane.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/Gachapandora.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/Gachapandora.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/MechaBu.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/MechaBu.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/PohBee.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/PohBee.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/Scarab.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MMZ/Scarab.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Armadiloid.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Armadiloid.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Bumpalo.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Bumpalo.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Cactula.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Cactula.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/DBTower.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/DBTower.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Hatterkiller.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Hatterkiller.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/HeavyMystic.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/HeavyMystic.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Rattlekiller.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Rattlekiller.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/RollerMKII.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/RollerMKII.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/UberCaterkiller.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/UberCaterkiller.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Vultron.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/MSZ/Vultron.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Music.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Music.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Aquis.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Aquis.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/MegaOctus.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/MegaOctus.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/MeterDroid.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/MeterDroid.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/OOZSetup.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/OOZSetup.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Octus.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Octus.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Sol.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/OOZ/Sol.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Dragonfly.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Dragonfly.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/HeavyShinobi.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/HeavyShinobi.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/IceBomba.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/IceBomba.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/JuggleSaw.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/JuggleSaw.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Shiversaw.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Shiversaw.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Woodrow.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/PGZ/Woodrow.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Ring.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Ring.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Canista.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Canista.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/MicDrop.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/MicDrop.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Shutterbug.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Shutterbug.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Tubinaut.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/Tubinaut.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/WeatherMobile.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SPZ/WeatherMobile.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Dango.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Dango.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/GigaMetal.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/GigaMetal.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Hotaru.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Hotaru.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/HotaruHiWatt.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/HotaruHiWatt.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/HotaruMKII.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/HotaruMKII.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Kabasira.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Kabasira.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Kanabun.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/Kanabun.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/MetalSonic.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SSZ/MetalSonic.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/SaveGame.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/ScoreBonus.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/BallHog.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/BallHog.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/CrimsonEye.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/CrimsonEye.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/FlasherMKII.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/FlasherMKII.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/SentryBug.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/SentryBug.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/TurboTurtle.c (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/TMZ/TurboTurtle.h (100%) rename src/hypermania/{Objects/Boilerplate => Mania}/Zone.c (100%) delete mode 100644 src/hypermania/Objects/Boilerplate/ItemBox.h delete mode 100644 src/hypermania/Objects/Boilerplate/SaveGame.h delete mode 100644 src/hypermania/Objects/Boilerplate/ScoreBonus.h delete mode 100644 src/hypermania/Objects/Boilerplate/Zone.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 108846b..2b05028 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,9 +46,8 @@ add_library(hypermania SHARED target_include_directories(hypermania PRIVATE src/${MOD_NAME}/ + src/${MOD_NAME}/Objects src/${MOD_NAME}/Mania - src/${MOD_NAME}/Objects/ - src/${MOD_NAME}/Objects/Boilerplate src/GameAPI/C/ ) diff --git a/src/hypermania/Objects/Boilerplate/Animals.c b/src/hypermania/Mania/Animals.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Animals.c rename to src/hypermania/Mania/Animals.c diff --git a/src/hypermania/Objects/Boilerplate/Animals.h b/src/hypermania/Mania/Animals.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Animals.h rename to src/hypermania/Mania/Animals.h diff --git a/src/hypermania/Objects/Boilerplate/BSS/BSS_Setup.c b/src/hypermania/Mania/BSS/BSS_Setup.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/BSS/BSS_Setup.c rename to src/hypermania/Mania/BSS/BSS_Setup.c diff --git a/src/hypermania/Objects/Boilerplate/BSS/BSS_Setup.h b/src/hypermania/Mania/BSS/BSS_Setup.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/BSS/BSS_Setup.h rename to src/hypermania/Mania/BSS/BSS_Setup.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/AmoebaDroid.c b/src/hypermania/Mania/CPZ/AmoebaDroid.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/AmoebaDroid.c rename to src/hypermania/Mania/CPZ/AmoebaDroid.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/AmoebaDroid.h b/src/hypermania/Mania/CPZ/AmoebaDroid.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/AmoebaDroid.h rename to src/hypermania/Mania/CPZ/AmoebaDroid.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Bubbler.c b/src/hypermania/Mania/CPZ/Bubbler.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Bubbler.c rename to src/hypermania/Mania/CPZ/Bubbler.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Bubbler.h b/src/hypermania/Mania/CPZ/Bubbler.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Bubbler.h rename to src/hypermania/Mania/CPZ/Bubbler.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/CPZSetup.c b/src/hypermania/Mania/CPZ/CPZSetup.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/CPZSetup.c rename to src/hypermania/Mania/CPZ/CPZSetup.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/CPZSetup.h b/src/hypermania/Mania/CPZ/CPZSetup.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/CPZSetup.h rename to src/hypermania/Mania/CPZ/CPZSetup.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/CaterkillerJr.c b/src/hypermania/Mania/CPZ/CaterkillerJr.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/CaterkillerJr.c rename to src/hypermania/Mania/CPZ/CaterkillerJr.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/CaterkillerJr.h b/src/hypermania/Mania/CPZ/CaterkillerJr.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/CaterkillerJr.h rename to src/hypermania/Mania/CPZ/CaterkillerJr.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Grabber.c b/src/hypermania/Mania/CPZ/Grabber.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Grabber.c rename to src/hypermania/Mania/CPZ/Grabber.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Grabber.h b/src/hypermania/Mania/CPZ/Grabber.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Grabber.h rename to src/hypermania/Mania/CPZ/Grabber.h diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Spiny.c b/src/hypermania/Mania/CPZ/Spiny.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Spiny.c rename to src/hypermania/Mania/CPZ/Spiny.c diff --git a/src/hypermania/Objects/Boilerplate/CPZ/Spiny.h b/src/hypermania/Mania/CPZ/Spiny.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CPZ/Spiny.h rename to src/hypermania/Mania/CPZ/Spiny.h diff --git a/src/hypermania/Objects/Boilerplate/Camera.c b/src/hypermania/Mania/Camera.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Camera.c rename to src/hypermania/Mania/Camera.c diff --git a/src/hypermania/Objects/Boilerplate/Camera.h b/src/hypermania/Mania/Camera.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Camera.h rename to src/hypermania/Mania/Camera.h diff --git a/src/hypermania/Objects/Boilerplate/CollapsingPlatform.c b/src/hypermania/Mania/CollapsingPlatform.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/CollapsingPlatform.c rename to src/hypermania/Mania/CollapsingPlatform.c diff --git a/src/hypermania/Objects/Boilerplate/CollapsingPlatform.h b/src/hypermania/Mania/CollapsingPlatform.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/CollapsingPlatform.h rename to src/hypermania/Mania/CollapsingPlatform.h diff --git a/src/hypermania/Objects/Boilerplate/Debris.c b/src/hypermania/Mania/Debris.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Debris.c rename to src/hypermania/Mania/Debris.c diff --git a/src/hypermania/Objects/Boilerplate/Debris.h b/src/hypermania/Mania/Debris.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Debris.h rename to src/hypermania/Mania/Debris.h diff --git a/src/hypermania/Objects/Boilerplate/ERZ/ERZStart.c b/src/hypermania/Mania/ERZ/ERZStart.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/ERZStart.c rename to src/hypermania/Mania/ERZ/ERZStart.c diff --git a/src/hypermania/Objects/Boilerplate/ERZ/ERZStart.h b/src/hypermania/Mania/ERZ/ERZStart.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/ERZStart.h rename to src/hypermania/Mania/ERZ/ERZStart.h diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomEgg.c b/src/hypermania/Mania/ERZ/PhantomEgg.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomEgg.c rename to src/hypermania/Mania/ERZ/PhantomEgg.c diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomEgg.h b/src/hypermania/Mania/ERZ/PhantomEgg.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomEgg.h rename to src/hypermania/Mania/ERZ/PhantomEgg.h diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomMystic.c b/src/hypermania/Mania/ERZ/PhantomMystic.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomMystic.c rename to src/hypermania/Mania/ERZ/PhantomMystic.c diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomMystic.h b/src/hypermania/Mania/ERZ/PhantomMystic.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomMystic.h rename to src/hypermania/Mania/ERZ/PhantomMystic.h diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomShinobi.c b/src/hypermania/Mania/ERZ/PhantomShinobi.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomShinobi.c rename to src/hypermania/Mania/ERZ/PhantomShinobi.c diff --git a/src/hypermania/Objects/Boilerplate/ERZ/PhantomShinobi.h b/src/hypermania/Mania/ERZ/PhantomShinobi.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/ERZ/PhantomShinobi.h rename to src/hypermania/Mania/ERZ/PhantomShinobi.h diff --git a/src/hypermania/Objects/Boilerplate/Explosion.c b/src/hypermania/Mania/Explosion.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Explosion.c rename to src/hypermania/Mania/Explosion.c diff --git a/src/hypermania/Objects/Boilerplate/Explosion.h b/src/hypermania/Mania/Explosion.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Explosion.h rename to src/hypermania/Mania/Explosion.h diff --git a/src/hypermania/Objects/Boilerplate/FBZ/BigSqueeze.c b/src/hypermania/Mania/FBZ/BigSqueeze.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/BigSqueeze.c rename to src/hypermania/Mania/FBZ/BigSqueeze.c diff --git a/src/hypermania/Objects/Boilerplate/FBZ/BigSqueeze.h b/src/hypermania/Mania/FBZ/BigSqueeze.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/BigSqueeze.h rename to src/hypermania/Mania/FBZ/BigSqueeze.h diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Blaster.c b/src/hypermania/Mania/FBZ/Blaster.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Blaster.c rename to src/hypermania/Mania/FBZ/Blaster.c diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Blaster.h b/src/hypermania/Mania/FBZ/Blaster.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Blaster.h rename to src/hypermania/Mania/FBZ/Blaster.h diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Clucker.c b/src/hypermania/Mania/FBZ/Clucker.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Clucker.c rename to src/hypermania/Mania/FBZ/Clucker.c diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Clucker.h b/src/hypermania/Mania/FBZ/Clucker.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Clucker.h rename to src/hypermania/Mania/FBZ/Clucker.h diff --git a/src/hypermania/Objects/Boilerplate/FBZ/FBZTrash.c b/src/hypermania/Mania/FBZ/FBZTrash.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/FBZTrash.c rename to src/hypermania/Mania/FBZ/FBZTrash.c diff --git a/src/hypermania/Objects/Boilerplate/FBZ/FBZTrash.h b/src/hypermania/Mania/FBZ/FBZTrash.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/FBZTrash.h rename to src/hypermania/Mania/FBZ/FBZTrash.h diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Technosqueek.c b/src/hypermania/Mania/FBZ/Technosqueek.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Technosqueek.c rename to src/hypermania/Mania/FBZ/Technosqueek.c diff --git a/src/hypermania/Objects/Boilerplate/FBZ/Technosqueek.h b/src/hypermania/Mania/FBZ/Technosqueek.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FBZ/Technosqueek.h rename to src/hypermania/Mania/FBZ/Technosqueek.h diff --git a/src/hypermania/Objects/Boilerplate/FXFade.c b/src/hypermania/Mania/FXFade.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/FXFade.c rename to src/hypermania/Mania/FXFade.c diff --git a/src/hypermania/Objects/Boilerplate/FXFade.h b/src/hypermania/Mania/FXFade.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/FXFade.h rename to src/hypermania/Mania/FXFade.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Batbrain.c b/src/hypermania/Mania/GHZ/Batbrain.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Batbrain.c rename to src/hypermania/Mania/GHZ/Batbrain.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Batbrain.h b/src/hypermania/Mania/GHZ/Batbrain.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Batbrain.h rename to src/hypermania/Mania/GHZ/Batbrain.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/BuzzBomber.c b/src/hypermania/Mania/GHZ/BuzzBomber.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/BuzzBomber.c rename to src/hypermania/Mania/GHZ/BuzzBomber.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/BuzzBomber.h b/src/hypermania/Mania/GHZ/BuzzBomber.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/BuzzBomber.h rename to src/hypermania/Mania/GHZ/BuzzBomber.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Chopper.c b/src/hypermania/Mania/GHZ/Chopper.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Chopper.c rename to src/hypermania/Mania/GHZ/Chopper.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Chopper.h b/src/hypermania/Mania/GHZ/Chopper.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Chopper.h rename to src/hypermania/Mania/GHZ/Chopper.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Crabmeat.c b/src/hypermania/Mania/GHZ/Crabmeat.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Crabmeat.c rename to src/hypermania/Mania/GHZ/Crabmeat.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Crabmeat.h b/src/hypermania/Mania/GHZ/Crabmeat.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Crabmeat.h rename to src/hypermania/Mania/GHZ/Crabmeat.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/DDWrecker.c b/src/hypermania/Mania/GHZ/DDWrecker.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/DDWrecker.c rename to src/hypermania/Mania/GHZ/DDWrecker.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/DDWrecker.h b/src/hypermania/Mania/GHZ/DDWrecker.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/DDWrecker.h rename to src/hypermania/Mania/GHZ/DDWrecker.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/DERobot.c b/src/hypermania/Mania/GHZ/DERobot.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/DERobot.c rename to src/hypermania/Mania/GHZ/DERobot.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/DERobot.h b/src/hypermania/Mania/GHZ/DERobot.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/DERobot.h rename to src/hypermania/Mania/GHZ/DERobot.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Motobug.c b/src/hypermania/Mania/GHZ/Motobug.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Motobug.c rename to src/hypermania/Mania/GHZ/Motobug.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Motobug.h b/src/hypermania/Mania/GHZ/Motobug.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Motobug.h rename to src/hypermania/Mania/GHZ/Motobug.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Newtron.c b/src/hypermania/Mania/GHZ/Newtron.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Newtron.c rename to src/hypermania/Mania/GHZ/Newtron.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Newtron.h b/src/hypermania/Mania/GHZ/Newtron.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Newtron.h rename to src/hypermania/Mania/GHZ/Newtron.h diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Splats.c b/src/hypermania/Mania/GHZ/Splats.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Splats.c rename to src/hypermania/Mania/GHZ/Splats.c diff --git a/src/hypermania/Objects/Boilerplate/GHZ/Splats.h b/src/hypermania/Mania/GHZ/Splats.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/GHZ/Splats.h rename to src/hypermania/Mania/GHZ/Splats.h diff --git a/src/hypermania/Objects/Boilerplate/Global/InvincibleStars.c b/src/hypermania/Mania/Global/InvincibleStars.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Global/InvincibleStars.c rename to src/hypermania/Mania/Global/InvincibleStars.c diff --git a/src/hypermania/Objects/Boilerplate/Global/InvincibleStars.h b/src/hypermania/Mania/Global/InvincibleStars.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Global/InvincibleStars.h rename to src/hypermania/Mania/Global/InvincibleStars.h diff --git a/src/hypermania/Objects/Boilerplate/Global/PauseMenu.c b/src/hypermania/Mania/Global/PauseMenu.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Global/PauseMenu.c rename to src/hypermania/Mania/Global/PauseMenu.c diff --git a/src/hypermania/Objects/Boilerplate/Global/PauseMenu.h b/src/hypermania/Mania/Global/PauseMenu.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Global/PauseMenu.h rename to src/hypermania/Mania/Global/PauseMenu.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Blastoid.c b/src/hypermania/Mania/HCZ/Blastoid.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Blastoid.c rename to src/hypermania/Mania/HCZ/Blastoid.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Blastoid.h b/src/hypermania/Mania/HCZ/Blastoid.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Blastoid.h rename to src/hypermania/Mania/HCZ/Blastoid.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Buggernaut.c b/src/hypermania/Mania/HCZ/Buggernaut.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Buggernaut.c rename to src/hypermania/Mania/HCZ/Buggernaut.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Buggernaut.h b/src/hypermania/Mania/HCZ/Buggernaut.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Buggernaut.h rename to src/hypermania/Mania/HCZ/Buggernaut.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/HCZSetup.c b/src/hypermania/Mania/HCZ/HCZSetup.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/HCZSetup.c rename to src/hypermania/Mania/HCZ/HCZSetup.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/HCZSetup.h b/src/hypermania/Mania/HCZ/HCZSetup.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/HCZSetup.h rename to src/hypermania/Mania/HCZ/HCZSetup.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Jawz.c b/src/hypermania/Mania/HCZ/Jawz.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Jawz.c rename to src/hypermania/Mania/HCZ/Jawz.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Jawz.h b/src/hypermania/Mania/HCZ/Jawz.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Jawz.h rename to src/hypermania/Mania/HCZ/Jawz.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Jellygnite.c b/src/hypermania/Mania/HCZ/Jellygnite.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Jellygnite.c rename to src/hypermania/Mania/HCZ/Jellygnite.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Jellygnite.h b/src/hypermania/Mania/HCZ/Jellygnite.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Jellygnite.h rename to src/hypermania/Mania/HCZ/Jellygnite.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/LaundroMobile.c b/src/hypermania/Mania/HCZ/LaundroMobile.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/LaundroMobile.c rename to src/hypermania/Mania/HCZ/LaundroMobile.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/LaundroMobile.h b/src/hypermania/Mania/HCZ/LaundroMobile.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/LaundroMobile.h rename to src/hypermania/Mania/HCZ/LaundroMobile.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/MegaChopper.c b/src/hypermania/Mania/HCZ/MegaChopper.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/MegaChopper.c rename to src/hypermania/Mania/HCZ/MegaChopper.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/MegaChopper.h b/src/hypermania/Mania/HCZ/MegaChopper.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/MegaChopper.h rename to src/hypermania/Mania/HCZ/MegaChopper.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Pointdexter.c b/src/hypermania/Mania/HCZ/Pointdexter.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Pointdexter.c rename to src/hypermania/Mania/HCZ/Pointdexter.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/Pointdexter.h b/src/hypermania/Mania/HCZ/Pointdexter.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/Pointdexter.h rename to src/hypermania/Mania/HCZ/Pointdexter.h diff --git a/src/hypermania/Objects/Boilerplate/HCZ/TurboSpiker.c b/src/hypermania/Mania/HCZ/TurboSpiker.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/TurboSpiker.c rename to src/hypermania/Mania/HCZ/TurboSpiker.c diff --git a/src/hypermania/Objects/Boilerplate/HCZ/TurboSpiker.h b/src/hypermania/Mania/HCZ/TurboSpiker.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/HCZ/TurboSpiker.h rename to src/hypermania/Mania/HCZ/TurboSpiker.h diff --git a/src/hypermania/Objects/Boilerplate/ItemBox.c b/src/hypermania/Mania/ItemBox.c similarity index 60% rename from src/hypermania/Objects/Boilerplate/ItemBox.c rename to src/hypermania/Mania/ItemBox.c index e7b3aa1..b1644d5 100644 --- a/src/hypermania/Objects/Boilerplate/ItemBox.c +++ b/src/hypermania/Mania/ItemBox.c @@ -2,4 +2,4 @@ ObjectItemBox *ItemBox; void (*ItemBox_State_Broken)(void); -void (*ItemBox_Break)(EntityItemBox*, EntityPlayer*); \ No newline at end of file +void (*ItemBox_Break)(EntityBase*, EntityBase*); \ No newline at end of file diff --git a/src/hypermania/Mania/ItemBox.h b/src/hypermania/Mania/ItemBox.h index acc475c..f57acf6 100644 --- a/src/hypermania/Mania/ItemBox.h +++ b/src/hypermania/Mania/ItemBox.h @@ -65,4 +65,11 @@ typedef struct { #endif } EntityItemBox; +// Object Struct +extern ObjectItemBox* ItemBox; + +// Imported Functions +extern void (*ItemBox_State_Broken)(); +extern void (*ItemBox_Break)(EntityBase* itemBox, EntityBase* player); + #endif //! MANIA_ITEMBOX_H \ No newline at end of file diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Drillerdroid.c b/src/hypermania/Mania/LRZ/Drillerdroid.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Drillerdroid.c rename to src/hypermania/Mania/LRZ/Drillerdroid.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Drillerdroid.h b/src/hypermania/Mania/LRZ/Drillerdroid.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Drillerdroid.h rename to src/hypermania/Mania/LRZ/Drillerdroid.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/DrillerdroidO.c b/src/hypermania/Mania/LRZ/DrillerdroidO.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/DrillerdroidO.c rename to src/hypermania/Mania/LRZ/DrillerdroidO.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/DrillerdroidO.h b/src/hypermania/Mania/LRZ/DrillerdroidO.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/DrillerdroidO.h rename to src/hypermania/Mania/LRZ/DrillerdroidO.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Fireworm.c b/src/hypermania/Mania/LRZ/Fireworm.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Fireworm.c rename to src/hypermania/Mania/LRZ/Fireworm.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Fireworm.h b/src/hypermania/Mania/LRZ/Fireworm.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Fireworm.h rename to src/hypermania/Mania/LRZ/Fireworm.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/HeavyKing.c b/src/hypermania/Mania/LRZ/HeavyKing.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/HeavyKing.c rename to src/hypermania/Mania/LRZ/HeavyKing.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/HeavyKing.h b/src/hypermania/Mania/LRZ/HeavyKing.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/HeavyKing.h rename to src/hypermania/Mania/LRZ/HeavyKing.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/HeavyRider.c b/src/hypermania/Mania/LRZ/HeavyRider.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/HeavyRider.c rename to src/hypermania/Mania/LRZ/HeavyRider.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/HeavyRider.h b/src/hypermania/Mania/LRZ/HeavyRider.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/HeavyRider.h rename to src/hypermania/Mania/LRZ/HeavyRider.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Rexon.c b/src/hypermania/Mania/LRZ/Rexon.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Rexon.c rename to src/hypermania/Mania/LRZ/Rexon.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Rexon.h b/src/hypermania/Mania/LRZ/Rexon.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Rexon.h rename to src/hypermania/Mania/LRZ/Rexon.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/RockDrill.c b/src/hypermania/Mania/LRZ/RockDrill.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/RockDrill.c rename to src/hypermania/Mania/LRZ/RockDrill.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/RockDrill.h b/src/hypermania/Mania/LRZ/RockDrill.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/RockDrill.h rename to src/hypermania/Mania/LRZ/RockDrill.h diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Toxomister.c b/src/hypermania/Mania/LRZ/Toxomister.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Toxomister.c rename to src/hypermania/Mania/LRZ/Toxomister.c diff --git a/src/hypermania/Objects/Boilerplate/LRZ/Toxomister.h b/src/hypermania/Mania/LRZ/Toxomister.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/LRZ/Toxomister.h rename to src/hypermania/Mania/LRZ/Toxomister.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/EggPistonsMKII.c b/src/hypermania/Mania/MMZ/EggPistonsMKII.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/EggPistonsMKII.c rename to src/hypermania/Mania/MMZ/EggPistonsMKII.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/EggPistonsMKII.h b/src/hypermania/Mania/MMZ/EggPistonsMKII.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/EggPistonsMKII.h rename to src/hypermania/Mania/MMZ/EggPistonsMKII.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/FarPlane.c b/src/hypermania/Mania/MMZ/FarPlane.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/FarPlane.c rename to src/hypermania/Mania/MMZ/FarPlane.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/FarPlane.h b/src/hypermania/Mania/MMZ/FarPlane.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/FarPlane.h rename to src/hypermania/Mania/MMZ/FarPlane.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/Gachapandora.c b/src/hypermania/Mania/MMZ/Gachapandora.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/Gachapandora.c rename to src/hypermania/Mania/MMZ/Gachapandora.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/Gachapandora.h b/src/hypermania/Mania/MMZ/Gachapandora.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/Gachapandora.h rename to src/hypermania/Mania/MMZ/Gachapandora.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/MechaBu.c b/src/hypermania/Mania/MMZ/MechaBu.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/MechaBu.c rename to src/hypermania/Mania/MMZ/MechaBu.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/MechaBu.h b/src/hypermania/Mania/MMZ/MechaBu.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/MechaBu.h rename to src/hypermania/Mania/MMZ/MechaBu.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/PohBee.c b/src/hypermania/Mania/MMZ/PohBee.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/PohBee.c rename to src/hypermania/Mania/MMZ/PohBee.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/PohBee.h b/src/hypermania/Mania/MMZ/PohBee.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/PohBee.h rename to src/hypermania/Mania/MMZ/PohBee.h diff --git a/src/hypermania/Objects/Boilerplate/MMZ/Scarab.c b/src/hypermania/Mania/MMZ/Scarab.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/Scarab.c rename to src/hypermania/Mania/MMZ/Scarab.c diff --git a/src/hypermania/Objects/Boilerplate/MMZ/Scarab.h b/src/hypermania/Mania/MMZ/Scarab.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MMZ/Scarab.h rename to src/hypermania/Mania/MMZ/Scarab.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Armadiloid.c b/src/hypermania/Mania/MSZ/Armadiloid.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Armadiloid.c rename to src/hypermania/Mania/MSZ/Armadiloid.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Armadiloid.h b/src/hypermania/Mania/MSZ/Armadiloid.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Armadiloid.h rename to src/hypermania/Mania/MSZ/Armadiloid.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Bumpalo.c b/src/hypermania/Mania/MSZ/Bumpalo.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Bumpalo.c rename to src/hypermania/Mania/MSZ/Bumpalo.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Bumpalo.h b/src/hypermania/Mania/MSZ/Bumpalo.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Bumpalo.h rename to src/hypermania/Mania/MSZ/Bumpalo.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Cactula.c b/src/hypermania/Mania/MSZ/Cactula.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Cactula.c rename to src/hypermania/Mania/MSZ/Cactula.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Cactula.h b/src/hypermania/Mania/MSZ/Cactula.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Cactula.h rename to src/hypermania/Mania/MSZ/Cactula.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/DBTower.c b/src/hypermania/Mania/MSZ/DBTower.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/DBTower.c rename to src/hypermania/Mania/MSZ/DBTower.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/DBTower.h b/src/hypermania/Mania/MSZ/DBTower.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/DBTower.h rename to src/hypermania/Mania/MSZ/DBTower.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Hatterkiller.c b/src/hypermania/Mania/MSZ/Hatterkiller.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Hatterkiller.c rename to src/hypermania/Mania/MSZ/Hatterkiller.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Hatterkiller.h b/src/hypermania/Mania/MSZ/Hatterkiller.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Hatterkiller.h rename to src/hypermania/Mania/MSZ/Hatterkiller.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/HeavyMystic.c b/src/hypermania/Mania/MSZ/HeavyMystic.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/HeavyMystic.c rename to src/hypermania/Mania/MSZ/HeavyMystic.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/HeavyMystic.h b/src/hypermania/Mania/MSZ/HeavyMystic.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/HeavyMystic.h rename to src/hypermania/Mania/MSZ/HeavyMystic.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Rattlekiller.c b/src/hypermania/Mania/MSZ/Rattlekiller.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Rattlekiller.c rename to src/hypermania/Mania/MSZ/Rattlekiller.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Rattlekiller.h b/src/hypermania/Mania/MSZ/Rattlekiller.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Rattlekiller.h rename to src/hypermania/Mania/MSZ/Rattlekiller.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/RollerMKII.c b/src/hypermania/Mania/MSZ/RollerMKII.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/RollerMKII.c rename to src/hypermania/Mania/MSZ/RollerMKII.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/RollerMKII.h b/src/hypermania/Mania/MSZ/RollerMKII.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/RollerMKII.h rename to src/hypermania/Mania/MSZ/RollerMKII.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/UberCaterkiller.c b/src/hypermania/Mania/MSZ/UberCaterkiller.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/UberCaterkiller.c rename to src/hypermania/Mania/MSZ/UberCaterkiller.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/UberCaterkiller.h b/src/hypermania/Mania/MSZ/UberCaterkiller.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/UberCaterkiller.h rename to src/hypermania/Mania/MSZ/UberCaterkiller.h diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Vultron.c b/src/hypermania/Mania/MSZ/Vultron.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Vultron.c rename to src/hypermania/Mania/MSZ/Vultron.c diff --git a/src/hypermania/Objects/Boilerplate/MSZ/Vultron.h b/src/hypermania/Mania/MSZ/Vultron.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/MSZ/Vultron.h rename to src/hypermania/Mania/MSZ/Vultron.h diff --git a/src/hypermania/Objects/Boilerplate/Music.c b/src/hypermania/Mania/Music.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Music.c rename to src/hypermania/Mania/Music.c diff --git a/src/hypermania/Objects/Boilerplate/Music.h b/src/hypermania/Mania/Music.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Music.h rename to src/hypermania/Mania/Music.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Aquis.c b/src/hypermania/Mania/OOZ/Aquis.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Aquis.c rename to src/hypermania/Mania/OOZ/Aquis.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Aquis.h b/src/hypermania/Mania/OOZ/Aquis.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Aquis.h rename to src/hypermania/Mania/OOZ/Aquis.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/MegaOctus.c b/src/hypermania/Mania/OOZ/MegaOctus.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/MegaOctus.c rename to src/hypermania/Mania/OOZ/MegaOctus.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/MegaOctus.h b/src/hypermania/Mania/OOZ/MegaOctus.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/MegaOctus.h rename to src/hypermania/Mania/OOZ/MegaOctus.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/MeterDroid.c b/src/hypermania/Mania/OOZ/MeterDroid.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/MeterDroid.c rename to src/hypermania/Mania/OOZ/MeterDroid.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/MeterDroid.h b/src/hypermania/Mania/OOZ/MeterDroid.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/MeterDroid.h rename to src/hypermania/Mania/OOZ/MeterDroid.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/OOZSetup.c b/src/hypermania/Mania/OOZ/OOZSetup.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/OOZSetup.c rename to src/hypermania/Mania/OOZ/OOZSetup.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/OOZSetup.h b/src/hypermania/Mania/OOZ/OOZSetup.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/OOZSetup.h rename to src/hypermania/Mania/OOZ/OOZSetup.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Octus.c b/src/hypermania/Mania/OOZ/Octus.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Octus.c rename to src/hypermania/Mania/OOZ/Octus.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Octus.h b/src/hypermania/Mania/OOZ/Octus.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Octus.h rename to src/hypermania/Mania/OOZ/Octus.h diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Sol.c b/src/hypermania/Mania/OOZ/Sol.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Sol.c rename to src/hypermania/Mania/OOZ/Sol.c diff --git a/src/hypermania/Objects/Boilerplate/OOZ/Sol.h b/src/hypermania/Mania/OOZ/Sol.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/OOZ/Sol.h rename to src/hypermania/Mania/OOZ/Sol.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Dragonfly.c b/src/hypermania/Mania/PGZ/Dragonfly.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Dragonfly.c rename to src/hypermania/Mania/PGZ/Dragonfly.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Dragonfly.h b/src/hypermania/Mania/PGZ/Dragonfly.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Dragonfly.h rename to src/hypermania/Mania/PGZ/Dragonfly.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/HeavyShinobi.c b/src/hypermania/Mania/PGZ/HeavyShinobi.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/HeavyShinobi.c rename to src/hypermania/Mania/PGZ/HeavyShinobi.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/HeavyShinobi.h b/src/hypermania/Mania/PGZ/HeavyShinobi.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/HeavyShinobi.h rename to src/hypermania/Mania/PGZ/HeavyShinobi.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/IceBomba.c b/src/hypermania/Mania/PGZ/IceBomba.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/IceBomba.c rename to src/hypermania/Mania/PGZ/IceBomba.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/IceBomba.h b/src/hypermania/Mania/PGZ/IceBomba.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/IceBomba.h rename to src/hypermania/Mania/PGZ/IceBomba.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/JuggleSaw.c b/src/hypermania/Mania/PGZ/JuggleSaw.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/JuggleSaw.c rename to src/hypermania/Mania/PGZ/JuggleSaw.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/JuggleSaw.h b/src/hypermania/Mania/PGZ/JuggleSaw.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/JuggleSaw.h rename to src/hypermania/Mania/PGZ/JuggleSaw.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Shiversaw.c b/src/hypermania/Mania/PGZ/Shiversaw.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Shiversaw.c rename to src/hypermania/Mania/PGZ/Shiversaw.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Shiversaw.h b/src/hypermania/Mania/PGZ/Shiversaw.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Shiversaw.h rename to src/hypermania/Mania/PGZ/Shiversaw.h diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Woodrow.c b/src/hypermania/Mania/PGZ/Woodrow.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Woodrow.c rename to src/hypermania/Mania/PGZ/Woodrow.c diff --git a/src/hypermania/Objects/Boilerplate/PGZ/Woodrow.h b/src/hypermania/Mania/PGZ/Woodrow.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/PGZ/Woodrow.h rename to src/hypermania/Mania/PGZ/Woodrow.h diff --git a/src/hypermania/Objects/Boilerplate/Ring.c b/src/hypermania/Mania/Ring.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Ring.c rename to src/hypermania/Mania/Ring.c diff --git a/src/hypermania/Objects/Boilerplate/Ring.h b/src/hypermania/Mania/Ring.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/Ring.h rename to src/hypermania/Mania/Ring.h diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Canista.c b/src/hypermania/Mania/SPZ/Canista.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Canista.c rename to src/hypermania/Mania/SPZ/Canista.c diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Canista.h b/src/hypermania/Mania/SPZ/Canista.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Canista.h rename to src/hypermania/Mania/SPZ/Canista.h diff --git a/src/hypermania/Objects/Boilerplate/SPZ/MicDrop.c b/src/hypermania/Mania/SPZ/MicDrop.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/MicDrop.c rename to src/hypermania/Mania/SPZ/MicDrop.c diff --git a/src/hypermania/Objects/Boilerplate/SPZ/MicDrop.h b/src/hypermania/Mania/SPZ/MicDrop.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/MicDrop.h rename to src/hypermania/Mania/SPZ/MicDrop.h diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Shutterbug.c b/src/hypermania/Mania/SPZ/Shutterbug.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Shutterbug.c rename to src/hypermania/Mania/SPZ/Shutterbug.c diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Shutterbug.h b/src/hypermania/Mania/SPZ/Shutterbug.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Shutterbug.h rename to src/hypermania/Mania/SPZ/Shutterbug.h diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Tubinaut.c b/src/hypermania/Mania/SPZ/Tubinaut.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Tubinaut.c rename to src/hypermania/Mania/SPZ/Tubinaut.c diff --git a/src/hypermania/Objects/Boilerplate/SPZ/Tubinaut.h b/src/hypermania/Mania/SPZ/Tubinaut.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/Tubinaut.h rename to src/hypermania/Mania/SPZ/Tubinaut.h diff --git a/src/hypermania/Objects/Boilerplate/SPZ/WeatherMobile.c b/src/hypermania/Mania/SPZ/WeatherMobile.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/WeatherMobile.c rename to src/hypermania/Mania/SPZ/WeatherMobile.c diff --git a/src/hypermania/Objects/Boilerplate/SPZ/WeatherMobile.h b/src/hypermania/Mania/SPZ/WeatherMobile.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SPZ/WeatherMobile.h rename to src/hypermania/Mania/SPZ/WeatherMobile.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Dango.c b/src/hypermania/Mania/SSZ/Dango.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Dango.c rename to src/hypermania/Mania/SSZ/Dango.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Dango.h b/src/hypermania/Mania/SSZ/Dango.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Dango.h rename to src/hypermania/Mania/SSZ/Dango.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/GigaMetal.c b/src/hypermania/Mania/SSZ/GigaMetal.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/GigaMetal.c rename to src/hypermania/Mania/SSZ/GigaMetal.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/GigaMetal.h b/src/hypermania/Mania/SSZ/GigaMetal.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/GigaMetal.h rename to src/hypermania/Mania/SSZ/GigaMetal.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Hotaru.c b/src/hypermania/Mania/SSZ/Hotaru.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Hotaru.c rename to src/hypermania/Mania/SSZ/Hotaru.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Hotaru.h b/src/hypermania/Mania/SSZ/Hotaru.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Hotaru.h rename to src/hypermania/Mania/SSZ/Hotaru.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/HotaruHiWatt.c b/src/hypermania/Mania/SSZ/HotaruHiWatt.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/HotaruHiWatt.c rename to src/hypermania/Mania/SSZ/HotaruHiWatt.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/HotaruHiWatt.h b/src/hypermania/Mania/SSZ/HotaruHiWatt.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/HotaruHiWatt.h rename to src/hypermania/Mania/SSZ/HotaruHiWatt.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/HotaruMKII.c b/src/hypermania/Mania/SSZ/HotaruMKII.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/HotaruMKII.c rename to src/hypermania/Mania/SSZ/HotaruMKII.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/HotaruMKII.h b/src/hypermania/Mania/SSZ/HotaruMKII.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/HotaruMKII.h rename to src/hypermania/Mania/SSZ/HotaruMKII.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Kabasira.c b/src/hypermania/Mania/SSZ/Kabasira.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Kabasira.c rename to src/hypermania/Mania/SSZ/Kabasira.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Kabasira.h b/src/hypermania/Mania/SSZ/Kabasira.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Kabasira.h rename to src/hypermania/Mania/SSZ/Kabasira.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Kanabun.c b/src/hypermania/Mania/SSZ/Kanabun.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Kanabun.c rename to src/hypermania/Mania/SSZ/Kanabun.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/Kanabun.h b/src/hypermania/Mania/SSZ/Kanabun.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/Kanabun.h rename to src/hypermania/Mania/SSZ/Kanabun.h diff --git a/src/hypermania/Objects/Boilerplate/SSZ/MetalSonic.c b/src/hypermania/Mania/SSZ/MetalSonic.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/MetalSonic.c rename to src/hypermania/Mania/SSZ/MetalSonic.c diff --git a/src/hypermania/Objects/Boilerplate/SSZ/MetalSonic.h b/src/hypermania/Mania/SSZ/MetalSonic.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/SSZ/MetalSonic.h rename to src/hypermania/Mania/SSZ/MetalSonic.h diff --git a/src/hypermania/Objects/Boilerplate/SaveGame.c b/src/hypermania/Mania/SaveGame.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/SaveGame.c rename to src/hypermania/Mania/SaveGame.c diff --git a/src/hypermania/Mania/SaveGame.h b/src/hypermania/Mania/SaveGame.h index d575bf3..2c01cc6 100644 --- a/src/hypermania/Mania/SaveGame.h +++ b/src/hypermania/Mania/SaveGame.h @@ -23,4 +23,25 @@ typedef struct { #endif } SaveRAM; +typedef enum { + SAVEGAME_BLANK, + SAVEGAME_INPROGRESS, + SAVEGAME_COMPLETE, +} SaveGameStates; + +typedef enum { + SAVERECALL_NORMAL, + SAVERECALL_DISABLED, + SAVERECALL_BROKENITEMBOX, +} SaveRecallStates; + +extern SaveRAM* (*SaveGame_GetSaveRAM)(void); +extern void (*SaveGame_SaveGameState)(void); +extern int32* (*SaveGame_GetDataPtr)(int32 slot, bool32 encore); + +#define OBJ_SAVE_SETUP \ + IMPORT_PUBLIC_FUNC(SaveGame_GetSaveRAM); \ + IMPORT_PUBLIC_FUNC(SaveGame_SaveGameState); \ + IMPORT_PUBLIC_FUNC(SaveGame_GetDataPtr) + #endif //! MANIA_SAVEGAME_H \ No newline at end of file diff --git a/src/hypermania/Objects/Boilerplate/ScoreBonus.c b/src/hypermania/Mania/ScoreBonus.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/ScoreBonus.c rename to src/hypermania/Mania/ScoreBonus.c diff --git a/src/hypermania/Mania/ScoreBonus.h b/src/hypermania/Mania/ScoreBonus.h index bc700d3..7e9c22c 100644 --- a/src/hypermania/Mania/ScoreBonus.h +++ b/src/hypermania/Mania/ScoreBonus.h @@ -12,4 +12,6 @@ typedef struct { Animator animator; } EntityScoreBonus; +extern ObjectScoreBonus* ScoreBonus; + #endif //! MANIA_SCOREBONUS_H \ No newline at end of file diff --git a/src/hypermania/Objects/Boilerplate/TMZ/BallHog.c b/src/hypermania/Mania/TMZ/BallHog.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/BallHog.c rename to src/hypermania/Mania/TMZ/BallHog.c diff --git a/src/hypermania/Objects/Boilerplate/TMZ/BallHog.h b/src/hypermania/Mania/TMZ/BallHog.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/BallHog.h rename to src/hypermania/Mania/TMZ/BallHog.h diff --git a/src/hypermania/Objects/Boilerplate/TMZ/CrimsonEye.c b/src/hypermania/Mania/TMZ/CrimsonEye.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/CrimsonEye.c rename to src/hypermania/Mania/TMZ/CrimsonEye.c diff --git a/src/hypermania/Objects/Boilerplate/TMZ/CrimsonEye.h b/src/hypermania/Mania/TMZ/CrimsonEye.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/CrimsonEye.h rename to src/hypermania/Mania/TMZ/CrimsonEye.h diff --git a/src/hypermania/Objects/Boilerplate/TMZ/FlasherMKII.c b/src/hypermania/Mania/TMZ/FlasherMKII.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/FlasherMKII.c rename to src/hypermania/Mania/TMZ/FlasherMKII.c diff --git a/src/hypermania/Objects/Boilerplate/TMZ/FlasherMKII.h b/src/hypermania/Mania/TMZ/FlasherMKII.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/FlasherMKII.h rename to src/hypermania/Mania/TMZ/FlasherMKII.h diff --git a/src/hypermania/Objects/Boilerplate/TMZ/SentryBug.c b/src/hypermania/Mania/TMZ/SentryBug.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/SentryBug.c rename to src/hypermania/Mania/TMZ/SentryBug.c diff --git a/src/hypermania/Objects/Boilerplate/TMZ/SentryBug.h b/src/hypermania/Mania/TMZ/SentryBug.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/SentryBug.h rename to src/hypermania/Mania/TMZ/SentryBug.h diff --git a/src/hypermania/Objects/Boilerplate/TMZ/TurboTurtle.c b/src/hypermania/Mania/TMZ/TurboTurtle.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/TurboTurtle.c rename to src/hypermania/Mania/TMZ/TurboTurtle.c diff --git a/src/hypermania/Objects/Boilerplate/TMZ/TurboTurtle.h b/src/hypermania/Mania/TMZ/TurboTurtle.h similarity index 100% rename from src/hypermania/Objects/Boilerplate/TMZ/TurboTurtle.h rename to src/hypermania/Mania/TMZ/TurboTurtle.h diff --git a/src/hypermania/Objects/Boilerplate/Zone.c b/src/hypermania/Mania/Zone.c similarity index 100% rename from src/hypermania/Objects/Boilerplate/Zone.c rename to src/hypermania/Mania/Zone.c diff --git a/src/hypermania/Mania/Zone.h b/src/hypermania/Mania/Zone.h index 2a54aa1..1c9960e 100644 --- a/src/hypermania/Mania/Zone.h +++ b/src/hypermania/Mania/Zone.h @@ -96,4 +96,9 @@ typedef struct { int32 fadeColor; } EntityZone; +extern ObjectZone* Zone; +extern int32 (*Zone_GetZoneID)(); +extern void (*Zone_StartFadeIn)(int32, int32); +extern void (*Zone_StartFadeOut)(int32, int32); + #endif //! MANIA_ZONE_H \ No newline at end of file diff --git a/src/hypermania/ModFunctions.h b/src/hypermania/ModFunctions.h index e46e314..ba5d617 100644 --- a/src/hypermania/ModFunctions.h +++ b/src/hypermania/ModFunctions.h @@ -4,27 +4,27 @@ #include "HyperManiaVariables.h" #include "Objects/Player.h" -#include "Objects/Boilerplate/SaveGame.h" -#include "Objects/Boilerplate/Animals.h" -#include "Objects/Boilerplate/Camera.h" -#include "Objects/Boilerplate/CollapsingPlatform.h" -#include "Objects/Boilerplate/Debris.h" -#include "Objects/Boilerplate/Explosion.h" -#include "Objects/Boilerplate/FXFade.h" -#include "Objects/Boilerplate/ItemBox.h" -#include "Objects/Boilerplate/Ring.h" -#include "Objects/Boilerplate/ScoreBonus.h" -#include "Objects/Boilerplate/Zone.h" -#include "Boilerplate/Music.h" -#include "Boilerplate/Global/PauseMenu.h" -#include "Boilerplate/Global/InvincibleStars.h" - -#include "Objects/Boilerplate/CPZ/CPZSetup.h" -#include "Objects/Boilerplate/OOZ/OOZSetup.h" -#include "Objects/Boilerplate/HCZ/HCZSetup.h" -#include "Objects/Boilerplate/MMZ/FarPlane.h" -#include "Objects/Boilerplate/ERZ/ERZStart.h" -#include "Objects/Boilerplate/BSS/BSS_Setup.h" +#include "Mania/SaveGame.h" +#include "Mania/Animals.h" +#include "Mania/Camera.h" +#include "Mania/CollapsingPlatform.h" +#include "Mania/Debris.h" +#include "Mania/Explosion.h" +#include "Mania/FXFade.h" +#include "Mania/ItemBox.h" +#include "Mania/Ring.h" +#include "Mania/ScoreBonus.h" +#include "Mania/Zone.h" +#include "Mania/Music.h" +#include "Mania/Global/PauseMenu.h" +#include "Mania/Global/InvincibleStars.h" + +#include "Mania/CPZ/CPZSetup.h" +#include "Mania/OOZ/OOZSetup.h" +#include "Mania/HCZ/HCZSetup.h" +#include "Mania/MMZ/FarPlane.h" +#include "Mania/ERZ/ERZStart.h" +#include "Mania/BSS/BSS_Setup.h" extern bool32 HPZ_SuperSpecialStage; // bad hack variable for testing purposes, will be removed later, please understand diff --git a/src/hypermania/Objects/All.c b/src/hypermania/Objects/All.c index 8253275..3ac1781 100644 --- a/src/hypermania/Objects/All.c +++ b/src/hypermania/Objects/All.c @@ -1,25 +1,25 @@ #include "ModFunctions.h" -#include "Boilerplate/SaveGame.c" -#include "Boilerplate/Animals.c" -#include "Boilerplate/Camera.c" -#include "Boilerplate/CollapsingPlatform.c" -#include "Boilerplate/Explosion.c" -#include "Boilerplate/FXFade.c" -#include "Boilerplate/Ring.c" -#include "Boilerplate/ScoreBonus.c" -#include "Boilerplate/ItemBox.c" -#include "Boilerplate/Zone.c" -#include "Boilerplate/Music.c" -#include "Boilerplate/Global/PauseMenu.c" -#include "Boilerplate/Global/InvincibleStars.c" +#include "Mania/SaveGame.c" +#include "Mania/Animals.c" +#include "Mania/Camera.c" +#include "Mania/CollapsingPlatform.c" +#include "Mania/Explosion.c" +#include "Mania/FXFade.c" +#include "Mania/Ring.c" +#include "Mania/ScoreBonus.c" +#include "Mania/ItemBox.c" +#include "Mania/Zone.c" +#include "Mania/Music.c" +#include "Mania/Global/PauseMenu.c" +#include "Mania/Global/InvincibleStars.c" -#include "Boilerplate/CPZ/CPZSetup.c" -#include "Boilerplate/OOZ/OOZSetup.c" -#include "Boilerplate/HCZ/HCZSetup.c" -#include "Boilerplate/MMZ/FarPlane.c" -#include "Boilerplate/ERZ/ERZStart.c" -#include "Boilerplate/BSS/BSS_Setup.c" +#include "Mania/CPZ/CPZSetup.c" +#include "Mania/OOZ/OOZSetup.c" +#include "Mania/HCZ/HCZSetup.c" +#include "Mania/MMZ/FarPlane.c" +#include "Mania/ERZ/ERZStart.c" +#include "Mania/BSS/BSS_Setup.c" // im sorry jesus typedef struct { @@ -44,7 +44,7 @@ uint32 sonic3_emerald_lookup[7] = { 0, 1, 3, 2, 4, 6, 5 }; #include "UISaveSlot.c" #include "LevelSelect.c" #include "PlaneSeeSaw.c" -#include "Boilerplate/Debris.c" +#include "Mania/Debris.c" #include "SuperFlicky.c" #include "HyperStars.c" diff --git a/src/hypermania/Objects/Boilerplate/ItemBox.h b/src/hypermania/Objects/Boilerplate/ItemBox.h deleted file mode 100644 index f1deb96..0000000 --- a/src/hypermania/Objects/Boilerplate/ItemBox.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef OBJ_ITEMBOX_H -#define OBJ_ITEMBOX_H - -#include "GameAPI/Game.h" -#include "Player.h" - -// Object Struct -extern ObjectItemBox *ItemBox; - -// Imported Functions -extern void (*ItemBox_State_Broken)(void); -extern void (*ItemBox_Break)(EntityItemBox *itemBox, EntityPlayer *player); - -#endif //! OBJ_ITEMBOX_H diff --git a/src/hypermania/Objects/Boilerplate/SaveGame.h b/src/hypermania/Objects/Boilerplate/SaveGame.h deleted file mode 100644 index e6f3543..0000000 --- a/src/hypermania/Objects/Boilerplate/SaveGame.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef OBJ_SAVEGAME_H -#define OBJ_SAVEGAME_H - -#include "GameAPI/Game.h" - -typedef enum { - SAVEGAME_BLANK, - SAVEGAME_INPROGRESS, - SAVEGAME_COMPLETE, -} SaveGameStates; - -typedef enum { - SAVERECALL_NORMAL, - SAVERECALL_DISABLED, - SAVERECALL_BROKENITEMBOX, -} SaveRecallStates; - -extern SaveRAM* (*SaveGame_GetSaveRAM)(void); -extern void (*SaveGame_SaveGameState)(void); -extern int32* (*SaveGame_GetDataPtr)(int32 slot, bool32 encore); - -#define OBJ_SAVE_SETUP \ - IMPORT_PUBLIC_FUNC(SaveGame_GetSaveRAM); \ - IMPORT_PUBLIC_FUNC(SaveGame_SaveGameState); \ - IMPORT_PUBLIC_FUNC(SaveGame_GetDataPtr) - -#endif //! OBJ_SAVEGAME_H diff --git a/src/hypermania/Objects/Boilerplate/ScoreBonus.h b/src/hypermania/Objects/Boilerplate/ScoreBonus.h deleted file mode 100644 index 451a66e..0000000 --- a/src/hypermania/Objects/Boilerplate/ScoreBonus.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef OBJ_SCOREBONUS_H -#define OBJ_SCOREBONUS_H - -#include "GameAPI/Game.h" - -extern ObjectScoreBonus *ScoreBonus; - -#endif //! OBJ_SCOREBONUS_H diff --git a/src/hypermania/Objects/Boilerplate/Zone.h b/src/hypermania/Objects/Boilerplate/Zone.h deleted file mode 100644 index ad6dbfe..0000000 --- a/src/hypermania/Objects/Boilerplate/Zone.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef OBJ_ZONE_H -#define OBJ_ZONE_H - -#include "GameAPI/Game.h" - -extern ObjectZone *Zone; -extern int32 (*Zone_GetZoneID)(void); -extern void (*Zone_StartFadeIn)(int32, int32); -extern void (*Zone_StartFadeOut)(int32, int32); - -#endif //! OBJ_ZONE_H diff --git a/src/hypermania/Objects/Enemy.c b/src/hypermania/Objects/Enemy.c index a09b921..f84173b 100644 --- a/src/hypermania/Objects/Enemy.c +++ b/src/hypermania/Objects/Enemy.c @@ -1,85 +1,85 @@ #include "Enemy.h" -#include "Boilerplate/ERZ/PhantomMystic.c" -#include "Boilerplate/ERZ/PhantomShinobi.c" -#include "Boilerplate/ERZ/PhantomEgg.c" -#include "Boilerplate/TMZ/CrimsonEye.c" -#include "Boilerplate/MMZ/Gachapandora.c" -#include "Boilerplate/MMZ/EggPistonsMKII.c" -#include "Boilerplate/LRZ/RockDrill.c" -#include "Boilerplate/LRZ/HeavyKing.c" -#include "Boilerplate/LRZ/HeavyRider.c" -#include "Boilerplate/LRZ/DrillerdroidO.c" -#include "Boilerplate/LRZ/Drillerdroid.c" -#include "Boilerplate/OOZ/MegaOctus.c" -#include "Boilerplate/OOZ/MeterDroid.c" -#include "Boilerplate/MSZ/HeavyMystic.c" -#include "Boilerplate/MSZ/DBTower.c" -#include "Boilerplate/MSZ/UberCaterkiller.c" -#include "Boilerplate/HCZ/LaundroMobile.c" -#include "Boilerplate/SSZ/GigaMetal.c" -#include "Boilerplate/SSZ/MetalSonic.c" -#include "Boilerplate/SSZ/HotaruHiWatt.c" -#include "Boilerplate/PGZ/HeavyShinobi.c" -#include "Boilerplate/PGZ/Shiversaw.c" -#include "Boilerplate/FBZ/BigSqueeze.c" -#include "Boilerplate/SPZ/WeatherMobile.c" -#include "Boilerplate/CPZ/AmoebaDroid.c" -#include "Boilerplate/GHZ/DERobot.c" -#include "Boilerplate/GHZ/DDWrecker.c" +#include "Mania/ERZ/PhantomMystic.c" +#include "Mania/ERZ/PhantomShinobi.c" +#include "Mania/ERZ/PhantomEgg.c" +#include "Mania/TMZ/CrimsonEye.c" +#include "Mania/MMZ/Gachapandora.c" +#include "Mania/MMZ/EggPistonsMKII.c" +#include "Mania/LRZ/RockDrill.c" +#include "Mania/LRZ/HeavyKing.c" +#include "Mania/LRZ/HeavyRider.c" +#include "Mania/LRZ/DrillerdroidO.c" +#include "Mania/LRZ/Drillerdroid.c" +#include "Mania/OOZ/MegaOctus.c" +#include "Mania/OOZ/MeterDroid.c" +#include "Mania/MSZ/HeavyMystic.c" +#include "Mania/MSZ/DBTower.c" +#include "Mania/MSZ/UberCaterkiller.c" +#include "Mania/HCZ/LaundroMobile.c" +#include "Mania/SSZ/GigaMetal.c" +#include "Mania/SSZ/MetalSonic.c" +#include "Mania/SSZ/HotaruHiWatt.c" +#include "Mania/PGZ/HeavyShinobi.c" +#include "Mania/PGZ/Shiversaw.c" +#include "Mania/FBZ/BigSqueeze.c" +#include "Mania/SPZ/WeatherMobile.c" +#include "Mania/CPZ/AmoebaDroid.c" +#include "Mania/GHZ/DERobot.c" +#include "Mania/GHZ/DDWrecker.c" -#include "Boilerplate/TMZ/FlasherMKII.c" -#include "Boilerplate/TMZ/TurboTurtle.c" -#include "Boilerplate/TMZ/SentryBug.c" -#include "Boilerplate/TMZ/BallHog.c" -#include "Boilerplate/MMZ/PohBee.c" -#include "Boilerplate/MMZ/Scarab.c" -#include "Boilerplate/MMZ/MechaBu.c" -#include "Boilerplate/LRZ/Fireworm.c" -#include "Boilerplate/LRZ/Rexon.c" -#include "Boilerplate/LRZ/Toxomister.c" -#include "Boilerplate/OOZ/Octus.c" -#include "Boilerplate/OOZ/Sol.c" -#include "Boilerplate/OOZ/Aquis.c" -#include "Boilerplate/MSZ/Rattlekiller.c" -#include "Boilerplate/MSZ/RollerMKII.c" -#include "Boilerplate/MSZ/Vultron.c" -#include "Boilerplate/MSZ/Bumpalo.c" -#include "Boilerplate/MSZ/Armadiloid.c" -#include "Boilerplate/MSZ/Cactula.c" -#include "Boilerplate/MSZ/Hatterkiller.c" -#include "Boilerplate/HCZ/TurboSpiker.c" -#include "Boilerplate/HCZ/Buggernaut.c" -#include "Boilerplate/HCZ/MegaChopper.c" -#include "Boilerplate/HCZ/Jawz.c" -#include "Boilerplate/HCZ/Jellygnite.c" -#include "Boilerplate/HCZ/Blastoid.c" -#include "Boilerplate/HCZ/Pointdexter.c" -#include "Boilerplate/SSZ/Kabasira.c" -#include "Boilerplate/SSZ/Dango.c" -#include "Boilerplate/SSZ/Kanabun.c" -#include "Boilerplate/SSZ/HotaruMKII.c" -#include "Boilerplate/SSZ/Hotaru.c" -#include "Boilerplate/PGZ/Woodrow.c" -#include "Boilerplate/PGZ/Dragonfly.c" -#include "Boilerplate/PGZ/IceBomba.c" -#include "Boilerplate/PGZ/JuggleSaw.c" -#include "Boilerplate/FBZ/FBZTrash.c" -#include "Boilerplate/FBZ/Technosqueek.c" -#include "Boilerplate/FBZ/Clucker.c" -#include "Boilerplate/FBZ/Blaster.c" -#include "Boilerplate/SPZ/Shutterbug.c" -#include "Boilerplate/SPZ/Canista.c" -#include "Boilerplate/SPZ/Tubinaut.c" -#include "Boilerplate/SPZ/MicDrop.c" -#include "Boilerplate/CPZ/Grabber.c" -#include "Boilerplate/CPZ/Spiny.c" -#include "Boilerplate/CPZ/CaterkillerJr.c" -#include "Boilerplate/CPZ/Bubbler.c" -#include "Boilerplate/GHZ/Splats.c" -#include "Boilerplate/GHZ/Newtron.c" -#include "Boilerplate/GHZ/Chopper.c" -#include "Boilerplate/GHZ/Crabmeat.c" -#include "Boilerplate/GHZ/Batbrain.c" -#include "Boilerplate/GHZ/Motobug.c" -#include "Boilerplate/GHZ/BuzzBomber.c" \ No newline at end of file +#include "Mania/TMZ/FlasherMKII.c" +#include "Mania/TMZ/TurboTurtle.c" +#include "Mania/TMZ/SentryBug.c" +#include "Mania/TMZ/BallHog.c" +#include "Mania/MMZ/PohBee.c" +#include "Mania/MMZ/Scarab.c" +#include "Mania/MMZ/MechaBu.c" +#include "Mania/LRZ/Fireworm.c" +#include "Mania/LRZ/Rexon.c" +#include "Mania/LRZ/Toxomister.c" +#include "Mania/OOZ/Octus.c" +#include "Mania/OOZ/Sol.c" +#include "Mania/OOZ/Aquis.c" +#include "Mania/MSZ/Rattlekiller.c" +#include "Mania/MSZ/RollerMKII.c" +#include "Mania/MSZ/Vultron.c" +#include "Mania/MSZ/Bumpalo.c" +#include "Mania/MSZ/Armadiloid.c" +#include "Mania/MSZ/Cactula.c" +#include "Mania/MSZ/Hatterkiller.c" +#include "Mania/HCZ/TurboSpiker.c" +#include "Mania/HCZ/Buggernaut.c" +#include "Mania/HCZ/MegaChopper.c" +#include "Mania/HCZ/Jawz.c" +#include "Mania/HCZ/Jellygnite.c" +#include "Mania/HCZ/Blastoid.c" +#include "Mania/HCZ/Pointdexter.c" +#include "Mania/SSZ/Kabasira.c" +#include "Mania/SSZ/Dango.c" +#include "Mania/SSZ/Kanabun.c" +#include "Mania/SSZ/HotaruMKII.c" +#include "Mania/SSZ/Hotaru.c" +#include "Mania/PGZ/Woodrow.c" +#include "Mania/PGZ/Dragonfly.c" +#include "Mania/PGZ/IceBomba.c" +#include "Mania/PGZ/JuggleSaw.c" +#include "Mania/FBZ/FBZTrash.c" +#include "Mania/FBZ/Technosqueek.c" +#include "Mania/FBZ/Clucker.c" +#include "Mania/FBZ/Blaster.c" +#include "Mania/SPZ/Shutterbug.c" +#include "Mania/SPZ/Canista.c" +#include "Mania/SPZ/Tubinaut.c" +#include "Mania/SPZ/MicDrop.c" +#include "Mania/CPZ/Grabber.c" +#include "Mania/CPZ/Spiny.c" +#include "Mania/CPZ/CaterkillerJr.c" +#include "Mania/CPZ/Bubbler.c" +#include "Mania/GHZ/Splats.c" +#include "Mania/GHZ/Newtron.c" +#include "Mania/GHZ/Chopper.c" +#include "Mania/GHZ/Crabmeat.c" +#include "Mania/GHZ/Batbrain.c" +#include "Mania/GHZ/Motobug.c" +#include "Mania/GHZ/BuzzBomber.c" \ No newline at end of file diff --git a/src/hypermania/Objects/Enemy.h b/src/hypermania/Objects/Enemy.h index 49882d8..a29e7f0 100644 --- a/src/hypermania/Objects/Enemy.h +++ b/src/hypermania/Objects/Enemy.h @@ -1,88 +1,88 @@ #include "GameAPI/Game.h" -#include "Boilerplate/ERZ/PhantomMystic.h" -#include "Boilerplate/ERZ/PhantomShinobi.h" -#include "Boilerplate/ERZ/PhantomEgg.h" -#include "Boilerplate/TMZ/CrimsonEye.h" -#include "Boilerplate/MMZ/Gachapandora.h" -#include "Boilerplate/MMZ/EggPistonsMKII.h" -#include "Boilerplate/LRZ/RockDrill.h" -#include "Boilerplate/LRZ/HeavyKing.h" -#include "Boilerplate/LRZ/HeavyRider.h" -#include "Boilerplate/LRZ/DrillerdroidO.h" -#include "Boilerplate/LRZ/Drillerdroid.h" -#include "Boilerplate/OOZ/MegaOctus.h" -#include "Boilerplate/OOZ/MeterDroid.h" -#include "Boilerplate/MSZ/HeavyMystic.h" -#include "Boilerplate/MSZ/DBTower.h" -#include "Boilerplate/MSZ/UberCaterkiller.h" -#include "Boilerplate/HCZ/LaundroMobile.h" -#include "Boilerplate/SSZ/GigaMetal.h" -#include "Boilerplate/SSZ/MetalSonic.h" -#include "Boilerplate/SSZ/HotaruHiWatt.h" -#include "Boilerplate/PGZ/HeavyShinobi.h" -#include "Boilerplate/PGZ/Shiversaw.h" -#include "Boilerplate/FBZ/BigSqueeze.h" -#include "Boilerplate/SPZ/WeatherMobile.h" -#include "Boilerplate/CPZ/AmoebaDroid.h" -#include "Boilerplate/GHZ/DERobot.h" -#include "Boilerplate/GHZ/DDWrecker.h" +#include "Mania/ERZ/PhantomMystic.h" +#include "Mania/ERZ/PhantomShinobi.h" +#include "Mania/ERZ/PhantomEgg.h" +#include "Mania/TMZ/CrimsonEye.h" +#include "Mania/MMZ/Gachapandora.h" +#include "Mania/MMZ/EggPistonsMKII.h" +#include "Mania/LRZ/RockDrill.h" +#include "Mania/LRZ/HeavyKing.h" +#include "Mania/LRZ/HeavyRider.h" +#include "Mania/LRZ/DrillerdroidO.h" +#include "Mania/LRZ/Drillerdroid.h" +#include "Mania/OOZ/MegaOctus.h" +#include "Mania/OOZ/MeterDroid.h" +#include "Mania/MSZ/HeavyMystic.h" +#include "Mania/MSZ/DBTower.h" +#include "Mania/MSZ/UberCaterkiller.h" +#include "Mania/HCZ/LaundroMobile.h" +#include "Mania/SSZ/GigaMetal.h" +#include "Mania/SSZ/MetalSonic.h" +#include "Mania/SSZ/HotaruHiWatt.h" +#include "Mania/PGZ/HeavyShinobi.h" +#include "Mania/PGZ/Shiversaw.h" +#include "Mania/FBZ/BigSqueeze.h" +#include "Mania/SPZ/WeatherMobile.h" +#include "Mania/CPZ/AmoebaDroid.h" +#include "Mania/GHZ/DERobot.h" +#include "Mania/GHZ/DDWrecker.h" -#include "Boilerplate/TMZ/FlasherMKII.h" -#include "Boilerplate/TMZ/TurboTurtle.h" -#include "Boilerplate/TMZ/SentryBug.h" -#include "Boilerplate/TMZ/BallHog.h" -#include "Boilerplate/MMZ/PohBee.h" -#include "Boilerplate/MMZ/Scarab.h" -#include "Boilerplate/MMZ/MechaBu.h" -#include "Boilerplate/LRZ/Fireworm.h" -#include "Boilerplate/LRZ/Rexon.h" -#include "Boilerplate/LRZ/Toxomister.h" -#include "Boilerplate/OOZ/Octus.h" -#include "Boilerplate/OOZ/Sol.h" -#include "Boilerplate/OOZ/Aquis.h" -#include "Boilerplate/MSZ/Rattlekiller.h" -#include "Boilerplate/MSZ/RollerMKII.h" -#include "Boilerplate/MSZ/Vultron.h" -#include "Boilerplate/MSZ/Bumpalo.h" -#include "Boilerplate/MSZ/Armadiloid.h" -#include "Boilerplate/MSZ/Cactula.h" -#include "Boilerplate/MSZ/Hatterkiller.h" -#include "Boilerplate/HCZ/TurboSpiker.h" -#include "Boilerplate/HCZ/Buggernaut.h" -#include "Boilerplate/HCZ/MegaChopper.h" -#include "Boilerplate/HCZ/Jawz.h" -#include "Boilerplate/HCZ/Jellygnite.h" -#include "Boilerplate/HCZ/Blastoid.h" -#include "Boilerplate/HCZ/Pointdexter.h" -#include "Boilerplate/SSZ/Kabasira.h" -#include "Boilerplate/SSZ/Dango.h" -#include "Boilerplate/SSZ/Kanabun.h" -#include "Boilerplate/SSZ/HotaruMKII.h" -#include "Boilerplate/SSZ/Hotaru.h" -#include "Boilerplate/PGZ/Woodrow.h" -#include "Boilerplate/PGZ/Dragonfly.h" -#include "Boilerplate/PGZ/IceBomba.h" -#include "Boilerplate/PGZ/JuggleSaw.h" -#include "Boilerplate/FBZ/FBZTrash.h" -#include "Boilerplate/FBZ/Technosqueek.h" -#include "Boilerplate/FBZ/Clucker.h" -#include "Boilerplate/FBZ/Blaster.h" -#include "Boilerplate/SPZ/Shutterbug.h" -#include "Boilerplate/SPZ/Canista.h" -#include "Boilerplate/SPZ/Tubinaut.h" -#include "Boilerplate/SPZ/MicDrop.h" -#include "Boilerplate/CPZ/Grabber.h" -#include "Boilerplate/CPZ/Spiny.h" -#include "Boilerplate/CPZ/CaterkillerJr.h" -#include "Boilerplate/CPZ/Bubbler.h" -#include "Boilerplate/GHZ/Splats.h" -#include "Boilerplate/GHZ/Newtron.h" -#include "Boilerplate/GHZ/Chopper.h" -#include "Boilerplate/GHZ/Crabmeat.h" -#include "Boilerplate/GHZ/Batbrain.h" -#include "Boilerplate/GHZ/Motobug.h" -#include "Boilerplate/GHZ/BuzzBomber.h" +#include "Mania/TMZ/FlasherMKII.h" +#include "Mania/TMZ/TurboTurtle.h" +#include "Mania/TMZ/SentryBug.h" +#include "Mania/TMZ/BallHog.h" +#include "Mania/MMZ/PohBee.h" +#include "Mania/MMZ/Scarab.h" +#include "Mania/MMZ/MechaBu.h" +#include "Mania/LRZ/Fireworm.h" +#include "Mania/LRZ/Rexon.h" +#include "Mania/LRZ/Toxomister.h" +#include "Mania/OOZ/Octus.h" +#include "Mania/OOZ/Sol.h" +#include "Mania/OOZ/Aquis.h" +#include "Mania/MSZ/Rattlekiller.h" +#include "Mania/MSZ/RollerMKII.h" +#include "Mania/MSZ/Vultron.h" +#include "Mania/MSZ/Bumpalo.h" +#include "Mania/MSZ/Armadiloid.h" +#include "Mania/MSZ/Cactula.h" +#include "Mania/MSZ/Hatterkiller.h" +#include "Mania/HCZ/TurboSpiker.h" +#include "Mania/HCZ/Buggernaut.h" +#include "Mania/HCZ/MegaChopper.h" +#include "Mania/HCZ/Jawz.h" +#include "Mania/HCZ/Jellygnite.h" +#include "Mania/HCZ/Blastoid.h" +#include "Mania/HCZ/Pointdexter.h" +#include "Mania/SSZ/Kabasira.h" +#include "Mania/SSZ/Dango.h" +#include "Mania/SSZ/Kanabun.h" +#include "Mania/SSZ/HotaruMKII.h" +#include "Mania/SSZ/Hotaru.h" +#include "Mania/PGZ/Woodrow.h" +#include "Mania/PGZ/Dragonfly.h" +#include "Mania/PGZ/IceBomba.h" +#include "Mania/PGZ/JuggleSaw.h" +#include "Mania/FBZ/FBZTrash.h" +#include "Mania/FBZ/Technosqueek.h" +#include "Mania/FBZ/Clucker.h" +#include "Mania/FBZ/Blaster.h" +#include "Mania/SPZ/Shutterbug.h" +#include "Mania/SPZ/Canista.h" +#include "Mania/SPZ/Tubinaut.h" +#include "Mania/SPZ/MicDrop.h" +#include "Mania/CPZ/Grabber.h" +#include "Mania/CPZ/Spiny.h" +#include "Mania/CPZ/CaterkillerJr.h" +#include "Mania/CPZ/Bubbler.h" +#include "Mania/GHZ/Splats.h" +#include "Mania/GHZ/Newtron.h" +#include "Mania/GHZ/Chopper.h" +#include "Mania/GHZ/Crabmeat.h" +#include "Mania/GHZ/Batbrain.h" +#include "Mania/GHZ/Motobug.h" +#include "Mania/GHZ/BuzzBomber.h" #define REGISTER_ENEMY(name) MOD_REGISTER_OBJ_OVERLOAD(name, NULL, NULL, NULL, NULL, NULL, name##_EnemyInfoHook, NULL, NULL, NULL) diff --git a/src/hypermania/Objects/HPZ/HPZBeam.c b/src/hypermania/Objects/HPZ/HPZBeam.c index 827ffcd..0e0c490 100644 --- a/src/hypermania/Objects/HPZ/HPZBeam.c +++ b/src/hypermania/Objects/HPZ/HPZBeam.c @@ -1,6 +1,6 @@ #include "HPZBeam.h" #include "ModFunctions.h" -//#include "Boilerplate/Zone.h" +//#include "Mania/Zone.h" ObjectHPZBeam* HPZBeam; diff --git a/src/hypermania/dllmain.c b/src/hypermania/dllmain.c index 425bc7f..4550dd2 100644 --- a/src/hypermania/dllmain.c +++ b/src/hypermania/dllmain.c @@ -3,26 +3,26 @@ #include "ModFunctions.h" // game classes litte/no notable modifications -#include "Objects/Boilerplate/SaveGame.h" -#include "Objects/Boilerplate/Animals.h" -#include "Objects/Boilerplate/Camera.h" -#include "Objects/Boilerplate/CollapsingPlatform.h" -#include "Objects/Boilerplate/Explosion.h" -#include "Objects/Boilerplate/FXFade.h" -#include "Objects/Boilerplate/ItemBox.h" -#include "Objects/Boilerplate/Ring.h" -#include "Objects/Boilerplate/ScoreBonus.h" -#include "Objects/Boilerplate/Zone.h" -#include "Boilerplate/Music.h" -#include "Boilerplate/Global/PauseMenu.h" -#include "Boilerplate/Global/InvincibleStars.h" +#include "Mania/SaveGame.h" +#include "Mania/Animals.h" +#include "Mania/Camera.h" +#include "Mania/CollapsingPlatform.h" +#include "Mania/Explosion.h" +#include "Mania/FXFade.h" +#include "Mania/ItemBox.h" +#include "Mania/Ring.h" +#include "Mania/ScoreBonus.h" +#include "Mania/Zone.h" +#include "Mania/Music.h" +#include "Mania/Global/PauseMenu.h" +#include "Mania/Global/InvincibleStars.h" -#include "Objects/Boilerplate/CPZ/CPZSetup.h" -#include "Objects/Boilerplate/OOZ/OOZSetup.h" -#include "Objects/Boilerplate/HCZ/HCZSetup.h" -#include "Objects/Boilerplate/MMZ/FarPlane.h" -#include "Objects/Boilerplate/ERZ/ERZStart.h" -#include "Objects/Boilerplate/BSS/BSS_Setup.h" +#include "Mania/CPZ/CPZSetup.h" +#include "Mania/OOZ/OOZSetup.h" +#include "Mania/HCZ/HCZSetup.h" +#include "Mania/MMZ/FarPlane.h" +#include "Mania/ERZ/ERZStart.h" +#include "Mania/BSS/BSS_Setup.h" // game classes with notable modifications #include "Objects/Player.h" @@ -36,7 +36,7 @@ #include "Objects/LevelSelect.h" #include "Objects/HPZ/HPZEmerald.h" #include "Objects/PlaneSeeSaw.h" -#include "Objects/Boilerplate/Debris.h" +#include "Mania/Debris.h" // new classes #include "Objects/SuperFlicky.h"