diff options
author | Treeki <treeki@gmail.com> | 2012-09-24 05:40:39 +0200 |
---|---|---|
committer | Treeki <treeki@gmail.com> | 2012-09-24 05:40:39 +0200 |
commit | 245bb3325f613f81973866100e86ee681b0fde9d (patch) | |
tree | 7837866a91fc6c422ffb9b730c2fdbbb6577ea53 /spritetex.yaml | |
parent | aafa2a57c88c01067266244eae2a906d8771c065 (diff) | |
parent | 4f567256d015cf7a835ac03b9e5abb8a2a7eb12a (diff) | |
download | kamek-245bb3325f613f81973866100e86ee681b0fde9d.tar.gz kamek-245bb3325f613f81973866100e86ee681b0fde9d.zip |
Merge branch 'level-select' into new-hud
Diffstat (limited to '')
-rw-r--r-- | spritetex.yaml | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index 88d0d55..a15b859 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -443,12 +443,28 @@ hooks: # data: '60000000' # addr_pal: 0x80A9D054 + - name: TEX_PokeySnowmanRotA + type: patch + data: '60000000' + addr_pal: 0x80A9F740 + + - name: TEX_PokeySnowmanRotB + type: patch + data: '60000000' + addr_pal: 0x80A9F768 + - name: TEX_PokeySnowmanRotate type: branch_insn branch_type: bl - src_addr_pal: 0x80A9F76C + src_addr_pal: 0x80AA0690 target_func: 'TEX_PokeySnowmanRotate' + - name: TEX_PokeySnowmanImmuneToIce + type: branch_insn + branch_type: bl + src_addr_pal: 0x80A9D940 + target_func: 'TEX_PokeySnowmanImmuneToIce' + - name: TEX_PokeySnowman type: branch_insn @@ -648,11 +664,11 @@ hooks: src_addr_pal: 0x808BB34C target_func: 'TobiPukuBypass' - - name: TEX_TobiPuku - type: branch_insn - branch_type: bl - src_addr_pal: 0x80AB2288 - target_func: 'TEX_TobiPuku' + # - name: TEX_TobiPuku + # type: branch_insn + # branch_type: bl + # src_addr_pal: 0x80AB2288 + # target_func: 'TEX_TobiPuku' - name: TobiPukuSoundChangeB type: branch_insn |