the worst error in the history of errors

sac
Zenith-Team · Aug 20, 2022 · e05ea89 · e05ea89
1 parent da7ea07
commit e05ea89
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/modules/deathfoo.yaml b/modules/deathfoo.yaml
@@ -3,14 +3,14 @@
 Files:
   - source/deathfoo.S
 Hooks:
-# Add the ability to spawn deathfoo clouds from Foo
-  # Temp patch: set type to spawned by death foo in onCreate
+# Add the ability to spawn deathfoo clouds from Foo (replaces No Cloud setting)
+  # Set type to spawned by death foo in onCreate
   - type: patch
     addr: "23b4f4c" # Foo::onCreate()
     data: "3BA000B0" # li r29, 0xB0
-  # Temp patch: set type to spawned by death foo executeState_BreathIn
+  # Set type to spawned by death foo executeState_BreathIn
   - type: patch
-    addr: "23b5b5c"
+    addr: "23b5b5c" # Foo::executeState_BreathIn()
     data: "3BA000B0" # li r29, 0xB0
 # Add custom deathfoo cloud type
   # Redirect the custom cloud type to call the foo type function, we can patch it there

diff --git a/source/csscript.cpp b/source/csscript.cpp
@@ -2,8 +2,8 @@
 
 /*
     * Course Select Scripts
-    * Dumped by RoadrunnerWMC for the Cobra project @ https://github.com/RoadrunnerWMC/Cobra
-    * Note: This is a modified version of the original CS scripts, find the orginal here: https://pastebin.com/f2MTPneY
+    * Originally dumped by RoadrunnerWMC for the Cobra project @ https://github.com/RoadrunnerWMC/Cobra
+    * Note: This is a modified version of the vanilla CS scripts, find those here: https://pastebin.com/f2MTPneY
 */
 
 namespace cmd = CSCommand;

diff --git a/source/deathfoo.S b/source/deathfoo.S
@@ -22,7 +22,7 @@ SetSpawnedCloudType:
     blr
 
 .global SetDeathFooTexture
-SetDeathFooTexture:
+SetDeathFooTexture: # Unused for now
     lwz   r0, 0x18C0(r28) # Load this->noCloud
     cmpwi r0, 0x0
     lis   r0, 0x1009
@@ -126,7 +126,7 @@ CloudCollision:
     mflr r23
     fmr f16, f1
 
-    # Load address to player damage function
+    # Load address to player damage function (vtable)
     lwz r12, 0x4C(r11)
     lwz r12, 0x8E4(r12)
     mtctr r12

diff --git a/source/profile/profile.cpp b/source/profile/profile.cpp
@@ -1,6 +1,8 @@
 #include "game/profile/profile.h"
 #include "game/actor/actor.h"
 
+#define RESERVED_ID 0xFFFF
+
 Profile* Profile::profilesCustom[Profile::NUM_PROFILES_CUSTOM];
 s16 Profile::prioritiesCustom[Profile::NUM_PROFILES_CUSTOM] = { 0 };
 u8 Profile::resourcesLoadAtCustom[Profile::NUM_PROFILES_CUSTOM] = { 0 };
@@ -823,7 +825,7 @@ u32 Profile::spriteToProfileList[] = {
     ProfileID::TaskChanger,             // 732
     ProfileID::Cataquack,               // 733
     ProfileID::TimeClock,               // 734
-    0xFFFF,                             // 735 //! Effect spawner goes here
+    RESERVED_ID,                        // 735 //! Effect spawner goes here
     ProfileID::AngrySun,                // 736
     ProfileID::AngryMoon,               // 737
     ProfileID::RainbowLight,            // 738

diff --git a/source/sarcloader.S b/source/sarcloader.S
@@ -1,5 +1,5 @@
 .rodata
-CoursePathFormat:       .string "course_res_pack/%s.sac"
+CoursePathFormat:       .string "course_res_pack/%s.sarc"
 RDashCoursePathFormat:  .string "rdash://course_res_pack/%s.sarc"
 
 .text