diff options
| author | Treeki <treeki@gmail.com> | 2013-03-03 02:53:03 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-03-03 02:53:03 +0100 |
| commit | fd44cf6ce77b7cc16619f4274c31ba9137fc0064 (patch) | |
| tree | 83ee84dcb8274dca2c4a9f114eb0161cd4da875d | |
| parent | c563103b0ba5bfe79e79395ab0e05094974e4ca7 (diff) | |
| download | kamek-fd44cf6ce77b7cc16619f4274c31ba9137fc0064.tar.gz kamek-fd44cf6ce77b7cc16619f4274c31ba9137fc0064.zip | |
disable mpgp on spike tops with texture 5
Diffstat (limited to '')
| -rw-r--r-- | spritetex.yaml | 5 | ||||
| -rwxr-xr-x | src/spritetex.S | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index 2beb4b6..c03afa4 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -121,6 +121,11 @@ hooks: src_addr_pal: 0x80AB2C34 target_func: 'TEX_SpikeTop' + - name: TogeMetPowFix + type: add_func_pointer + src_addr_pal: 0x80B0B9DC + target_func: 'TogeMetPowFix' + - name: TEX_SpinyShell type: branch_insn diff --git a/src/spritetex.S b/src/spritetex.S index 7fa09ba..2831b31 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -1598,6 +1598,13 @@ BigMetPowFix: beqlr b OriginalPowBlockActivated +.global TogeMetPowFix +TogeMetPowFix: + lwz r5, 4(r3) + extrwi r5, r5, 4,4 + cmpwi r5, 5 + beqlr + b OriginalPowBlockActivated .data BomombDir: |