Added many small fixes, updates, etc

1 files changed, 152 insertions, 85 deletions

diff --git a/growup.yaml b/growup.yaml
index de51ca4..2d1d4a1 100644
--- a/growup.yaml
+++ b/growup.yaml
@@ -21,32 +21,92 @@ hooks:
     target_func: 'ModifyCollision'

 
 
+# Update Object Positions Based on Speed Values
 
-# Stand On Top Special Collisions Inits
+#  - name: Global_Speed_Updates

+#    type: branch_insn

+#    branch_type: b

+#    src_addr_pal: 0x8006CD00

+#    target_func: 'ModifySpeedUpdates'

 
-  - name: Global_StandonTopA

+  - name: Global_Speed_UpdatesA

     type: branch_insn

     branch_type: b

-    src_addr_pal: 0x800DB27C

-    target_func: 'ModifyStandOnTopInitA'

+    src_addr_pal: 0x80065620

+    target_func: 'ModifySpeedUpdatesA'

 
-  - name: Global_StandonTopB

+  - name: Global_Speed_UpdatesB

     type: branch_insn

     branch_type: b

-    src_addr_pal: 0x800DB294

-    target_func: 'ModifyStandOnTopInitB'

+    src_addr_pal: 0x80095730

+    target_func: 'ModifySpeedUpdatesB'

+
+
+# Loading Patches
+
+#  - name: Global_SizeLoader_X

+#    type: branch_insn

+#    branch_type: bl

+#    src_addr_pal: 0x800684B8

+#    target_func: 'ModifyLoadSizeX'

+#
+#  - name: Global_SizeLoader_Y

+#    type: branch_insn

+#    branch_type: bl

+#    src_addr_pal: 0x800684C0

+#    target_func: 'ModifyLoadSizeY'

+
+
+#  - name: Global_SizeLoader

+#    type: branch_insn

+#    branch_type: bl

+#    src_addr_pal: 0x80068930

+#    target_func: 'ModifyLoadSize'

+#
+#  - name: Global_SizeLoaderNull

+#    type: patch

+#    data: "600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000600000006000000060000000"

+#    addr_pal: 0x80068934

+
+#  - name: GlobalSizeA

+#    type: patch

+#    data: '38600001'

+#    addr_pal: 0x80064540

+#
+#  - name: GlobalSizeB

+#    type: patch

+#    data: '4E800020'

+#    addr_pal: 0x80064544

 
-  - name: Global_StandonTopC

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB30C

-    target_func: 'ModifyStandOnTopInitC'

 
-  - name: Global_StandonTopD

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB32C

-    target_func: 'ModifyStandOnTopInitD'

+
+
+
+# Stand On Top Special Collisions Inits
+#
+#  - name: Global_StandonTopA

+#    type: branch_insn

+#    branch_type: b

+#    src_addr_pal: 0x800DB27C

+#    target_func: 'ModifyStandOnTopInitA'

+#
+#  - name: Global_StandonTopB

+#    type: branch_insn

+#    branch_type: b

+#    src_addr_pal: 0x800DB294

+#    target_func: 'ModifyStandOnTopInitB'

+#
+#  - name: Global_StandonTopC

+#    type: branch_insn

+#    branch_type: b

+#    src_addr_pal: 0x800DB30C

+#    target_func: 'ModifyStandOnTopInitC'

+#
+#  - name: Global_StandonTopD

+#    type: branch_insn

+#    branch_type: b

+#    src_addr_pal: 0x800DB32C

+#    target_func: 'ModifyStandOnTopInitD'

 
 
 
@@ -90,15 +150,21 @@ hooks:
   - name: FixingPipeSpawnerGoomba

     type: branch_insn

     branch_type: bl

-    src_addr_pal: 0x80ABB6AC

-    target_func: 'InheritSettings_A'
+    src_addr_pal: 0x80ABB6A8

+    target_func: 'InheritSettings_C'
+
+  - name: FixingPipeSpawnerGoombaB

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80ABB6D0

+    target_func: 'InheritSettings_D'
 
 
   - name: FixingPipeSpawnerBobomb

     type: branch_insn

     branch_type: bl

-    src_addr_pal: 0x80ABB748

-    target_func: 'InheritSettings_A'
+    src_addr_pal: 0x80ABB758

+    target_func: 'InheritSettings_B'
     

 
 #  - name: FixingBlockHit

@@ -113,74 +179,75 @@ hooks:
 #    branch_type: bl

 #    src_addr_pal: 0x80088938

 #    target_func: 'InheritSettings_C'
-#
-#
-#  - name: FixingMegaGoomba

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A5AAA8

-#    target_func: 'InheritSettings_D'
-#
-#  - name: FixingMegaGoombaB

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A5AAC4

-#    target_func: 'InheritSettings_E'
-#
-#  - name: FixingMegaGoombaC

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A5AB44

-#    target_func: 'InheritSettings_D'
-#
-#  - name: FixingMegaGoombaD

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x880A5AB80

-#    target_func: 'InheritSettings_E'
-#
-#  - name: FixingMegaGoombaE

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A5AB9C

-#    target_func: 'InheritSettings_E'
-#
-#  - name: FixingMegaGoombaF

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A5ABB8

-#    target_func: 'InheritSettings_E'
-#
-#
-#  - name: FixingLargeGoomba

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A6A208

-#    target_func: 'InheritSettings_D'
-#
-#  - name: FixingLargeGoombaB

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A6A22C

-#    target_func: 'InheritSettings_E'
-#
-#  - name: FixingLargeGoombaC

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A6A2A8

-#    target_func: 'InheritSettings_D'
-#
-#  - name: FixingLargeGoombaD

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A6A2CC

-#    target_func: 'InheritSettings_E'
-#
+
+  - name: FixingMegaGoombaAA

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5AAA8

+    target_func: 'InheritSettings'
+
+  - name: FixingMegaGoombaAB

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5AAC4

+    target_func: 'InheritSettings'
+
+
+  - name: FixingMegaGoombaBA

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5AB44

+    target_func: 'InheritSettings'
+
+  - name: FixingMegaGoombaBB

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5AB80

+    target_func: 'InheritSettings'
+
+  - name: FixingMegaGoombaBC

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5AB9C

+    target_func: 'InheritSettings'
+
+  - name: FixingMegaGoombaBD

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A5ABB8

+    target_func: 'InheritSettings'
+
+
+  - name: FixingLargeGoombaAA

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A6A208

+    target_func: 'InheritSettings'
+
+  - name: FixingLargeGoombaAB

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A6A22C

+    target_func: 'InheritSettings'
+
+
+  - name: FixingLargeGoombaBA

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A6A2A8

+    target_func: 'InheritSettings'
+
+  - name: FixingLargeGoombaBB

+    type: branch_insn

+    branch_type: bl

+    src_addr_pal: 0x80A6A2CC

+    target_func: 'InheritSettings'
+
 
 
   - name: Piranha_Collisions

     type: patch

-    data: "41800000"

+    data: "41C00000"

     addr_pal: 0x802EE81C