diff options
| author | Treeki <treeki@gmail.com> | 2012-02-04 21:36:43 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-02-04 21:36:43 +0100 |
| commit | 4c8f7e0c1e6d219b5642e322d37dc6169de50d2c (patch) | |
| tree | 0ff01b1b268d5a0814598ae5e2d62a81755fef96 | |
| parent | a1e88d255ec5b2d47c6467a5818fbe34e00588c1 (diff) | |
| download | kamek-4c8f7e0c1e6d219b5642e322d37dc6169de50d2c.tar.gz kamek-4c8f7e0c1e6d219b5642e322d37dc6169de50d2c.zip | |
ported Another sprite 38 fix to Newer
| -rw-r--r-- | anotherhax.yaml | 2 | ||||
| -rw-r--r-- | bugfixes.yaml | 14 | ||||
| -rw-r--r-- | src/fix38.S (renamed from src/anotherhax.S) | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/anotherhax.yaml b/anotherhax.yaml index 4fe904c..b09081b 100644 --- a/anotherhax.yaml +++ b/anotherhax.yaml @@ -1,4 +1,4 @@ -source_files: [../src/anotherhax.S] +source_files: [../src/fix38.S] hooks: - {addr_pal: 0x8000D064, data: '280000FF', name: Fix1, type: patch} - {addr_pal: 0x80079BD0, data: '280000FF', name: Fix2, type: patch} diff --git a/bugfixes.yaml b/bugfixes.yaml index 0ca99c7..63cc6a2 100644 --- a/bugfixes.yaml +++ b/bugfixes.yaml @@ -1,5 +1,5 @@ ---
-source_files: [../src/randomcrap.S, ../src/music.S]
+source_files: [../src/randomcrap.S, ../src/music.S, ../src/fix38.S]
hooks:
- name: MusicHax type: branch_insn @@ -7,12 +7,12 @@ hooks: branch_type: b target_func: 'HaxMusic' - - name: FixCoinJump
- type: patch
- addr_ntsc: 0x809E75F0
- addr_pal: 0x809E75D0
- data: '38800008 B0830364 4e800020' #li r4,8; sth r4,0x364(r3); blr
-
+ - name: Fix38WithJumpCoin + src_addr_pal: 0x807EBC5C + type: branch_insn + branch_type: b + target_func: 'fix38WithJumpCoin' + - name: 1-1 BG Fix
type: patch
addr_ntsc: 0x80117F6C
diff --git a/src/anotherhax.S b/src/fix38.S index ca0a658..09c3ac6 100644 --- a/src/anotherhax.S +++ b/src/fix38.S @@ -13,9 +13,10 @@ fix38WithJumpCoin: # check actor type for EN_COIN_JUMP lhz r0, 8(r3) cmplwi r0, 403 - bne dontContinue - b continueFromFlagObjCheck -dontContinue: + beq continueFromFlagObjCheck + # and EN_HATENA_BALLOON + cmplwi r0, 221 + beq continueFromFlagObjCheck # it wasn't that, so just return 0 li r3, 0 |