merged

1 files changed, 227 insertions, 227 deletions

diff --git a/growup.yaml b/growup.yaml
index c7238ae..94790e1 100644
--- a/growup.yaml
+++ b/growup.yaml
@@ -1,82 +1,82 @@
----

-source_files: [../src/growup.s]

-hooks:

+---
+source_files: [../src/growup.s]
+hooks:
 
 
 # After Actor onCreate
 
-  - name: Global_Size

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x800951EC

-    target_func: 'ModifyGlobalSizes'

+  - name: Global_Size
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x800951EC
+    target_func: 'ModifyGlobalSizes'
 
 
 # Active Physics Init from Struct
 
-  - name: Global_Collisions

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x8008C3E0

-    target_func: 'ModifyCollision'

+  - name: Global_Collisions
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x8008C3E0
+    target_func: 'ModifyCollision'
 
 
 # Update Object Positions Based on Speed Values
 
-#  - name: Global_Speed_Updates

-#    type: branch_insn

-#    branch_type: b

-#    src_addr_pal: 0x8006CD00

-#    target_func: 'ModifySpeedUpdates'

+#  - name: Global_Speed_Updates
+#    type: branch_insn
+#    branch_type: b
+#    src_addr_pal: 0x8006CD00
+#    target_func: 'ModifySpeedUpdates'
 
-  - name: Global_Speed_UpdatesA

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x80065620

-    target_func: 'ModifySpeedUpdatesA'

+  - name: Global_Speed_UpdatesA
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x80065620
+    target_func: 'ModifySpeedUpdatesA'
 
-  - name: Global_Speed_UpdatesB

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x80095730

-    target_func: 'ModifySpeedUpdatesB'

+  - name: Global_Speed_UpdatesB
+    type: branch_insn
+    branch_type: b
+    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_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_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: 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: GlobalSizeB
+#    type: patch
+#    data: '4E800020'
+#    addr_pal: 0x80064544
 
 
 
@@ -84,58 +84,58 @@ hooks:
 
 # Stand On Top Special Collisions Inits
 #
-#  - name: Global_StandonTopA

-#    type: branch_insn

-#    branch_type: b

-#    src_addr_pal: 0x800DB27C

-#    target_func: 'ModifyStandOnTopInitA'

+#  - 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_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_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'

+#  - name: Global_StandonTopD
+#    type: branch_insn
+#    branch_type: b
+#    src_addr_pal: 0x800DB32C
+#    target_func: 'ModifyStandOnTopInitD'
 
 
 
 # Rideable Actor Inits
 
 
-  - name: Global_RiderA

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB690

+  - name: Global_RiderA
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800DB690
     target_func: 'ModifyRiderInitA'
 
-  - name: Global_RiderB

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB6B4

+  - name: Global_RiderB
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800DB6B4
     target_func: 'ModifyRiderInitB'
 
-  - name: Global_RiderC

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB6E8

-    target_func: 'ModifyRiderInitC'

+  - name: Global_RiderC
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800DB6E8
+    target_func: 'ModifyRiderInitC'
 
-  - name: Global_RiderD

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x800DB6FC

-    target_func: 'ModifyRiderInitD'

+  - name: Global_RiderD
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x800DB6FC
+    target_func: 'ModifyRiderInitD'
 
 
 
@@ -147,207 +147,207 @@ hooks:
 ## Below are enemy specific hacks to fix issues that arise when resizing
 
 
-  - name: FixingPipeSpawnerGoomba

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x80ABB6A8

+  - name: FixingPipeSpawnerGoomba
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x80ABB6A8
     target_func: 'InheritSettings_C'
 
-  - name: FixingPipeSpawnerGoombaB

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x80ABB6D0

+  - 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: 0x80ABB758

+  - name: FixingPipeSpawnerBobomb
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x80ABB758
     target_func: 'InheritSettings_B'
-    

+    
 
-#  - name: FixingBlockHit

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x800883A4

+#  - name: FixingBlockHit
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x800883A4
 #    target_func: 'InheritSettings_B'
 #
 #
-#  - name: FixingBlockHitB

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80088938

+#  - name: FixingBlockHitB
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x80088938
 #    target_func: 'InheritSettings_C'
 
-  - name: FixingMegaGoombaAA

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x80A5AAA8

+  - 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

+  - 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

+  - 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

+  - 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

+  - 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

+  - 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

+  - 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

+  - 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

+  - 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

+  - name: FixingLargeGoombaBB
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x80A6A2CC
     target_func: 'InheritSettings'
 
 
 
-  - name: Piranha_Collisions

-    type: patch

-    data: "41C00000"

-    addr_pal: 0x802EE81C

+  - name: Piranha_Collisions
+    type: patch
+    data: "41C00000"
+    addr_pal: 0x802EE81C
 
 
 
 
-  - name: GlobalZOrderDeath

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x800980A4

+  - name: GlobalZOrderDeath
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x800980A4
     target_func: 'GlobalZOrderDeath'
 
-  - name: PokeyZOrderDeath

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x80A9ED2C

+  - name: PokeyZOrderDeath
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x80A9ED2C
     target_func: 'PokeyZOrderDeath'
 
-  - name: PokeyZOrderDeathFreeze

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x80A9EE58

+  - name: PokeyZOrderDeathFreeze
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x80A9EE58
     target_func: 'PokeyZOrderDeathFreeze'
 
-  - name: PokeyZOrderDamage

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x800A18E8

+  - name: PokeyZOrderDamage
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x800A18E8
     target_func: 'PokeyZOrderDamage'
 
 
-  - name: GabonRockZOrderDeath

-    type: branch_insn

-    branch_type: b

-    src_addr_pal: 0x807FAAAC

+  - name: GabonRockZOrderDeath
+    type: branch_insn
+    branch_type: b
+    src_addr_pal: 0x807FAAAC
     target_func: 'GabonRockZOrderDeath'
 
-  - name: GabonRockZOrderDeathDrop

-    type: branch_insn

-    branch_type: bl

-    src_addr_pal: 0x807FA9C0 

+  - name: GabonRockZOrderDeathDrop
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x807FA9C0 
     target_func: 'GabonRockZOrderDeathDrop'
 
 
 
 #
-#  - name: Projectile_Lakitu

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80AB7A28

+#  - name: Projectile_Lakitu
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x80AB7A28
 #    target_func: 'LakituBomb'
 #    
 #
-#  - name: Projectile_LakituTwo

-#    type: patch

-#    data: "6000000060000000"

-#    addr_pal: 0x80A37BF4

+#  - name: Projectile_LakituTwo
+#    type: patch
+#    data: "6000000060000000"
+#    addr_pal: 0x80A37BF4
 #
-#  - name: Projectile_LakituThree

-#    type: patch

-#    data: "60000000"

-#    addr_pal: 0x80A37CDC

+#  - name: Projectile_LakituThree
+#    type: patch
+#    data: "60000000"
+#    addr_pal: 0x80A37CDC
 #
-#  - name: Projectile_LakituFour

-#    type: patch

-#    data: "60000000"

-#    addr_pal: 0x80A37D00

+#  - name: Projectile_LakituFour
+#    type: patch
+#    data: "60000000"
+#    addr_pal: 0x80A37D00
 #
-#  - name: Projectile_LakituFive

-#    type: patch

-#    data: "60000000"

-#    addr_pal: 0x80A37B0C

+#  - name: Projectile_LakituFive
+#    type: patch
+#    data: "60000000"
+#    addr_pal: 0x80A37B0C
 #
 
 
 
-#  - name: Projectile_Pirahna

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80029640

-#    target_func: 'PiranhaFireType'

+#  - name: Projectile_Pirahna
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x80029640
+#    target_func: 'PiranhaFireType'
 #
-#  - name: Projectile_PiranhaPos

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x8002964C

-#    target_func: 'PiranhaFirePos'

+#  - name: Projectile_PiranhaPos
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x8002964C
+#    target_func: 'PiranhaFirePos'
 
 #
-#  - name: Projectile_PirahnaB

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80A33300

-#    target_func: 'PiranhaFireType'

-
-
-#  - name: PipeGenerator

-#    type: branch_insn

-#    branch_type: bl

-#    src_addr_pal: 0x80ABB76C

-#    target_func: 'PipeGeneratorSpawn'

+#  - name: Projectile_PirahnaB
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x80A33300
+#    target_func: 'PiranhaFireType'
+
+
+#  - name: PipeGenerator
+#    type: branch_insn
+#    branch_type: bl
+#    src_addr_pal: 0x80ABB76C
+#    target_func: 'PipeGeneratorSpawn'
 
 
 # 809EA268 - Broozer physics struct