diff options
| author | Treeki <treeki@gmail.com> | 2012-04-28 18:09:21 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-04-28 18:09:21 +0200 |
| commit | 9534a0a6dc0bde85c397fe2bca2bbca0a6b69f6e (patch) | |
| tree | d64fae9d65d12236ecbe93d9c7c23f615041e69a | |
| parent | c60dbb8bcdb585753980cadda66f012ffb71f1ec (diff) | |
| download | kamek-9534a0a6dc0bde85c397fe2bca2bbca0a6b69f6e.tar.gz kamek-9534a0a6dc0bde85c397fe2bca2bbca0a6b69f6e.zip | |
powerup texture fixed for toad
| -rw-r--r-- | kamek_pal.x | 3 | ||||
| -rw-r--r-- | poweruphax.yaml | 6 | ||||
| -rw-r--r-- | src/poweruphax.S | 10 |
3 files changed, 19 insertions, 0 deletions
diff --git a/kamek_pal.x b/kamek_pal.x index 0079576..5ca1042 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -296,6 +296,7 @@ SECTIONS { createHeap__7fBase_cFUiPv = 0x80162930; heapCreated__7fBase_cFv = 0x801629F0; Delete__7fBase_cFv = 0x80162650; + findNextUninitialisedProcess__7fBase_cFv = 0x80162AF0; hasUninitialisedProcesses__7fBase_cFv = 0x80162B60; onDraw__7fBase_cFv = 0x80162310; _Z15fBase_c__DeletePv = 0x80162650; @@ -1361,6 +1362,8 @@ SECTIONS { continuePlumberSetPowerupTexture = 0x800CA71C; doneSettingThePowerupTexture = 0x800D483C; doneSettingThePowerupTexture2 = 0x80141574; + + continueToadPowerupSet = 0x800BCFD4; continuePlumberSetPowerupTextureDebug = 0x800CA6B4; diff --git a/poweruphax.yaml b/poweruphax.yaml index 4b454aa..3a9aa21 100644 --- a/poweruphax.yaml +++ b/poweruphax.yaml @@ -207,6 +207,12 @@ hooks: # branch_type: b # src_addr_pal: 0x800CA6B0 # target_func: 'PlumberSetPowerupTextureDebug' + + - name: FixToadPowerup + type: branch_insn + branch_type: b + src_addr_pal: 0x800BCFB0 + target_func: 'ToadPowerupFix' - name: FixPowerupScale_First type: branch_insn diff --git a/src/poweruphax.S b/src/poweruphax.S index f8d1c2a..cf6ecb6 100644 --- a/src/poweruphax.S +++ b/src/poweruphax.S @@ -612,6 +612,16 @@ gotHammerStatus: +.extern continueToadPowerupSet +.global ToadPowerupFix +ToadPowerupFix: + lis r8, PowerupTextures@h + ori r8, r8, PowerupTextures@l + slwi r9, r4, 2 + lfsx f1, r8, r9 + fadds f31, f31, f1 + b continueToadPowerupSet + .data |