summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--growup.yaml4
-rwxr-xr-xsrc/growup.s9
2 files changed, 11 insertions, 2 deletions
diff --git a/growup.yaml b/growup.yaml
index 9e5caeb..0fe73ed 100644
--- a/growup.yaml
+++ b/growup.yaml
@@ -152,7 +152,7 @@ hooks:
type: branch_insn
branch_type: bl
src_addr_pal: 0x80ABB6D0
- target_func: 'InheritSettings_D'
+ target_func: 'InheritSettings_D_r31'
- name: FixingPipeSpawnerBobomb
@@ -355,4 +355,4 @@ hooks:
# 809EA268 - Broozer physics struct
# 80ABB6E0 - Pipe Generator
-#80AB7910 \ No newline at end of file
+#80AB7910
diff --git a/src/growup.s b/src/growup.s
index d7923ac..4ec3a6b 100755
--- a/src/growup.s
+++ b/src/growup.s
@@ -919,6 +919,15 @@ InheritSettings_D:
blr
+.global InheritSettings_D_r31
+InheritSettings_D:
+
+ lwz r0, 4(r31)
+ andis. r0, r0, 0xFFF0
+ or r4, r4, r0
+ blr
+
+
.global AlwaysVisible
AlwaysVisible: