diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 16:08:54 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 16:08:54 -0500 |
| commit | 9df87851bac473d72f8c061af719e2b0a0116dec (patch) | |
| tree | dbea9530ad6dfbfc606b60d4c5e8af7de558a103 | |
| parent | b9d6e55d5823ec18050ba2bd3c9c968c219dec92 (diff) | |
| download | kamek-9df87851bac473d72f8c061af719e2b0a0116dec.tar.gz kamek-9df87851bac473d72f8c061af719e2b0a0116dec.zip | |
fixed up the level select yaml, fixed snowman pokey and commented out cheep cheep textures
| -rw-r--r-- | NewerProject.yaml | 4 | ||||
| -rw-r--r-- | spritetex.yaml | 28 | ||||
| -rwxr-xr-x | src/spritetex.S | 26 |
3 files changed, 47 insertions, 11 deletions
diff --git a/NewerProject.yaml b/NewerProject.yaml index ae354bf..056cdbd 100644 --- a/NewerProject.yaml +++ b/NewerProject.yaml @@ -2,8 +2,11 @@ output_dir: "NewerASM" code_address: 0x808D9000 modules: - processed/prolog.yaml +# - processed/layoutDebug.yaml - processed/fileselect.yaml - processed/magicplatform.yaml + - processed/cutScene.yaml + - processed/bonepiece.yaml - processed/bugfixes.yaml - processed/worldmap.yaml # - processed/koopatlas.yaml @@ -54,5 +57,6 @@ modules: - processed/makeYourOwn.yaml - processed/challengeStar.yaml - processed/singAlong.yaml + - processed/pumpkinGoomba.yaml # - processed/pengi.yaml # - processed/actorlog.yaml 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 diff --git a/src/spritetex.S b/src/spritetex.S index 692a381..7c9f505 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -638,13 +638,10 @@ SnowmanSandToSnowB: - SnowmanPokeyRotate: - - lha r3, 0x102(r30) + li r5, 0x100 blr - .global TEX_PokeySnowmanRotate TEX_PokeySnowmanRotate: @@ -655,10 +652,29 @@ TEX_PokeySnowmanRotate: cmpwi r10, 0x2 bne SnowmanPokeyRotate + li r5, 0 + blr + + +PokeySnowmanImmuneToIce: + lwz r31, 4(r5) + blr + +.global TEX_PokeySnowmanImmuneToIce +TEX_PokeySnowmanImmuneToIce: + lwz r10, 4(r3) + srwi r10, r10, 24 + andi. r10, r10, 0xF + + cmpwi r10, 0x2 + bne PokeySnowmanImmuneToIce + li r3, 0 - sth r3, 0x102(r30) + mtlr r0 blr + + .global TEX_PokeySnowman TEX_PokeySnowman: |