diff options
| author | Treeki <treeki@gmail.com> | 2013-01-19 00:12:33 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-01-19 00:12:33 +0100 |
| commit | 15afe4d423d3966b90f6c72b9cdc06914b0ac363 (patch) | |
| tree | 85cb6490a0d6c26bc5b202788f119e34feeed805 /src/poweruphax.S | |
| parent | 1e2fe2181af8215e6da3f55d0350385d0af2f7e0 (diff) | |
| download | kamek-15afe4d423d3966b90f6c72b9cdc06914b0ac363.tar.gz kamek-15afe4d423d3966b90f6c72b9cdc06914b0ac363.zip | |
hammer model added
Diffstat (limited to '')
| -rw-r--r-- | src/poweruphax.S | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/src/poweruphax.S b/src/poweruphax.S index 16800e6..2a65f3e 100644 --- a/src/poweruphax.S +++ b/src/poweruphax.S @@ -961,12 +961,26 @@ g3d_I_kinoko_brres: .string "g3d/I_kinoko.brres" .global I_propeller_model I_propeller_model: .string "I_propeller_model" +.global SI_kinoko +SI_kinoko: .string "SI_kinoko" + +.global SI_hammer +SI_hammer: .string "SI_hammer" + +g3d: .string "g3d/" + .text .global AddHSToBattleItem_FixWait2Anim AddHSToBattleItem_FixWait2Anim: lis r4, wait2@h ori r4, r4, wait2@l blr + +.global InsertLostG3D +InsertLostG3D: + lis r4, g3d@h + ori r4, r4, g3d@l + blr .data wait2: .string "wait2" @@ -1240,7 +1254,7 @@ notGoodEnough: lwz r0, 0x91C(r30) li r3, 7 cmpwi r0, 0 - b _ChosenStartChoice + beq _ChosenStartChoice stw r3, 0x8A0(r30) _ChosenStartChoice: b ChosenStartChoice @@ -1417,3 +1431,25 @@ DontUpdateSIS: .align 4 ptrToTwo: .long 2 +.text +.global SkawoHatesMe, SkawoStillHatesMe + +SkawoHatesMe: + lwzx r4, r27, r0 + cmpwi r0, 28 + bnelr + lis r5, SkawoFucksDucks@h + ori r5, r5, SkawoFucksDucks@l + blr +SkawoStillHatesMe: + lwzx r4, r4, r0 + cmpwi r0, 28 + bnelr + lis r4, DuckFuckersUnited@h + ori r4, r4, DuckFuckersUnited@l + blr +.data +SkawoFucksDucks: .string "g3d/I_fireflower.brres" +DuckFuckersUnited: .string "I_fireflower" +.align 4 + |