diff options
| author | Treeki <treeki@gmail.com> | 2013-03-03 02:52:30 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-03-03 02:52:30 +0100 |
| commit | 623986662d631c124ea61f96b44f3de410b4e052 (patch) | |
| tree | 198cff6ac341e21acc10d37124ad94f8d8d0bf08 | |
| parent | 306549db49e602e0c6fd02a282f779e254f371c1 (diff) | |
| download | kamek-623986662d631c124ea61f96b44f3de410b4e052.tar.gz kamek-623986662d631c124ea61f96b44f3de410b4e052.zip | |
fix the broken fireball setup
| -rw-r--r-- | bugfixes.yaml | 6 | ||||
| -rw-r--r-- | kamek_pal.x | 1 | ||||
| -rw-r--r-- | src/randomcrap.S | 12 |
3 files changed, 19 insertions, 0 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml index d5488ca..fe47d41 100644 --- a/bugfixes.yaml +++ b/bugfixes.yaml @@ -258,3 +258,9 @@ hooks: src_addr_pal: 0x8011857C
target_func: 'GiganticBackgrounds'
+ - name: FixFireballSensorSetup
+ type: branch_insn
+ branch_type: b
+ src_addr_pal: 0x8011A82C
+ target_func: 'FixFireballSensorSetup'
+
diff --git a/kamek_pal.x b/kamek_pal.x index c3ceadd..5011f13 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -1,4 +1,5 @@ SECTIONS { + ContinueFromFixFireballSensorSetup = 0x8011A830; GetPosForLayoutEffect__FP7Point3db = 0x800B37E0; ContinueFromJustOneBomb = 0x80A123AC; diff --git a/src/randomcrap.S b/src/randomcrap.S index 2956300..ff5f1ba 100644 --- a/src/randomcrap.S +++ b/src/randomcrap.S @@ -287,6 +287,18 @@ ExitStageReal: stwu r1, -0x20(r1) b ExitStageRealRest + +.global FixFireballSensorSetup +.extern ContinueFromFixFireballSensorSetup +FixFireballSensorSetup: + mr r3, r30 + lwz r12, 0x60(r3) + lwz r12, 0x11C(r12) + mtctr r12 + bctrl + mr r3, r30 + b ContinueFromFixFireballSensorSetup + .data .global BGScaleFront, BGScaleBack, BGScaleEnabled BGScale: |