From 4c8f7e0c1e6d219b5642e322d37dc6169de50d2c Mon Sep 17 00:00:00 2001 From: Treeki Date: Sat, 4 Feb 2012 21:36:43 +0100 Subject: ported Another sprite 38 fix to Newer --- src/anotherhax.S | 23 ----------------------- src/fix38.S | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 src/anotherhax.S create mode 100644 src/fix38.S (limited to 'src') diff --git a/src/anotherhax.S b/src/anotherhax.S deleted file mode 100644 index ca0a658..0000000 --- a/src/anotherhax.S +++ /dev/null @@ -1,23 +0,0 @@ -.set sp, 1 - -.extern continueFromFlagObjCheck -.extern returnFromFlagObjCheck - -.global fix38WithJumpCoin - -.text - -fix38WithJumpCoin: - # hacky fix because I can't figure out how to do it the right way - - # check actor type for EN_COIN_JUMP - lhz r0, 8(r3) - cmplwi r0, 403 - bne dontContinue - b continueFromFlagObjCheck -dontContinue: - - # it wasn't that, so just return 0 - li r3, 0 - b returnFromFlagObjCheck - diff --git a/src/fix38.S b/src/fix38.S new file mode 100644 index 0000000..09c3ac6 --- /dev/null +++ b/src/fix38.S @@ -0,0 +1,24 @@ +.set sp, 1 + +.extern continueFromFlagObjCheck +.extern returnFromFlagObjCheck + +.global fix38WithJumpCoin + +.text + +fix38WithJumpCoin: + # hacky fix because I can't figure out how to do it the right way + + # check actor type for EN_COIN_JUMP + lhz r0, 8(r3) + cmplwi r0, 403 + beq continueFromFlagObjCheck + # and EN_HATENA_BALLOON + cmplwi r0, 221 + beq continueFromFlagObjCheck + + # it wasn't that, so just return 0 + li r3, 0 + b returnFromFlagObjCheck + -- cgit v1.2.3